From 4cd068eb783c0d87ec6421335558ad588596b6d3 Mon Sep 17 00:00:00 2001
From: wzh <zhuhaow@phiskin.com>
Date: 星期一, 08 八月 2022 17:13:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java | 7 +++++--
phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoDto.java | 28 ++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 5 +++++
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoDto.java
new file mode 100644
index 0000000..c8e15d9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/TagRuleInfoDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.dcp;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鏍囩瑙勫垯锛堟爣绛剧被鍨嬶級鏌ヨ dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TagRuleInfoDto extends BaseDto {
+
+ /**鏍囪瘑*/
+ private String id;
+
+ /**涓婄骇鏍囪瘑*/
+ private String parentId;
+
+ /**鏍囩鍚嶇О**/
+ private String tagTypeName;
+
+ /**鑼冨洿**/
+ private String ascription;
+
+ public TagRuleInfoDto() {
+
+ }
+}
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
index d6bd1a5..2990f96 100644
--- 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
@@ -24,11 +24,14 @@
/**鏍囩绫诲埆*/
private String tagTypeName;
+ /**鐢ㄦ埛骞冲彴缂栧彿*/
+ private String platformCode;
+
/**鏍囩鏍囪瘑鍖归厤鎼滅储*/
- private List<String> tagIdAndList;
+ private List<String> tagNoAndList;
/**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
- private List<String> tagIdOrList;
+ private List<String> tagNoOrList;
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
index bd99279..d2c5b18 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,6 +2,7 @@
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;
@@ -49,4 +50,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