Просмотр исходного кода

补充实验室风险监测功能

liubo лет назад: 3
Родитель
Сommit
415b757108

+ 3 - 0
docker/mysql/update/job-update.sql

@@ -0,0 +1,3 @@
+
+# 添加任务
+INSERT INTO `sys_job` (`job_id`, `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (16, '实验室风险指标监测', 'DEFAULT', 'chemicalTask.indicatorMonitoring', '0 0 0/1 * * ?', '1', '1', '1', 'superAdmin', '2022-08-30 10:21:11', '', NULL, '');

+ 3 - 0
zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/RemoteStockService.java

@@ -25,4 +25,7 @@ public interface RemoteStockService {
 
     @GetMapping(value = "/hxpUserecord/checkOvertime")
     public void checkOvertime();
+
+    @PostMapping("/hxpChemical/indicatorMonitoring")
+    public void indicatorMonitoring();
 }

+ 5 - 0
zd-api/zd-api-system/src/main/java/com/zd/system/api/chemical/factory/RemoteStockFallbackFactory.java

@@ -34,6 +34,11 @@ public class RemoteStockFallbackFactory implements FallbackFactory<RemoteStockSe
             public void checkOvertime() {
                 logger.error("化学品领用超时调度失败:" + throwable.getMessage());
             }
+
+            @Override
+            public void indicatorMonitoring() {
+                logger.error("定时监测实验室化学品存放风险指标:" + throwable.getMessage());
+            }
         };
     }
 }

+ 1 - 1
zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -527,7 +527,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
 
                     hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);
 
-                    // TODO 此处需要发送短信通知
+                    // TODO 此处需要发送短信通知 - 等 MQTT 提前为公共服务
 
                     String[] strings = Stream.of(new String[]{subInfo.get("phones")+""})
                             .filter(a -> StrUtil.isNotBlank(a))

+ 11 - 1
zd-modules/zd-modules-job/src/main/java/com/zd/job/task/ChemicalTask.java

@@ -3,6 +3,7 @@ package com.zd.job.task;
 import com.zd.system.api.chemical.RemoteStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
 
 @Component("chemicalTask")
 public class ChemicalTask {
@@ -17,8 +18,17 @@ public class ChemicalTask {
         remoteStockService.expireCheck();
     }
 
-    // 任务添加 -- 一分钟执行一次
+    /**
+     * 检测领用超时
+     */
     public void checkOvertime(){
         remoteStockService.checkOvertime();
     }
+
+    /**
+     * 定时监测实验室化学品存放风险指标
+     */
+    public void indicatorMonitoring() {
+        remoteStockService.indicatorMonitoring();
+    }
 }