Merge remote-tracking branch 'origin/master'

tofly-dlrq-gas/framework/tofly-config/src/main/resources/config/tofly-zmrq-dev.yml

@@ -1,7 +1,7 @@
 # 数据源
 spring:
   datasource:
-    url: jdbc:oracle:thin:@118.122.225.96:15522/orcl
+    url: jdbc:oracle:thin:@125.65.179.211:15522/orcl
     driver-class-name: oracle.jdbc.OracleDriver
     username: DLRQ
     password: DLRQ_tofly2024
@@ -31,7 +31,7 @@ spring:
       #      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
       use-global-data-source-stat: true
   rabbitmq:
-    host: 118.122.225.96
+    host: 125.65.179.211
     port: 16572
     username: guest
     password: dlrqmq

tofly-dlrq-gas/service/zmourq/src/main/java/com/tofly/zmrq/custommeicun/entity/ScadaDataInfoPressHistory.java

@@ -43,7 +43,7 @@ public class ScadaDataInfoPressHistory {
 
     @ApiModelProperty(value = "进站压力")
     private String pressure1;
-    @ApiModelProperty(value = "汇管压力")
+    @ApiModelProperty(value = "汇管3压力")
     private String pressure2;
     @ApiModelProperty(value = "加气站压力")
     private String pressure3;
@@ -56,6 +56,19 @@ public class ScadaDataInfoPressHistory {
     @ApiModelProperty(value = "去机械园区压力")
     private String pressure7;
 
+    @ApiModelProperty(value = "汇管2压力")
+    private String pressure8;
+
+    @ApiModelProperty(value = "浓度1")
+    private String concentration1;
+
+    @ApiModelProperty(value = "浓度2")
+    private String concentration2;
+
+    @ApiModelProperty(value = "浓度3")
+    private String concentration3;
+
+
     @ApiModelProperty(value = "设备名称")
     private String deviceName;
 

tofly-dlrq-gas/service/zmourq/src/main/java/com/tofly/zmrq/rabbitmq/consumer/ConsumerListener.java

@@ -311,6 +311,11 @@ private void  dealData(String msgStr){
         String pressure5Code= "pressure_qdcc"; //去丹齿厂压力
         String pressure6Code = "pressure_qcqgw";//去城区管网压力
         String pressure7Code = "pressure_qjxyq";//去机械园区压力
+        String pressure8Code = "pressure_hg2";//汇管2压力
+        String concentration1 = "concentration1";//浓度1
+        String concentration2 = "concentration2";//浓度2
+        String concentration3 = "concentration3";//浓度3
+
 
         List<Scada> list = new ArrayList<>();
         Long maxId = scadaMapper.getPlanTempMaxId(tableName);
@@ -376,6 +381,45 @@ private void  dealData(String msgStr){
         pressure7.setUpdateTime(new Date());
         pressure7.setFiledName(pressure7Code.toUpperCase());
         list.add(pressure7);
+
+        Scada pressure8 = new Scada();
+        pressure8.setId(maxId++);
+        pressure8.setCode(pressure8Code.concat("_").concat(dutId));
+        pressure8.setScadaTime(scadaDataInfo.getCollect_time());
+        pressure8.setValue(scadaDataInfo.getPressure8());
+        pressure8.setUpdateTime(new Date());
+        pressure8.setFiledName(pressure8Code.toUpperCase());
+        list.add(pressure8);
+
+        Scada concentration_1 = new Scada();
+        concentration_1.setId(maxId++);
+        concentration_1.setCode(concentration1.concat("_").concat(dutId));
+        concentration_1.setScadaTime(scadaDataInfo.getCollect_time());
+        concentration_1.setValue(scadaDataInfo.getConcentration1());
+        concentration_1.setUpdateTime(new Date());
+        concentration_1.setFiledName(concentration1.toUpperCase());
+        list.add(concentration_1);
+
+        Scada concentration_2 = new Scada();
+        concentration_2.setId(maxId++);
+        concentration_2.setCode(concentration2.concat("_").concat(dutId));
+        concentration_2.setScadaTime(scadaDataInfo.getCollect_time());
+        concentration_2.setValue(scadaDataInfo.getConcentration2());
+        concentration_2.setUpdateTime(new Date());
+        concentration_2.setFiledName(concentration2.toUpperCase());
+        list.add(concentration_2);
+
+
+        Scada concentration_3 = new Scada();
+        concentration_3.setId(maxId++);
+        concentration_3.setCode(concentration3.concat("_").concat(dutId));
+        concentration_3.setScadaTime(scadaDataInfo.getCollect_time());
+        concentration_3.setValue(scadaDataInfo.getConcentration3());
+        concentration_3.setUpdateTime(new Date());
+        concentration_3.setFiledName(concentration3.toUpperCase());
+        list.add(concentration_3);
+
+
         scadaMapper.insertMouth(list, tableName);
         saveDataReal(list,dutId);
         saveHistoryAlertData(list,dutId);