[task-2813]深圳三院-温控对接

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

@@ -33,6 +33,16 @@ public class VendorBinxiang {
 
     private String diDian;
 
+    private String room;
+
+    public String getRoom() {
+        return room;
+    }
+
+    public void setRoom(String room) {
+        this.room = room;
+    }
+
     public String getDiDian() {
         return diDian;
     }

exchange/src/main/java/com/jyxt/thridparty/exchange/bx/entity/EquipRelation.java

@@ -88,8 +88,18 @@ public class EquipRelation implements Serializable {
      */
     private String area_;
 
+    private String room_;
+
     private String diDian_;
 
+    public String getRoom_() {
+        return room_;
+    }
+
+    public void setRoom_(String room_) {
+        this.room_ = room_;
+    }
+
     public String getDiDian_() {
         return diDian_;
     }

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

@@ -19,8 +19,8 @@ public class BinxiangRepository {
     public void saveWsd(final VendorBinxiang bx){
         //sql语句
         final String sql = "insert into t_dsfbxwdjl (id_,create_time_,cai_ji_shi_jian_,wen_du_,shi_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_,shi_du_shang_xian,shi_du_xia_xian_,type_,area_,di_dian_)" +
-                " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+                "cai_ji_qi_ming_ch,wen_du_shang_xian,wen_du_xia_xian_,shi_yan_zu_,shi_yan_zu_id_,shi_du_shang_xian,shi_du_xia_xian_,type_,area_,di_dian_,fang_jian_)" +
+                " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
         jdbcTemplate.update(new PreparedStatementCreator() {
             public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
                 PreparedStatement prepareStatement = connection.prepareStatement(sql);
@@ -42,6 +42,7 @@ public class BinxiangRepository {
                 prepareStatement.setString(16,bx.getType());
                 prepareStatement.setString(17,bx.getArea());
                 prepareStatement.setString(18,bx.getDiDian());
+                prepareStatement.setString(19,bx.getRoom());
                 return prepareStatement;
             }
         });

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

@@ -87,6 +87,8 @@ public class VendorBinxiangRepository {
                     JSONObject jsonObject = data.getJSONObject(0);
                     JSONArray channels = jsonObject.getJSONArray("channels");
                     if(!data.isEmpty()){
+                        EquipRelation wenDu = getWsdRange(twksbpzb.getDeviceNo_(),"温度");
+                        EquipRelation shiDu = getWsdRange(twksbpzb.getDeviceNo_(),"湿度");
                         for(Object object : channels){
                             // 测点类型：dataitem 0-温湿度  17-经纬度 18-温湿度 19-单温
                             JSONObject channel = (JSONObject) object;
@@ -106,7 +108,6 @@ public class VendorBinxiangRepository {
                                     bx.setCaiJiId(channel.getString("serial"));
                                     bx.setCaiJiName(twksbpzb.getDeviceName_());
                                     bx.setCaiJiTime(date);
-                                    EquipRelation wenDu = getWsdRange(twksbpzb.getDeviceNo_(),"温度");
                                     if (wenDu != null){
                                         bx.setWenduUp(wenDu.getHigh_());
                                         bx.setWenduDown(wenDu.getLow_());
@@ -115,8 +116,8 @@ public class VendorBinxiangRepository {
                                         bx.setType(wenDu.getDeviceType_());
                                         bx.setArea(wenDu.getArea_());
                                         bx.setDiDian(wenDu.getDiDian_());
+                                        bx.setRoom(wenDu.getRoom_());
                                     }
-                                    EquipRelation shiDu = getWsdRange(twksbpzb.getDeviceNo_(),"湿度");
                                     if (shiDu != null){
                                         bx.setShiduUp(shiDu.getHigh_());
                                         bx.setShiduDown(shiDu.getLow_());
@@ -125,6 +126,7 @@ public class VendorBinxiangRepository {
                                         bx.setType(shiDu.getDeviceType_());
                                         bx.setArea(shiDu.getArea_());
                                         bx.setDiDian(shiDu.getDiDian_());
+                                        bx.setRoom(shiDu.getRoom_());
                                     }
                                     bxSet.add(bx);
                                 }
@@ -143,7 +145,6 @@ public class VendorBinxiangRepository {
                                     bx.setCaiJiId(channel.getString("serial"));
                                     bx.setCaiJiName(twksbpzb.getDeviceName_());
                                     bx.setCaiJiTime(date);
-                                    EquipRelation wenDu = getWsdRange(twksbpzb.getDeviceNo_(),"温度");
                                     if (wenDu != null){
                                         bx.setWenduUp(wenDu.getHigh_());
                                         bx.setWenduDown(wenDu.getLow_());
@@ -152,6 +153,7 @@ public class VendorBinxiangRepository {
                                         bx.setType(wenDu.getDeviceType_());
                                         bx.setArea(wenDu.getArea_());
                                         bx.setDiDian(wenDu.getDiDian_());
+                                        bx.setRoom(wenDu.getRoom_());
                                         bxSet.add(bx);
                                     }
                                 }
@@ -179,6 +181,7 @@ public class VendorBinxiangRepository {
                 er.setDeptId_(rs.getString("dept_id_"));
                 er.setDeptName_(rs.getString("dept_name_"));
                 er.setDiDian_(rs.getString("di_dian_"));
+                er.setRoom_(rs.getString("room_"));
                 return er;
             });
         } catch (Exception e) {