From ea2db2505b95d05791ffd718ed4bc8a15fb499d2 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 20 三月 2024 18:13:09 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java | 4 +++-
phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java | 7 +++++--
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java | 27 +++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java
new file mode 100644
index 0000000..85b3eb4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java
@@ -0,0 +1,27 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import com.hz.his.dto.user.*;
+import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.user.project.UserProjectDto;
+import com.hz.his.dto.user.room.UserDoctorRoomDto;
+import com.hz.his.vo.label.UserLabelVo;
+import net.sf.json.JSONObject;
+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="phi-platform-service",path = "/phip",contextId = "phip-user-label")
+public interface SPhipUserLabelService {
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鏍囩鍒楄〃
+ */
+ @PostMapping(value = "/label/user/v2/add")
+ Result add(@RequestBody UserLabelVo userLabelVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
index c5ef966..2781674 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
@@ -13,8 +13,10 @@
/**鐢ㄦ埛鏍囩鏍囪瘑*/
private String id;
- /**鏍囩鏍囪瘑*/
+ /**绯荤粺鏍囩鏍囪瘑*/
private String labelId;
+ /**绯荤粺鏍囩鍒嗙被鏍囪瘑*/
+ private String labelTypeId;
/**鏍囩鍚嶇О*/
private String name;
/**鏄惁鑷畾涔夋爣绛撅細0鍚�1鏄�*/
@@ -28,8 +30,9 @@
this.name = name;
}
- public LabelVo(String id,String labelId, String name, Integer isCustom) {
+ public LabelVo(String id,String labelTypeId,String labelId, String name, Integer isCustom) {
this.id = id;
+ this.labelTypeId = labelTypeId;
this.labelId = labelId;
this.name = name;
this.isCustom = isCustom;
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
index ecad2f9..6c9d765 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
@@ -7,10 +7,12 @@
*/
@Data
public class UserLabelInfoVo {
+ /**鐢ㄦ埛鏍囩鏍囪瘑*/
+ private String id;
/**鏄惁鑷畾涔夛細0鍚�1鏄�-蹇呭～*/
private Integer isCustom;
/**绯荤粺鏍囩鏍囪瘑-閫夊～锛坕sCustom鏄�0蹇呭～锛�*/
private String labelId;
- /**鏍囩鏍囪瘑-閫夊～锛坕sCustom鏄�1蹇呭～锛�*/
+ /**鏍囩鍚嶇О-閫夊～锛坕sCustom鏄�1蹇呭～锛�*/
private String labelName;
}
--
Gitblit v1.8.0