调整烘干事件

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/controller/SysTelecomEventController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.common.utils.StringUtilsWork;
+import com.huimv.produce.dhicc.util.GetResponse;
 import com.huimv.produce.entity.BaseTelecomRoom;
 import com.huimv.produce.entity.SysTelecom;
 import com.huimv.produce.entity.SysTelecomEvent;
@@ -34,7 +35,6 @@ public class SysTelecomEventController {
 
     @Autowired
     private ISysTelecomEventService sysTelecomEventService;
-
     //传入机器编码  返回这个机器下的所有事件 带分页
     @GetMapping("/listevent")
     public Result list(@RequestParam(name = "deviceId", required = false) String deviceId    ,
@@ -45,14 +45,22 @@ public class SysTelecomEventController {
                        @RequestParam(name = "farmId") Integer farmId  //分页大小
 
     ) throws ParseException {
+        //如果传入的开始时间是默认的今天的 就返回最近三天的 --前端说改起来比较麻烦
+
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
         Date startTime = fmt.parse(startTimeString);
         Date endTime = fmt.parse(endTimeString);
+
+         long timeGap = date.getTime()-startTime.getTime();
         QueryWrapper<SysTelecomEvent> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_id", farmId);
         if(StringUtilsWork.isNotBlank(deviceId)){
             wrapper.eq("device_id", deviceId);
         }
+        if (timeGap<1000*60*60*24){
+            startTime = new Date(endTime.getTime()-1000*60*60*72);
+        }
         wrapper.between("event_time", startTime, endTime);
         wrapper.orderByDesc( "id" );
         Page<SysTelecomEvent> page = sysTelecomEventService.page(new Page< >(current, size), wrapper);

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/VideoRecorController.java

@@ -42,7 +42,6 @@ public class VideoRecorController {
     @Autowired
     private  IccChannelMapper iccChannelMapper  ;
 
-
     @RequestMapping("/getVideoRecord")
     public R getVideoRecord(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
         String happendTime = (String) params1.get("happendTime");
@@ -67,10 +66,10 @@ public class VideoRecorController {
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //格式化传入的时间---拿传入时间前后五分钟的视频
         Date Time = fmt.parse(happendTime);   //事件时间
-        Date GapTimeBefor_gap = new Date(Time.getTime() -1000*60*5);//star   事件五分钟之前
+        Date GapTimeBefor_gap = new Date(Time.getTime() -1000*10);//star   事件十秒之前
         Date GapAfter = new Date(Time.getTime() +1000*60*5);// end   事件五分钟之后
-        String befor= String.valueOf(GapTimeBefor_gap.getTime() / 1000);
-        String after= String.valueOf(GapAfter.getTime() / 1000);
+        String befor= String.valueOf(GapTimeBefor_gap.getTime() /1000);
+        String after= String.valueOf(GapAfter.getTime() /1000);
         value.put("endTime",after);
         value.put("startTime",befor);
         params.put("clientMac","30:9c:23:79:40:08");