优化ukey登录的条件

src/main/java/org/sss/presentation/noui/controller/UkeyLoginController.java

@@ -31,48 +31,47 @@ public class UkeyLoginController {
     private NoUiParam noUiParam;
 
     private static final Log log = LogFactory.getLog(UkeyLoginController.class);
+
     @ResponseBody
     @RequestMapping(value = "/getUserByDn", method = RequestMethod.POST)
     public Object ukeyLogin(@RequestBody Map<String, Object> dataMap, HttpServletRequest request, HttpServletResponse reponse) throws Exception {
-        String certdn=request.getHeader("certdn");
-        log.info("====getUserByDn====certdn"+certdn);
+        String certdn = request.getHeader("certdn");
+        log.info("====getUserByDn====certdn" + certdn);
         NoUiRequest noUiRequest = new NoUiRequest(request, "", dataMap);
-        Map<String,Object> retDatamap=new HashMap<>();
-        if(StringUtils.isNotBlank(certdn))
-        {
-            Map<String,Object> map=getLoginidByDN(certdn,noUiRequest);
-             String loginid=map.get("nam").toString();
-            log.info("====getUserByDn====loginid"+loginid);
-            if(StringUtils.isNotBlank(loginid))
-            {
-                retDatamap.put("msgCode", "0000");
-                retDatamap.put("loginid", loginid);
-                return ResultUtil.result(ErrorCodes.SUCCESS, ErrorCodes.SUCCESS_INFO, retDatamap,noUiParam.getVersion());
+        Map<String, Object> retDatamap = new HashMap<>();
+        if (StringUtils.isNotBlank(certdn)) {
+            Map<String, Object> map = getLoginidByDN(certdn, noUiRequest);
+            if (map.containsKey("nam")) {
+                String loginid = map.get("nam").toString();
+                log.info("====getUserByDn====loginid" + loginid);
+                if (StringUtils.isNotBlank(loginid)) {
+                    retDatamap.put("msgCode", "0000");
+                    retDatamap.put("loginid", loginid);
+                    return ResultUtil.result(ErrorCodes.SUCCESS, ErrorCodes.SUCCESS_INFO, retDatamap, noUiParam.getVersion());
+                }
             }
         }
         retDatamap.put("msgCode", "9999");
         retDatamap.put("loginid", "");
-        return ResultUtil.result(ErrorCodes.SUCCESS, ErrorCodes.SUCCESS_INFO, retDatamap,noUiParam.getVersion());
+        return ResultUtil.result(ErrorCodes.SUCCESS, ErrorCodes.SUCCESS_INFO, retDatamap, noUiParam.getVersion());
     }
 
-    private Map<String,Object> getLoginidByDN(String certdn,NoUiRequest noUiRequest) {
-        Map<String,Object> values=new HashMap<>();
+    private Map<String, Object> getLoginidByDN(String certdn, NoUiRequest noUiRequest) {
+        Map<String, Object> values = new HashMap<>();
         NoUiContext context = NoUiContextManager.createNoUiContext(noUiRequest);
-        String sql="SELECT inr,nam,ukey FROM usr WHERE ukey=?";
-        context.getSupport().execute(sql,new Object[]{certdn});
-        Argument<String> inr=new Argument<>("inr");
-        Argument<String> nam=new Argument<>("nam");
-        Argument<String> ukey=new Argument<>("ukey");
-        while (true)
-        {
-            context.getSupport().fetch(new IResult[]{inr,nam,ukey});
-            if(context.getError()!=0)
-            {
+        String sql = "SELECT inr,nam,ukey FROM usr WHERE ukey=?";
+        context.getSupport().execute(sql, new Object[]{certdn});
+        Argument<String> inr = new Argument<>("inr");
+        Argument<String> nam = new Argument<>("nam");
+        Argument<String> ukey = new Argument<>("ukey");
+        while (true) {
+            context.getSupport().fetch(new IResult[]{inr, nam, ukey});
+            if (context.getError() != 0) {
                 context.getSupport().close();
                 return values;
             }
-            values.put("nam",nam.getValue());
-            values.put("ukey",ukey.getValue());
+            values.put("nam", nam.getValue());
+            values.put("ukey", ukey.getValue());
         }
     }
 }