From 9f29abe0654aa7c5566883329395f6ee22877ead Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 22 五月 2023 18:01:04 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 6 ++
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearancePictureDto.java | 32 ++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppearanceService.java | 44 ++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java | 29 +++++++++
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java | 38 ++++++++++++
5 files changed, 149 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
new file mode 100644
index 0000000..78c1991
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
@@ -0,0 +1,38 @@
+package com.hz.his.dto.appearance;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 棰滃�艰鍒掑浘鐗嘍to
+ */
+@Data
+public class AppearanceDto{
+
+ /**椤垫暟*/
+ private Integer pageNum = 1;
+ /**鏉℃暟*/
+ private Integer pageSize = 20;
+
+ /**鏁版嵁id*/
+ private String id;
+ /**鐢ㄦ埛Id*/
+ private String userId;
+ /**鏄惁鏂扮増棰滃�艰鍒�*/
+ private Integer isNewVersion = YES;
+ /**鍛樺伐id*/
+ private String employeeId;
+ /**棰滃�艰鍒欐爣绛惧垪琛�*/
+ List<AppearanceLabelDto> labelDtoList;
+ /**棰滃�艰鍒欏浘鐗囧垪琛�*/
+ List<AppearancePictureDto> pictureDtoList;
+
+ public AppearanceDto() {
+ }
+
+ /**鏁板瓧0*/
+ public static final Integer NO = 0;
+ /**鏁板瓧1*/
+ public static final Integer YES = 1;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
new file mode 100644
index 0000000..94725e4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.appearance;
+
+import lombok.Data;
+
+/**
+ * 棰滃�艰鍒掓爣绛綝to
+ */
+@Data
+public class AppearanceLabelDto {
+
+ /**鏍囩鍒嗙被鏍囪瘑锛圠abelType锛�*/
+ private String labelTypeId;
+ /**鏍囩鍒嗙被缂栧彿(涓嶅～鑷姩鐢熸垚)*/
+ private String labelTypeNo;
+ /**鏍囩鍒嗙被鍚嶇О*/
+ private String labelTypeName;
+
+ /**鏍囩鏍囪瘑锛圠abelInfo锛�*/
+ private String labelInfoId;
+ /**鏍囩缂栧彿(涓嶅～鍒欒嚜鍔ㄧ敓鎴�)*/
+ private String labelInfoNo;
+ /**鏍囩鍚嶇О*/
+ private String labelInfoName;
+ /**棰滆壊*/
+ private String color;
+
+ public AppearanceLabelDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearancePictureDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearancePictureDto.java
new file mode 100644
index 0000000..4ec4913
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearancePictureDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto.appearance;
+
+import lombok.Data;
+
+/**
+ * 棰滃�艰鍒掑浘鐗嘍to
+ */
+@Data
+public class AppearancePictureDto {
+
+ /**鍥剧墖*/
+ private String image;
+ /**绫诲瀷锛�1闈㈤儴鐓х墖,2VISIA鐓х墖*/
+ private Integer type = FACE_PICTURE;
+ /**闈㈤儴鍒嗙被锛堥拡瀵归潰閮ㄧ収鐗囷級*/
+ private Integer faceType = FACE_POSITIVE;
+
+ public AppearancePictureDto() {
+ }
+
+ /**绫诲瀷锛�1闈㈤儴鐓х墖*/
+ public static final Integer FACE_PICTURE = 1;
+ /**绫诲瀷锛�2VISIA鐓х墖*/
+ public static final Integer VISIA_PICTURE = 2;
+
+ /**闈㈤儴鍒嗙被锛氭鑴�*/
+ public static final Integer FACE_POSITIVE = 0;
+ /**闈㈤儴鍒嗙被锛氫晶鑴�*/
+ public static final Integer FACE_SIDE = 1;
+ /**闈㈤儴鍒嗙被锛氳搴︾収锛�45掳瑙掞級*/
+ public static final Integer FACE_ANGLE = 2;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 316bc8e..504fa58 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -277,4 +277,10 @@
*/
@PostMapping(value = "/user/check/member")
Result checkMember(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛浼氬憳绛夌骇涓嬩竴绾�
+ * */
+ @PostMapping(value = "/user/next/level")
+ Result nextLevel(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppearanceService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppearanceService.java
new file mode 100644
index 0000000..e5b362a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppearanceService.java
@@ -0,0 +1,44 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.appearance.AppearanceDto;
+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-appearance")
+public interface SPhipAppearanceService {
+
+ /**
+ * 寮�鏀惧钩鍙�-棰滃�艰鍒掑垪琛�
+ */
+ @PostMapping(value = "/appearance/list")
+ Result getAppearanceList(@RequestBody AppearanceDto appearanceDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-棰滃�艰鍒掕鎯�
+ */
+ @PostMapping(value = "/appearance/one")
+ Result getAppearanceOne(@RequestBody AppearanceDto appearanceDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-棰滃�艰鍒掓坊鍔�
+ */
+ @PostMapping(value = "/appearance/add")
+ Result addAppearance(@RequestBody AppearanceDto appearanceDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-棰滃�艰鍒掍慨鏀�
+ */
+ @PostMapping(value = "/appearance/edit")
+ Result editAppearance(@RequestBody AppearanceDto appearanceDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-棰滃�艰鍒掑垹闄�
+ */
+ @PostMapping(value = "/appearance/del")
+ Result delAppearance(@RequestBody AppearanceDto appearanceDto);
+}
--
Gitblit v1.8.0