增加定时任务接口

zd-model/src/main/java/com/zd/model/entity/SysFile.java

@@ -4,12 +4,17 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.Serializable;
+
 /**
  * 文件信息
  *
  * @author zd
  */
-public class SysFile {
+public class SysFile implements Serializable {
+
+    private static final long serialVersionUID = 1187407483164436972L;
+
     /**
      * 文件名称
      */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/AlarmRecordController.java

@@ -13,6 +13,7 @@ import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.TransferUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
 import com.zd.model.entity.InventoryTag;
 import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
@@ -99,4 +100,13 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
     public R<Boolean> remoteAdd(@RequestBody InventoryTag tag) {
         return R.ok(alarmRecordService.remoteAdd(tag));
     }
+
+    /**
+     * 化学品超时定时任务
+     */
+    @GetMapping("/qpTimeOut")
+    public ResultData qpTimeOut() {
+        alarmRecordService.qpTimeOut();
+        return ResultData.success();
+    }
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IAlarmRecordService.java

@@ -58,4 +58,9 @@ public interface IAlarmRecordService {
      * @return
      */
     List<BottleStorageInfoVo> setMasterIds(AlarmRecord alarmRecord);
+
+    /**
+     * 气瓶超时定时任务
+     */
+    void qpTimeOut();
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -418,7 +418,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
      **/
 //    @Scheduled(cron = "0 0/1 * * * ? ")
     @Scheduled(cron = "0 0 0 * * ?")
-    public void hxpTimeOut() {
+    public void qpTimeOut() {
         // 查询配置
         ResultData<WarningConfigDto> byType = laboratoryService.getByType(3);
         if (HttpStatus.SUCCESS != byType.getCode()) {

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpStockController.java

@@ -287,4 +287,25 @@ public class HxpStockController extends BaseController {
            return R.fail("短信发送失败：" + e.getMessage());
         }
     }
+
+    /**
+     * 化学品即将过期 已过期
+     * @Param []
+     * @Return com.zd.model.domain.ResultData
+     **/
+    @GetMapping(value = "/hxpExpired")
+    public ResultData hxpExpired() {
+        hxpStockService.hxpExpired();
+        return ResultData.success();
+    }
+
+    /**
+     * 化学品超时未归还
+     * @return
+     */
+    @GetMapping(value = "/hxpTimeOut")
+    public ResultData hxpTimeOut() {
+        hxpStockService.hxpTimeOut();
+        return ResultData.success();
+    }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/IHxpStockService.java

@@ -96,4 +96,8 @@ public interface IHxpStockService
     void expireCheck();
 
     void outStock(HxpStock hxpStock);
+
+    void hxpTimeOut();
+
+    void hxpExpired();
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -74,7 +74,6 @@ import java.util.stream.Stream;
 public class HxpStockServiceImpl implements IHxpStockService {
     private static Logger logger = LoggerFactory.getLogger(HxpStockServiceImpl.class);
 
-//    private static final ScheduledExecutorService scheduledExecutorService = SpringUtils.getBean("scheduledExecutorService");
     private static Map<String, Date> cacheMap = new ConcurrentHashMap<>();
 
     private static int interval = 60 * 3;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -92,7 +92,7 @@ public class WarningNoticeLogController extends AbstractController {
                 warningNoticeLogVO.setCreateDate(LocalDateTimeUtil.ofDate(warningNoticeLogVO.getCreateTime()));
             });
             List<LinkedHashMap<LocalDate, List<WarningNoticeLogVO>>> list = new ArrayList<>();
-            LinkedHashMap<LocalDate, List<WarningNoticeLogVO>> collect = warningNoticeLogVOS.stream().collect(Collectors.groupingBy(WarningNoticeLogVO::getCreateDate, LinkedHashMap::new, Collectors.toList()));
+            LinkedHashMap<LocalDate, List<WarningNoticeLogVO>> collect = warningNoticeLogVOS.stream().filter(i->i.getCreateDate() != null).collect(Collectors.groupingBy(WarningNoticeLogVO::getCreateDate, LinkedHashMap::new, Collectors.toList()));
             list.add(collect);
             BeanUtils.copyProperties(page,VOPage);
             VOPage.setRecords(list);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredPhotographListener.java

@@ -127,13 +127,12 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                 algorithmWarningBo.setFile(fileR.getData().getMultipartFile());
                 ResultData resultData = remoteForwardService.warningCheck(algorithmWarningBo);
                 if (HttpStatus.SUCCESS == resultData.getCode()) {
-                    resultData.getData();
-                    AlgorithmWarningVo algorithmWarningVo = JSON.parseObject(JSONObject.toJSONString(resultData), AlgorithmWarningVo.class);
+                    AlgorithmWarningVo algorithmWarningVo = JSON.parseObject(JSONObject.toJSONString(resultData.getData()), AlgorithmWarningVo.class);
                     WarningDetail warningDetail = new WarningDetail();
                     warningDetail.setLogId(warningNoticeLog.getId());
                     warningDetail.setSubId(warningNoticeLog.getSubId());
                     //预警类型(1预案抓拍 2穿戴抓拍)
-                    //warningDetail.setType();
+//                    warningDetail.setType(2);
                     warningDetail.setPhotoUrl(fileR.getData().getUrl());
                     warningDetail.setCallbackPhotoUrl(algorithmWarningVo.getResultImage());
                     warningDetail.setResult(algorithmWarningVo.getIsAlert());