更新字段

src/main/java/com/xkrs/model/qo/FirePointQo.java

@@ -44,7 +44,7 @@ public class FirePointQo {
     /**
      * 植被类型
      */
-    private String landtype;
+    private String landType;
 
     /**
      * 置信度
@@ -64,7 +64,7 @@ public class FirePointQo {
     /**
      * 乡镇街道区划编码
      */
-    private String towncode;
+    private String townCode;
 
     public FirePointQo() {
     }
@@ -125,12 +125,12 @@ public class FirePointQo {
         this.satelliteType = satelliteType;
     }
 
-    public String getLandtype() {
-        return landtype;
+    public String getLandType() {
+        return landType;
     }
 
-    public void setLandtype(String landtype) {
-        this.landtype = landtype;
+    public void setLandType(String landType) {
+        this.landType = landType;
     }
 
     public String getConfidence() {
@@ -157,16 +157,29 @@ public class FirePointQo {
         this.satelliteImage = satelliteImage;
     }
 
-    public String getTowncode() {
-        return towncode;
+    public String getTownCode() {
+        return townCode;
     }
 
-    public void setTowncode(String towncode) {
-        this.towncode = towncode;
+    public void setTownCode(String townCode) {
+        this.townCode = townCode;
     }
 
     @Override
     public String toString() {
-        return "FirePointQo{" + "fireCode='" + fireCode + '\'' + ", countyCode=" + countyCode + ", countyName='" + countyName + '\'' + ", satelliteTimeTs=" + satelliteTimeTs + ", longitude=" + longitude + ", latitude=" + latitude + ", satelliteType='" + satelliteType + '\'' + ", landtype='" + landtype + '\'' + ", confidence='" + confidence + '\'' + ", fireImage='" + fireImage + '\'' + ", satelliteImage='" + satelliteImage + '\'' + ", towncode='" + towncode + '\'' + '}';
+        return "FirePointQo{" +
+                "fireCode='" + fireCode + '\'' +
+                ", countyCode=" + countyCode +
+                ", countyName='" + countyName + '\'' +
+                ", satelliteTimeTs=" + satelliteTimeTs +
+                ", longitude=" + longitude +
+                ", latitude=" + latitude +
+                ", satelliteType='" + satelliteType + '\'' +
+                ", landType='" + landType + '\'' +
+                ", confidence='" + confidence + '\'' +
+                ", fireImage='" + fireImage + '\'' +
+                ", satelliteImage='" + satelliteImage + '\'' +
+                ", townCode='" + townCode + '\'' +
+                '}';
     }
 }

src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java

@@ -1,6 +1,5 @@
 package com.xkrs.service.impl;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xkrs.common.encapsulation.PromptMessageEnum;
 import com.xkrs.dao.*;
 import com.xkrs.model.entity.CountyCodeWeiXinEntity;
@@ -91,7 +90,7 @@ public class FirePointServiceImpl implements FirePointService {
     @CacheEvict(value = "FirePointServiceCache", allEntries = true)
     @Override
     public boolean insertFirePoint(FirePointQo firePointQo) {
-        if ("水体".equals(firePointQo.getLandtype())) {
+        if ("水体".equals(firePointQo.getLandType())) {
             return false;
         }
         if ("Himawari 8".equals(firePointQo.getSatelliteType())) {
@@ -107,7 +106,7 @@ public class FirePointServiceImpl implements FirePointService {
         firePointEntity.setLongitude(firePointQo.getLongitude());
         firePointEntity.setLatitude(firePointQo.getLatitude());
         firePointEntity.setSatelliteType(firePointQo.getSatelliteType());
-        firePointEntity.setLandType(firePointQo.getLandtype());
+        firePointEntity.setLandType(firePointQo.getLandType());
         firePointEntity.setConfidence(firePointQo.getConfidence());
         firePointEntity.setAddTime(dateTimeToString(LocalDateTime.now()));
         firePointEntity.setFireType("0");
@@ -121,33 +120,7 @@ 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();
-        }
     }
 
     /**

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 server.port = 6801
 
 ## 数据源配置
-spring.datasource.url = jdbc:postgresql://8.142.26.238:5432/fire_point
+spring.datasource.url = jdbc:postgresql://118.24.27.47:5432/fire_point
 spring.datasource.userName = fire_manage
 spring.datasource.password = fire456
 spring.datasource.driverClassName = org.postgresql.Driver