From 987817beb67f16bcdf1b3816ab73fd3225812abc Mon Sep 17 00:00:00 2001
From: wzh <zhuhaow@phiskin.com>
Date: 星期五, 05 八月 2022 16:04:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java | 28 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 51 ++++++++++++
phis-feign/src/main/java/com/hz/his/dto/dcp/BaseDto.java | 83 ++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoItemDto.java | 31 +++++++
4 files changed, 193 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/BaseDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/BaseDto.java
new file mode 100644
index 0000000..e500714
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/BaseDto.java
@@ -0,0 +1,83 @@
+package com.hz.his.dto.dcp;
+
+/**
+ * 鍒楄〃鏌ヨ鍏叡绫�
+ *
+ */
+public class BaseDto {
+ /**椤电爜*/
+ private Integer pageNum;
+ /**姣忛〉鏁伴噺*/
+ private Integer pageSize;
+ /**鎼滅储鍏抽敭璇�*/
+ private String keyWord;
+ /**鏌ヨ鍒涘缓鏃堕棿寮�濮嬫椂闂� Y-m-d**/
+ private String startCreateTime;
+ /**鏌ヨ鍒涘缓鏃堕棿缁撴潫鏃堕棿 Y-m-d**/
+ private String endCreateTime;
+
+ /**鏌ヨ鏇存柊鏃堕棿寮�濮嬫椂闂� Y-m-d**/
+ private String startUpdateTime;
+ /**鏌ヨ鏇存柊鏃堕棿缁撴潫鏃堕棿 Y-m-d**/
+ private String endUpdateTime;
+
+ public BaseDto() {
+
+ }
+
+ public Integer getPageNum() {
+ return pageNum;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public String getStartCreateTime() {
+ return startCreateTime;
+ }
+
+ public void setStartCreateTime(String startCreateTime) {
+ this.startCreateTime = startCreateTime;
+ }
+
+ public String getEndCreateTime() {
+ return endCreateTime;
+ }
+
+ public void setEndCreateTime(String endCreateTime) {
+ this.endCreateTime = endCreateTime;
+ }
+
+ public String getStartUpdateTime() {
+ return startUpdateTime;
+ }
+
+ public void setStartUpdateTime(String startUpdateTime) {
+ this.startUpdateTime = startUpdateTime;
+ }
+
+ public String getEndUpdateTime() {
+ return endUpdateTime;
+ }
+
+ public void setEndUpdateTime(String endUpdateTime) {
+ this.endUpdateTime = endUpdateTime;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoItemDto.java
new file mode 100644
index 0000000..b22ef09
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoItemDto.java
@@ -0,0 +1,31 @@
+package com.hz.his.dto.dcp;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鏍囩瑙勫垯瀛愰」锛堟爣绛撅級鏌ヨ dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TagRuleInfoItemDto extends BaseDto {
+
+ /**涓婄骇鏍囪瘑 鏍囩绫诲瀷id*/
+ private String ruleId;
+
+ /**id**/
+ private String id;
+
+ /**鏍囩鍚嶇О**/
+ private String tagName;
+
+ /**鎿嶄綔绫诲瀷 鏄惁涓婃灦 0 鍚� 1 鏄�**/
+ private String upType;
+
+ /**鑼冨洿**/
+ private String ascription;
+
+ public TagRuleInfoItemDto() {
+
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
new file mode 100644
index 0000000..113ab33
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.dcp;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserTagInfoDto extends BaseDto{
+
+ /**鐢ㄦ埛鏍囪瘑绗�*/
+ private String userId;
+
+ /**鐢ㄦ埛缂栧彿*/
+ private String userNo;
+
+ /**鐢ㄦ埛鍚嶇О*/
+ private String userName;
+
+ /**鏍囩鍚嶇О*/
+ private String tagName;
+
+ /**鏍囩绫诲埆*/
+ private String tagTypeName;
+
+ public UserTagInfoDto() {
+
+ }
+}
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
new file mode 100644
index 0000000..7ebbb7b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
@@ -0,0 +1,51 @@
+package com.hz.his.feign.service.dcp;
+
+import com.hx.resultTool.Result;
+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;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="dcp-rules-service",path = "/dcp-rules",contextId = "userTagInfo")
+public interface SUserTagInfoService {
+
+ /**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/
+ @PostMapping("/user/tag/info/list")
+ Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
+
+ /**
+ * 缂栬緫鐢ㄦ埛鏍囩 娣诲姞 缂栬緫 鍒犻櫎 涓夊悎涓�鎺ュ彛
+ * 鏁版嵁妗堜緥锛�
+ * {
+ * (棰勭害鐢ㄦ埛id)"userId": "3816410df04411ebb06bb8599f4cafbe",
+ * (鏉ユ簮鎿嶄綔鐨勫钩鍙板悕绉帮級"sourceType": "phis",
+ * (淇敼娣诲姞鐨勬暟鎹�)"editUserTagInfoList": [{
+ * (鏄惁鑷畾涔夋爣绛� 鍚�)"isCustom": 0,
+ * (鏍囩绫诲瀷缂栧彿)"typeNo": "constellation",
+ * (鏍囩缂栧彿)"tagNo": "LA20220506bRnJDj"
+ * },
+ * {
+ * (鏄惁鑷畾涔夋爣绛� 鏄�)"isCustom": 1,
+ * (鏍囩绫诲瀷缂栧彿 娌℃湁绫诲瀷鍙互涓虹┖鎴栦笉浼�)"typeNo": "constellation",
+ * (鏍囩缂栧彿)"tagName": "鐗涢┈搴�"
+ * }
+ * ],
+ * (鍒犻櫎鐨勬暟鎹甶d)"deleteUserTagInfoIdList": ["62d91ec5776bca1873344066"]
+ * }
+ */
+ @PostMapping(value = "/user/tag/info/edit")
+ Result edit(@RequestBody String data);
+
+
+ /**鏍囩鍒嗙被鏍戝舰鏁版嵁 鏁版嵁妗堜緥锛歿"ascription":["customer","project","product","card","employee","promotion"]}*/
+ @PostMapping("/tag/rule/info/tree/data")
+ Result tagTypeTreeData(@RequestBody String data);
+
+ /**鏍囩鍒楄〃*/
+ @PostMapping("/tag/rule/item/list")
+ Result tagInfoListData(@RequestBody TagRuleInfoItemDto tagRuleInfoItemDto);
+}
--
Gitblit v1.8.0