预警调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/qhse/CertJob.java

@@ -67,6 +67,8 @@ public class CertJob implements JobHandler {
             } else  {
                 if (ChronoUnit.DAYS.between(LocalDateTime.now(), certExpire) < 60) {
                     item.setAlertWarn(true);//设置为60天预警过期
+                } else {
+                    item.setAlertWarn(false);
                 }
                 item.setExpired(false);
             }
@@ -103,6 +105,9 @@ public class CertJob implements JobHandler {
                         if (maxDate.isAfter(LocalDateTime.now()) && ChronoUnit.DAYS.between(LocalDateTime.now(), maxDate) < 90) {
                             item.setAlertWarn(true);
                             item.setExpired(false);
+                        } else {
+                            item.setAlertWarn(false);
+//                            item.setExpired(false);
                         }
                         iotMeasureBookMapper.updateById(item);
                     });
@@ -120,6 +125,8 @@ public class CertJob implements JobHandler {
             if (certExpire.isAfter(LocalDateTime.now()) && ChronoUnit.DAYS.between(LocalDateTime.now(), certExpire) < 90) {
                 item.setAlertWarn(true);
                 item.setExpired(false);
+            } else {
+                item.setAlertWarn(false);
             }
             qhseDeviceCertMapper.updateById(item);
         });
@@ -134,6 +141,9 @@ public class CertJob implements JobHandler {
             if (certExpire.isAfter(LocalDateTime.now()) && ChronoUnit.DAYS.between(LocalDateTime.now(), certExpire) < 90) {
                 item.setAlertWarn(true);
                 item.setExpired(false);
+            } else {
+                item.setAlertWarn(false);
+//                item.setExpired(false);
             }
             qhseEmergencyCertMapper.updateById(item);
         });
@@ -149,6 +159,8 @@ public class CertJob implements JobHandler {
             if (certExpire.isAfter(LocalDateTime.now()) && ChronoUnit.DAYS.between(LocalDateTime.now(), certExpire) < 60) {
                 item.setAlertWarn(true);
                 item.setExpired(false);
+            } else {
+                item.setAlertWarn(false);
             }
             qhseOrgCertMapper.updateById(item);
         });

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/IotMeasureCertServiceImpl.java

@@ -72,6 +72,8 @@ public class IotMeasureCertServiceImpl implements IotMeasureCertService {
         } else  {
             if (ChronoUnit.DAYS.between(LocalDateTime.now(), certExpire) < 60) {
                 updateObj.setAlertWarn(true);//设置为60天预警过期
+            }else {
+                updateObj.setAlertWarn(false);
             }
             updateObj.setExpired(false);
         }