修复bug

273548560@qq.com
1 parent e2c42fdd
Showing 4 changed files with 49 additions and 8 deletions
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationTable.vue
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
@@ -312,7 +312,7 @@ public class DriverTask
 	 * kafka补偿机制，每半小时一次
 	 * @throws InterruptedException
 	 */
-	public void kafkaCompensation() throws InterruptedException {
+	public void kafkaCompensation() throws InterruptedException, IOException {
 		KafkaCompensation kafkaCompensation = new KafkaCompensation();
 		kafkaCompensation.setStatus(0);
 		List<KafkaCompensation> kafkaCompensationList = SpringUtils.getBean(KafkaCompensationMapper.class).selectKafkaCompensationList(kafkaCompensation);
@@ -10,6 +10,7 @@
         <el-date-picker
           v-model="createTime"
           type="daterange"
+          :picker-options="pickerOptions"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期">
@@ -50,6 +51,27 @@ export default {
       createTime: [],
       areas: [],
       hackReset: false,
+      pickerMinDate: null,
+      pickerMaxDate: null,
+      pickerOptions: {
+        onPick: ({ maxDate, minDate }) => {
+          if (minDate && this.pickerMinDate) {
+            this.pickerMinDate = null;
+          } else if (minDate) {
+            this.pickerMinDate = minDate.getTime();
+          }
+        },
+        disabledDate: (time) => {
+          if (this.pickerMinDate) {
+            const day1 =  30 * 24 * 3600 * 1000
+            let maxTime = this.pickerMinDate + day1
+            let minTime = this.pickerMinDate - day1
+            return time.getTime() > maxTime || time.getTime()<minTime || time.getTime() > Date.now()
+          } else {
+            return time.getTime() > Date.now()
+          }
+        },
+      },
     }
   },
   created() {
@@ -10,6 +10,7 @@
         <el-date-picker
           v-model="createTime"
           type="daterange"
+          :picker-options="pickerOptions"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期">
@@ -49,6 +50,27 @@ export default {
       createTime: [],
       areas: [],
       hackReset:false,
+      pickerMinDate: null,
+      pickerMaxDate: null,
+      pickerOptions: {
+        onPick: ({ maxDate, minDate }) => {
+          if (minDate && this.pickerMinDate) {
+            this.pickerMinDate = null;
+          } else if (minDate) {
+            this.pickerMinDate = minDate.getTime();
+          }
+        },
+        disabledDate: (time) => {
+          if (this.pickerMinDate) {
+            const day1 =  30 * 24 * 3600 * 1000
+            let maxTime = this.pickerMinDate + day1
+            let minTime = this.pickerMinDate - day1
+            return time.getTime() > maxTime || time.getTime()<minTime || time.getTime() > Date.now()
+          } else {
+            return time.getTime() > Date.now()
+          }
+        },
+      },
     }
   },
   created() {
@@ -37,7 +37,7 @@ public class Consumer {
     private IViolationWarningInformationService violationWarningInformationService;
     @KafkaListener(topics = "record_process_alarm")
-    public void consume(@Payload String data) throws InterruptedException {
+    public void consume(@Payload String data) throws InterruptedException, IOException {
         log.info("kafka消费数据成功,data:" + data);
         String id = insertKafkaCompensation(data);
         autoViolationWarning(data,id);
@@ -53,7 +53,7 @@ public class Consumer {
     RedisCache redisCache;
     @Transactional
-    public void autoViolationWarning(String data,String id) throws InterruptedException {
+    public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
         String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警未按时间作业",
                 "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
@@ -164,11 +164,8 @@ public class Consumer {
             }
             violationWarningInformation.setDescribe(describe);
             // 业务逻辑
-            try {
-                violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            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") + "在" +