src/main/java/com/gkhy/testFourierSpecialGasMonitor/entity/req/GasConcentrationExportBO.java
@@ -16,12 +16,13 @@ // 0不查询，1查询 private Integer ch4; private Integer c2h6; private Integer c3H8; private Integer c4h101; private Integer h2s; private Integer c2h4; private Integer c4h102; private Integer c4h10; private Integer c3h4cl2; private Integer c2h4o; private Integer c4h10_1; private Integer o3; private Integer c3h6o_2; private Integer c7h8_1; private Integer position1; private Integer position2; src/main/java/com/gkhy/testFourierSpecialGasMonitor/entity/resp/GasConcentrationExportDTO.java
@@ -49,5 +49,7 @@ private Double gasValue06; private String gasName07; private Double gasValue07; private String gasName08; private Double gasValue08; } src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
@@ -16,6 +16,7 @@ import com.gkhy.testFourierSpecialGasMonitor.service.*; import com.gkhy.testFourierSpecialGasMonitor.utils.AreaHandle; import com.gkhy.testFourierSpecialGasMonitor.utils.PositionHandle; import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ; import io.micrometer.core.instrument.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -476,33 +477,37 @@ gasConcentrationExportDTO.setPosition(positionHandle.positionHandleMethod(gasConcentration.getPosition())); gasConcentrationExportDTO.setGasName01("甲烷CH4"); gasConcentrationExportDTO.setGasName02("乙烷C2H6"); gasConcentrationExportDTO.setGasName03("丙烷C3H8"); gasConcentrationExportDTO.setGasName04("丁烷C4H10"); gasConcentrationExportDTO.setGasName05("硫化氢H2S"); gasConcentrationExportDTO.setGasName06("乙烯C2H4"); gasConcentrationExportDTO.setGasName07("异丁烷C4H10"); gasConcentrationExportDTO.setGasName02("丁烷C4H10"); gasConcentrationExportDTO.setGasName03("二氯丙烯C3H4C12"); gasConcentrationExportDTO.setGasName04("乙醛C2H4O"); gasConcentrationExportDTO.setGasName05("异丁烷H4h10_1"); gasConcentrationExportDTO.setGasName06("臭氧O3"); gasConcentrationExportDTO.setGasName07("丙醛C3H6O_2"); gasConcentrationExportDTO.setGasName08("甲苯C7H8_1"); if (gasConcentrationExportBO.getCh4() == 0){ gasConcentrationExportDTO.setGasValue01(null); } if (gasConcentrationExportBO.getC2h6() == 0){ if (gasConcentrationExportBO.getC4h10() == 0){ gasConcentrationExportDTO.setGasValue02(null); } if (gasConcentrationExportBO.getC3H8() == 0){ if (gasConcentrationExportBO.getC3h4cl2() == 0){ gasConcentrationExportDTO.setGasValue03(null); } if (gasConcentrationExportBO.getC4h101() == 0){ if (gasConcentrationExportBO.getC2h4o() == 0){ gasConcentrationExportDTO.setGasValue04(null); } if (gasConcentrationExportBO.getH2s() == 0){ if (gasConcentrationExportBO.getC4h10_1() == 0){ gasConcentrationExportDTO.setGasValue05(null); } if (gasConcentrationExportBO.getC2h4() == 0){ if (gasConcentrationExportBO.getO3() == 0){ gasConcentrationExportDTO.setGasValue06(null); } if (gasConcentrationExportBO.getC4h102() == 0){ if (gasConcentrationExportBO.getC3h6o_2() == 0){ gasConcentrationExportDTO.setGasValue07(null); } if (gasConcentrationExportBO.getC7h8_1() == 0){ gasConcentrationExportDTO.setGasValue08(null); } exportLists.add(gasConcentrationExportDTO); }
@@ -6,14 +6,14 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:7006/fourier_specialgas_monitor.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true&allowPublicKeyRetrieval=true username: root password: 2farwL3yPXfbH2AP url: jdbc:mysql://127.0.0.1:23306/ftirtest?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true&allowPublicKeyRetrieval=true username: ftirtest password: syYjBsdcWWzXzbJk master: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:7006/fourier_specialgas_monitor.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true&allowPublicKeyRetrieval=true username: root password: 2farwL3yPXfbH2AP url: jdbc:mysql://127.0.0.1:23306/ftirtest?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true&allowPublicKeyRetrieval=true username: ftirtest password: syYjBsdcWWzXzbJk type: com.alibaba.druid.pool.DruidDataSource jpa: hibernate: @@ -66,16 +66,16 @@ reportfile: path: #基础路径 dcPath: upload/ dcPath: /home/gkhy/upload/fourierSpecialgasMonitor/ urlRootPath: /upload/ file: path: #基础路径 dcPath: /home/upload/huataiFourierSpecialgasMonitor/ urlRootPath: /upload/ module: #用户模块 accountPath: /huataiFourierSpecialgasMonitor path: #基础路径 dcPath: /home/upload/fourierSpecialgasMonitor/ urlRootPath: /upload/ module: #用户模块 accountPath: /fourierSpecialgasMonitor #线程池配置 threadPool: src/main/resources/config/redisson-dev.yml
@@ -10,7 +10,7 @@ # 命令重试发送时间间隔，单位：毫秒 retryInterval: 1500 # 密码 password: password: akj78avauba789a # 单个连接最大订阅数量 subscriptionsPerConnection: 5 # 客户端名称 src/main/resources/config/redisson-online-uat.yml
@@ -26,7 +26,7 @@ # 连接池大小 connectionPoolSize: 8 # redis数据库编号 database: 10 database: 0 # DNS监测时间间隔，单位：毫秒 dnsMonitoringInterval: 5000 # 线程池数量
