From d7427ab305dc17af447f5832903691eee329850c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 09:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yufei' into yufei

---
 src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index ddf7301..d197cf3 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -33,6 +33,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("interfaceService")
 public class InterfaceServiceImpl implements InterfaceService {
@@ -41,7 +42,10 @@
 
 	@Resource
 	private OpeUseFlowService opeUseFlowService;
-
+	@Resource
+    private SysWarningService sysWarningService;
+    @Resource(name = "sysWarningDao")
+    SysWarningDao sysWarningDao;
     @Resource(name = "sysWarehouseDao")
     SysWarehouseDao sysWarehouseDao;
 
@@ -1032,7 +1036,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);
@@ -1448,7 +1452,7 @@
                 }
                 //给daping系统发送信息
 
-                if(!"".equals(alarmUrl) && ("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) ) {
+                if(!"".equals(alarmUrl) && ("1".equals(warningId) || "2".equals(warningId))){
                     JSONObject json = new JSONObject();
                     json.put("barCode", location.get("barCode"));
                     json.put("type", alarmType);
@@ -1728,4 +1732,53 @@
     public JSONObject getUserInfo(JSONObject jsonObject) {
         return null;
     }
+
+    // 人员违规预警接口
+    @Override
+    public void delalarmperson(JSONObject jsonObject) throws Exception {
+        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());//新的不在原有里面的
+
+            for (String warning : delWarnings){
+                Map<String, String> metaMap = new HashMap<>();
+                metaMap.put("groupId", "user_violate_type");
+                metaMap.put("metaKey", warning);
+
+                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