From 31725f9133cb70063740d039e922ec6d534ec0eb Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期五, 10 二月 2023 10:32:50 +0800 Subject: [PATCH] commit --- src/main/java/com/nanometer/smartlab/api/ApiAction.java | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java index d3a9991..0d7c5a0 100644 --- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java +++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java @@ -573,6 +573,7 @@ map.put("specification", opeReagentStatus.getReagent().getReagentFormat()); map.put("itemNumber", opeReagentStatus.getArticleNumber()); map.put("producer", opeReagentStatus.getReagent().getProductHome()); + map.put("density", opeReagentStatus.getReagent().getDensity()); if (opeReagentStatus.getReagent().getMainMetering() == null){ map.put("masterMetering",opeReagentStatus.getReagent().getReagentUnit()); }else{ @@ -792,7 +793,7 @@ } reader.close(); } catch (IOException e) { - System.out.println("IOException: " + e); + logger.info(e.getMessage()); } JSONObject jsonObject = JSON.parseObject(str); @@ -1052,31 +1053,24 @@ token.setRememberMe(true); BaseController baseController=new BaseController(); Subject currentUser = baseController.getSubject(); - System.out.println(1); try { - System.out.println(2); currentUser.login(token); } catch (UnknownAccountException e) { - System.out.println("用户名不存在"); FacesUtils.warn("用户名不存在"); return null; } catch (Exception e) { - System.out.println("登陆失败"); logger.error("登陆失败", e); } if (currentUser.isAuthenticated()) {//登录成功进入主页 - System.out.println(3); SysUser user = this.sysUserService.getSysUserByAccount("admin"); currentUser.getSession(true).setAttribute(Constants.SESSION_USER, user); currentUser.getSession(true).getId(); MenuController menuController=new MenuController(); menuController.initPage(); - System.out.println(4); //return "redirect:http://192.168.1.195:8888/smartlab_war_exploded/index.xhtml"; return new ModelAndView("redirect:/index.xhtml"); } else { - System.out.println("用户名与密码不匹配"); FacesUtils.warn("用户名与密码不匹配"); } return null; -- Gitblit v1.9.2