修改amb的新增条件;

110的分页条件添加ai字段不为空;
新增110算法接口5分钟一次定时任务

alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java

@@ -2,6 +2,8 @@ package com.yingji.quartz;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
 import com.yingji.entity.Alarm;
 import com.yingji.entity.dto.request.AlarmRequest;
 import com.yingji.service.AlarmService;
@@ -16,7 +18,9 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 
 /**
@@ -46,6 +50,39 @@ public class AlarmQuartz {
         String token = alarmService.getToken();
         // 查询所有id
         List<String> idList = findId(token);
+        // 根据id查询数据保存
+        addList(idList, token);
+    }
+
+    /**
+     * 110算法接口
+     */
+    @Async
+    @Scheduled(cron = "0 */5 * * * ? ")
+    public void emergencyAlgorithm() {
+        log.info("============110算法接口开始" + LocalDateTime.now() + "=============");
+        // 获取当前的时间
+        LocalDateTime endTime = LocalDateTime.now();
+        // 获取五分钟前时间
+        LocalDateTime startTime = endTime.minusMinutes(5);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        String endTimeStr = endTime.format(formatter) + ":00";
+        String startTimeStr = startTime.format(formatter) + ":00";
+        Map<String, String> map = new HashMap<>();
+        map.put("startTime", startTimeStr);
+        map.put("endTime", endTimeStr);
+        String body = JSONUtil.toJsonStr(map);
+        HttpRequest.post("http://localhost:9002/emergency_algorithm").body(body).execute().body();
+        log.info("============110算法接口结束" + LocalDateTime.now() + "=============");
+    }
+
+    /**
+     * 根据id查询数据保存
+     *
+     * @param idList 数据id
+     * @param token  token
+     */
+    private void addList(List<String> idList, String token) {
         // 查询数据条件
         AlarmRequest alarmRequest = new AlarmRequest();
         alarmRequest.setType("getValue");
@@ -59,6 +96,7 @@ public class AlarmQuartz {
             try {
                 for (String x : idList) {
                     alarmRequest.setValue(x);
+                    // 查询数据
                     Alarm alarm = alarmService.findDataList(alarmRequest, token);
                     if (alarm != null) {
                         alarm.setSourceId(x);

page/src/main/resources/mapper/yingji/AlarmMapper.xml

@@ -7,9 +7,9 @@
 
     <select id="page" resultType="com.yingji.entity.Alarm">
         select * from alarm
-        <where>
+        where ai_class is not null
         <if test="req.startTime != null ">
-                emergency_event_time &gt;= #{req.startTime}
+            and emergency_event_time &gt;= #{req.startTime}
         </if>
         <if test="req.endTime != null ">
             and emergency_event_time &lt;= #{req.endTime}
@@ -41,7 +41,6 @@
         <if test="req.aiNumMax != null ">
             and ai_num &lt;= #{req.aiNumMax}
         </if>
-        </where>
         order by update_time desc
     </select>
 

rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java

@@ -215,14 +215,14 @@ public class AccidentServiceImpl implements AccidentService {
                             Task one = taskService.getOne(wrapper);
                             if (BeanUtil.isEmpty(one)) {
                                 taskService.save(task);
-                            } else {
-                                taskService.updateById(task);
-                            }
                                 Amb amb = taskInfo.getAmb();
                                 if (BeanUtil.isNotEmpty(amb)) {
                                     amb.setTaskId(task.getTaskId());
                                     ambService.save(amb);
                                 }
+                            } else {
+                                taskService.updateById(task);
+                            }
                         }
                     }
                 }