From 7e80bb0a3bb2247fb519e00722b76145456981df Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 04 五月 2023 19:01:03 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
index 1524058..80ac242 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
@@ -4,11 +4,15 @@
* @Author
*/
-import org.springframework.cloud.openfeign.FeignClient;
import com.hx.resultTool.Result;
+import net.sf.json.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -18,16 +22,25 @@
/**
* 鏍规嵁鐢ㄦ埛id鍚屾鐢ㄦ埛鍩烘湰淇℃伅锛岃鍗曚俊鎭紝鍙垝鎵ｄ俊鎭紝宸插垝鎵ｄ俊鎭�
- * @param userId
- * @return
+ * @param userId 鐢ㄦ埛id
+ * @return 杩斿洖
*/
- @PostMapping(value = "/user/consumption/data/list",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+ @PostMapping(value = "/user/consumption/data/list")
Result userList(@RequestParam("userId") String userId);
+
/**
* 鏍规嵁鐢ㄦ埛id鍚屾鐢ㄦ埛鍩烘湰淇℃伅
- * @param userId
- * @return
+ * @param userId 鐢ㄦ埛id
+ * @return 杩斿洖
*/
- @PostMapping(value = "/sync/user/syncUserById",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+ @PostMapping(value = "/sync/user/syncUserById")
Result syncUserById(@RequestParam("userId") String userId);
+
+ /** 涓诲姩鍚屾鍒涘缓椤惧鍒癶is - 淇敼鐢ㄦ埛ciq鍜屼細鍛樼瓑绾�*/
+ @PostMapping("/sync/user/updateMembership")
+ Result updateMembership(@RequestBody JSONObject jsonObject);
+
+ /** 鏍￠獙鍥剧墖鏄惁绗﹀悎鍟嗘堡瑕佹眰*/
+ @PostMapping(value = "/sync/user/recognition/quality", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+ Result syncUserRecognitionQuality(@RequestPart MultipartFile file);
}
--
Gitblit v1.8.0