Commit ae2625cc authored by 鲁鸿波's avatar 鲁鸿波

所有作业3天未完成的,需要重新发起申请。

危险作业到交底环节后按固定时间判断是否超时,超时自动取消
parent 9d92e76e
...@@ -98,7 +98,7 @@ public class HazardWorkPlanScheduler { ...@@ -98,7 +98,7 @@ public class HazardWorkPlanScheduler {
/** /**
* 定时刷新字典缓存(每 10 分钟刷新一次,保证字典变更能生效) * 定时刷新字典缓存(每 10 分钟刷新一次,保证字典变更能生效)
*/ */
//@Scheduled(cron = "0 0/10 * * * ?") @Scheduled(cron = "0 0/10 * * * ?")
public void refreshDictCacheScheduled() { public void refreshDictCacheScheduled() {
refreshDictCache(); refreshDictCache();
} }
...@@ -126,9 +126,9 @@ public class HazardWorkPlanScheduler { ...@@ -126,9 +126,9 @@ public class HazardWorkPlanScheduler {
} }
/** /**
* 每5分钟检查安全许可通过后仍在运行的作业 * 定时刷新开关(每 30 分钟刷新一次,保证开关变更能生效)
*/ */
//@Scheduled(cron = "0 0/5 * * * ?") @Scheduled(cron = "0 */30 * * * ?")
public void refreshSwitch() { public void refreshSwitch() {
if (!isSchedulerEnabled()) { if (!isSchedulerEnabled()) {
log.debug("refreshSwitch: 调度被禁用(字典值非 {})", DICT_ENABLE_VALUE); log.debug("refreshSwitch: 调度被禁用(字典值非 {})", DICT_ENABLE_VALUE);
......
...@@ -65,7 +65,7 @@ public class DangerousOperationValidator { ...@@ -65,7 +65,7 @@ public class DangerousOperationValidator {
// 动火作业 // 动火作业
Map<DangerLevel, Integer> hotWorkMap = new HashMap<>(); Map<DangerLevel, Integer> hotWorkMap = new HashMap<>();
hotWorkMap.put(DangerLevel.HIGH, 8); hotWorkMap.put(DangerLevel.HIGH, 8);
hotWorkMap.put(DangerLevel.MEDIUM, 12); hotWorkMap.put(DangerLevel.MEDIUM, 8);
hotWorkMap.put(DangerLevel.LOW, 72); hotWorkMap.put(DangerLevel.LOW, 72);
TIME_LIMITS.put(OperationType.HOT_WORK, hotWorkMap); TIME_LIMITS.put(OperationType.HOT_WORK, hotWorkMap);
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<select id="selectHazardLicensePassTime" resultType="com.testor.module.hazard.model.domain.THazardWorkPlan"> <select id="selectHazardLicensePassTime" resultType="com.testor.module.hazard.model.domain.THazardWorkPlan">
select * from t_hazard_work_plan select * from t_hazard_work_plan
where status ='0' and hazard_license_pass_time is not null where status ='0' and hazard_license_pass_time is not null and hazard_license_pass_time !=''
and work_status in('4','8','9','10') and work_status in('4','8','9','10')
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment