修复bug

273548560@qq.com
1 parent 04f65edd
Showing 3 changed files with 45 additions and 36 deletions
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
trash-workFlow/src/main/resources/mapper/casefile/ViolationWarningInformationMapper.xml
@@ -58,23 +58,29 @@ public class Consumer {
     public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
-        String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警未按时间作业",
+        String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警-未按时间作业",
                 "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
                 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
                 "44030033=闯禁行驶", "44030034=失信车辆作业"};
         JSONObject jsonObject = JSONObject.parseObject(data);
+        //报警时间
+        Date alarmTime = new Date(jsonObject.getLong("alarmTime")*1000L);
-        String nowHour = DateFormatUtils.format(new Date(), "HH");
+        //这一块是一天内同一工地，同一类型的报警，只报有一条数据，不重复报工，只累加
+        String nowHour = DateFormatUtils.format(alarmTime, "HH");
         String nowDate = null;
         String tomorrowDate = null;
         if(Integer.valueOf(nowHour)<8){
-            nowDate = DateFormatUtils.format(DateUtils.addDays(new Date(), -1), "yyyy-MM-dd");
-            tomorrowDate = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
+            nowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, -1), "yyyy-MM-dd");
+            tomorrowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
         }else{
-            nowDate = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
-            tomorrowDate = DateFormatUtils.format(DateUtils.addDays(new Date(), 1), "yyyy-MM-dd");
+            nowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
+            tomorrowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, 1), "yyyy-MM-dd");
         }
+        //违规类型code
+        String violationTypeCode = jsonObject.getString("alarmType");
+        //违规类型
         String violationType = jsonObject.getString("alarmName");
         if(RemoteServerUtils.remote==null){
             //登录
@@ -85,9 +91,9 @@ public class Consumer {
         JSONArray company1 = null;
         JSONObject basevehicleInfo = null;
         //这两种类型无需累加
-        if(violationType.equals("工地预警-视频设备离线超时报警") || violationType.equals("消纳场预警-视频设备离线超时报警")){
+        if(violationTypeCode.equals("44030021") || violationTypeCode.equals("44030025")){
             violationWarningInformation1 = null;
-        }else if(violationType.equals("闯禁行驶")||violationType.equals("失信车辆作业")){//这两种类型根据公司累加
+        }else if(violationTypeCode.equals("44030033")||violationTypeCode.equals("44030034")){//这两种类型根据公司累加
             company1 = redisCache.getCacheObject("companyList");
             basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),trashConfig.getToken());
             if(company1==null){
@@ -103,6 +109,7 @@ public class Consumer {
             String project = jsonObject.getString("siteName");
             violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(null,project, violationType, nowDate, tomorrowDate);
         }
+
         //判断该类型，该工地，该时间段是否已经存在报警信息，如果存在则不再新增，如果不存在则新增
         if (violationWarningInformation1 == null) {
             ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
@@ -115,7 +122,7 @@ public class Consumer {
             //所属区域
             violationWarningInformation.setOwningRegion(jsonObject.getString("areaName"));
             //案卷编码
-            String number = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS");
+            String number = DateFormatUtils.format(alarmTime, "yyyyMMddHHmmssSSS");
             violationWarningInformation.setNumber(number.substring(2));
             //公司名称
             violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
@@ -129,46 +136,47 @@ public class Consumer {
             violationWarningInformation.setSendObject("区管理部门(治)");
             String describe = "";
-            switch (violationWarningInformation.getViolationType()) {
-                case "工地预警-未报开工作业":
-                case "工地预警-未按时间作业":
-                case "工地预警-三无车辆进入工地":
-                case "工地预警-视频设备离线超时报警":
-                case "离线运输报警(工)":
-                case "未激活车辆作业":
-                case "未核准作业车辆作业":
+            //根据不同违规类型，走不同流程
+            switch (violationTypeCode) {
+                case "44030020":
+                case "44030023":
+                case "44030022":
+                case "44030021":
+                case "44030028":
+                case "44030030":
+                case "44030031":
                     violationWarningInformation.setViolationObjectType("0");
                     violationWarningInformation.setSendObject("区管理部门(治)");
                     violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-                    describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
                             + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
                             jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
                     break;
-                case "消纳场预警-未到指定的消纳场作业":
-                case "消纳场预警-三无车辆进入消纳场":
-                case "消纳场预警-未报开工作业":
-                case "离线运输报警(消)":
-                case "消纳场预警-视频设备离线超时报警":
+                case "44030027":
+                case "44030026":
+                case "44030024":
+                case "44030029":
+                case "44030025":
                     violationWarningInformation.setViolationObjectType("1");
                     violationWarningInformation.setSendObject("区管理部门(消)");
                     violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-                    describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
                             + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
                             jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
                     break;
-                case "未按线路行驶":
+                case "44030032":
                     violationWarningInformation.setViolationObjectType("0");
                     violationWarningInformation.setViolationGrade("重点类");
                     violationWarningInformation.setSendObject("区管理部门(治)");
-                    describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
                             + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
                             jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
                     break;
-                case "闯禁行驶":
-                case "失信车辆作业":
+                case "44030033":
+                case "44030034":
                     violationWarningInformation.setViolationObjectType("2");
                     violationWarningInformation.setSendObject("运输企业");
-                    describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
                             + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
                     //设置公司简称
                     for(Object o:company1){
@@ -181,18 +189,18 @@ public class Consumer {
             }
-
+            violationWarningInformation.setCreateTime(alarmTime);
             violationWarningInformation.setDescribe(describe);
             // 业务逻辑
             violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
         } else {
             String describe = "";
-            if(violationType.equals("闯禁行驶")||violationType.equals("失信车辆作业")){
-                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+            if(violationTypeCode.equals("44030033")||violationTypeCode.equals("44030034")){
+                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
                         + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "出现" + jsonObject.getString("alarmName");
             }else{
-                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
                         + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
                         jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
             }
@@ -90,6 +90,9 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
     @Override
     @Transactional
     public int insertViolationWarningInformation(MultipartFile[] files,ViolationWarningInformation violationWarningInformation) throws IOException {
+        if(violationWarningInformation.getCreateTime()==null){
+            violationWarningInformation.setCreateTime(DateUtils.getNowDate());
+        }
         if(StringUtils.isEmpty(violationWarningInformation.getCreateBy())){
             violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
         }
@@ -103,8 +106,6 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
                 }
             }
         }
-
-        violationWarningInformation.setCreateTime(DateUtils.getNowDate());
         violationWarningInformation.setStatus(0);
         log.info("违规预警信息新增");
         Integer result = violationWarningInformationMapper.insertViolationWarningInformation(violationWarningInformation);
@@ -85,7 +85,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="abbreviation!=null">abbreviation,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            now(),
+            <if test="createTime != null">#{createTime},</if>
             <if test="number != null">#{number},</if>
             <if test="violationObjectType != null">#{violationObjectType},</if>
             <if test="owningRegion != null">#{owningRegion},</if>