From 31725f9133cb70063740d039e922ec6d534ec0eb Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Fri, 10 Feb 2023 10:32:50 +0800
Subject: [PATCH] commit
---
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 7789cf4..0d7c5a0 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -101,6 +101,9 @@
@Lazy
@Resource
private OpeUseFlowService opeUseFlowService;
+ @Lazy
+ @Resource
+ private SysWarehouseStatusService sysWarehouseStatusService;
@Value("${institute.url}")
String instituteUrl;
@@ -426,7 +429,7 @@
return retJSON.toJSONString();
}
- // 报警情况接口（warning）
+ // 报警情况接口（warning） 货柜预警接口
@ResponseBody
@RequestMapping(value = "/alarm")
public String alarm(HttpServletRequest request) throws IOException {
@@ -570,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{
@@ -618,7 +622,8 @@
(String[])wareContainerCodeList.toArray(new String[0])));
}
- if(user.getSeeFlag().ordinal() == SeeFlag.MANAGE.ordinal()){
+ if(user.getSeeFlag().ordinal() == SeeFlag.MANAGE.ordinal()
+ || user.getSeeFlag().ordinal() == SeeFlag.LEADING.ordinal()){
map.put("containerCodeList", containerCodeList);
}
}
@@ -788,7 +793,7 @@
}
reader.close();
} catch (IOException e) {
- System.out.println("IOException: " + e);
+ logger.info(e.getMessage());
}
JSONObject jsonObject = JSON.parseObject(str);
@@ -1048,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;
@@ -1426,6 +1424,7 @@
return ResponseModel.getErrInstance(reagentCode+",该试剂在库存中不存在");
}
}
+ String number = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
for (String reagentCode : reagentReceiving.getReagentCode()) {
OpeReagentStatus opeReagentStatus = opeReagentStatusService
.getOpeReagentStatusByReagentCode(reagentCode);
@@ -1458,6 +1457,7 @@
opeUseFlow.setRemainder(opeUseFlowExist.getRemainder());
BaseMeta baseMeta = baseMetaService.getBaseMeta("operate_status",String.valueOf(OperateStatus.TRANSFER.getKey()),"转移");
opeUseFlow.setOperateState(baseMeta.getId());
+ opeUseFlow.setReceiptNumber(number);
opeUseFlowService.insertOpeUseFlow(opeUseFlow);
}
return ResponseModel.getOkInstence("转移成功");
@@ -1793,4 +1793,36 @@
}
return retJSON.toJSONString();
}
+
+
+
+
+ @ResponseBody
+ @RequestMapping("/getAllWarehouse")
+ public Object getAllWarehouse() {
+ try {
+ List<Map> res = sysWarehouseService.getAllWarehouse();
+ return ResponseModel.getOkInstence(res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseModel.getErrInstance("系统内部错误");
+ }
+
+ }
+
+ @ResponseBody
+ @RequestMapping(value = "addWarehouseStatus",method = RequestMethod.POST)
+ public Object addWarehouseStatus(@RequestBody SysWarehouseStatus one){
+ try {
+ one.setCreateTime(new Date());
+ sysWarehouseStatusService.addOne(one);
+ return ResponseModel.getOkInstence("新增成功");
+ } catch (BusinessException e) {
+ e.printStackTrace();
+ return ResponseModel.getErrInstance(e.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseModel.getErrInstance("系统内部错误");
+ }
+ }
}
--
Gitblit v1.9.2