From 605a19169121bbcaaf559030dd1d9aae614f8026 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 28 十二月 2020 09:51:28 +0800
Subject: [PATCH] 修改 新增

---
 src/main/java/com/nanometer/smartlab/api/ApiAction.java |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 104 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 6d25ef8..53318c8 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -10,8 +10,10 @@
 import com.nanometer.smartlab.dao.SysLaboratoryContainerDao;
 import com.nanometer.smartlab.dao.SysWarehouseContainerDao;
 import com.nanometer.smartlab.entity.*;
-import com.nanometer.smartlab.entity.SysWarning;
+import com.nanometer.smartlab.entity.dto.InWarehouseInfoDto;
+import com.nanometer.smartlab.entity.dto.SysWarehouseDto;
 import com.nanometer.smartlab.entity.enumtype.ApiStatus;
+import com.nanometer.smartlab.entity.enumtype.ReplaceDictType;
 import com.nanometer.smartlab.entity.enumtype.SeeFlag;
 import com.nanometer.smartlab.exception.ApiException;
 import com.nanometer.smartlab.exception.BusinessException;
@@ -65,6 +67,8 @@
     private BaseMetaService baseMetaService;
     @Resource
     private InterfaceService interfaceService;
+    @Resource
+    private SysWarehouseService sysWarehouseService;
 
     @Resource
     private SysWarningService sysWarningService;
@@ -80,6 +84,8 @@
     private SysWarehouseContainerDao sysWarehouseContainerDao;
     @Resource
     private DangerousEncodeService dangerousEncodeService;
+    @Resource
+    private EncodeReplaceDictService encodeReplaceDictService;
     @Value("${institute.url}")
     String instituteUrl;
 
@@ -1184,6 +1190,103 @@
         return ResponseModel.getOkInstence(code);
     }
 
+    /**
+     * 获取替换字典
+     *
+     */
+    @ResponseBody
+    @RequestMapping("getEncodeReplaceDict")
+    public Object getEncodeReplaceDict(@RequestParam String type) {
+        try {
+            ReplaceDictType rdType = ReplaceDictType.parse(Integer.parseInt(type));
+            EncodeReplaceDict encodeReplaceDict = new EncodeReplaceDict();
+            encodeReplaceDict.setType(rdType);
+            List<EncodeReplaceDict> data = encodeReplaceDictService.selectAll(encodeReplaceDict, null, null);
+            return ResponseModel.getOkInstence(data);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.info(e);
+            return ResponseModel.getErrInstance("系统出错");
+        }
+
+    }
+
+    /**
+     * 获取编码
+     *
+     */
+    @ResponseBody
+    @RequestMapping("getDangerousEncode")
+    public Object getDangerousEncode(@RequestParam(required = false) String reagentName, @RequestParam(required = false) String cas) {
+        try {
+            List<DangerousEncode> data = dangerousEncodeService.selectByCodeAndName(null, reagentName, cas, null);
+            return ResponseModel.getOkInstence(data);
+        } catch (Exception e){
+            e.printStackTrace();
+            logger.info(e);
+            return ResponseModel.getErrInstance("系统出错");
+    }
+
+    }
+    /**
+     * 获取仓库信息
+     */
+    @ResponseBody
+    @RequestMapping("getWarehouseInfo")
+    public Object getWarehouseInfo() {
+        try {
+            List<SysWarehouseDto> data = sysWarehouseService.getWarehouseList();
+            return ResponseModel.getOkInstence(data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info(e);
+            return ResponseModel.getErrInstance("系统出错");
+        }
+
+    }
+
+
+    /**
+    * @Description: 获取所有人员，人员相关实验室，实验室相关试剂柜
+    * @date 2020/12/23 16:47
+    */
+    @ResponseBody
+    @RequestMapping("getApplyPersonDetailInfo")
+    public Object getApplyPersonDetailInfo() {
+        try {
+            List data = sysUserService.getUserInfo();
+            return ResponseModel.getOkInstence(data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info(e);
+            return ResponseModel.getErrInstance("系统出错");
+        }
+
+    }
+
+
+   /**
+   * @Description: 入库
+   * @date 2020/12/24 14:19
+   */
+    @ResponseBody
+    @RequestMapping("putInStorage")
+    public Object putInWarehouse(@RequestBody InWarehouseInfoDto inWarehouseInfo) {
+        try {
+
+            if (inWarehouseInfo.getReagentCode() != null && inWarehouseInfo.getReagentCode().size() > 0) {
+                sysWarehouseService.putInWarehouse(inWarehouseInfo);
+                return ResponseModel.getOkInstence("入库成功");
+            } else {
+                return ResponseModel.getErrInstance("无试剂条码");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info(e);
+            return ResponseModel.getErrInstance("系统出错");
+        }
+
+    }
 
 
 }

--
Gitblit v1.9.2