From 29166bc750623bea12a367ba7c527facdb582235 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 13 七月 2021 17:12:28 +0800
Subject: [PATCH] 修改转移试剂，生成领用单
---
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 107 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index a2ae000..b773749 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -22,6 +22,7 @@
import org.apache.http.util.EntityUtils;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -33,17 +34,19 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
@Service("interfaceService")
public class InterfaceServiceImpl implements InterfaceService {
private static Logger logger = Logger.getLogger(ApiAction.class);
-
+ @Lazy
@Resource
private OpeUseFlowService opeUseFlowService;
@Resource
private SysWarningService sysWarningService;
-
+ @Resource(name = "sysWarningDao")
+ SysWarningDao sysWarningDao;
@Resource(name = "sysWarehouseDao")
SysWarehouseDao sysWarehouseDao;
@@ -1034,7 +1037,7 @@
}
List<String> projects = sysLaboratoryContainer.selectProjectsByContainerCode(containerCode);
List<SysUser> userList = null;
- if (projects != null) {
+ if (projects != null && projects.size() > 0){
userList = new ArrayList<>();
for (String project : projects) {
List<SysUser> dataList = sysUserDao.getUserListByProject(project, startTime, endTime);
@@ -1251,7 +1254,8 @@
logger.error("The containerCode has not been exists!");
continue;
}
- } else if (status.equals(2)){
+ }
+ else if (status.equals(2)){
/*SysWarehouseContainer container = sysWarehouseContainerDao
.getSysWarehouseContainerByContainerCode(containerCode);
if (Objects.isNull(container) == false) {
@@ -1275,8 +1279,10 @@
if (status.equals(-1)){
continue;
}
- opeReagentStatusDao.syncOpeReagentStatus(params);
-
+ int i = opeReagentStatusDao.syncOpeReagentStatus(params);
+ if (i < 1){
+ opeReagentStatusDao.syncOpeReagentStatus(params);
+ }
}
}
@@ -1531,15 +1537,16 @@
}
sysAlarmPersonDao.insertSysAlarmPerson(sysAlarmPerson);
+ // 将人员扣分更新到人员表
+ if (warningPoint == null) {
+ warningPoint = 0;
+ }
+ // SysUser user = sysUserDao.getSysUser(userId);
+ if (user != null) {
+ sysUserDao.updateUserPointBySelective(user.getPoint() - warningPoint, user.getId());
+ }
}
- // 将人员扣分更新到人员表
- if (warningPoint == null) {
- warningPoint = 0;
- }
-// SysUser user = sysUserDao.getSysUser(userId);
- if (user != null) {
- sysUserDao.updateUserPointBySelective(user.getPoint() - warningPoint, user.getId());
- }
+
}
}
@@ -1711,8 +1718,11 @@
continue;
}
}
+ int count = opeUseFlowService.getOpeUseFlow(opeUseFlow);
+ if (count < 1) {
- this.opeUseFlowService.insertOpeUseFlow(opeUseFlow);
+ this.opeUseFlowService.insertOpeUseFlow(opeUseFlow);
+ }
}
}
@@ -1734,35 +1744,48 @@
// 人员违规预警接口
@Override
public void delalarmperson(JSONObject jsonObject) throws Exception {
- String containerCode = jsonObject.getString("containerCode");
- String warningId = jsonObject.getString("warningId");
- // 货柜条码 containerCode String ○
- // 报警类别 warningId Integer ○
- if (StringUtils.isBlank(containerCode) || StringUtils.isBlank(warningId)) {
- throw new ApiException(ApiStatus.PARAM_NO_EXIST);
- }
- Map<String, String> metaMap = new HashMap<>();
- metaMap.put("groupId", "user_violate_type");
- metaMap.put("metaKey", warningId);
+ JSONArray dataArr = jsonObject.getJSONArray("data");
+ Iterator<Object> dataIt = dataArr.iterator();
+ while (dataIt.hasNext()) {
+ JSONObject dataJson = JSONObject.parseObject(dataIt.next().toString());
+ // 货柜条码 containerCode String ○
+ // 报警类别 warningId Integer ○
+ if (!dataJson.containsKey("warningId") || !dataJson.containsKey("containerCode")) {
+ throw new ApiException(ApiStatus.PARAM_NO_EXIST);
+ }
+ String containerCode = dataJson.getString("containerCode");
+ String warningId = dataJson.getString("warningId");
+ List<String> warningList = Arrays.asList(warningId.split(","));
+ List<String> warningList1 = new ArrayList<>(Arrays.asList("1","2","3","4","5","6"));
+ List<String> delWarnings = warningList1.stream().filter(o->!warningList.contains(o)).collect(Collectors.toList());//新的不在原有里面的
- List<BaseMeta> baseMetaList = baseMetaDao.getBaseMetaList(metaMap);
- if (baseMetaList == null || baseMetaList.size() != 1) {
- throw new ApiException(ApiStatus.PARAM_ERR, ApiStatus.PARAM_ERR.getRetMsg() + "[warningId]");
- }
+ for (String warning : delWarnings){
+ Map<String, String> metaMap = new HashMap<>();
+ metaMap.put("groupId", "user_violate_type");
+ metaMap.put("metaKey", warning);
- SysAlarmPerson sysAlarmPerson = new SysAlarmPerson();
- sysAlarmPerson.setContainerCode(containerCode);
- sysAlarmPerson.setWarningId(baseMetaList.get(0).getId());
-
- List<SysAlarmPerson> sysAlarmPersonList = sysAlarmPersonDao.selectByCode(containerCode, baseMetaList.get(0).getId());
- // 将人员违规预警记录保存到数据库表
- for (SysAlarmPerson sysAlarm : sysAlarmPersonList) {
- if (!"".equals(alarmUrl) && StringUtils.isNotBlank(sysAlarm.getRefId()) && ("1".equals(warningId) || "2".equals(warningId))) {
- SysWarning sysWarning = new SysWarning();
- sysWarning.setId(String.valueOf(sysAlarm.getId()));
- sysWarning.setStatus(1);
- sysWarning.setAlarmId(sysAlarm.getRefId());
- sysWarningService.updateSysWarning(sysWarning);
+ List<BaseMeta> baseMetaList = baseMetaDao.getBaseMetaList(metaMap);
+ if (baseMetaList == null || baseMetaList.size() != 1) {
+ throw new ApiException(ApiStatus.PARAM_ERR, ApiStatus.PARAM_ERR.getRetMsg() + "[warningId]");
+ }
+ SysAlarmPerson sysAlarmPerson = new SysAlarmPerson();
+ sysAlarmPerson.setContainerCode(containerCode);
+ sysAlarmPerson.setWarningId(baseMetaList.get(0).getId());
+ List<SysAlarmPerson> sysAlarmPersonList = sysAlarmPersonDao.selectByCode(containerCode, baseMetaList.get(0).getId());
+ for (SysAlarmPerson sysAlarm : sysAlarmPersonList) {
+ if (!"".equals(alarmUrl) && StringUtils.isNotBlank(sysAlarm.getRefId()) && ("1".equals(warning) || "2".equals(warning))) {
+ SysWarning sysWarning = new SysWarning();
+ sysWarning.setId(String.valueOf(sysAlarm.getId()));
+ sysWarning.setStatus(1);
+ sysWarning.setAlarmId(sysAlarm.getRefId());
+ sysWarningService.updateSysWarning(sysWarning);
+ }else {
+ Map<String,Object> params = new HashMap<>();
+ params.put("status",1);
+ params.put("id", String.valueOf(sysAlarm.getId()));
+ sysWarningDao.updateSysWarning(params);
+ }
+ }
}
}
}
--
Gitblit v1.9.2