From f31ae0176ba124a2a39121584f5c39c3de932157 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 12:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 4b9e7fb..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,13 +4,15 @@
* @Author
*/
+import com.hx.resultTool.Result;
import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
-import com.hx.resultTool.Result;
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 鏄姹傛帴鍙ｅ墠缂�
@@ -20,15 +22,16 @@
/**
* 鏍规嵁鐢ㄦ埛id鍚屾鐢ㄦ埛鍩烘湰淇℃伅锛岃鍗曚俊鎭紝鍙垝鎵ｄ俊鎭紝宸插垝鎵ｄ俊鎭�
- * @param userId
- * @return
+ * @param userId 鐢ㄦ埛id
+ * @return 杩斿洖
*/
@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")
Result syncUserById(@RequestParam("userId") String userId);
@@ -37,4 +40,7 @@
@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