From 46aeae0a262ada2efef412dc1eaed355959d5f02 Mon Sep 17 00:00:00 2001 From: wu Date: Fri, 17 May 2024 15:11:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9amb=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9D=A1=E4=BB=B6;=20110=E7=9A=84=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0ai=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E4=B8=BA=E7=A9=BA;=20=E6=96=B0=E5=A2=9E110=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E6=8E=A5=E5=8F=A35=E5=88=86=E9=92=9F=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yingji/quartz/AlarmQuartz.java | 38 ++++++++++ .../resources/mapper/yingji/AlarmMapper.xml | 69 +++++++++---------- .../service/impl/AccidentServiceImpl.java | 10 +-- 3 files changed, 77 insertions(+), 40 deletions(-) diff --git a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java index 7ea393e..0ef0068 100644 --- a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java +++ b/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 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 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 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); diff --git a/page/src/main/resources/mapper/yingji/AlarmMapper.xml b/page/src/main/resources/mapper/yingji/AlarmMapper.xml index 7224616..8b29db9 100644 --- a/page/src/main/resources/mapper/yingji/AlarmMapper.xml +++ b/page/src/main/resources/mapper/yingji/AlarmMapper.xml @@ -7,41 +7,40 @@ diff --git a/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java b/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java index 07c6b9e..13644d9 100644 --- a/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java +++ b/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); + Amb amb = taskInfo.getAmb(); + if (BeanUtil.isNotEmpty(amb)) { + amb.setTaskId(task.getTaskId()); + ambService.save(amb); + } } else { taskService.updateById(task); } - Amb amb = taskInfo.getAmb(); - if (BeanUtil.isNotEmpty(amb)) { - amb.setTaskId(task.getTaskId()); - ambService.save(amb); - } } } } From a82f459415d75fdcd3d35845787003310d77b46f Mon Sep 17 00:00:00 2001 From: wu Date: Fri, 17 May 2024 17:04:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9110=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=BA11=E8=8E=B7=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8E=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java index 0ef0068..494ff3e 100644 --- a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java +++ b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java @@ -1,6 +1,7 @@ package com.yingji.quartz; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; @@ -52,19 +53,21 @@ public class AlarmQuartz { List idList = findId(token); // 根据id查询数据保存 addList(idList, token); + // 110算法接口 + if (CollectionUtil.isNotEmpty(idList)) { + emergencyAlgorithm(); + } } /** * 110算法接口 */ - @Async - @Scheduled(cron = "0 */5 * * * ? ") public void emergencyAlgorithm() { log.info("============110算法接口开始" + LocalDateTime.now() + "============="); // 获取当前的时间 LocalDateTime endTime = LocalDateTime.now(); // 获取五分钟前时间 - LocalDateTime startTime = endTime.minusMinutes(5); + LocalDateTime startTime = endTime.minusMinutes(1); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); String endTimeStr = endTime.format(formatter) + ":00"; String startTimeStr = startTime.format(formatter) + ":00"; From 94b891179d53badd6ab30becb5e7a2dfa0185b0f Mon Sep 17 00:00:00 2001 From: wu Date: Fri, 17 May 2024 17:20:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9110=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java index 494ff3e..fffca04 100644 --- a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java +++ b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java @@ -64,9 +64,9 @@ public class AlarmQuartz { */ public void emergencyAlgorithm() { log.info("============110算法接口开始" + LocalDateTime.now() + "============="); - // 获取当前的时间 - LocalDateTime endTime = LocalDateTime.now(); - // 获取五分钟前时间 + // 获取1分钟后时间 + LocalDateTime endTime = LocalDateTime.now().plusMinutes(1); + // 获取1分钟前时间 LocalDateTime startTime = endTime.minusMinutes(1); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); String endTimeStr = endTime.format(formatter) + ":00"; From 88bded6e412d02236cef37616405c0f321e16853 Mon Sep 17 00:00:00 2001 From: wu Date: Wed, 29 May 2024 09:13:43 +0800 Subject: [PATCH 4/5] bugfix --- .../main/java/com/yingji/entity/Alarm.java | 8 +++++ .../java/com/yingji/quartz/AlarmQuartz.java | 32 +++++++++++++------ .../yingji/service/impl/AlarmServiceImpl.java | 29 ++++++++++++----- alarm/src/main/resources/application-dev.yml | 8 ----- .../java/com/yingji/entity/AcceptEvents.java | 8 +++++ .../main/java/com/yingji/entity/Alarm.java | 12 +++++-- .../java/com/yingji/entity/AcceptEvents.java | 8 +++++ .../com/yingji/quartz/AccidentQuartz.java | 9 ++++-- .../service/impl/AccidentServiceImpl.java | 15 +++++++++ rescue/src/main/resources/application-dev.yml | 12 ------- 10 files changed, 99 insertions(+), 42 deletions(-) diff --git a/alarm/src/main/java/com/yingji/entity/Alarm.java b/alarm/src/main/java/com/yingji/entity/Alarm.java index c190e5b..c742ede 100644 --- a/alarm/src/main/java/com/yingji/entity/Alarm.java +++ b/alarm/src/main/java/com/yingji/entity/Alarm.java @@ -2,6 +2,7 @@ package com.yingji.entity; import cn.hutool.core.annotation.Alias; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -192,5 +193,12 @@ public class Alarm implements Serializable { */ @ApiModelProperty(value = "紧急系数") private Double aiNum; + + /** + * 120的event_id + */ + @ApiModelProperty(value = "120的event_id") + @TableField(value = "ai_120_id") + private String ai120Id; } diff --git a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java index fffca04..c5c959f 100644 --- a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java +++ b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java @@ -1,5 +1,6 @@ package com.yingji.quartz; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; @@ -49,13 +50,17 @@ public class AlarmQuartz { public void savaData() { // 获取token String token = alarmService.getToken(); - // 查询所有id - List idList = findId(token); - // 根据id查询数据保存 - addList(idList, token); - // 110算法接口 - if (CollectionUtil.isNotEmpty(idList)) { - emergencyAlgorithm(); + if (StrUtil.isNotEmpty(token)) { + // 查询所有id + List idList = findId(token); + // 根据id查询数据保存 + addList(idList, token); + // 110算法接口 + if (CollectionUtil.isNotEmpty(idList)) { + emergencyAlgorithm(); + } + } else { + log.error("============110算法接口获取token失败============="); } } @@ -101,7 +106,7 @@ public class AlarmQuartz { alarmRequest.setValue(x); // 查询数据 Alarm alarm = alarmService.findDataList(alarmRequest, token); - if (alarm != null) { + if (BeanUtil.isNotEmpty(alarm)) { alarm.setSourceId(x); list.add(alarm); successNum++; @@ -110,14 +115,20 @@ public class AlarmQuartz { int randomNumber = random.nextInt(101) + 100; Thread.sleep(randomNumber); } else { + if (CollectionUtil.isNotEmpty(list)) { + alarmService.saveAll(list); + } return; } } } catch (Exception e) { log.info("==========================" + e.getMessage()); + e.printStackTrace(); } } - alarmService.saveAll(list); + if (CollectionUtil.isNotEmpty(list)) { + alarmService.saveAll(list); + } log.info("成功条数==========================" + successNum); } @@ -156,7 +167,8 @@ public class AlarmQuartz { if (data == null) { return idList; } - sourceService.addList(data); + // todo 注释保存id +// sourceService.addList(data); idList.addAll(data); size += data.size(); if (data.size() == pageSize) { diff --git a/alarm/src/main/java/com/yingji/service/impl/AlarmServiceImpl.java b/alarm/src/main/java/com/yingji/service/impl/AlarmServiceImpl.java index fe429e7..e38e2b1 100644 --- a/alarm/src/main/java/com/yingji/service/impl/AlarmServiceImpl.java +++ b/alarm/src/main/java/com/yingji/service/impl/AlarmServiceImpl.java @@ -68,6 +68,8 @@ public class AlarmServiceImpl extends ServiceImpl implements List records = null; // 获取id String body = HttpRequest.post(specificWarn).header("Authorization", "Basic " + token).body(bodyJson).execute().body(); + log.info("==========================================="); + log.info("++++++++++++++++" + body + "++++++++++++++"); JSONObject json = JSONObject.parse(body); Object response = json.get("response"); if (BeanUtil.isNotEmpty(response)) { @@ -101,19 +103,30 @@ public class AlarmServiceImpl extends ServiceImpl implements Object response = json.get("response"); if (BeanUtil.isNotEmpty(response)) { String recordsStr = JSONUtil.toJsonStr(response); + if (StrUtil.isEmpty(recordsStr)) { + return null; + } records = JSONUtil.toBean(recordsStr, Alarm.class); + if (records == null) { + return null; + } JSONObject recordsJson = JSONObject.parse(recordsStr); + if (BeanUtil.isEmpty(recordsJson)) { + return null; + } Object bjdhsj = recordsJson.get("bjdhsj"); - String bjdhsjStr = JSONUtil.toJsonStr(bjdhsj); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").withZone(ZoneId.systemDefault()); - LocalDateTime emergencyEventTime = LocalDateTime.parse(bjdhsjStr, formatter); - records.setEmergencyEventTime(emergencyEventTime); - records.setCreateTime(LocalDateTime.now()); - records.setUpdateTime(LocalDateTime.now()); - records.setDelFlag(0); + if (BeanUtil.isNotEmpty(bjdhsj)) { + String bjdhsjStr = JSONUtil.toJsonStr(bjdhsj); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").withZone(ZoneId.systemDefault()); + LocalDateTime emergencyEventTime = LocalDateTime.parse(bjdhsjStr, formatter); + records.setEmergencyEventTime(emergencyEventTime); + records.setCreateTime(LocalDateTime.now()); + records.setUpdateTime(LocalDateTime.now()); + records.setDelFlag(0); + } } } catch (Exception e) { - throw new RuntimeException(e); + log.info("系统内部异常,请联系管理员"); } return records; } diff --git a/alarm/src/main/resources/application-dev.yml b/alarm/src/main/resources/application-dev.yml index 287eb22..668eef7 100644 --- a/alarm/src/main/resources/application-dev.yml +++ b/alarm/src/main/resources/application-dev.yml @@ -40,11 +40,3 @@ clientId: BNjP9S8p2EJZyt1UF+D6kCsK6ZVapyKqiGzarEdsZ3QmIWoVdB7YkrX2GBAmCDO16tQ/ak # 110clientSecret clientSecret: AM4oMOsJj0ULAUOOXlz5xHjIF4kp9W63ajZrXxTGLHEn -# 120获取token授权码 -getAuthorizeValidateUrl: http://192.180.22.214:7015/api/Authorize/validate/v1 - -# 120获取token -getAuthorizeTokenUrl: http://192.180.22.214:7015/api/Authorize/token/get/v1 - -# 120获取数据 -getAccidentUrl: http://192.180.22.214:7015/api/Event/accident/list/get/v2 diff --git a/page/src/main/java/com/yingji/entity/AcceptEvents.java b/page/src/main/java/com/yingji/entity/AcceptEvents.java index 57ba52f..15ac252 100644 --- a/page/src/main/java/com/yingji/entity/AcceptEvents.java +++ b/page/src/main/java/com/yingji/entity/AcceptEvents.java @@ -1,6 +1,7 @@ package com.yingji.entity; import cn.hutool.core.annotation.Alias; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -136,5 +137,12 @@ public class AcceptEvents implements Serializable { @ApiModelProperty(value = "受理序号") @Alias("AcceptOrder") private String acceptOrder; + + /** + * 110的emergency_event_id + */ + @ApiModelProperty(value = "110的emergency_event_id") + @TableField(value = "ai_110_id") + private Long ai110Id; } diff --git a/page/src/main/java/com/yingji/entity/Alarm.java b/page/src/main/java/com/yingji/entity/Alarm.java index bfb6379..c742ede 100644 --- a/page/src/main/java/com/yingji/entity/Alarm.java +++ b/page/src/main/java/com/yingji/entity/Alarm.java @@ -2,6 +2,7 @@ package com.yingji.entity; import cn.hutool.core.annotation.Alias; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -173,13 +174,13 @@ public class Alarm implements Serializable { * 预警大类 */ @ApiModelProperty(value = "预警大类") - private String aiCategories; + private String aiClass; /** * 预警小类 */ @ApiModelProperty(value = "预警小类") - private String aiSubCategories; + private String aiClass2; /** * 紧急程度 @@ -192,5 +193,12 @@ public class Alarm implements Serializable { */ @ApiModelProperty(value = "紧急系数") private Double aiNum; + + /** + * 120的event_id + */ + @ApiModelProperty(value = "120的event_id") + @TableField(value = "ai_120_id") + private String ai120Id; } diff --git a/rescue/src/main/java/com/yingji/entity/AcceptEvents.java b/rescue/src/main/java/com/yingji/entity/AcceptEvents.java index 57ba52f..15ac252 100644 --- a/rescue/src/main/java/com/yingji/entity/AcceptEvents.java +++ b/rescue/src/main/java/com/yingji/entity/AcceptEvents.java @@ -1,6 +1,7 @@ package com.yingji.entity; import cn.hutool.core.annotation.Alias; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -136,5 +137,12 @@ public class AcceptEvents implements Serializable { @ApiModelProperty(value = "受理序号") @Alias("AcceptOrder") private String acceptOrder; + + /** + * 110的emergency_event_id + */ + @ApiModelProperty(value = "110的emergency_event_id") + @TableField(value = "ai_110_id") + private Long ai110Id; } diff --git a/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java b/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java index aee717a..5cf3d3d 100644 --- a/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java +++ b/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java @@ -1,5 +1,6 @@ package com.yingji.quartz; +import cn.hutool.core.util.StrUtil; import com.yingji.service.AccidentService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,11 @@ public class AccidentQuartz { @Scheduled(cron = "*/10 * * * * ? ") public void savaData() { String accessToken = accidentService.getAuthorizeToken(); - accidentService.getAccidentUrl(accessToken); - log.info("=================120定时任务结束==============="); + if (StrUtil.isNotEmpty(accessToken)) { + accidentService.getAccidentUrl(accessToken); + log.info("=================120定时任务结束==============="); + } else { + log.info("=================120定时任务获取token失败==============="); + } } } diff --git a/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java b/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java index 13644d9..9fae1e7 100644 --- a/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java +++ b/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java @@ -188,6 +188,8 @@ public class AccidentServiceImpl implements AccidentService { Event one = eventService.getOne(wrapper); if (BeanUtil.isEmpty(one)) { eventService.save(event); + // 调用120和110事件对比接口 + linkAlgorithm(event.getEventId()); } else { eventService.updateById(event); } @@ -230,6 +232,19 @@ public class AccidentServiceImpl implements AccidentService { } } + /** + * 120算法接口 + */ + public void linkAlgorithm(String eventId) { + log.info("============120和110对比算法接口开始" + LocalDateTime.now() + "============="); + Map map = new HashMap<>(); + map.put("event_id", eventId); + String body = JSONUtil.toJsonStr(map); + String response = HttpRequest.post("http://localhost:9002/link_algorithm").body(body).execute().body(); + log.info("++++++120和110对比算法响应数据++++++" + response); + log.info("============120和110对比算法接口结束" + LocalDateTime.now() + "============="); + } + @Override public void text() { String s = "{\n" + diff --git a/rescue/src/main/resources/application-dev.yml b/rescue/src/main/resources/application-dev.yml index 287eb22..647069b 100644 --- a/rescue/src/main/resources/application-dev.yml +++ b/rescue/src/main/resources/application-dev.yml @@ -28,18 +28,6 @@ knife4j: # test1: # group-name: 应急算法 -# 110获取token -getToken: http://2.46.4.198:8008/token - -# 110获取数据 -specificWarn: http://2.46.4.198:8008/rs/k4r3h/DataAnalysisService/sz/share/specificWarn - -# 110clientId -clientId: BNjP9S8p2EJZyt1UF+D6kCsK6ZVapyKqiGzarEdsZ3QmIWoVdB7YkrX2GBAmCDO16tQ/ak86pZgP5ZS3s4EGdco= - -# 110clientSecret -clientSecret: AM4oMOsJj0ULAUOOXlz5xHjIF4kp9W63ajZrXxTGLHEn - # 120获取token授权码 getAuthorizeValidateUrl: http://192.180.22.214:7015/api/Authorize/validate/v1 From 399d3d0bf5930f3112f39795f63a1d8aaf4564b7 Mon Sep 17 00:00:00 2001 From: wu Date: Wed, 29 May 2024 15:32:43 +0800 Subject: [PATCH 5/5] bugfix --- page/src/main/java/com/yingji/entity/AcceptEvents.java | 7 ------- page/src/main/java/com/yingji/entity/Event.java | 8 ++++++++ rescue/src/main/java/com/yingji/entity/AcceptEvents.java | 7 ------- rescue/src/main/java/com/yingji/entity/Event.java | 8 ++++++++ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/page/src/main/java/com/yingji/entity/AcceptEvents.java b/page/src/main/java/com/yingji/entity/AcceptEvents.java index 15ac252..ec8041b 100644 --- a/page/src/main/java/com/yingji/entity/AcceptEvents.java +++ b/page/src/main/java/com/yingji/entity/AcceptEvents.java @@ -1,7 +1,6 @@ package com.yingji.entity; import cn.hutool.core.annotation.Alias; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -138,11 +137,5 @@ public class AcceptEvents implements Serializable { @Alias("AcceptOrder") private String acceptOrder; - /** - * 110的emergency_event_id - */ - @ApiModelProperty(value = "110的emergency_event_id") - @TableField(value = "ai_110_id") - private Long ai110Id; } diff --git a/page/src/main/java/com/yingji/entity/Event.java b/page/src/main/java/com/yingji/entity/Event.java index 73acd90..25dab10 100644 --- a/page/src/main/java/com/yingji/entity/Event.java +++ b/page/src/main/java/com/yingji/entity/Event.java @@ -1,6 +1,7 @@ package com.yingji.entity; import cn.hutool.core.annotation.Alias; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -124,5 +125,12 @@ public class Event implements Serializable { @ApiModelProperty(value = "备注") @Alias("Remark") private String remark; + + /** + * 110的emergency_event_id + */ + @ApiModelProperty(value = "110的emergency_event_id") + @TableField(value = "ai_110_id") + private Long ai110Id; } diff --git a/rescue/src/main/java/com/yingji/entity/AcceptEvents.java b/rescue/src/main/java/com/yingji/entity/AcceptEvents.java index 15ac252..ec8041b 100644 --- a/rescue/src/main/java/com/yingji/entity/AcceptEvents.java +++ b/rescue/src/main/java/com/yingji/entity/AcceptEvents.java @@ -1,7 +1,6 @@ package com.yingji.entity; import cn.hutool.core.annotation.Alias; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -138,11 +137,5 @@ public class AcceptEvents implements Serializable { @Alias("AcceptOrder") private String acceptOrder; - /** - * 110的emergency_event_id - */ - @ApiModelProperty(value = "110的emergency_event_id") - @TableField(value = "ai_110_id") - private Long ai110Id; } diff --git a/rescue/src/main/java/com/yingji/entity/Event.java b/rescue/src/main/java/com/yingji/entity/Event.java index 73acd90..25dab10 100644 --- a/rescue/src/main/java/com/yingji/entity/Event.java +++ b/rescue/src/main/java/com/yingji/entity/Event.java @@ -1,6 +1,7 @@ package com.yingji.entity; import cn.hutool.core.annotation.Alias; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -124,5 +125,12 @@ public class Event implements Serializable { @ApiModelProperty(value = "备注") @Alias("Remark") private String remark; + + /** + * 110的emergency_event_id + */ + @ApiModelProperty(value = "110的emergency_event_id") + @TableField(value = "ai_110_id") + private Long ai110Id; }