diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index aad629f..a85db95 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -126,31 +126,29 @@ public class FirePointServiceImpl implements FirePointService { return false; } if (firePointEntity.getCountyCode().startsWith("37")) { - //如果是山东的点,就入库 if (isSwitchStateOpen()) { - //如果开关已打开,就只将未审核的火点添加到山东临时表 - 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(); + //如果是山东的非耕地火点,就考虑入库 + if (!"耕地".equals(firePointEntity.getLandType())) { + //如果开关已打开,就只将未审核的火点添加到山东临时表 + 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; } - return true; - } else { - return false; } } else { log.info("-------发现新火点"); firePointDao.save(firePointEntity); return true; } -// log.info("-------发现新火点"); -// firePointDao.save(firePointEntity); -// return true; + return false; } /**