From a9193cfd5ae8d7fa7e0824b5f77e4deb72695dae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 16 五月 2020 22:29:00 +0800
Subject: [PATCH] 合并代码
---
java110-core/src/main/java/com/java110/core/smo/user/IUserInnerServiceSMO.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/user/IUserInnerServiceSMO.java b/java110-core/src/main/java/com/java110/core/smo/user/IUserInnerServiceSMO.java
index 10d72ee..a33c007 100644
--- a/java110-core/src/main/java/com/java110/core/smo/user/IUserInnerServiceSMO.java
+++ b/java110-core/src/main/java/com/java110/core/smo/user/IUserInnerServiceSMO.java
@@ -1,22 +1,85 @@
package com.java110.core.smo.user;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import com.java110.core.feign.FeignConfiguration;
+import com.java110.dto.user.UserDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* 鐢ㄦ埛鏈嶅姟鎺ュ彛绫伙紙渚涙湇鍔￠棿璋冪敤锛�
*/
-@FeignClient("user-service")
+@FeignClient(name = "user-service", configuration = {FeignConfiguration.class})
@RequestMapping("/userApi")
public interface IUserInnerServiceSMO {
/**
* 鏌ヨ鐢ㄦ埛鏈嶅姟鐗堟湰
- * @param code
- * @return
+ *
+ * @param code 缂栫爜 娌℃湁浠讳綍鎰忎箟 闅忎究浼犱竴涓瓧绗︿覆灏卞彲浠�
+ * @return 缂栫爜 + 鐗堟湰鍙�
*/
- @RequestMapping(value = "/getUserServiceVersion",method = RequestMethod.GET)
+ @RequestMapping(value = "/getUserServiceVersion", method = RequestMethod.GET)
String getUserServiceVersion(@RequestParam("code") String code);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛淇℃伅
+ *
+ * @param userIds 鐢ㄦ埛ID
+ * 鏀寔 澶氫釜鏌ヨ
+ * @return 鐢ㄦ埛灏佽淇℃伅
+ */
+ @RequestMapping(value = "/getUserInfo", method = RequestMethod.GET)
+ List<UserDto> getUserInfo(@RequestParam("userIds") String[] userIds);
+
+
+ /**
+ * 鏌ヨ鍛樺伐鎬绘暟
+ *
+ * @param userDto 鐢ㄦ埛ID
+ * 鏀寔 澶氫釜鏌ヨ
+ * @return 鐢ㄦ埛灏佽淇℃伅
+ */
+ @RequestMapping(value = "/getStaffCount", method = RequestMethod.POST)
+ int getStaffCount(@RequestBody UserDto userDto);
+
+
+ /**
+ * 鏌ヨ鍛樺伐淇℃伅
+ *
+ * @param userDto 鐢ㄦ埛ID
+ * 鏀寔 澶氫釜鏌ヨ
+ * @return 鐢ㄦ埛灏佽淇℃伅
+ */
+ @RequestMapping(value = "/getStaffs", method = RequestMethod.POST)
+ List<UserDto> getStaffs(@RequestBody UserDto userDto);
+
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鎬绘暟
+ *
+ * @param userDto 鐢ㄦ埛ID
+ * 鏀寔 澶氫釜鏌ヨ
+ * @return 鐢ㄦ埛灏佽淇℃伅
+ */
+ @RequestMapping(value = "/getUserCount", method = RequestMethod.POST)
+ int getUserCount(@RequestBody UserDto userDto);
+
+
+ /**
+ * 鏌ヨ鍛樺伐淇℃伅
+ *
+ * @param userDto 鐢ㄦ埛ID
+ * 鏀寔 澶氫釜鏌ヨ
+ * @return 鐢ㄦ埛灏佽淇℃伅
+ */
+ @RequestMapping(value = "/getUsers", method = RequestMethod.POST)
+ List<UserDto> getUsers(@RequestBody UserDto userDto);
+
+ @RequestMapping(value = "/getUserHasPwd", method = RequestMethod.POST)
+ List<UserDto> getUserHasPwd(@RequestBody UserDto userDto);
}
--
Gitblit v1.8.0