山西数据推送完整版

src/main/java/com/amqp/shanxi/Sender.java

@@ -49,11 +49,11 @@ public class Sender {
 			resultList.add(dbDeviceInfo);
 			//对数据加密
 			String result = JSONUtil.toJsonStr(resultList);
-			String encrypt = AESUtil.encrypt(result, "i2MvNzkedPgITpz2UcZS3A==" , "ReQb3Swiz8frJ3+8l9RGvg==");
+			String encrypt = AESUtil.encrypt(result, "4qInuXy6CREhRch7toLcBg==" , "rluhvrn9+EHIodq5Tx86Jg==");
 			Map<String, Object>  resultMap = new HashMap<String, Object>();
 			//荷载消息内容
 			while(true) {
-				resultMap.put("tailingNo","1402240003");
+				resultMap.put("tailingNo","1409240055");
 				resultMap.put("departmentId","" );
 				resultMap.put("provinceId", "");
 				resultMap.put("type","0101");

src/main/java/com/amqp/shanxi/ShanxiApplication.java

@@ -16,13 +16,16 @@ import org.springframework.context.ConfigurableApplicationContext;
 public class ShanxiApplication {
 
     /*
-        山西宏伟矿业有限责任公司泽水沟东沟尾矿库
-        尾矿库编号：1402240003
+        转自 接口：
+        请上传尾矿库监测数据，以下是上传数据所需的配置信息：
+
+        繁峙县鑫丰矿业有限责任公司大李老沟尾矿库
+        尾矿库编号：1409240055
         数据上传IP：192.166.1.253
-        rbmq账号：hwzsgdg
-        rbmq密码：7793oa
-        密钥：i2MvNzkedPgITpz2UcZS3A==
-        向量：ReQb3Swiz8frJ3+8l9RGvg==
+        rbmq账号：fsxfdllg
+        rbmq密码：TErA18
+        密钥：4qInuXy6CREhRch7toLcBg==
+        向量：rluhvrn9+EHIodq5Tx86Jg==
     */
     public static void main(String[] args) {
         ConfigurableApplicationContext run = SpringApplication.run(ShanxiApplication.class, args);
@@ -36,16 +39,16 @@ public class ShanxiApplication {
             //rabbitmq监听默认端口
             factory.setPort(5672);
             //设置访问的用户
-            factory.setUsername("hwzsgdg");
-            factory.setPassword("7793oa");
+            factory.setUsername("fsxfdllg");
+            factory.setPassword("TErA18");
             factory.setVirtualHost("/");
             Connection connection = factory.newConnection();
             ThreadService threadService1 = new ThreadService("staticData", connection, deviceStaticDataAMQPService, realTimeDataAMQPService, alarmDataAMQPService);
             ThreadService threadService2 = new ThreadService("realTimeData", connection, deviceStaticDataAMQPService, realTimeDataAMQPService,alarmDataAMQPService);
-            //ThreadService threadService3 = new ThreadService("alarmData", connection, deviceStaticDataAMQPService, realTimeDataAMQPService,alarmDataAMQPService);
+            ThreadService threadService3 = new ThreadService("alarmData", connection, deviceStaticDataAMQPService, realTimeDataAMQPService,alarmDataAMQPService);
             threadService1.start();
             threadService2.start();
-            //threadService3.start();
+            threadService3.start();
         } catch(Exception e) {
             e.printStackTrace();
         }

src/main/java/com/amqp/shanxi/dao/DeviceStaticDataInfoDao.java

@@ -17,7 +17,7 @@ public interface DeviceStaticDataInfoDao {
     List<KushuiweiDeviceInfoModel> findKushuiweiDeviceInfo();
 
 
-    @Select("SELECT id AS equipno, name AS equipname, jd AS longitude, wd AS latitude, gaocheng AS altitude FROM tab_sensor WHERE mark = '坝体表面位移'")
+    @Select("SELECT id AS equipno, name AS equipname, jd AS longitude, wd AS latitude, gaocheng AS altitude FROM tab_sensor WHERE mark = '坝体表面位移' and name != '基准点'")
     List<BiaomianweiyiDeviceInfoModel> findBiaomianweiyiDeviceInfo();
 
 

src/main/java/com/amqp/shanxi/dao/RealTimeInfoDao.java

 package com.amqp.shanxi.dao;
 
 import com.amqp.shanxi.model.*;
-import lombok.Data;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -10,11 +9,10 @@ import java.util.List;
 @Mapper
 public interface RealTimeInfoDao {
 
-
     /**
      * 干滩实时数据
      */
-    @Select("SELECT c.gantanid AS sensorno, c.jctime AS collectdate, c.gantan AS value, c.bagao AS beachTopHeight, c.podu AS beachLongSlope, c.ifbj AS valuestate, b.id AS recordid FROM (" +
+    @Select("SELECT b.id AS sensorno, c.jctime AS collectdate, c.gantan AS value, c.ifbj AS valuestate, c.id AS recordid FROM (" +
             " SELECT a.id, a.gantanid, a.jctime, a.gantan, a.bagao, a.podu, a.ifbj from (" +
             " SELECT id, gantanid, jctime, gantan, bagao, podu, ifbj, rank() OVER (PARTITION BY gantanid ORDER BY jctime DESC)" +
             " FROM tab_gantanweiyi where jctime > now() - INTERVAL '6 hour'" +
@@ -23,7 +21,7 @@ public interface RealTimeInfoDao {
     List<GantanRealTimeInfoModel> findGantanRealTimeData();
 
 
-    @Select("SELECT c.sensorname AS sensorno, c.jctime AS collectdate, c.value2 as value, c.ifbj AS valuestate, b.id AS recordid FROM (" +
+    @Select("SELECT b.id AS sensorno, c.jctime AS collectdate, c.value2 as value, c.ifbj AS valuestate, c.id AS recordid FROM (" +
             " SELECT a.id, a.sensorname, a.jctime, a.value2, a.ifbj FROM (" +
             " SELECT id, sensorname, jctime, value2, ifbj, rank() OVER (PARTITION BY sensorname ORDER BY jctime DESC)"+
             " FROM tab_kushuiwei WHERE jctime > now() - INTERVAL '6 hour'" +
@@ -32,7 +30,7 @@ public interface RealTimeInfoDao {
     List<KushuiweiRealTimeInfoModel> findKushuiweiRealTimeData();
 
 
-    @Select("SELECT c.sensorname AS sensorno, c.jctime AS collectdate, c.disx AS xvalue, c.disy AS yvalue, c.disz AS zvalue, c.ifbj AS displacementstate, b.id AS recordid FROM (" +
+    @Select("SELECT b.id AS sensorno, c.jctime AS collectdate, c.disx AS xvalue, c.disy AS yvalue, c.disz AS zvalue, c.ifbj AS displacementstate, c.id AS recordid FROM (" +
             " SELECT a.id, a.sensorname, a.jctime, a.disx, a.disy, a.disz, a.ifbj from (" +
             " SELECT id, sensorname, jctime, disx, disy, disz, ifbj, rank() OVER (PARTITION BY sensorname ORDER BY jctime DESC)" +
             " FROM tab_batidibiaoweiyi where jctime > now() - INTERVAL '6 hour'" +
@@ -41,7 +39,7 @@ public interface RealTimeInfoDao {
     List<BiaomianweiyiRealTimeInfoModel> findBiaomianweiyiRealTimeData();
 
 
-    @Select("select c.sensorname AS sensorno, c.jctime AS collectdate, c.value2 as value, c.ifbj AS valuestate, b.id AS recordid from ("+
+    @Select("select b.id AS sensorno, c.jctime AS collectdate, c.value2 as value, c.ifbj AS valuestate, c.id AS recordid from ("+
             " select a.id, a.sensorname, a.jctime, a.value2, a.ifbj from (" +
             " select id, sensorname, jctime, value2, ifbj, rank() over (partition by sensorname order by jctime desc)" +
             " from tab_jinrunxian where jctime > now() - interval '6 hour'" +
@@ -50,7 +48,7 @@ public interface RealTimeInfoDao {
     List<JinrunxianRealTimeInfoModel> findJinrunxianRealTimeData();
 
 
-    @Select("select c.sensorname AS sensorno, c.jctime AS collectdate, c.value2 as value, c.ifbj AS onehourvaluestate, b.id AS recordid from (" +
+    @Select("select b.id AS sensorno, c.jctime AS collectdate, c.value2 as value, c.ifbj AS onehourvaluestate, c.id AS recordid from (" +
             " select a.id, a.sensorname, a.jctime, a.value2, a.ifbj from (" +
             " select id, sensorname, jctime, value2, ifbj, rank() over (partition by sensorname order by jctime desc)" +
             " from tab_jiangyuliang where jctime > now() - interval '6 hour'" +
@@ -59,9 +57,33 @@ public interface RealTimeInfoDao {
     List<JiangyuliangRealTimeInfoModel> findJiangyuliangRealTimeData();
 
 
+    /**
+     * 内部位移(水平)
+     * @return List<NeibuweiyiRealTimeInfoModel>
+     */
+    @Select("select b.id AS sensorno, c.jctime AS collectdate, c.value2 as xvalue, 0 as yvalue, c.ifbj AS valuestate, c.id AS recordid from (" +
+            " select a.id, a.sensorname, a.jctime, a.value2, a.ifbj from ("+
+            " select id, sensorname, jctime, value2, ifbj, rank() over (partition by sensorname order by jctime desc)" +
+            " from tab_shuipingweiyi where jctime > now() - interval '6 hour'" +
+            " ) a where rank = 1" +
+            " ) c  inner join (select id, name from tab_sensor) b on c.sensorname = b.name")
+    List<NeibuweiyiRealTimeInfoModel> findNeibuShuipingRealTimeData();
+
+    /**
+     * 内部位移(沉降)
+     * @return List<NeibuweiyiRealTimeInfoModel>
+     */
+    @Select("select b.id AS sensorno, c.jctime AS collectdate, c.value2 as yvalue, 0 as xvalue, c.ifbj AS valuestate, c.id AS recordid from (" +
+            " select a.id, a.sensorname, a.jctime, a.value2, a.ifbj from (" +
+            " select id, sensorname, jctime, value2, ifbj, rank() over (partition by sensorname order by jctime desc)" +
+            " from tab_neibuchenjiang where jctime > now() - interval '6 hour'" +
+            " ) a where rank = 1" +
+            " ) c  inner join (select id, name from tab_sensor) b on c.sensorname = b.name")
+    List<NeibuweiyiRealTimeInfoModel> findNeibuChenjiangRealTimeData();
+
     // 监测项报警
     @Select("select a.mark AS itemno,b.id AS recordid, b.yjjb AS state, b.jctime AS collectdate from"+
-            " (select mark from tab_sensor group by mark) a left join" +
+            " (select mark from tab_sensor where mark != '干滩1' group by mark) a left join" +
             " (select id, alarmtype, yjjb, jctime from tab_alarmtype where status = 0) b on a.mark = b.alarmtype")
     List<DeviceRealTimeInfoModel> findDeviceRealTimeData();
 
@@ -71,50 +93,27 @@ public interface RealTimeInfoDao {
 
     /**
      * 设备离线
-     * @return
+     * @return List<DeviceOffLineInfoModel>
      */
-    @Select("select b.id AS recordid, b.name, a.jctime from" +
+    @Select("select b.id AS recordid, b.mark AS sensorno, a.jctime from" +
             " (select jctime, gantanid from tab_gantanweiyi where jctime > now() - interval '6 hour') a right join" +
-            " (select id, name from tab_sensor where mark = '干滩2') b on a.gantanid = b.name where jctime is null" +
+            " (select id, name, mark from tab_sensor where mark = '干滩2') b on a.gantanid = b.name where jctime is null" +
             " union all" +
-            " select  b.id AS recordid, b.name, a.jctime from" +
+            " select  b.id AS recordid, b.mark AS sensorno, a.jctime from" +
             " (select sensorname, jctime from tab_kushuiwei where jctime > now() - interval '6 hour') a right join" +
-            " (select id, name from tab_sensor where mark = '库水位') b on a.sensorname = b.name where a.jctime is null" +
+            " (select id, name, mark from tab_sensor where mark = '库水位') b on a.sensorname = b.name where a.jctime is null" +
             " union all" +
-            " select  b.id AS recordid, b.name, a.jctime from" +
+            " select  b.id AS recordid, b.mark AS sensorno, a.jctime from" +
             " (select sensorname, jctime from tab_batidibiaoweiyi where jctime > now() - interval '6 hour') a right join" +
-            " (select id, name from tab_sensor where mark = '坝体表面位移') b on a.sensorname = b.name where a.jctime is null" +
+            " (select id, name, mark from tab_sensor where mark = '坝体表面位移') b on a.sensorname = b.name where a.jctime is null" +
             " union all"+
-            " select  b.id AS recordid, b.name, a.jctime from" +
+            " select  b.id AS recordid, b.mark AS sensorno, a.jctime from" +
             " (select sensorname, jctime from tab_jinrunxian where jctime > now() - interval '6 hour') a right join" +
-            " (select id, name from tab_sensor where mark = '浸润线') b on a.sensorname = b.name where a.jctime is null" +
+            " (select id, name, mark from tab_sensor where mark = '浸润线') b on a.sensorname = b.name where a.jctime is null" +
             " union all" +
-            " select  b.id AS recordid, b.name, a.jctime from" +
+            " select  b.id AS recordid, b.mark AS sensorno, a.jctime from" +
             " (select sensorname, jctime from tab_jiangyuliang where jctime > now() - interval '6 hour') a right join" +
-            " (select id, name from tab_sensor where mark = '雨量计') b on a.sensorname = b.name where a.jctime is null")
+            " (select id, name, mark from tab_sensor where mark = '雨量计') b on a.sensorname = b.name where a.jctime is null")
     List<DeviceOffLineInfoModel> findDeviceOffLineData();
 
-    /**
-     * 内部位移(水平)
-     * @return
-     */
-    @Select("select c.sensorname AS sensorno, c.jctime AS collectdate, c.value2 as xvalue, 0 as yvalue, c.ifbj AS valuestate, b.id AS recordid from (" +
-            " select a.id, a.sensorname, a.jctime, a.value2, a.ifbj from ("+
-            " select id, sensorname, jctime, value2, ifbj, rank() over (partition by sensorname order by jctime desc)" +
-            " from tab_shuipingweiyi where jctime > now() - interval '6 hour'" +
-            " ) a where rank = 1" +
-            " ) c  inner join (select id, name from tab_sensor) b on c.sensorname = b.name")
-    List<NeibuweiyiRealTimeInfoModel> findNeibuShuipingRealTimeData();
-
-    /**
-     * 内部位移(沉降)
-     * @return
-     */
-    @Select("select c.sensorname AS sensorno, c.jctime AS collectdate, c.value2 as yvalue, 0 as xvalue, c.ifbj AS valuestate, b.id AS recordid from (" +
-            " select a.id, a.sensorname, a.jctime, a.value2, a.ifbj from (" +
-            " select id, sensorname, jctime, value2, ifbj, rank() over (partition by sensorname order by jctime desc)" +
-            " from tab_neibuchenjiang where jctime > now() - interval '6 hour'" +
-            " ) a where rank = 1" +
-            " ) c  inner join (select id, name from tab_sensor) b on c.sensorname = b.name")
-    List<NeibuweiyiRealTimeInfoModel> findNeibuChenjiangRealTimeData();
 }

src/main/java/com/amqp/shanxi/model/BiaomianweiyiAlarmInfoModel.java

@@ -7,7 +7,6 @@ public class BiaomianweiyiAlarmInfoModel {
 
     private Integer recordid;
     private String sensorno;
-    private String collectdate;
     private String value;
     private String warninglevel;
     private String rvalue;

src/main/java/com/amqp/shanxi/model/BiaomianweiyiRealTimeInfoModel.java

@@ -5,16 +5,15 @@ import lombok.Data;
 @Data
 public class BiaomianweiyiRealTimeInfoModel {
 
-    private Integer recordid;
+    private String recordid;
     private String sensorno;
     private String collectdate;
-    private Double xvalue;
-    private Double yvalue;
-    private Double zvalue;
+    private String xvalue;
+    private String yvalue;
+    private String zvalue;
     private Double displacement;
     private String displacementstate;
     private Double displacementrate;
     private String displacementratestate;
 
-
 }

src/main/java/com/amqp/shanxi/model/DBDeviceInfo.java

 package com.amqp.shanxi.model;
+
+import lombok.Data;
+
 /**
  * 干滩设备信息实体类
  */
+@Data
 public class DBDeviceInfo {
 	
 	private String equipno;//设备编号
@@ -38,142 +42,6 @@ public class DBDeviceInfo {
 	
 	private String is_sync;//同步状态
 
-	public String getEquipno() {
-		return equipno;
-	}
-
-	public void setEquipno(String equipno) {
-		this.equipno = equipno;
-	}
-
-	public String getEquipname() {
-		return equipname;
-	}
-
-	public void setEquipname(String equipname) {
-		this.equipname = equipname;
-	}
-
-	public String getInstallationdate() {
-		return installationdate;
-	}
-
-	public void setInstallationdate(String installationdate) {
-		this.installationdate = installationdate;
-	}
-
-	public String getManufacture() {
-		return manufacture;
-	}
-
-	public void setManufacture(String manufacture) {
-		this.manufacture = manufacture;
-	}
-
-	public Double getInstalllocation() {
-		return installlocation;
-	}
-
-	public void setInstalllocation(Double installlocation) {
-		this.installlocation = installlocation;
-	}
-
-	public String getInstallationlocate() {
-		return installationlocate;
-	}
-
-	public void setInstallationlocate(String installationlocate) {
-		this.installationlocate = installationlocate;
-	}
-
-	public Double getLongitude() {
-		return longitude;
-	}
-
-	public void setLongitude(Double longitude) {
-		this.longitude = longitude;
-	}
-
-	public Double getLatitude() {
-		return latitude;
-	}
-
-	public void setLatitude(Double latitude) {
-		this.latitude = latitude;
-	}
-
-	public Double getAltitude() {
-		return altitude;
-	}
-
-	public void setAltitude(Double altitude) {
-		this.altitude = altitude;
-	}
-
-	public Double getOnelevelalarm() {
-		return onelevelalarm;
-	}
-
-	public void setOnelevelalarm(Double onelevelalarm) {
-		this.onelevelalarm = onelevelalarm;
-	}
-
-	public Double getTwolevelalarm() {
-		return twolevelalarm;
-	}
-
-	public void setTwolevelalarm(Double twolevelalarm) {
-		this.twolevelalarm = twolevelalarm;
-	}
-
-	public Double getThreelevelalarm() {
-		return threelevelalarm;
-	}
-
-	public void setThreelevelalarm(Double threelevelalarm) {
-		this.threelevelalarm = threelevelalarm;
-	}
-
-	public Double getHonelevelalarm() {
-		return honelevelalarm;
-	}
-
-	public void setHonelevelalarm(Double honelevelalarm) {
-		this.honelevelalarm = honelevelalarm;
-	}
-
-	public Double getHtwolevelalarm() {
-		return htwolevelalarm;
-	}
-
-	public void setHtwolevelalarm(Double htwolevelalarm) {
-		this.htwolevelalarm = htwolevelalarm;
-	}
-
-	public Double getHthreelevelalarm() {
-		return hthreelevelalarm;
-	}
-
-	public void setHthreelevelalarm(Double hthreelevelalarm) {
-		this.hthreelevelalarm = hthreelevelalarm;
-	}
-
-	public String getIs_used() {
-		return is_used;
-	}
-
-	public void setIs_used(String is_used) {
-		this.is_used = is_used;
-	}
-
-	public String getIs_sync() {
-		return is_sync;
-	}
-
-	public void setIs_sync(String is_sync) {
-		this.is_sync = is_sync;
-	}
-
 	@Override
 	public String toString() {
 		return "DBDeviceInfo [equipno=" + equipno + ", equipname=" + equipname + ", installationdate="

src/main/java/com/amqp/shanxi/model/DeviceRealTimeInfoModel.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class DeviceRealTimeInfoModel {
 
-    private Integer recordid;
+    private String recordid;
     private String itemno;
     private String collectdate;
     private String state;

src/main/java/com/amqp/shanxi/model/GantanDeviceInfoModel.java

@@ -11,7 +11,6 @@ public class GantanDeviceInfoModel {
     private String equipname;
     private String installationdate;
     private String installationlocate;
-    private Double installlocation;
     private String manufacture;
     private String longitude;
     private String latitude;

src/main/java/com/amqp/shanxi/model/GantanRealTimeInfoModel.java

@@ -5,10 +5,10 @@ import lombok.Data;
 @Data
 public class GantanRealTimeInfoModel {
 
-    private Integer recordid;
+    private String recordid;
     private String sensorno;
     private String collectdate;
-    private Double value;
+    private String value;
     private String valuestate;
     private Double freeBoard;
     private String freeBoardState;

src/main/java/com/amqp/shanxi/model/JiangyuliangAlarmInfoModel.java

@@ -15,8 +15,8 @@ public class JiangyuliangAlarmInfoModel {
     private String sixwarninglevel;
     private String twelvevalue;
     private String twelvewarninglevel;
-    private String twentyvalue;
-    private String twentywarninglevel;
+    private String twentyfourvalue;
+    private String twentyfourwarninglevel;
     private String warningcontent;
     private String warningdata;
 

src/main/java/com/amqp/shanxi/model/JiangyuliangDeviceInfoModel.java

@@ -23,8 +23,8 @@ public class JiangyuliangDeviceInfoModel {
     private Double sixhourstwolevelalarm;
     private Double sixhoursthreelevelalarm;
     private Double twelvehoursonelevelalarm;
-    private Double twolvehourstwolevelalarm;
-    private Double twolvehoursthreelevelalarm;
+    private Double twelvehourstwolevelalarm;
+    private Double twelvehoursthreelevelalarm;
     private Double tfhoursonelevelalarm;
     private Double tfhourstwolevelalarm;
     private Double tfhoursthreelevelalarm;

src/main/java/com/amqp/shanxi/model/JiangyuliangRealTimeInfoModel.java

@@ -5,10 +5,10 @@ import lombok.Data;
 @Data
 public class JiangyuliangRealTimeInfoModel {
 
-    private Integer recordid;
+    private String recordid;
     private String sensorno;
     private String collectdate;
-    private Double value;
+    private String value;
     private Double onehourvalue;
     private String onehourvaluestate;
     private Double threehoursvalue;
@@ -17,7 +17,7 @@ public class JiangyuliangRealTimeInfoModel {
     private String sixhoursvaluestate;
     private Double twelvehoursvalue;
     private String twelvehoursvaluestate;
-    private Double twentyhoursvalue;
-    private String twentyhoursvaluestate;
+    private Double twentyfourhoursvalue;
+    private String twentyfourhoursvaluestate;
 
 }

src/main/java/com/amqp/shanxi/model/JinrunxianDeviceInfoModel.java

@@ -11,7 +11,7 @@ public class JinrunxianDeviceInfoModel {
     private String installationlocate;
     private String manufacture;
     private String holedepth;
-    private String burialdepath;
+    private String burialdepth;
     private String longitude;
     private String latitude;
     private String altitude;

src/main/java/com/amqp/shanxi/model/JinrunxianRealTimeInfoModel.java

@@ -5,10 +5,10 @@ import lombok.Data;
 @Data
 public class JinrunxianRealTimeInfoModel {
 
-    private Integer recordid;
+    private String recordid;
     private String sensorno;
     private String collectdate;
-    private Double value;
+    private String value;
     private String valuestate;
 
 }

src/main/java/com/amqp/shanxi/model/KushuiweiRealTimeInfoModel.java

@@ -5,10 +5,10 @@ import lombok.Data;
 @Data
 public class KushuiweiRealTimeInfoModel {
 
-    private Integer recordid;
+    private String recordid;
     private String sensorno;
     private String collectdate;
-    private Double value;
+    private String value;
     private String valuestate;
 
 }

src/main/java/com/amqp/shanxi/model/NeibuweiyiRealTimeInfoModel.java

@@ -5,11 +5,11 @@ import lombok.Data;
 @Data
 public class NeibuweiyiRealTimeInfoModel {
 
-    private Integer recordid;
+    private String recordid;
     private String sensorno;
     private String collectdate;
-    private Double xvalue;
-    private Double yvalue;
+    private String xvalue;
+    private String yvalue;
     private Double displacement;
     private String displacementstate;
     private Double displacementrate;

src/main/java/com/amqp/shanxi/model/WkkRealTimeInfoModel.java

@@ -5,8 +5,8 @@ import lombok.Data;
 @Data
 public class WkkRealTimeInfoModel {
 
-    private Integer recordid;
-    private String collectdat;
+    private String recordid;
+    private String collectdate;
     private String state;
 
 }

src/main/java/com/amqp/shanxi/service/AlarmDataAMQPService.java

@@ -44,12 +44,14 @@ public class AlarmDataAMQPService {
     public void publishAlarm(String type, Connection connection) {
         try {
             if ("gt".equals(type)) {
+                String gantanAlarmData = alarmDataService.gantanAlarm();
+                if (gantanAlarmData.length() > 2) {
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEGANtANALARM
                             , null
-                        , alarmDataService.gantanAlarm().getBytes());
+                            , gantanAlarmData.getBytes());
                     // 消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -58,13 +60,19 @@ public class AlarmDataAMQPService {
                         System.out.println("干滩报警信息发送失败！");
                     }
                     channel.close();
+                } else {
+                    System.out.println("暂无干滩报警信息数据～");
+                }
+
             } else if ("ksw".equals(type)) {
+                String kswAlarmData = alarmDataService.kushuiweiAlarm();
+                if (kswAlarmData.length() > 2) {
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEKUSHUIWEIALARM
                             , null
-                        , alarmDataService.kushuiweiAlarm().getBytes());
+                            , kswAlarmData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -73,13 +81,18 @@ public class AlarmDataAMQPService {
                         System.out.println("库水位报警信息发送失败！");
                     }
                     channel.close();
+                } else {
+                    System.out.println("暂无库水位报警信息数据～");
+                }
             } else if ("bmwy".equals(type)) {
+                String bmwyAlarmData = alarmDataService.biaomianweiyiAlarm();
+                if (bmwyAlarmData.length() > 2) {
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEBIAOMIANWEIYIALARM
                             , null
-                        , alarmDataService.biaomianweiyiAlarm().getBytes());
+                            , bmwyAlarmData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -88,13 +101,20 @@ public class AlarmDataAMQPService {
                         System.out.println("表面位移报警信息发送失败！");
                     }
                     channel.close();
+                }else {
+                    System.out.println("暂无表面位移报警信息数据～");
+                }
             } else if ("nbwy".equals(type)) {
+
                 Channel channel = connection.createChannel();
+                String nbcjAlarmData = alarmDataService.neibuchenjiangAlarm();
+                String nbspAlarmData = alarmDataService.neibushuipingAlarm();
                 // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
+                if (nbspAlarmData.length() > 2) {
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUENEIBUWEIYIALARM
                             , null
-                        , alarmDataService.neibushuipingAlarm().getBytes());
+                            , nbspAlarmData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -102,13 +122,17 @@ public class AlarmDataAMQPService {
                     } else {
                         System.out.println("内部水平报警信息发送失败！");
                     }
+                }else {
+                    System.out.println("暂无内部水平报警信息数据～");
+                }
 
                 // ====================内部沉降
                 // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
+                if (nbcjAlarmData.length() > 2) {
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUENEIBUWEIYIALARM
                             , null
-                        , alarmDataService.neibuchenjiangAlarm().getBytes());
+                            , nbcjAlarmData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -116,15 +140,19 @@ public class AlarmDataAMQPService {
                     } else {
                         System.out.println("内部沉降报警信息发送失败！");
                     }
-
+                }else {
+                    System.out.println("暂无内部沉降报警信息数据～");
+                }
                 channel.close();
             } else if ("jrx".equals(type)) {
+                String jrxAlarmData = alarmDataService.jinrunxianAlarm();
+                if (jrxAlarmData.length() > 2) {
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEJINRUNXIANALARM
                             , null
-                        , alarmDataService.jinrunxianAlarm().getBytes());
+                            , jrxAlarmData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -133,13 +161,18 @@ public class AlarmDataAMQPService {
                         System.out.println("浸润线报警信息发送失败！");
                     }
                     channel.close();
+                }else {
+                    System.out.println("暂无浸润线报警信息数据～");
+                }
             } else if ("jyl".equals(type)) {
+                String jylAlarmData = alarmDataService.jiangyuliangAlarm();
+                if (jylAlarmData.length() > 2) {
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEJIANGYULIANGALARM
                             , null
-                        , alarmDataService.jiangyuliangAlarm().getBytes());
+                            , jylAlarmData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -148,16 +181,21 @@ public class AlarmDataAMQPService {
                         System.out.println("降雨量报警信息发送失败！");
                     }
                     channel.close();
+                } else {
+                    System.out.println("暂无降雨量报警信息数据～");
+                }
             }/* else if ("sll".equals(type)) {
 
             }*/ else if ("device".equals(type)) {
+                String deviceAlarmData = alarmDataService.deviceAlarm();
+                if (deviceAlarmData.length() > 2) {
                     // 监测项数据信息
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEDEVICEALARM
                             , null
-                        , alarmDataService.deviceAlarm().getBytes());
+                            , deviceAlarmData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -166,14 +204,19 @@ public class AlarmDataAMQPService {
                         System.out.println("检测项报警信息发送失败！");
                     }
                     channel.close();
+                }else {
+                    System.out.println("暂无检测项报警信息数据～");
+                }
             } else if ("wkk".equals(type)) {
+                String wkkAlarmData = alarmDataService.wkkAlarm();
+                if (wkkAlarmData.length() > 2) {
                     // 尾矿库数据信息
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEWKKALARM
                             , null
-                        , alarmDataService.wkkAlarm().getBytes());
+                            , wkkAlarmData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -182,6 +225,9 @@ public class AlarmDataAMQPService {
                         System.out.println("尾矿库报警信息发送失败！");
                     }
                     channel.close();
+                }else {
+                    System.out.println("暂无尾矿库报警信息数据～");
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/amqp/shanxi/service/DeviceStaticDataAMQPService.java

@@ -62,6 +62,7 @@ public class DeviceStaticDataAMQPService {
                     System.out.println("尾矿库基础信息发送失败！");
                 }
                 channel.close();
+
             } else if ("gt".equals(type)) {
                 Channel channel = connection.createChannel();
                 // channel.queueDeclare("static_gantan", true, false, false, null);
@@ -78,6 +79,7 @@ public class DeviceStaticDataAMQPService {
                     System.out.println("干滩设备信息发送失败！");
                 }
                 channel.close();
+
             } else if ("ksw".equals(type)) {
                 Channel channel = connection.createChannel();
                 //channel.queueDeclare("static_kushuiwei", true, false, false, null);
@@ -124,6 +126,7 @@ public class DeviceStaticDataAMQPService {
                     System.out.println("内部位移设备信息发送失败！");
                 }
                 channel.close();
+
             } else if ("jrx".equals(type)) {
                 Channel channel = connection.createChannel();
                 channel.basicPublish(AMQPTopicStaticDataConfig.TOPIC_EXCHANGE

src/main/java/com/amqp/shanxi/service/RealTimeDataAMQPService.java

@@ -29,7 +29,7 @@ public class RealTimeDataAMQPService {
         for (String kind : sensorKind) {
             if ("干滩".equals(kind)) {
                 publishRealTime("gt", connection);
-            } else if("库水位".equals(kind)) {
+            }else if("库水位".equals(kind)) {
                 publishRealTime("ksw", connection);
             }else if("坝体表面位移".equals(kind)) {
                 publishRealTime("bmwy", connection);
@@ -46,12 +46,14 @@ public class RealTimeDataAMQPService {
     public void publishRealTime(String type, Connection connection) {
         try {
             if ("gt".equals(type)) {
+                String gantanRealTimeData = realTimeInfoService.gantanRealTimeData();
+                if(gantanRealTimeData.length() > 2) {
                     Channel channel = connection.createChannel();
-                // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
+                    //channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEGANTANREALTIME
                             , null
-                        , realTimeInfoService.gantanRealTimeData().getBytes());
+                            , gantanRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -60,14 +62,18 @@ public class RealTimeDataAMQPService {
                         System.out.println("干滩实时数据发送失败！");
                     }
                     channel.close();
-
+                } else {
+                  System.out.println("暂无干滩实时数据～");
+                }
             } else if ("ksw".equals(type)) {
+                String kushuiweiRealTimeData = realTimeInfoService.kushuiweiRealTimeData();
+                if(kushuiweiRealTimeData.length() > 2) {
                     Channel channel = connection.createChannel();
                     //channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEKUSHUIWEIREALTIME
                             , null
-                        , realTimeInfoService.kushuiweiRealTimeData().getBytes());
+                            , kushuiweiRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -76,14 +82,18 @@ public class RealTimeDataAMQPService {
                         System.out.println("库水位实时数据发送失败！");
                     }
                     channel.close();
-
+                } else {
+                    System.out.println("暂无库水位实时数据～");
+                }
             } else if ("bmwy".equals(type)) {
+                String biaomianweiyiRealTimeData = realTimeInfoService.biaomianweiyiRealTimeData();
+                if(biaomianweiyiRealTimeData.length() > 2) {
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEBIAOMIANWEIYIREALTIME
                             , null
-                        , realTimeInfoService.biaomianweiyiRealTimeData().getBytes());
+                            , biaomianweiyiRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -92,14 +102,20 @@ public class RealTimeDataAMQPService {
                         System.out.println("表面位移实时数据发送失败！");
                     }
                     channel.close();
+                } else {
+                    System.out.println("暂无表面位移实时数据～");
+                }
 
             } else if ("nbwy".equals(type)) {
                 Channel channel = connection.createChannel();
+                String neibuchenjiangRealTimeData = realTimeInfoService.neibuChenJiangRealTimeData();
+                String neibushuipingRealTimeData = realTimeInfoService.neibuShuiPingRealTimeData();
+                if(neibuchenjiangRealTimeData.length() > 2) {
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUENEIBUWEIYIREALTIME
                             , null
-                        , realTimeInfoService.neibuChenJiangRealTimeData().getBytes());
+                            , neibuchenjiangRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -107,12 +123,15 @@ public class RealTimeDataAMQPService {
                     } else {
                         System.out.println("内部沉降实时数据发送失败！");
                     }
+                } else {
+                    System.out.println("暂无内部沉降实时数据～");
+                }
 
-
+                if(neibushuipingRealTimeData.length() > 2) {
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUENEIBUWEIYIREALTIME
                             , null
-                        , realTimeInfoService.neibuShuiPingRealTimeData().getBytes());
+                            , neibushuipingRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -120,15 +139,19 @@ public class RealTimeDataAMQPService {
                     } else {
                         System.out.println("内部水平实时数据发送失败！");
                     }
+                } else {
+                    System.out.println("暂无内部水平实时数据～");
+                }
                 channel.close();
-
             } else if ("jrx".equals(type)) {
+                String jinrunxianRealTimeData = realTimeInfoService.jinrunxianRealTimeData();
+                if(jinrunxianRealTimeData.length() > 2) {
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEJINRUNXIANREALTIME
                             , null
-                        , realTimeInfoService.jinrunxianRealTimeData().getBytes());
+                            , jinrunxianRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -137,14 +160,18 @@ public class RealTimeDataAMQPService {
                         System.out.println("浸润线实时数据发送失败！");
                     }
                     channel.close();
-
+                } else {
+                    System.out.println("暂无浸润线实时数据～");
+                }
             } else if ("jyl".equals(type)) {
+                String jiangyuliangRealTimeData = realTimeInfoService.jiangyuliangRealTimeData();
+                if(jiangyuliangRealTimeData.length() > 2) {
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEJIANGYULIANGREALTIME
                             , null
-                        , realTimeInfoService.jiangyuliangRealTimeData().getBytes());
+                            , jiangyuliangRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -153,17 +180,19 @@ public class RealTimeDataAMQPService {
                         System.out.println("降雨量实时数据发送失败！");
                     }
                     channel.close();
-
-            } else if ("sll".equals(type)) {
-
+                } else {
+                    System.out.println("暂无降雨量实时数据～");
+                }
             } else if ("device".equals(type)) {
+                String deviceRealTimeData = realTimeInfoService.deviceRealTimeData();
+                if(deviceRealTimeData.length() > 2) {
                     // 监测项数据信息
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEDEVICEREALTIME
                             , null
-                        , realTimeInfoService.deviceRealTimeData().getBytes());
+                            , deviceRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -172,15 +201,19 @@ public class RealTimeDataAMQPService {
                         System.out.println("检测项实时数据发送失败！");
                     }
                     channel.close();
-
+                } else {
+                    System.out.println("暂无检测项实时数据～");
+                }
             } else if ("wkk".equals(type)) {
+                String wkkRealTimeData = realTimeInfoService.wkkRealTimeData();
+                if(wkkRealTimeData.length() > 2) {
                     // 尾矿库数据信息
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEWKKREALTIME
                             , null
-                        , realTimeInfoService.wkkRealTimeData().getBytes());
+                            , wkkRealTimeData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -189,15 +222,19 @@ public class RealTimeDataAMQPService {
                         System.out.println("尾矿库实时数据发送失败！");
                     }
                     channel.close();
-
+                } else {
+                    System.out.println("暂无尾矿库实时数据～");
+                }
             } else if ("offline".equals(type)) {
+                String deviceOffLineData = realTimeInfoService.deviceOffLineData();
+                if(deviceOffLineData.length() > 2) {
                     // 设备离线
                     Channel channel = connection.createChannel();
                     // channel.exchangeDeclare(AMQPTopicStaticDataConfig.topicExchangeRealTime, "topic", false, true, null);
                     channel.basicPublish(AMQPTopicStaticDataConfig.topicExchangeRealTime
                             , AMQPTopicStaticDataConfig.TOPICQUEUEOFFLINEINFO
                             , null
-                        , realTimeInfoService.deviceOffLineData().getBytes());
+                            , deviceOffLineData.getBytes());
                     //消息确认
                     channel.confirmSelect();
                     if (channel.waitForConfirms()) {
@@ -206,18 +243,13 @@ public class RealTimeDataAMQPService {
                         System.out.println("设备离线实时数据发送失败！");
                     }
                     channel.close();
-
+                } else {
+                    System.out.println("暂无设备离线实时数据~");
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-/*
-    @RabbitListener(queues ="equipOfflineInfo" )
-    public void receiveMessage1(String str){
-        System.out.println("我是监听干滩topic.message的, dataInfo.01:    " + str);
-    }
-*/
-
 }

src/main/java/com/amqp/shanxi/service/impl/AlarmDataServiceImpl.java

@@ -40,11 +40,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("gt报警======================" + JSONUtil.toJsonStr(gantanAlarmData));
             if (gantanAlarmData.size() > 0) {
                 gantanAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                gantanAlarmInfo.setDepartmentId("911402247485664344");
+                gantanAlarmInfo.setDepartmentId("9114092469913874XR");
                 gantanAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 gantanAlarmInfo.setType(StaticParamUtils.GANTANALARM);
                 gantanAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                gantanAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(gantanAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                gantanAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(gantanAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(gantanAlarmInfo);
         }catch (Exception e) {
@@ -70,11 +70,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("ksw报警======================" + JSONUtil.toJsonStr(kushuiweiAlarmData));
             if (kushuiweiAlarmData.size() > 0) {
                 kswAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                kswAlarmInfo.setDepartmentId("911402247485664344");
+                kswAlarmInfo.setDepartmentId("9114092469913874XR");
                 kswAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 kswAlarmInfo.setType(StaticParamUtils.KUSHUIWEIALARM);
                 kswAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                kswAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(kushuiweiAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                kswAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(kushuiweiAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(kswAlarmInfo);
         }catch (Exception e) {
@@ -100,11 +100,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("bmwy报警======================" + JSONUtil.toJsonStr(biaomianweiyiAlarmData));
             if (biaomianweiyiAlarmData.size() > 0) {
                 bmwyAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                bmwyAlarmInfo.setDepartmentId("911402247485664344");
+                bmwyAlarmInfo.setDepartmentId("9114092469913874XR");
                 bmwyAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 bmwyAlarmInfo.setType(StaticParamUtils.BIAOMIANWEIYIALARM);
                 bmwyAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                bmwyAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(biaomianweiyiAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                bmwyAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(biaomianweiyiAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(bmwyAlarmInfo);
         }catch (Exception e) {
@@ -130,11 +130,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("jrx报警======================" + JSONUtil.toJsonStr(jinrunxianAlarmData));
             if (jinrunxianAlarmData.size() > 0) {
                 jrxAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                jrxAlarmInfo.setDepartmentId("911402247485664344");
+                jrxAlarmInfo.setDepartmentId("9114092469913874XR");
                 jrxAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 jrxAlarmInfo.setType(StaticParamUtils.JINRUNXIANALARM);
                 jrxAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                jrxAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jinrunxianAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                jrxAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jinrunxianAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(jrxAlarmInfo);
         }catch (Exception e) {
@@ -160,11 +160,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("jyl报警======================" + JSONUtil.toJsonStr(jylAlarmData));
             if (jylAlarmData.size() > 0) {
                 jylAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                jylAlarmInfo.setDepartmentId("911402247485664344");
+                jylAlarmInfo.setDepartmentId("9114092469913874XR");
                 jylAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 jylAlarmInfo.setType(StaticParamUtils.JIANGYULIANGALARM);
                 jylAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                jylAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jylAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                jylAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jylAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(jylAlarmInfo);
         }catch (Exception e) {
@@ -189,7 +189,7 @@ public class AlarmDataServiceImpl implements AlarmDataService {
                     deviceAlarmData.get(i).setItemno("06");
                 } else if (deviceAlarmData.get(i).getItemno().contains("浸润线")) {
                     deviceAlarmData.get(i).setItemno("05");
-                } else if (deviceAlarmData.get(i).getItemno().contains("坝体内部")) {
+                } else if (deviceAlarmData.get(i).getItemno().contains("坝体内部沉降")) {
                     deviceAlarmData.get(i).setItemno("04");
                 }
                 deviceAlarmData.get(i).setWarningdata(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -197,11 +197,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("device报警============" + JSONUtil.toJsonStr(deviceAlarmData));
             if (deviceAlarmData.size() > 0) {
                 deviceAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                deviceAlarmInfo.setDepartmentId("911402247485664344");
+                deviceAlarmInfo.setDepartmentId("9114092469913874XR");
                 deviceAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 deviceAlarmInfo.setType(StaticParamUtils.DEVICEALARM);
                 deviceAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                deviceAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(deviceAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                deviceAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(deviceAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(deviceAlarmInfo);
         }catch (Exception e) {
@@ -221,11 +221,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("wkk报警=====================" + JSONUtil.toJsonStr(wkkAlarmData));
             if (wkkAlarmData.size() > 0) {
                 wkkAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                wkkAlarmInfo.setDepartmentId("911402247485664344");
+                wkkAlarmInfo.setDepartmentId("9114092469913874XR");
                 wkkAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 wkkAlarmInfo.setType(StaticParamUtils.WKKALARM);
                 wkkAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                wkkAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(wkkAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                wkkAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(wkkAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(wkkAlarmInfo);
         }catch (Exception e) {
@@ -255,11 +255,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("内部沉降报警======================" + JSONUtil.toJsonStr(neibuchenjiangAlarmData));
             if (neibuchenjiangAlarmData.size() > 0) {
                 nbwyAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                nbwyAlarmInfo.setDepartmentId("911402247485664344");
+                nbwyAlarmInfo.setDepartmentId("9114092469913874XR");
                 nbwyAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 nbwyAlarmInfo.setType(StaticParamUtils.NEIBUWEIYIALARM);
                 nbwyAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                nbwyAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuchenjiangAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                nbwyAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuchenjiangAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(nbwyAlarmInfo);
         }catch (Exception e) {
@@ -289,11 +289,11 @@ public class AlarmDataServiceImpl implements AlarmDataService {
             System.out.println("内部水平报警======================" + JSONUtil.toJsonStr(neibuchenjiangAlarmData));
             if (neibuchenjiangAlarmData.size() > 0) {
                 nbwyAlarmInfo.setTailingNo(StaticParamUtils.WKKNO);
-                nbwyAlarmInfo.setDepartmentId("911402247485664344");
+                nbwyAlarmInfo.setDepartmentId("9114092469913874XR");
                 nbwyAlarmInfo.setProvinceId(StaticParamUtils.PROVINCENO);
                 nbwyAlarmInfo.setType(StaticParamUtils.NEIBUWEIYIALARM);
                 nbwyAlarmInfo.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                nbwyAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuchenjiangAlarmData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                nbwyAlarmInfo.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuchenjiangAlarmData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
             return JSONUtil.toJsonStr(nbwyAlarmInfo);
         }catch (Exception e) {

src/main/java/com/amqp/shanxi/service/impl/DeviceStaticDataInfoServiceImpl.java

@@ -34,15 +34,14 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
                 gantanDeviceInfo.setIs_used("1");
                 gantanDeviceInfo.setIs_sync("0");
                 gantanDeviceInfo.setInstallationdate("2019-03-21");
-
             }
 
             staticDataInfoModel.setTailingNo(StaticParamUtils.WKKNO);
-            staticDataInfoModel.setDepartmentId("911402247485664344");
+            staticDataInfoModel.setDepartmentId("9114092469913874XR");
             staticDataInfoModel.setProvinceId(StaticParamUtils.PROVINCENO);
             staticDataInfoModel.setType(StaticParamUtils.GANTANDEVICE);
             staticDataInfoModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(gantanDeviceInfos), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(gantanDeviceInfos), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             System.out.println("干滩设备信息===========" + JSONUtil.toJsonStr(staticDataInfoModel));
             return staticDataInfoModel;
         }catch (Exception e){
@@ -53,8 +52,8 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
 
     /**
      * 库水位设备信息
-     *        密钥：i2MvNzkedPgITpz2UcZS3A==
-     *      * 向量：ReQb3Swiz8frJ3+8l9RGvg==
+     *        密钥：4qInuXy6CREhRch7toLcBg==
+     *      * 向量：rluhvrn9+EHIodq5Tx86Jg==
      * @return StaticDataInfoModel
      */
     @Override
@@ -69,15 +68,14 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
                 kushuiweiDeviceInfoModel.setInstallationdate("2019-03-21");
                 kushuiweiDeviceInfoModel.setInstalllocation(kushuiweiDeviceInfoModel.getManufacture());
                 kushuiweiDeviceInfoModel.setManufacture("");
-
             }
 
             staticDataInfoModel.setTailingNo(StaticParamUtils.WKKNO);
-            staticDataInfoModel.setDepartmentId("911402247485664344");
+            staticDataInfoModel.setDepartmentId("9114092469913874XR");
             staticDataInfoModel.setProvinceId(StaticParamUtils.PROVINCENO);
             staticDataInfoModel.setType(StaticParamUtils.KUSHUIWEIDEVICE);
             staticDataInfoModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(kushuiweiDeviceInfo), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(kushuiweiDeviceInfo), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             System.out.println("库水位设备信息===========" + JSONUtil.toJsonStr(staticDataInfoModel));
             return staticDataInfoModel;
         }catch (Exception e){
@@ -96,7 +94,7 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
             StaticDataInfoModel staticDataInfoModel = new StaticDataInfoModel();
             List<BiaomianweiyiDeviceInfoModel> biaomianweiyiDeviceInfo = deviceStaticDataInfoDao.findBiaomianweiyiDeviceInfo();
             for (BiaomianweiyiDeviceInfoModel biaomianweiyiDeviceInfoModel : biaomianweiyiDeviceInfo) {
-                biaomianweiyiDeviceInfoModel.setEquipno(StaticParamUtils.KUSHUIWEINO + (Integer.parseInt(biaomianweiyiDeviceInfoModel.getEquipno()) >= 10 ? biaomianweiyiDeviceInfoModel.getEquipno() : "0" + biaomianweiyiDeviceInfoModel.getEquipno()));
+                biaomianweiyiDeviceInfoModel.setEquipno(StaticParamUtils.BIAOMIANWEIYINO + (Integer.parseInt(biaomianweiyiDeviceInfoModel.getEquipno()) >= 10 ? biaomianweiyiDeviceInfoModel.getEquipno() : "0" + biaomianweiyiDeviceInfoModel.getEquipno()));
                 biaomianweiyiDeviceInfoModel.setIs_used("1");
                 biaomianweiyiDeviceInfoModel.setIs_sync("0");
                 biaomianweiyiDeviceInfoModel.setInstallationdate("2019-03-21");
@@ -104,11 +102,11 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
 
             }
             staticDataInfoModel.setTailingNo(StaticParamUtils.WKKNO);
-            staticDataInfoModel.setDepartmentId("911402247485664344");
+            staticDataInfoModel.setDepartmentId("9114092469913874XR");
             staticDataInfoModel.setProvinceId(StaticParamUtils.PROVINCENO);
             staticDataInfoModel.setType(StaticParamUtils.BIAOMIANWEIYIDEVICE);
             staticDataInfoModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(biaomianweiyiDeviceInfo), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(biaomianweiyiDeviceInfo), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             System.out.println("表面位移设备信息===========" + JSONUtil.toJsonStr(staticDataInfoModel));
             return staticDataInfoModel;
         }catch (Exception e) {
@@ -131,18 +129,19 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
                 jinrunxianDeviceInfoModel.setIs_used("1");
                 jinrunxianDeviceInfoModel.setIs_sync("0");
                 jinrunxianDeviceInfoModel.setInstallationdate("2019-03-21");
-                String[] split = jinrunxianDeviceInfoModel.getManufacture().split("//|");
+                String[] split = jinrunxianDeviceInfoModel.getManufacture().split("\\|");
                 jinrunxianDeviceInfoModel.setHoledepth(split[0]);
-                jinrunxianDeviceInfoModel.setBurialdepath(split[1]);
+                jinrunxianDeviceInfoModel.setBurialdepth(split[1]);
                 jinrunxianDeviceInfoModel.setManufacture("");
                 // 经度　纬度
             }
             staticDataInfoModel.setTailingNo(StaticParamUtils.WKKNO);
-            staticDataInfoModel.setDepartmentId("911402247485664344");
+            staticDataInfoModel.setDepartmentId("9114092469913874XR");
             staticDataInfoModel.setProvinceId(StaticParamUtils.PROVINCENO);
             staticDataInfoModel.setType(StaticParamUtils.JINRUNXIANDEVICE);
             staticDataInfoModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jinrunxianDeviceInfo), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jinrunxianDeviceInfo), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            System.out.println("浸润线加密前============" + JSONUtil.toJsonStr(jinrunxianDeviceInfo));
             System.out.println("浸润线设备信息===========" + JSONUtil.toJsonStr(staticDataInfoModel));
             return staticDataInfoModel;
         } catch (Exception e) {
@@ -170,11 +169,11 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
 
             }
             staticDataInfoModel.setTailingNo(StaticParamUtils.WKKNO);
-            staticDataInfoModel.setDepartmentId("911402247485664344");
+            staticDataInfoModel.setDepartmentId("9114092469913874XR");
             staticDataInfoModel.setProvinceId(StaticParamUtils.PROVINCENO);
             staticDataInfoModel.setType(StaticParamUtils.JIANGYULIANGEDEVICE);
             staticDataInfoModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jiangyuliangDeviceInfo), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jiangyuliangDeviceInfo), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             System.out.println("降雨量设备信息===========" + JSONUtil.toJsonStr(staticDataInfoModel));
             return staticDataInfoModel;
         }catch (Exception e) {
@@ -200,11 +199,11 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
 
             }
             staticDataInfoModel.setTailingNo(StaticParamUtils.WKKNO);
-            staticDataInfoModel.setDepartmentId("911402247485664344");
+            staticDataInfoModel.setDepartmentId("9114092469913874XR");
             staticDataInfoModel.setProvinceId(StaticParamUtils.PROVINCENO);
             staticDataInfoModel.setType(StaticParamUtils.NEIBUWEIYIDEVICE);
             staticDataInfoModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuweiyiDeviceInfo), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuweiyiDeviceInfo), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             System.out.println("内部位移设备信息===========" + JSONUtil.toJsonStr(staticDataInfoModel));
             return staticDataInfoModel;
         }catch (Exception e) {
@@ -219,11 +218,12 @@ public class DeviceStaticDataInfoServiceImpl implements DeviceStaticDataInfoServ
             StaticDataInfoModel staticDataInfoModel = new StaticDataInfoModel();
             List<WkkBasicInfoModel> wkkBasicInfo = deviceStaticDataInfoDao.findWkkBasicInfo();
             staticDataInfoModel.setTailingNo(StaticParamUtils.WKKNO);
-            staticDataInfoModel.setDepartmentId("911402247485664344");
+            staticDataInfoModel.setDepartmentId("9114092469913874XR");
             staticDataInfoModel.setProvinceId(StaticParamUtils.PROVINCENO);
             staticDataInfoModel.setType(StaticParamUtils.BASICINFO);
             staticDataInfoModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(wkkBasicInfo), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+            staticDataInfoModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(wkkBasicInfo), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            System.out.println("尾矿库基础信息============" + JSONUtil.toJsonStr(staticDataInfoModel));
             return staticDataInfoModel;
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/amqp/shanxi/service/impl/RealTimeInfoServiceImpl.java

@@ -30,19 +30,22 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
             StaticDataInfoModel gantanRealTime = new StaticDataInfoModel();
             for (GantanRealTimeInfoModel gantanRealTimeInfoModel : gantanRealTimeInfoModelList) {
                 // 未报警
-                gantanRealTimeInfoModel.setSensorno(StaticParamUtils.GANTANNO + (gantanRealTimeInfoModel.getRecordid() >= 10 ? String.valueOf(gantanRealTimeInfoModel.getRecordid()) : "0" + gantanRealTimeInfoModel.getRecordid()));
+                gantanRealTimeInfoModel.setSensorno(StaticParamUtils.GANTANNO + (Integer.parseInt(gantanRealTimeInfoModel.getSensorno()) >= 10 ? gantanRealTimeInfoModel.getSensorno() : "0" + Integer.parseInt(gantanRealTimeInfoModel.getSensorno())));
                 if (gantanRealTimeInfoModel.getCollectdate().contains(".")) {
                     gantanRealTimeInfoModel.setCollectdate(gantanRealTimeInfoModel.getCollectdate().substring(0, gantanRealTimeInfoModel.getCollectdate().indexOf(".")));
                 }
+                gantanRealTimeInfoModel.setValue(String.format("%.2f", Double.parseDouble(gantanRealTimeInfoModel.getValue())));
             }
             System.out.println("gt实时数据=======================" + JSONUtil.toJsonStr(gantanRealTimeInfoModelList));
 
+            if (gantanRealTimeInfoModelList.size() > 0) {
                 gantanRealTime.setTailingNo(StaticParamUtils.WKKNO);
-            gantanRealTime.setDepartmentId("911402247485664344");
+                gantanRealTime.setDepartmentId("9114092469913874XR");
                 gantanRealTime.setProvinceId(StaticParamUtils.PROVINCENO);
                 gantanRealTime.setType(StaticParamUtils.GANTANDATA);
                 gantanRealTime.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            gantanRealTime.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(gantanRealTimeInfoModelList), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                gantanRealTime.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(gantanRealTimeInfoModelList), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            }
             return JSONUtil.toJsonStr(gantanRealTime);
         }catch(Exception e) {
             e.printStackTrace();
@@ -57,19 +60,21 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
             StaticDataInfoModel kswRealTimeData = new StaticDataInfoModel();
             for (KushuiweiRealTimeInfoModel kushuiweiRealTimeInfoModel : kushuiweiRealTimeData) {
                 // 未报警
-                kushuiweiRealTimeInfoModel.setSensorno(StaticParamUtils.KUSHUIWEINO + (kushuiweiRealTimeInfoModel.getRecordid() >= 10 ? String.valueOf(kushuiweiRealTimeInfoModel.getRecordid()) : "0" + kushuiweiRealTimeInfoModel.getRecordid()));
+                kushuiweiRealTimeInfoModel.setSensorno(StaticParamUtils.KUSHUIWEINO + (Integer.parseInt(kushuiweiRealTimeInfoModel.getSensorno()) >= 10 ? kushuiweiRealTimeInfoModel.getSensorno() : "0" + Integer.parseInt(kushuiweiRealTimeInfoModel.getSensorno())));
                 if (kushuiweiRealTimeInfoModel.getCollectdate().contains(".")) {
                     kushuiweiRealTimeInfoModel.setCollectdate(kushuiweiRealTimeInfoModel.getCollectdate().substring(0, kushuiweiRealTimeInfoModel.getCollectdate().indexOf(".")));
                 }
             }
             System.out.println("ksw实时数据=======================" + JSONUtil.toJsonStr(kushuiweiRealTimeData));
 
+            if (kushuiweiRealTimeData.size() > 0) {
                 kswRealTimeData.setTailingNo(StaticParamUtils.WKKNO);
-            kswRealTimeData.setDepartmentId("911402247485664344");
+                kswRealTimeData.setDepartmentId("9114092469913874XR");
                 kswRealTimeData.setProvinceId(StaticParamUtils.PROVINCENO);
                 kswRealTimeData.setType(StaticParamUtils.KUSHUIWEIDATA);
                 kswRealTimeData.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            kswRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(kushuiweiRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                kswRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(kushuiweiRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            }
             return JSONUtil.toJsonStr(kswRealTimeData);
         }catch(Exception e) {
             e.printStackTrace();
@@ -85,19 +90,20 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
             StaticDataInfoModel bmwyRealTimeData = new StaticDataInfoModel();
             for (BiaomianweiyiRealTimeInfoModel biaomianweiyiRealTimeDatum : biaomianweiyiRealTimeData) {
                 // 未报警
-                biaomianweiyiRealTimeDatum.setSensorno(StaticParamUtils.BIAOMIANWEIYINO + (biaomianweiyiRealTimeDatum.getRecordid() >= 10 ? String.valueOf(biaomianweiyiRealTimeDatum.getRecordid()) : "0" + biaomianweiyiRealTimeDatum.getRecordid()));
+                biaomianweiyiRealTimeDatum.setSensorno(StaticParamUtils.BIAOMIANWEIYINO + (Integer.parseInt(biaomianweiyiRealTimeDatum.getSensorno()) >= 10 ? biaomianweiyiRealTimeDatum.getSensorno() : "0" + Integer.parseInt(biaomianweiyiRealTimeDatum.getSensorno())));
                 if (biaomianweiyiRealTimeDatum.getCollectdate().contains(".")) {
                     biaomianweiyiRealTimeDatum.setCollectdate(biaomianweiyiRealTimeDatum.getCollectdate().substring(0, biaomianweiyiRealTimeDatum.getCollectdate().indexOf(".")));
                 }
             }
             System.out.println("bmwy实时数据=======================" + JSONUtil.toJsonStr(biaomianweiyiRealTimeData));
-
+            if (biaomianweiyiRealTimeData.size() > 0) {
                 bmwyRealTimeData.setTailingNo(StaticParamUtils.WKKNO);
-            bmwyRealTimeData.setDepartmentId("911402247485664344");
+                bmwyRealTimeData.setDepartmentId("9114092469913874XR");
                 bmwyRealTimeData.setProvinceId(StaticParamUtils.PROVINCENO);
                 bmwyRealTimeData.setType(StaticParamUtils.BIAOMIANWEIYIDATA);
                 bmwyRealTimeData.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            bmwyRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(biaomianweiyiRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                bmwyRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(biaomianweiyiRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            }
             return JSONUtil.toJsonStr(bmwyRealTimeData);
         }catch (Exception e) {
             e.printStackTrace();
@@ -112,19 +118,20 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
             StaticDataInfoModel jrxRealTimeData = new StaticDataInfoModel();
             for (JinrunxianRealTimeInfoModel jinrunxianRealTimeDatum : jinrunxianRealTimeData) {
                 // 未报警
-                jinrunxianRealTimeDatum.setSensorno(StaticParamUtils.JINRUNXIANNO + (jinrunxianRealTimeDatum.getRecordid() >= 10 ? String.valueOf(jinrunxianRealTimeDatum.getRecordid()) : "0" + jinrunxianRealTimeDatum.getRecordid()));
+                jinrunxianRealTimeDatum.setSensorno(StaticParamUtils.JINRUNXIANNO + (Integer.parseInt(jinrunxianRealTimeDatum.getSensorno()) >= 10 ? jinrunxianRealTimeDatum.getSensorno() : "0" + Integer.parseInt(jinrunxianRealTimeDatum.getSensorno())));
                 if (jinrunxianRealTimeDatum.getCollectdate().contains(".")) {
                     jinrunxianRealTimeDatum.setCollectdate(jinrunxianRealTimeDatum.getCollectdate().substring(0, jinrunxianRealTimeDatum.getCollectdate().indexOf(".")));
                 }
             }
             System.out.println("jrx实时数据=======================" + JSONUtil.toJsonStr(jinrunxianRealTimeData));
-
+            if (jinrunxianRealTimeData.size() > 0) {
                 jrxRealTimeData.setTailingNo(StaticParamUtils.WKKNO);
-            jrxRealTimeData.setDepartmentId("911402247485664344");
+                jrxRealTimeData.setDepartmentId("9114092469913874XR");
                 jrxRealTimeData.setProvinceId(StaticParamUtils.PROVINCENO);
                 jrxRealTimeData.setType(StaticParamUtils.JINRUNXIANDATA);
                 jrxRealTimeData.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            jrxRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jinrunxianRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                jrxRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jinrunxianRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            }
             return JSONUtil.toJsonStr(jrxRealTimeData);
         }catch(Exception e) {
             e.printStackTrace();
@@ -139,19 +146,20 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
             StaticDataInfoModel jylRealTimeData = new StaticDataInfoModel();
             for (JiangyuliangRealTimeInfoModel jiangyuliangRealTimeDatum : jiangyuliangRealTimeData) {
                 // 未报警
-                jiangyuliangRealTimeDatum.setSensorno(StaticParamUtils.JIANGYULIANGNO + (jiangyuliangRealTimeDatum.getRecordid() >= 10 ? String.valueOf(jiangyuliangRealTimeDatum.getRecordid()) : "0" + jiangyuliangRealTimeDatum.getRecordid()));
+                jiangyuliangRealTimeDatum.setSensorno(StaticParamUtils.JIANGYULIANGNO + (Integer.parseInt(jiangyuliangRealTimeDatum.getSensorno()) >= 10 ? jiangyuliangRealTimeDatum.getSensorno() : "0" + Integer.parseInt(jiangyuliangRealTimeDatum.getSensorno())));
                 if (jiangyuliangRealTimeDatum.getCollectdate().contains(".")) {
                     jiangyuliangRealTimeDatum.setCollectdate(jiangyuliangRealTimeDatum.getCollectdate().substring(0, jiangyuliangRealTimeDatum.getCollectdate().indexOf(".")));
                 }
             }
             System.out.println("jyl实时数据=======================" + JSONUtil.toJsonStr(jiangyuliangRealTimeData));
-
+            if (jiangyuliangRealTimeData.size() > 0) {
                 jylRealTimeData.setTailingNo(StaticParamUtils.WKKNO);
-            jylRealTimeData.setDepartmentId("911402247485664344");
+                jylRealTimeData.setDepartmentId("9114092469913874XR");
                 jylRealTimeData.setProvinceId(StaticParamUtils.PROVINCENO);
                 jylRealTimeData.setType(StaticParamUtils.JIANGYULIANGDATA);
                 jylRealTimeData.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            jylRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jiangyuliangRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                jylRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(jiangyuliangRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            }
             return JSONUtil.toJsonStr(jylRealTimeData);
         }catch (Exception e){
             e.printStackTrace();
@@ -159,6 +167,63 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
         }
     }
 
+    @Override
+    public String neibuChenJiangRealTimeData() {
+        try {
+            List<NeibuweiyiRealTimeInfoModel> neibuChenjiangRealTimeData = realTimeInfoDao.findNeibuChenjiangRealTimeData();
+            StaticDataInfoModel nbcjRealTimeData = new StaticDataInfoModel();
+            for (NeibuweiyiRealTimeInfoModel neibuChenjiangRealTimeDatum : neibuChenjiangRealTimeData) {
+                // 未报警
+                neibuChenjiangRealTimeDatum.setSensorno(StaticParamUtils.NEIBUWEIYINO + (Integer.parseInt(neibuChenjiangRealTimeDatum.getSensorno()) >= 10 ? String.valueOf(neibuChenjiangRealTimeDatum.getSensorno()) : "0" + neibuChenjiangRealTimeDatum.getSensorno()));
+                if (neibuChenjiangRealTimeDatum.getCollectdate().contains(".")) {
+                    neibuChenjiangRealTimeDatum.setCollectdate(neibuChenjiangRealTimeDatum.getCollectdate().substring(0, neibuChenjiangRealTimeDatum.getCollectdate().indexOf(".")));
+                }
+            }
+            System.out.println("nbcj内部沉降实时数据=======================" + JSONUtil.toJsonStr(neibuChenjiangRealTimeData));
+            if (neibuChenjiangRealTimeData.size() > 0) {
+                nbcjRealTimeData.setTailingNo(StaticParamUtils.WKKNO);
+                nbcjRealTimeData.setDepartmentId("9114092469913874XR");
+                nbcjRealTimeData.setProvinceId(StaticParamUtils.PROVINCENO);
+                nbcjRealTimeData.setType(StaticParamUtils.NEIBUWEIYIDATA);
+                nbcjRealTimeData.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                nbcjRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuChenjiangRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            }
+            return JSONUtil.toJsonStr(nbcjRealTimeData);
+        }catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    @Override
+    public String neibuShuiPingRealTimeData() {
+        try {
+            List<NeibuweiyiRealTimeInfoModel> neibuShuipingRealTimeData = realTimeInfoDao.findNeibuShuipingRealTimeData();
+            StaticDataInfoModel nbspRealTimeData = new StaticDataInfoModel();
+            for (NeibuweiyiRealTimeInfoModel neibuShuipingRealTimeDatum : neibuShuipingRealTimeData) {
+                // 未报警
+                neibuShuipingRealTimeDatum.setSensorno(StaticParamUtils.NEIBUWEIYINO + (Integer.parseInt(neibuShuipingRealTimeDatum.getSensorno()) >= 10 ? String.valueOf(neibuShuipingRealTimeDatum.getSensorno()) : "0" + neibuShuipingRealTimeDatum.getSensorno()));
+                if (neibuShuipingRealTimeDatum.getCollectdate().contains(".")) {
+                    neibuShuipingRealTimeDatum.setCollectdate(neibuShuipingRealTimeDatum.getCollectdate().substring(0, neibuShuipingRealTimeDatum.getCollectdate().indexOf(".")));
+                }
+            }
+            System.out.println("nbsp内部水平实时数据=======================" + JSONUtil.toJsonStr(neibuShuipingRealTimeData));
+            if (neibuShuipingRealTimeData.size() > 0) {
+                nbspRealTimeData.setTailingNo(StaticParamUtils.WKKNO);
+                nbspRealTimeData.setDepartmentId("9114092469913874XR");
+                nbspRealTimeData.setProvinceId(StaticParamUtils.PROVINCENO);
+                nbspRealTimeData.setType(StaticParamUtils.NEIBUWEIYIDATA);
+                nbspRealTimeData.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                nbspRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuShuipingRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            }
+            return JSONUtil.toJsonStr(nbspRealTimeData);
+        }catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     /**
      * 监测设备
      */
@@ -168,7 +233,7 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
             StaticDataInfoModel deviceRealTimeDataModel = new StaticDataInfoModel();
             List<DeviceRealTimeInfoModel> deviceRealTimeData = realTimeInfoDao.findDeviceRealTimeData();
             for (int i = 0; i < deviceRealTimeData.size(); i++) {
-                if (deviceRealTimeData.get(i).getItemno().contains("干滩")) {
+                if (deviceRealTimeData.get(i).getItemno().contains("干滩2")) {
                     deviceRealTimeData.get(i).setItemno("01");
                 } else if (deviceRealTimeData.get(i).getItemno().contains("库水位")) {
                     deviceRealTimeData.get(i).setItemno("02");
@@ -178,10 +243,9 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
                     deviceRealTimeData.get(i).setItemno("06");
                 } else if (deviceRealTimeData.get(i).getItemno().contains("浸润线")) {
                     deviceRealTimeData.get(i).setItemno("05");
-                } else if (deviceRealTimeData.get(i).getItemno().contains("坝体内部")) {
+                } else if (deviceRealTimeData.get(i).getItemno().contains("坝体内部沉降")) {
                     deviceRealTimeData.get(i).setItemno("04");
                 }
-
                 if (deviceRealTimeData.get(i).getState() != null) {
                     deviceRealTimeData.get(i).setState("1");
                 } else {
@@ -192,13 +256,14 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
             }
 
             System.out.println("device实时数据=======================" + JSONUtil.toJsonStr(deviceRealTimeData));
-
+            if (deviceRealTimeData.size() > 0) {
                 deviceRealTimeDataModel.setTailingNo(StaticParamUtils.WKKNO);
-            deviceRealTimeDataModel.setDepartmentId("911402247485664344");
+                deviceRealTimeDataModel.setDepartmentId("9114092469913874XR");
                 deviceRealTimeDataModel.setProvinceId(StaticParamUtils.PROVINCENO);
                 deviceRealTimeDataModel.setType(StaticParamUtils.DEVICEDATA);
                 deviceRealTimeDataModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            deviceRealTimeDataModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(deviceRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                deviceRealTimeDataModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(deviceRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
+            }
             return JSONUtil.toJsonStr(deviceRealTimeDataModel);
         }catch (Exception e) {
             e.printStackTrace();
@@ -213,27 +278,27 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
             List<WkkRealTimeInfoModel> wkkRealTimeData = realTimeInfoDao.findWkkRealTimeData();
             if (wkkRealTimeData.size() > 0) {
                 wkkRealTimeData.get(0).setState("1");
-                wkkRealTimeData.get(0).setCollectdat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                wkkRealTimeData.get(0).setCollectdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                 wkkRealTimeDataModel.setTailingNo(StaticParamUtils.WKKNO);
-                wkkRealTimeDataModel.setDepartmentId("911402247485664344");
+                wkkRealTimeDataModel.setDepartmentId("9114092469913874XR");
                 wkkRealTimeDataModel.setProvinceId(StaticParamUtils.PROVINCENO);
                 wkkRealTimeDataModel.setType(StaticParamUtils.WKKDATA);
                 wkkRealTimeDataModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                wkkRealTimeDataModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(wkkRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                wkkRealTimeDataModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(wkkRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
                 System.out.println("wkk实时数据=======================" + JSONUtil.toJsonStr(wkkRealTimeData));
                 return JSONUtil.toJsonStr(wkkRealTimeDataModel);
-            }else {
+            } else {
                 WkkRealTimeInfoModel wkkRealTimeInfoModel = new WkkRealTimeInfoModel();
-                wkkRealTimeInfoModel.setCollectdat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                wkkRealTimeInfoModel.setCollectdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                 wkkRealTimeInfoModel.setState("0");
                 wkkRealTimeData.add(wkkRealTimeInfoModel);
 
                 wkkRealTimeDataModel.setTailingNo(StaticParamUtils.WKKNO);
-                wkkRealTimeDataModel.setDepartmentId("911402247485664344");
+                wkkRealTimeDataModel.setDepartmentId("9114092469913874XR");
                 wkkRealTimeDataModel.setProvinceId(StaticParamUtils.PROVINCENO);
                 wkkRealTimeDataModel.setType(StaticParamUtils.WKKDATA);
                 wkkRealTimeDataModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                wkkRealTimeDataModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(wkkRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
+                wkkRealTimeDataModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(wkkRealTimeData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
                 System.out.println("wkk实时数据=======================" + JSONUtil.toJsonStr(wkkRealTimeData));
                 return JSONUtil.toJsonStr(wkkRealTimeDataModel);
             }
@@ -252,78 +317,40 @@ public class RealTimeInfoServiceImpl implements RealTimeInfoService {
         try {
             StaticDataInfoModel deviceOffLineDataModel = new StaticDataInfoModel();
             List<DeviceOffLineInfoModel> deviceOffLineData = realTimeInfoDao.findDeviceOffLineData();
+            System.out.println("离线设备数据个数：" + deviceOffLineData.size());
             if(deviceOffLineData.size() > 0) {
                 // 有离线设备
                 for(int i = 0; i < deviceOffLineData.size(); i++) {
-                    deviceOffLineData.get(i).setSensorno(StaticParamUtils.JIANGYULIANGNO + (deviceOffLineData.get(i).getRecordid() >= 10 ? String.valueOf(deviceOffLineData.get(i).getRecordid()): "0" + deviceOffLineData.get(i).getRecordid()));
+                    if ("雨量计".equals(deviceOffLineData.get(i).getSensorno())) {
+                        deviceOffLineData.get(i).setSensorno(StaticParamUtils.JIANGYULIANGNO + (deviceOffLineData.get(i).getRecordid() >= 10 ? String.valueOf(deviceOffLineData.get(i).getRecordid()) : "0" + deviceOffLineData.get(i).getRecordid()));
+                        deviceOffLineData.get(i).setCollectdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                    } else if ("坝体表面位移".equals(deviceOffLineData.get(i).getSensorno())) {
+                        deviceOffLineData.get(i).setSensorno(StaticParamUtils.BIAOMIANWEIYINO + (deviceOffLineData.get(i).getRecordid() >= 10 ? String.valueOf(deviceOffLineData.get(i).getRecordid()) : "0" + deviceOffLineData.get(i).getRecordid()));
+                        deviceOffLineData.get(i).setCollectdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                    } else if ("浸润线".equals(deviceOffLineData.get(i).getSensorno())) {
+                        deviceOffLineData.get(i).setSensorno(StaticParamUtils.JINRUNXIANNO + (deviceOffLineData.get(i).getRecordid() >= 10 ? String.valueOf(deviceOffLineData.get(i).getRecordid()) : "0" + deviceOffLineData.get(i).getRecordid()));
+                        deviceOffLineData.get(i).setCollectdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                    } else if ("库水位".equals(deviceOffLineData.get(i).getSensorno())) {
+                        deviceOffLineData.get(i).setSensorno(StaticParamUtils.KUSHUIWEINO + (deviceOffLineData.get(i).getRecordid() >= 10 ? String.valueOf(deviceOffLineData.get(i).getRecordid()) : "0" + deviceOffLineData.get(i).getRecordid()));
+                        deviceOffLineData.get(i).setCollectdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                    } else if ("干滩2".equals(deviceOffLineData.get(i).getSensorno())) {
+                        deviceOffLineData.get(i).setSensorno(StaticParamUtils.GANTANNO + (deviceOffLineData.get(i).getRecordid() >= 10 ? String.valueOf(deviceOffLineData.get(i).getRecordid()) : "0" + deviceOffLineData.get(i).getRecordid()));
                         deviceOffLineData.get(i).setCollectdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                     }
+                }
                 deviceOffLineDataModel.setTailingNo(StaticParamUtils.WKKNO);
-                deviceOffLineDataModel.setDepartmentId("911402247485664344");
+                deviceOffLineDataModel.setDepartmentId("9114092469913874XR");
                 deviceOffLineDataModel.setProvinceId(StaticParamUtils.PROVINCENO);
                 deviceOffLineDataModel.setType(StaticParamUtils.DEVICEOFFLINE);
                 deviceOffLineDataModel.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-                deviceOffLineDataModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(deviceOffLineData), "i2MvNzkedPgITpz2UcZS3A==" , "ReQb3Swiz8frJ3+8l9RGvg=="));
+                deviceOffLineDataModel.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(deviceOffLineData), "4qInuXy6CREhRch7toLcBg==", "rluhvrn9+EHIodq5Tx86Jg=="));
             }
+            System.out.println("离线设备信息数据长度 :" + JSONUtil.toJsonStr(deviceOffLineData));
+
             return JSONUtil.toJsonStr(deviceOffLineData);
         }catch(Exception e) {
             e.printStackTrace();
             return null;
         }
     }
-
-    @Override
-    public String neibuChenJiangRealTimeData() {
-        try {
-            List<NeibuweiyiRealTimeInfoModel> neibuChenjiangRealTimeData = realTimeInfoDao.findNeibuChenjiangRealTimeData();
-            StaticDataInfoModel nbcjRealTimeData = new StaticDataInfoModel();
-            for (int i = 0; i < neibuChenjiangRealTimeData.size(); i++) {
-                // 未报警
-                neibuChenjiangRealTimeData.get(i).setSensorno(StaticParamUtils.BIAOMIANWEIYINO + (neibuChenjiangRealTimeData.get(i).getRecordid() >= 10 ? String.valueOf(neibuChenjiangRealTimeData.get(i).getRecordid()) : "0" + neibuChenjiangRealTimeData.get(i).getRecordid()));
-                if (neibuChenjiangRealTimeData.get(i).getCollectdate().contains(".")) {
-                    neibuChenjiangRealTimeData.get(i).setCollectdate(neibuChenjiangRealTimeData.get(i).getCollectdate().substring(0, neibuChenjiangRealTimeData.get(i).getCollectdate().indexOf(".")));
-                }
-            }
-            System.out.println("nbcj内部沉降实时数据=======================" + JSONUtil.toJsonStr(neibuChenjiangRealTimeData));
-
-            nbcjRealTimeData.setTailingNo(StaticParamUtils.WKKNO);
-            nbcjRealTimeData.setDepartmentId("911402247485664344");
-            nbcjRealTimeData.setProvinceId(StaticParamUtils.PROVINCENO);
-            nbcjRealTimeData.setType(StaticParamUtils.NEIBUWEIYIDATA);
-            nbcjRealTimeData.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            nbcjRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuChenjiangRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
-            return JSONUtil.toJsonStr(nbcjRealTimeData);
-        }catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-
-    @Override
-    public String neibuShuiPingRealTimeData() {
-        try {
-            List<NeibuweiyiRealTimeInfoModel> neibuShuipingRealTimeData = realTimeInfoDao.findNeibuShuipingRealTimeData();
-            StaticDataInfoModel nbcjRealTimeData = new StaticDataInfoModel();
-            for (int i = 0; i < neibuShuipingRealTimeData.size(); i++) {
-                // 未报警
-                neibuShuipingRealTimeData.get(i).setSensorno(StaticParamUtils.BIAOMIANWEIYINO + (neibuShuipingRealTimeData.get(i).getRecordid() >= 10 ? String.valueOf(neibuShuipingRealTimeData.get(i).getRecordid()) : "0" + neibuShuipingRealTimeData.get(i).getRecordid()));
-                if (neibuShuipingRealTimeData.get(i).getCollectdate().contains(".")) {
-                    neibuShuipingRealTimeData.get(i).setCollectdate(neibuShuipingRealTimeData.get(i).getCollectdate().substring(0, neibuShuipingRealTimeData.get(i).getCollectdate().indexOf(".")));
-                }
-            }
-            System.out.println("nbsp内部水平实时数据=======================" + JSONUtil.toJsonStr(neibuShuipingRealTimeData));
-
-            nbcjRealTimeData.setTailingNo(StaticParamUtils.WKKNO);
-            nbcjRealTimeData.setDepartmentId("911402247485664344");
-            nbcjRealTimeData.setProvinceId(StaticParamUtils.PROVINCENO);
-            nbcjRealTimeData.setType(StaticParamUtils.NEIBUWEIYIDATA);
-            nbcjRealTimeData.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            nbcjRealTimeData.setDatas(AESUtil.encrypt(JSONUtil.toJsonStr(neibuShuipingRealTimeData), "i2MvNzkedPgITpz2UcZS3A==", "ReQb3Swiz8frJ3+8l9RGvg=="));
-            return JSONUtil.toJsonStr(nbcjRealTimeData);
-        }catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
 }

src/main/resources/application.yml

@@ -3,22 +3,23 @@ server:
 spring:
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://localhost:5432/MineTRS_hongwei
+    url: jdbc:postgresql://localhost:5432/MineTRS_fanshi
     username: postgres
     #password: ENC(MUOMhFvUHg7PHf1SB5lEs7cCgxexl14k)
-    password: mengzi--
+    password: red___
+
 device:   # 设备编码 -parameters
-  gantanno: '140224000301'
-  kushuiweino: '140224000302'
-  biaomianweiyino: '140224000303'
-  neibuweiyino: '140224000304'
-  jinrunxianno: '140224000305'
-  jiangyuliangno: '140224000306'
-  shenliuliangno: '140224000307'
+  gantanno: '140924005501'
+  kushuiweino: '140924005502'
+  biaomianweiyino: '140924005503'
+  neibuweiyino: '140924005504'
+  jinrunxianno: '140924005505'
+  jiangyuliangno: '140924005506'
+  shenliuliangno: '140924005507'
 
 basic: # 基础信息
   provinceno: '14'
-  wkkno: '1402240003'
+  wkkno: '1409240055'
 
 datatype:
   basicinfo: '0001'

target/classes/application.yml

@@ -3,22 +3,23 @@ server:
 spring:
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://localhost:5432/MineTRS_hongwei
+    url: jdbc:postgresql://localhost:5432/MineTRS_fanshi
     username: postgres
     #password: ENC(MUOMhFvUHg7PHf1SB5lEs7cCgxexl14k)
-    password: mengzi--
+    password: red___
+
 device:   # 设备编码 -parameters
-  gantanno: '140224000301'
-  kushuiweino: '140224000302'
-  biaomianweiyino: '140224000303'
-  neibuweiyino: '140224000304'
-  jinrunxianno: '140224000305'
-  jiangyuliangno: '140224000306'
-  shenliuliangno: '140224000307'
+  gantanno: '140924005501'
+  kushuiweino: '140924005502'
+  biaomianweiyino: '140924005503'
+  neibuweiyino: '140924005504'
+  jinrunxianno: '140924005505'
+  jiangyuliangno: '140924005506'
+  shenliuliangno: '140924005507'
 
 basic: # 基础信息
   provinceno: '14'
-  wkkno: '1402240003'
+  wkkno: '1409240055'
 
 datatype:
   basicinfo: '0001'