From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码

---
 service-user/src/main/java/com/java110/user/api/UserLoginApi.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 51 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
old mode 100644
new mode 100755
index 11b82e5..8f557f9
--- 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,47 @@
         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);
+
+    }
 }

--
Gitblit v1.8.0