From f19ddcd887b1e4c8054a0da978d115cf307affcc Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 12 七月 2023 15:59:55 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java | 30 ++++++++++++++++++++++++++++++ phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java | 9 +++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java b/phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java new file mode 100644 index 0000000..e04fe41 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/channel/ChannelGeneralDto.java @@ -0,0 +1,30 @@ +package com.hz.his.dto.channel; + +import lombok.Data; + +import java.util.List; + +/** + * @author fwq + * 娓犻亾鎵╁睍 + * */ +@Data +public class ChannelGeneralDto { + + /**涓绘笭閬撲竴绾ф爣璇�*/ + private String channelId; + /**涓绘笭閬撲簩绾ф爣璇�*/ + private String channel2Id; + + /**娆℃笭閬撲竴绾ф爣璇�*/ + private String channelAssId; + /**娆℃笭閬撲簩绾ф爣璇�*/ + private String channelAss2Id; + + /**娓犻亾澶х被鏍囪瘑*/ + private List<String> typeIdList; + + /**鍒ゆ柇鍝簺:0涓绘笭閬�1娆℃笭閬�*/ + private Integer checkType; + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java index a5717d4..eb87393 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java @@ -2,6 +2,8 @@ import com.hx.resultTool.Result; import com.hz.his.dto.PageDto; +import com.hz.his.dto.channel.ChannelDto; +import com.hz.his.dto.channel.ChannelGeneralDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -34,4 +36,11 @@ */ @PostMapping(value = "/channels/type/list") Result getChannelsListByType(@RequestBody PageDto pageDto); + + /** + * 鑾峰彇娓犻亾鍒楄〃-鍒ゆ柇鏄惁褰掑睘 + * @return Result + */ + @PostMapping(value = "/channels/type/check") + Result checkInChannel(@RequestBody ChannelGeneralDto channelGeneralDto); } -- Gitblit v1.8.0