liuchengqian/fire_point
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

删除无用代码

Browse Source
This commit is contained in:
liuchengqian 2023-03-01 20:37:32 +08:00
parent cb860c46a1
commit 65e5bb7cb8
5 changed files with 63 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
View File

@ -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();
}
}
/**

40
src/main/java/com/xkrs/straw/controller/FirePointController.java
View File

@ -51,26 +51,26 @@ public class FirePointController {
@Resource
private FirePointQueryHelper firePointQueryHelper;
@GetMapping("/queryzzhd")
public String queryzzhd() {
List<FirePointEntity> firePointEntities1 = firePointQueryHelper.queryZZHD("371482", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
List<FirePointEntity> firePointEntities2 = firePointQueryHelper.queryZZHD("371403", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
List<FirePointEntity> firePointEntities3 = firePointQueryHelper.queryZZHD("371426", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
List<FirePointEntity> firePointEntities4 = firePointQueryHelper.queryZZHD("371424", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
List<FirePointEntity> firePointEntities5 = firePointQueryHelper.queryZZHD("371526", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
List<FirePointEntity> firePointEntities6 = firePointQueryHelper.queryZZHD("371425", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
List<FirePointEntity> firePointEntities7 = firePointQueryHelper.queryZZHD("371503", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
List<FirePointEntity> 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<FirePointEntity> firePointEntities1 = firePointQueryHelper.queryZZHD("371482", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
// List<FirePointEntity> firePointEntities2 = firePointQueryHelper.queryZZHD("371403", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
// List<FirePointEntity> firePointEntities3 = firePointQueryHelper.queryZZHD("371426", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
// List<FirePointEntity> firePointEntities4 = firePointQueryHelper.queryZZHD("371424", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
// List<FirePointEntity> firePointEntities5 = firePointQueryHelper.queryZZHD("371526", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
// List<FirePointEntity> firePointEntities6 = firePointQueryHelper.queryZZHD("371425", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
// List<FirePointEntity> firePointEntities7 = firePointQueryHelper.queryZZHD("371503", "2022-01-01 00:00:10", "2022-06-26 00:00:10");
//
// List<FirePointEntity> 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);
// }
/**
* 添加火点数据

18
src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java
View File

@ -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 + '\'' +
'}';
}
}

23
src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java
View File

@ -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 + '\'' +
'}';
}
}

2
src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java
View File

@ -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();