From 0c3e8c0ab0312262e5fa0e1a58c3562dd0201915 Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期二, 18 四月 2023 18:27:44 +0800 Subject: [PATCH] 新增调查问卷dto --- phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 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 9251bb7..989077f 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 @@ -1,14 +1,15 @@ package com.hz.his.feign.service.dcp; +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; -import org.springframework.web.bind.annotation.RequestMethod; - -import javax.servlet.http.HttpServletRequest; +import org.springframework.web.bind.annotation.RequestParam; /** * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� @@ -16,9 +17,17 @@ @FeignClient(name="dcp-rules-service",path = "/dcp-rules",contextId = "userTagInfo") public interface SUserTagInfoService { + /** 鏍囩鍒嗙被鏍戝瀷鍒楄〃 */ + @PostMapping("/tag/rule/info/list/tree") + Result listTreeData(); + /**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/ - @RequestMapping("/user/tag/info/list") - Result userTagInfoListData(@RequestBody(required = false) UserTagInfoDto userTagInfoDto); + @PostMapping("/user/tag/info/list") + Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto); + + /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖(FilterUserDto)*/ + @RequestMapping("/user/tag/info/user/list") + Result userListData(@RequestBody UserTagInfoDto userTagInfoDto); /** * 缂栬緫鐢ㄦ埛鏍囩 娣诲姞 缂栬緫 鍒犻櫎 涓夊悎涓�鎺ュ彛 @@ -30,25 +39,33 @@ * (鏄惁鑷畾涔夋爣绛� 鍚�)"isCustom": 0, * (鏍囩绫诲瀷缂栧彿)"typeNo": "constellation", * (鏍囩缂栧彿)"tagNo": "LA20220506bRnJDj" - * }, - * { + * }, + * { * (鏄惁鑷畾涔夋爣绛� 鏄�)"isCustom": 1, - * (鏍囩绫诲瀷缂栧彿 娌℃湁绫诲瀷鍙互涓虹┖鎴栦笉浼�)"typeNo": "constellation", + * (鏍囩绫诲瀷缂栧彿)"typeNo": "constellation", * (鏍囩缂栧彿)"tagName": "鐗涢┈搴�" * } * ], * (鍒犻櫎鐨勬暟鎹甶d)"deleteUserTagInfoIdList": ["62d91ec5776bca1873344066"] * } */ - @RequestMapping(value = "/user/tag/info/edit", method = RequestMethod.POST) - Result edit(HttpServletRequest request, @RequestBody(required = false) String data); + @PostMapping(value = "/user/tag/info/edit") + Result edit(@RequestBody JSONObject data); /**鏍囩鍒嗙被鏍戝舰鏁版嵁 鏁版嵁妗堜緥锛歿"ascription":["customer","project","product","card","employee","promotion"]}*/ - @RequestMapping("/tag/rule/info/tree/data") - Result tagTypeTreeData(@RequestBody(required = false) String data); + @PostMapping("/tag/rule/info/tree/data") + Result tagTypeTreeData(@RequestBody JSONObject data); /**鏍囩鍒楄〃*/ - @RequestMapping("/tag/rule/item/list") - Result tagInfoListData(@RequestBody(required = false) TagRuleInfoItemDto tagRuleInfoItemDto); + @PostMapping("/tag/rule/item/list") + Result tagInfoListData(@RequestBody TagRuleInfoItemDto tagRuleInfoItemDto); + + /**鏍囩鍒嗙被鏁版嵁鍒楄〃*/ + @PostMapping("/tag/rule/info/list") + Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto); + + /**鍚屾鐢ㄦ埛鏍囩鏁版嵁*/ + @PostMapping("/test/handlerSyncUserLabelInfo") + Result handlerSyncUserLabelInfo(@RequestParam("userId") String userId); } -- Gitblit v1.8.0