From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
service-user/src/main/java/com/java110/user/api/UserLoginApi.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 8 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/UserLoginApi.java b/service-user/src/main/java/com/java110/user/api/UserLoginApi.java
index 11b82e5..b987c5b 100755
--- a/service-user/src/main/java/com/java110/user/api/UserLoginApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserLoginApi.java
@@ -1,21 +1,21 @@
package com.java110.user.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.user.UserDto;
import com.java110.dto.userLogin.UserLoginDto;
import com.java110.po.userLogin.UserLoginPo;
import com.java110.user.bmo.userLogin.IDeleteUserLoginBMO;
import com.java110.user.bmo.userLogin.IGetUserLoginBMO;
import com.java110.user.bmo.userLogin.ISaveUserLoginBMO;
import com.java110.user.bmo.userLogin.IUpdateUserLoginBMO;
+import com.java110.utils.cache.CommonCache;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-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 org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "/userLogin")
@@ -100,9 +100,9 @@
* @path /app/userLogin/queryUserLogin
*/
@RequestMapping(value = "/queryUserLogin", method = RequestMethod.GET)
- public ResponseEntity<String> queryUserLogin(@RequestParam(value = "userName",required = false) String userName,
- @RequestParam(value = "parentOrgName",required = false) String parentOrgName,
- @RequestParam(value = "orgName",required = false) String orgName,
+ public ResponseEntity<String> queryUserLogin(@RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "parentOrgName", required = false) String parentOrgName,
+ @RequestParam(value = "orgName", required = false) String orgName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
UserLoginDto userLoginDto = new UserLoginDto();
@@ -113,4 +113,61 @@
userLoginDto.setOrgName(orgName);
return getUserLoginBMOImpl.get(userLoginDto);
}
+
+ /**
+ * 鏍规嵁code 鏌ヨ鐢ㄦ埛淇℃伅
+ *
+ * @param hcCode
+ * @serviceCode /userLogin/getUserInfoByHcCode
+ * @return
+ */
+ @RequestMapping(value = "/getUserInfoByHcCode", method = RequestMethod.GET)
+ public ResponseEntity<String> getUserInfoByHcCode(@RequestParam(value = "hcCode") String hcCode) {
+ UserDto userDto = null;
+// String env = MappingCache.getValue("HC_ENV");
+// if ("DEV".equals(env) || "TEST".equals(env)) {
+// userDto = new UserDto();
+// userDto.setUserId("1000000020021010001");
+// userDto.setUserName("鍚村鏂�");
+// userDto.setAddress("闈掓捣鐪佽タ瀹佸競鍩庝腑鍖虹敵瀹佽矾");
+// userDto.setAge(30);
+// userDto.setEmail("928255095@qq.com");
+// userDto.setName("鍚村鏂�");
+// userDto.setSex("1");
+// userDto.setTel("18909711443");
+// return ResultVo.createResponseEntity(userDto);
+// }
+ String userInfoStr = CommonCache.getAndRemoveValue(hcCode);
+ userDto = JSONObject.parseObject(userInfoStr, UserDto.class);
+ return ResultVo.createResponseEntity(userDto);
+ }
+
+ /**
+ * 鐢熸垚code
+ *
+ * @param userId
+ * @serviceCode /userLogin/generatorHcCode
+ * @return
+ */
+ @RequestMapping(value = "/generatorHcCode", method = RequestMethod.GET)
+ public ResponseEntity<String> generatorHcCode(@RequestHeader(value = "user-id") String userId) {
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ return getUserLoginBMOImpl.generatorHcCode(userDto);
+
+ }
+ /**
+ * 鐢熸垚code
+ *
+ * @param userId
+ * @serviceCode /userLogin/deleteOpenId
+ * @return
+ */
+ @RequestMapping(value = "/deleteOpenId", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteOpenId(@RequestParam(value = "userId", required = false) String userId) {
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ return deleteUserLoginBMOImpl.deleteOpenId(userDto);
+
+ }
}
--
Gitblit v1.8.0