From 765007dcc802b0539124cb4c780de665e6665509 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期六, 06 五月 2023 14:56:25 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 7ebbb7b..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,11 +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.RequestParam;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -13,9 +17,17 @@
@FeignClient(name="dcp-rules-service",path = "/dcp-rules",contextId = "userTagInfo")
public interface SUserTagInfoService {
+ /** 鏍囩鍒嗙被鏍戝瀷鍒楄〃 */
+ @PostMapping("/tag/rule/info/list/tree")
+ Result listTreeData();
+
/**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/
@PostMapping("/user/tag/info/list")
Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
+
+ /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖(FilterUserDto)*/
+ @RequestMapping("/user/tag/info/user/list")
+ Result userListData(@RequestBody UserTagInfoDto userTagInfoDto);
/**
* 缂栬緫鐢ㄦ埛鏍囩 娣诲姞 缂栬緫 鍒犻櫎 涓夊悎涓�鎺ュ彛
@@ -27,10 +39,10 @@
* (鏄惁鑷畾涔夋爣绛� 鍚�)"isCustom": 0,
* (鏍囩绫诲瀷缂栧彿)"typeNo": "constellation",
* (鏍囩缂栧彿)"tagNo": "LA20220506bRnJDj"
- * },
- * {
+ * },
+ * {
* (鏄惁鑷畾涔夋爣绛� 鏄�)"isCustom": 1,
- * (鏍囩绫诲瀷缂栧彿 娌℃湁绫诲瀷鍙互涓虹┖鎴栦笉浼�)"typeNo": "constellation",
+ * (鏍囩绫诲瀷缂栧彿)"typeNo": "constellation",
* (鏍囩缂栧彿)"tagName": "鐗涢┈搴�"
* }
* ],
@@ -38,14 +50,22 @@
* }
*/
@PostMapping(value = "/user/tag/info/edit")
- Result edit(@RequestBody String data);
+ Result edit(@RequestBody JSONObject data);
/**鏍囩鍒嗙被鏍戝舰鏁版嵁 鏁版嵁妗堜緥锛歿"ascription":["customer","project","product","card","employee","promotion"]}*/
@PostMapping("/tag/rule/info/tree/data")
- Result tagTypeTreeData(@RequestBody String data);
+ Result tagTypeTreeData(@RequestBody JSONObject data);
/**鏍囩鍒楄〃*/
@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