From 65e5bb7cb888ddd14f746be8ce6447fc377c95af Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 1 Mar 2023 20:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FirePointServiceImpl.java | 24 ----------- .../straw/controller/FirePointController.java | 40 +++++++++---------- .../xkrs/straw/model/qo/AllFirePointQo.java | 18 +++++++++ .../xkrs/straw/model/vo/AllFirePointVo.java | 23 +++++++++++ .../impl/DispatchFirePointServiceImpl.java | 2 + 5 files changed, 63 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index f88ee65..8ea5edd 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -110,33 +110,9 @@ public class FirePointServiceImpl implements FirePointService { } log.info("-------发现新火点"); firePointDao.save(firePointEntity); - forwardPoint(firePointEntity); //发送消息通知 sendBroadcast(firePointEntity); return true; -// if (firePointEntity.getCountyCode().startsWith("37")) { -// //如果开关已打开，就只将未审核的火点添加到山东临时表 -// log.info("-------发现新山东火点"); -// ShanDongFirePointEntity shanDongFirePointByFirePoint = getShanDongFirePointByFirePoint(firePointEntity); -// ShanDongFirePointEntity savedShanDongFirePoint = shanDongFirePointDao.save(shanDongFirePointByFirePoint); -// //微信消息通知火点审核工作组 -// try { -// String messageContent = getMessageContent(savedShanDongFirePoint); -// WDWxSendMsgUtil.sendMsg("18447024917@chatroom", messageContent, 0); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// return true; -// } - } - - private void forwardPoint(FirePointEntity firePointEntity) { - try { - String url = "http://121.36.229.60:6811/insertfirepointchannelThree"; - HttpClientUtils.sendHttpPostTextPlain(url, new ObjectMapper().writeValueAsString(firePointEntity)); - } catch (Exception e) { - e.printStackTrace(); - } } /** diff --git a/src/main/java/com/xkrs/straw/controller/FirePointController.java b/src/main/java/com/xkrs/straw/controller/FirePointController.java index 3376d95..aeb89ba 100644 --- a/src/main/java/com/xkrs/straw/controller/FirePointController.java +++ b/src/main/java/com/xkrs/straw/controller/FirePointController.java @@ -51,26 +51,26 @@ public class FirePointController { @Resource private FirePointQueryHelper firePointQueryHelper; - @GetMapping("/queryzzhd") - public String queryzzhd() { - List firePointEntities1 = firePointQueryHelper.queryZZHD("371482", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); - List firePointEntities2 = firePointQueryHelper.queryZZHD("371403", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); - List firePointEntities3 = firePointQueryHelper.queryZZHD("371426", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); - List firePointEntities4 = firePointQueryHelper.queryZZHD("371424", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); - List firePointEntities5 = firePointQueryHelper.queryZZHD("371526", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); - List firePointEntities6 = firePointQueryHelper.queryZZHD("371425", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); - List firePointEntities7 = firePointQueryHelper.queryZZHD("371503", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); - - List firePointList = new ArrayList<>(); - firePointList.addAll(firePointEntities1); - firePointList.addAll(firePointEntities2); - firePointList.addAll(firePointEntities3); - firePointList.addAll(firePointEntities4); - firePointList.addAll(firePointEntities5); - firePointList.addAll(firePointEntities6); - firePointList.addAll(firePointEntities7); - return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale); - } +// @GetMapping("/queryzzhd") +// public String queryzzhd() { +// List firePointEntities1 = firePointQueryHelper.queryZZHD("371482", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); +// List firePointEntities2 = firePointQueryHelper.queryZZHD("371403", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); +// List firePointEntities3 = firePointQueryHelper.queryZZHD("371426", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); +// List firePointEntities4 = firePointQueryHelper.queryZZHD("371424", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); +// List firePointEntities5 = firePointQueryHelper.queryZZHD("371526", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); +// List firePointEntities6 = firePointQueryHelper.queryZZHD("371425", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); +// List firePointEntities7 = firePointQueryHelper.queryZZHD("371503", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); +// +// List firePointList = new ArrayList<>(); +// firePointList.addAll(firePointEntities1); +// firePointList.addAll(firePointEntities2); +// firePointList.addAll(firePointEntities3); +// firePointList.addAll(firePointEntities4); +// firePointList.addAll(firePointEntities5); +// firePointList.addAll(firePointEntities6); +// firePointList.addAll(firePointEntities7); +// return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale); +// } /** * 添加火点数据 diff --git a/src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java b/src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java index 38aa407..f091c68 100644 --- a/src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java @@ -149,4 +149,22 @@ public class AllFirePointQo { public void setTownCode(String townCode) { this.townCode = townCode; } + + @Override + public String toString() { + return "AllFirePointQo{" + + "fireCode='" + fireCode + '\'' + + ", countyCode=" + countyCode + + ", countyName='" + countyName + '\'' + + ", satelliteTimeTs=" + satelliteTimeTs + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", satelliteType='" + satelliteType + '\'' + + ", landType='" + landType + '\'' + + ", confidence='" + confidence + '\'' + + ", fireImage='" + fireImage + '\'' + + ", satelliteImage='" + satelliteImage + '\'' + + ", townCode='" + townCode + '\'' + + '}'; + } } diff --git a/src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java b/src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java index 827fa2c..de91f12 100644 --- a/src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java +++ b/src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java @@ -225,4 +225,27 @@ public class AllFirePointVo { public void setRemark(String remark) { this.remark = remark; } + + @Override + public String toString() { + return "AllFirePointVo{" + + "id=" + id + + ", fireCode='" + fireCode + '\'' + + ", countyCode='" + countyCode + '\'' + + ", countyName='" + countyName + '\'' + + ", satelliteTime='" + satelliteTime + '\'' + + ", longitude=" + longitude + + ", latitude=" + latitude + + ", satelliteType='" + satelliteType + '\'' + + ", landType='" + landType + '\'' + + ", confidence='" + confidence + '\'' + + ", fireImage='" + fireImage + '\'' + + ", satelliteImage='" + satelliteImage + '\'' + + ", townCode='" + townCode + '\'' + + ", townName='" + townName + '\'' + + ", addTime='" + addTime + '\'' + + ", firePointAddress='" + firePointAddress + '\'' + + ", remark='" + remark + '\'' + + '}'; + } } diff --git a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java index c83f1a6..04fdb08 100644 --- a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java @@ -95,6 +95,7 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService { */ @Override public String insertFirePointChannelOrdinary(AllFirePointQo firePointQo) { + log.info("insertFirePointChannelOrdinary 接收到火点信息：" + firePointQo.toString()); String fireCode = firePointQo.getFireCode(); Long countyCode = firePointQo.getCountyCode(); @@ -161,6 +162,7 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService { */ @Override public String insertFirePointChannelPrecise(AllFirePointQo firePointQo) { + log.info("insertFirePointChannelPrecise 接收到火点信息：" + firePointQo.toString()); String fireCode = firePointQo.getFireCode(); Long countyCode = firePointQo.getCountyCode();