福永-温控数据对接处理

exchange/pom.xml

@@ -35,11 +35,13 @@
             <artifactId>orai18n</artifactId>
             <version>19.3.0.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc -->
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <version>12.8.0.jre8</version>
+            <version>12.7.0.jre11-preview</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

exchange/src/main/java/com/jyxt/thridparty/exchange/bx/VendorBinxiang.java

@@ -21,6 +21,8 @@ public class VendorBinxiang {
     private String shiyanzhuName;
     //实验组ID
     private String shiyanzhuId;
+    //厂商
+    private String changShang;
 
     @Override
     public boolean equals(Object o) {
@@ -123,6 +125,14 @@ public class VendorBinxiang {
         this.shiyanzhuId = shiyanzhuId;
     }
 
+    public String getChangShang() {
+        return changShang;
+    }
+
+    public void setChangShang(String changShang) {
+        this.changShang = changShang;
+    }
+
     @Override
     public String toString() {
         return "VendorBinxiang{" +

exchange/src/main/java/com/jyxt/thridparty/exchange/bx/repository/BinxiangRepository.java

@@ -21,8 +21,8 @@ public class BinxiangRepository {
     public void save(final VendorBinxiang bx){
         //sql语句
         final String sql = "insert into t_dsfbxwdjl (id_,create_time_,cai_ji_shi_jian_,wen_du_,bing_xiang_id_,bing_xiang_ming_c,cai_ji_qi_id_," +
-                "cai_ji_qi_ming_ch,wen_du_shang_xian,wen_du_xia_xian_,shi_yan_zu_,shi_yan_zu_id_)" +
-                " values (?,?,?,?,?,?,?,?,?,?,?,?) ";
+                "cai_ji_qi_ming_ch,wen_du_shang_xian,wen_du_xia_xian_,shi_yan_zu_,shi_yan_zu_id_,chang_shang_)" +
+                " values (?,?,?,?,?,?,?,?,?,?,?,?,?) ";
         jdbcTemplate.update(new PreparedStatementCreator() {
             public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
                 PreparedStatement prepareStatement = connection.prepareStatement(sql);
@@ -38,6 +38,7 @@ public class BinxiangRepository {
                 prepareStatement.setString(10,bx.getWenduDown());
                 prepareStatement.setString(11,bx.getShiyanzhuName());
                 prepareStatement.setString(12,bx.getShiyanzhuId());
+                prepareStatement.setString(13,bx.getChangShang());
                 return prepareStatement;
             }
         });

exchange/src/main/java/com/jyxt/thridparty/exchange/bx/repository/VendorBinxiangRepository.java

@@ -38,8 +38,9 @@ public class VendorBinxiangRepository {
         for (ToLoggerInfo equip : equipList) {
             String equipSn = equip.getLoggerSn();
             String equipName = equip.getLoggerName();
-//            String subSql = "select *from logs_"+equipSn+" WHERE DATE_FORMAT(LOGS_TIME,'%Y-%m-%d')=CURRENT_DATE";
-            String subSql = "SELECT *FROM LOGS_"+equipSn+" WHERE DATE_FORMAT(LOGS_TIME,'%Y-%m-%d')='2024-09-05'";
+            //String subSql = "select *from logs_"+equipSn+" WHERE DATE_FORMAT(LOGS_TIME,'%Y-%m-%d')=CURRENT_DATE";
+            //condition = "DATE_FORMAT(LOGS_TIME,'%Y-%m-%d')='2024-09-05'";
+            String subSql = "SELECT *FROM LOGS_"+equipSn+" WHERE "+condition;
             log.warn(subSql);
             List<EquipHumiture> list;
             try {
@@ -68,6 +69,7 @@ public class VendorBinxiangRepository {
                     bx.setWenduDown(equip.getChoneLow());
                     bx.setShiyanzhuName(equip.getGroupId().toString());
                     bx.setShiyanzhuId(equip.getGroupId().toString());
+                    bx.setChangShang("福永人民医院");
                     bxSet.add(bx);
                 }else {
                     for (int i = 1; i<=2; i++){
@@ -83,6 +85,7 @@ public class VendorBinxiangRepository {
                         bx.setWenduDown(i==1?equip.getChoneLow():equip.getChtwoLow());
                         bx.setShiyanzhuName(equip.getGroupId().toString());
                         bx.setShiyanzhuId(equip.getGroupId().toString());
+                        bx.setChangShang("福永人民医院");
                         bxSet.add(bx);
                     }
                 }