From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug

---
 src/main/java/com/nanometer/smartlab/api/ApiAction.java |   94 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 86 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..993fe6b 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -104,6 +104,10 @@
     @Lazy
     @Resource
     private SysWarehouseStatusService sysWarehouseStatusService;
+    @Lazy
+    @Resource
+    private SysReagentService sysReagentService;
+
     @Value("${institute.url}")
     String instituteUrl;
 
@@ -573,6 +577,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 +797,7 @@
             }
             reader.close();
         } catch (IOException e) {
-            System.out.println("IOException: " + e);
+            logger.info(e.getMessage());
         }
         JSONObject jsonObject = JSON.parseObject(str);
 
@@ -1052,31 +1057,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;
@@ -1831,4 +1829,84 @@
             return ResponseModel.getErrInstance("系统内部错误");
         }
     }
+
+
+    /**
+     * 试剂流向追踪
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/reagentFlows",method = RequestMethod.GET)
+    public Object reagentFlows(@RequestParam(required=false,defaultValue = "1") Integer pageNum,@RequestParam(required=false,defaultValue = "10") Integer pageSize,OpeUseFlowQueryDto opeUseFlowQueryDto){
+        try {
+            return ResponseModel.getOkInstence(opeUseFlowService.getOpeUseFlowSimpleInfoList(pageNum, pageSize, opeUseFlowQueryDto));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseModel.getErrInstance("系统内部错误");
+        }
+    }
+
+    /**
+     * 试剂管理分页查询
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/reagentList",method = RequestMethod.GET)
+    public Object reagentList(@RequestParam(required=false,defaultValue = "1") Integer pageNum,@RequestParam(required=false,defaultValue = "10") Integer pageSize,String name,String cas){
+        try {
+            return ResponseModel.getOkInstence(sysReagentService.reagentList(pageNum,pageSize,name,cas));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseModel.getErrInstance("系统内部错误");
+        }
+    }
+
+    /**
+     * 实验室管理分页查询
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/labList",method = RequestMethod.GET)
+    public Object labList(@RequestParam(required=false,defaultValue = "1") Integer pageNum,@RequestParam(required=false,defaultValue = "10") Integer pageSize,String name){
+        try {
+            return ResponseModel.getOkInstence(sysLaboratoryService.getSysLaboratoryList(pageNum,pageSize,name));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseModel.getErrInstance("系统内部错误");
+        }
+    }
+
+
+    /**
+     * 实验室临时库存管理分页查询
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/labContainerList",method = RequestMethod.GET)
+    public Object labContainerList(@RequestParam(required=false,defaultValue = "1") Integer pageNum,@RequestParam(required=false,defaultValue = "10") Integer pageSize,String name,String controllerName){
+        try {
+            return ResponseModel.getOkInstence(sysLaboratoryContainerService.getSysLaboratoryContainerList(pageNum,pageSize,name,controllerName));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseModel.getErrInstance("系统内部错误");
+        }
+    }
+
+
+    /**
+     * 人员管理分页查询
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/userList",method = RequestMethod.GET)
+    public Object userList(@RequestParam(required=false,defaultValue = "1") Integer pageNum,@RequestParam(required=false,defaultValue = "10") Integer pageSize,String name){
+        try {
+            return ResponseModel.getOkInstence(sysUserService.getSysUserList(pageNum,pageSize,name));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseModel.getErrInstance("系统内部错误");
+        }
+    }
+
 }
+

--
Gitblit v1.9.2