From 04bede5143bebe71270ef602c42c7fa9d063abbe Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期三, 23 十二月 2020 16:46:48 +0800 Subject: [PATCH] 获取仓库信息 --- src/main/java/com/nanometer/smartlab/api/ApiAction.java | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 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 2af3581..dbf3054 100644 --- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java +++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java @@ -11,6 +11,7 @@ import com.nanometer.smartlab.dao.SysWarehouseContainerDao; import com.nanometer.smartlab.entity.*; import com.nanometer.smartlab.entity.SysWarning; +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; @@ -66,6 +67,8 @@ private BaseMetaService baseMetaService; @Resource private InterfaceService interfaceService; + @Resource + private SysWarehouseService sysWarehouseService; @Resource private SysWarningService sysWarningService; @@ -1187,7 +1190,10 @@ return ResponseModel.getOkInstence(code); } - + /** + * 获取替换字典 + * + */ @ResponseBody @RequestMapping("getEncodeReplaceDict") public Object getEncodeReplaceDict(@RequestParam String type) { @@ -1205,6 +1211,10 @@ } + /** + * 获取编码 + * + */ @ResponseBody @RequestMapping("getDangerousEncode") public Object getDangerousEncode(@RequestParam(required = false) String reagentName, @RequestParam(required = false) String cas) { @@ -1218,6 +1228,24 @@ } } + /** + * 获取仓库信息 + */ + @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("系统出错"); + } + + } + + } -- Gitblit v1.9.2