From d768d607e24628420c6416ac955e491e8d747d9d Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期一, 08 八月 2022 19:45:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java index bd99279..9251ceb 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java @@ -2,11 +2,13 @@ import com.alibaba.fastjson.JSONObject; import com.hx.resultTool.Result; +import com.hz.his.dto.dcp.TagRuleInfoDto; import com.hz.his.dto.dcp.TagRuleInfoItemDto; import com.hz.his.dto.dcp.UserTagInfoDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; /** * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� @@ -17,6 +19,10 @@ /**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/ @PostMapping("/user/tag/info/list") Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto); + + /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖鐢ㄦ埛id鏁扮粍*/ + @RequestMapping("/user/tag/info/user/list") + Result userListData(@RequestBody UserTagInfoDto userTagInfoDto); /** * 缂栬緫鐢ㄦ埛鏍囩 娣诲姞 缂栬緫 鍒犻櫎 涓夊悎涓�鎺ュ彛 @@ -49,4 +55,8 @@ /**鏍囩鍒楄〃*/ @PostMapping("/tag/rule/item/list") Result tagInfoListData(@RequestBody TagRuleInfoItemDto tagRuleInfoItemDto); + + /**鏍囩鍒嗙被鏁版嵁鍒楄〃*/ + @PostMapping("/tag/rule/info/list") + Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto); } -- Gitblit v1.8.0