Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev

youxiw2000
2 parents be16adfc 9304d22b
Showing 5 changed files with 77 additions and 62 deletions
trash-admin/src/main/resources/application.yml
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/views/activiti/task/index.vue
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
@@ -9,18 +9,19 @@ spring:
   #kafka配置
   kafka:
     bootstrap-servers: 183.66.242.6:9101
+    listener:
+      ack-mode: manual_immediate
     producer:
       x-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
       buffer-memory: 33554432
       acks: all
     consumer:
-      enable-auto-commit: true
-      group-id: trash123
+      enable-auto-commit: false
+      group-id: trash
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
       max-poll-records: 1
-
   # 资源信息
   messages:
     # 国际化资源文件路径
@@ -9,11 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.trash.casefile.domain.KafkaCompensation;
 import com.trash.casefile.kafka.Consumer;
 import com.trash.casefile.mapper.KafkaCompensationMapper;
@@ -35,8 +30,6 @@ import com.trash.business.service.IDriverCreditService;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.ITruckActivateService;
 import com.trash.business.service.ITruckCreditService;
-import com.trash.casefile.domain.ViolationWarningInformation;
-import com.trash.common.annotation.Log;
 import com.trash.common.config.trashConfig;
 import com.trash.common.utils.LogUtils;
 import com.trash.common.utils.RemoteServerUtils;
 <template>
   <div class="app-container">
-    <el-select v-model="queryParams.dept" filterable  reserve-keyword @change="getList">
-      <el-option v-for="item in depts" :label="item.name"
-                 :value="item.code" :key="item.code">
-      </el-option>
-    </el-select>
-    <el-select v-model="queryParams.role" filterable  reserve-keyword @change="getList">
-      <el-option v-for="item in roles" :label="item.name"
-                 :value="item.code" :key="item.code">
-      </el-option>
-    </el-select>
+<!--    <el-select v-model="queryParams.dept" filterable  reserve-keyword @change="getList">-->
+<!--      <el-option v-for="item in depts" :label="item.name"-->
+<!--                 :value="item.code" :key="item.code">-->
+<!--      </el-option>-->
+<!--    </el-select>-->
+<!--    <el-select v-model="queryParams.role" filterable  reserve-keyword @change="getList">-->
+<!--      <el-option v-for="item in roles" :label="item.name"-->
+<!--                 :value="item.code" :key="item.code">-->
+<!--      </el-option>-->
+<!--    </el-select>-->
     <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
@@ -15,10 +15,12 @@ import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.spring.SpringUtils;
 import com.trash.framework.web.service.SysLoginService;
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.support.Acknowledgment;
 import org.springframework.kafka.support.KafkaHeaders;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.messaging.handler.annotation.Payload;
@@ -37,10 +39,12 @@ public class Consumer {
     private IViolationWarningInformationService violationWarningInformationService;
     @KafkaListener(topics = "record_process_alarm")
-    public void consume(@Payload String data) throws InterruptedException, IOException {
-        log.info("kafka消费数据成功,data:" + data);
-        String id = insertKafkaCompensation(data);
-        autoViolationWarning(data,id);
+    public void consume(ConsumerRecord<?, ?> record, Acknowledgment ack) throws InterruptedException, IOException {
+        log.info("kafka消费数据成功,offset:"+ record.offset() +",data:" + record.value());
+        String id = insertKafkaCompensation(record.value().toString());
+        autoViolationWarning(record.value().toString(),id);
+        //手动提交offset
+        ack.acknowledge();
     }
     @Autowired
@@ -52,7 +56,6 @@ public class Consumer {
     @Autowired
     RedisCache redisCache;
-    @Transactional
     public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
         String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警未按时间作业",
@@ -72,8 +75,6 @@ public class Consumer {
             tomorrowDate = DateFormatUtils.format(DateUtils.addDays(new Date(), 1), "yyyy-MM-dd");
         }
-
-
         String violationType = jsonObject.getString("alarmName");
         if(RemoteServerUtils.remote==null){
             //登录
@@ -81,19 +82,21 @@ public class Consumer {
             loginService.loginByRemote(trashConfig.getToken());
         }
         ViolationWarningInformation violationWarningInformation1 = null;
-        JSONArray company1 = redisCache.getCacheObject("companyList");
-        JSONObject basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),trashConfig.getToken());
-        if(company1==null){
-            throw new RuntimeException("获取公司列表失败！！！");
-        }
-
-        if(basevehicleInfo==null){
-            throw new RuntimeException("获取公司详情失败！vehicleId:"+jsonObject.getString("vehicleId"));
-        }
+        JSONArray company1 = null;
+        JSONObject basevehicleInfo = null;
         //这两种类型无需累加
         if(violationType.equals("工地预警-视频设备离线超时报警") || violationType.equals("消纳场预警-视频设备离线超时报警")){
             violationWarningInformation1 = null;
         }else if(violationType.equals("闯禁行驶")||violationType.equals("失信车辆作业")){//这两种类型根据公司累加
+            company1 = redisCache.getCacheObject("companyList");
+            basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),trashConfig.getToken());
+            if(company1==null){
+                throw new RuntimeException("获取公司列表失败！！！");
+            }
+
+            if(basevehicleInfo==null){
+                throw new RuntimeException("获取公司详情失败！vehicleId:"+jsonObject.getString("vehicleId"));
+            }
             String company = jsonObject.getString("enterpriseName");
             violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(company,null, violationType, nowDate, tomorrowDate);
         }else{//其他都是根据工地/消纳站累加
@@ -105,7 +108,7 @@ public class Consumer {
             ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
             String siteType = jsonObject.getString("siteType");
             if ("1".equals(siteType)) {//工地
-                violationWarningInformation.setViolationObjectType("0");
+
             } else if ("2".equals(siteType)) {//消纳场
                 violationWarningInformation.setViolationObjectType("1");
             }
@@ -123,53 +126,77 @@ public class Consumer {
             //推送对象
             violationWarningInformation.setViolationGrade("一般类");
             //项目名称（工地名称，消纳场名称）
-            violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+
             violationWarningInformation.setSendObject("区管理部门(治)");
+            String describe = "";
             switch (violationWarningInformation.getViolationType()) {
                 case "工地预警-未报开工作业":
-                case "消纳场预警-未到指定的消纳场作业":
-                case "消纳场预警-三无车辆进入消纳场":
-                case "消纳场预警-未报开工作业":
                 case "工地预警-未按时间作业":
                 case "工地预警-三无车辆进入工地":
                 case "工地预警-视频设备离线超时报警":
-                case "离线运输报警(消)":
                 case "离线运输报警(工)":
                 case "未激活车辆作业":
                 case "未核准作业车辆作业":
+                    violationWarningInformation.setViolationObjectType("0");
                     violationWarningInformation.setSendObject("区管理部门(治)");
+                    violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+                    describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
                     break;
+                case "消纳场预警-未到指定的消纳场作业":
+                case "消纳场预警-三无车辆进入消纳场":
+                case "消纳场预警-未报开工作业":
+                case "离线运输报警(消)":
                 case "消纳场预警-视频设备离线超时报警":
+                    violationWarningInformation.setViolationObjectType("1");
                     violationWarningInformation.setSendObject("区管理部门(消)");
+                    violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+                    describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
                     break;
                 case "未按线路行驶":
+                    violationWarningInformation.setViolationObjectType("0");
                     violationWarningInformation.setViolationGrade("重点类");
                     violationWarningInformation.setSendObject("区管理部门(治)");
+                    describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
                     break;
                 case "闯禁行驶":
                 case "失信车辆作业":
+                    violationWarningInformation.setViolationObjectType("2");
                     violationWarningInformation.setSendObject("运输企业");
+                    describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
+                    //设置公司简称
+                    for(Object o:company1){
+                        JSONObject jo = (JSONObject) o;
+                        if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
+                            violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
+                        }
+                    }
                     break;
             }
-            String describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
-                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-            //设置公司简称
-            for(Object o:company1){
-                JSONObject jo = (JSONObject) o;
-                if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
-                    violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
-                }
-            }
+
+
             violationWarningInformation.setDescribe(describe);
             // 业务逻辑
             violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
         } else {
-            String describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
-                    + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
-                    jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
+            String describe = "";
+            if(violationType.equals("闯禁行驶")||violationType.equals("失信车辆作业")){
+                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(new Date(), "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") + " "
+                        + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
+                        jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
+            }
+
             violationWarningInformation1.setDescribe(describe);
             SpringUtils.getBean(ViolationWarningInformationMapper.class).updateViolationWarningInformation(violationWarningInformation1);
         }
@@ -180,7 +207,6 @@ public class Consumer {
         SpringUtils.getBean(KafkaCompensationMapper.class).updateKafkaCompensation(kafkaCompensation);
     }
-    @Transactional
     public String insertKafkaCompensation(String data){
         KafkaCompensation kafkaCompensation = new KafkaCompensation();
         kafkaCompensation.setData(data);
@@ -6,19 +6,14 @@ import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
-import com.trash.casefile.kafka.Consumer;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.file.FileUploadUtils;
-import com.trash.office.domain.LeaveApplication;
 import com.trash.office.domain.UploadFile;
-import com.trash.office.domain.vo.LeaveApplicationVo;
 import com.trash.office.mapper.UploadFileMapper;
-import com.trash.workflow.domain.Workflow;
 import com.trash.workflow.service.IWorkflowService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 @Service
 public class ViolationWarningInformationServiceImpl implements IViolationWarningInformationService
 {
-    private static final Logger log = LoggerFactory.getLogger(Consumer.class);
+    private static final Logger log = LoggerFactory.getLogger(ViolationWarningInformationServiceImpl.class);
     @Autowired
     private ViolationWarningInformationMapper violationWarningInformationMapper;
     @Autowired