[task-1860]设施环境冰箱修改

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/BinXiangJob.java

@@ -30,7 +30,6 @@ public class BinXiangJob extends AbstractJob {
     private ICommonDao<?> commonDao = AppUtil.getBean(ICommonDao.class);
     public static final String PLAN_TIME = "plan-time"; //default: 8,12,17
     public static final String UNCONTROL_TIMES = "uncontrol-times"; //default: 4
-    private static final String skTable = "t_sshjskycljlb";
     public static final String ENABLE_SKLC = "enable-sklc";
 
     @Override
@@ -68,7 +67,8 @@ public class BinXiangJob extends AbstractJob {
                         double min = Double.parseDouble(map.get("wen_du_xia_xian_").toString());
                         if (wenDu>max || wenDu<min){
                             control=control+1;
-                            beiZhu.append("采集时间：").append(map.get("cai_ji_shi_jian_")).append("，温度：").append(wenDu).append("℃，").append("温度范围：").append(min).append("~").append(max).append("℃；\n");
+                            beiZhu.append("采集时间：").append(map.get("cai_ji_shi_jian_")).append("，温度：").append(wenDu).
+                                    append("℃，").append("温度范围：").append(min).append("~").append(max).append("℃；\n");
                         }else {
                             control=0;
                         }
@@ -88,8 +88,7 @@ public class BinXiangJob extends AbstractJob {
     }
 
     private void addWenDuSkData(String sheBeiBianHao,String deptId , String beiZhu , String uncontrolTimes , String caiJiShiJian) throws Exception {
-        String roomSql = "  select b.deviceno1_,b.di_dian_,f.id_ fang_jian_id_,f.fang_jian_ming_,q.id_ qu_yu_id_,q.qu_yu_ming_cheng_ " +
-                " FROM t_sshjpzxq b,t_jjqfjb f,t_qypzb q where b.deviceno1_='%s' and b.fang_jian_id_=f.id_ and f.qu_yu_id_=q.id_";
+        String roomSql = " select v.deviceNo1,v.location,v.area,v.roomName,v.roomId FROM v_facs v where v.type='02-冰箱温度监控' and v.deviceNo1='%s' limit 1";
         roomSql = String.format(roomSql,sheBeiBianHao);
         Map<String,Object> room = commonDao.queryOne(roomSql);
         if (BeanUtils.isNotEmpty(room)){
@@ -99,15 +98,14 @@ public class BinXiangJob extends AbstractJob {
             data.put("bian_zhi_shi_jian", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             data.put("fa_xian_shi_jian_", caiJiShiJian);
             data.put("bian_zhi_bu_men_", deptId);
-            data.put("di_dian_", room.get("di_dian_"));
-            data.put("fa_sheng_qu_yu_", room.get("qu_yu_ming_cheng_"));
-            data.put("qu_yu_id_", room.get("qu_yu_id_"));
-            data.put("fang_jian_id_", room.get("fang_jian_id_"));
-            data.put("fang_jian_", room.get("fang_jian_ming_"));
+            data.put("di_dian_", room.get("location"));
+            data.put("fa_sheng_qu_yu_", room.get("area"));
+            data.put("fang_jian_id_", room.get("roomId"));
+            data.put("fang_jian_", room.get("roomName"));
             data.put("jie_guo_", "是");
             data.put("qing_kuang_", "原设备编号为："+sheBeiBianHao+"的设备连续"+uncontrolTimes+"个时间点温度失控，\n失控记录：\n"+beiZhu);
             data.put("shi_fou_guo_shen_", "待分析处理");
-            commonDao.execute(this.buildInsertSql(data,skTable));
+            commonDao.execute(this.buildInsertSql(data,"t_sshjskycljlb"));
         }
     }
 
@@ -144,14 +142,14 @@ public class BinXiangJob extends AbstractJob {
                     String pId = UniqueIdUtil.getId();
                     String sheBeiId = StringUtil.defaultString(map.get("she_bei_bian_hao_").toString(),"");
 
-                    String eqSql = "  select b.jian_ce_gang_wei_,b.deviceno1_ she_bei_bian_hao_,b.devicename1_ she_bei_ming_cheng_,b.di_dian_," +
-                            "f.id_ fang_jian_id_,f.fang_jian_ming_,f.fang_jian_ming_ha,q.id_ qu_yu_id_,q.qu_yu_ming_cheng_ " +
-                            "FROM t_sshjpzxq b,t_jjqfjb f,t_qypzb q where b.deviceno1_='%s' and b.fang_jian_id_=f.id_ and f.qu_yu_id_=q.id_ LIMIT 1";
+                    String eqSql = " select v.subId,v.position,v.deviceNo1,v.deviceName1,v.location,v.area,v.roomName,v.roomId " +
+                            " FROM v_facs v where v.type='02-冰箱温度监控' and v.deviceNo1='%s' LIMIT 1 ";
                     eqSql = String.format(eqSql,sheBeiId);
                     Map<String,Object> eqMap = commonDao.queryOne(eqSql);
                     if (BeanUtils.isNotEmpty(eqMap)){
-                        String diDian = StringUtil.defaultString(eqMap.get("di_dian_").toString(),"");
+                        String diDian = StringUtil.defaultString(eqMap.get("location").toString(),"");
                         String deptId = StringUtil.defaultString(map.get("dept_id_").toString(),"");
+                        String caiJiShiJian = StringUtil.defaultString(map.get("cai_ji_shi_jian_").toString(),"");
 
                         Map<String,Object> data = new HashMap<>();
                         data.put("id_", pId);
@@ -170,7 +168,7 @@ public class BinXiangJob extends AbstractJob {
                         double wenDu = Double.parseDouble(map.get("wen_du_").toString());
                         if (max>0){
                             data.put("leng_cang_wen_du_", wenDu);
-                        }else {
+                        }else if (max<0){
                             data.put("leng_dong_wen_du_", wenDu);
                         }
                         if (wenDu>max || wenDu<min){
@@ -178,9 +176,11 @@ public class BinXiangJob extends AbstractJob {
                         }else {
                             data.put("shi_kong_zhuang_t","正常");
                         }
-                        String quYuMingCheng = StringUtil.defaultString(eqMap.get("qu_yu_ming_cheng_").toString(),"");
-                        String sheBeiMingCheng = StringUtil.defaultString(eqMap.get("she_bei_ming_cheng_").toString(),"");
-                        String fangJian = StringUtil.defaultString(eqMap.get("fang_jian_ming_ha").toString(),"");
+                        String quYuMingCheng = StringUtil.defaultString(eqMap.get("area").toString(),"");
+                        String sheBeiMingCheng = StringUtil.defaultString(eqMap.get("deviceName1").toString(),"");
+                        String fangJian = StringUtil.defaultString(eqMap.get("roomName").toString(),"");
+                        String gangWei = StringUtil.defaultString(eqMap.get("position").toString(),"");
+                        String subId = StringUtil.defaultString(eqMap.get("subId").toString(),"");
                         data.put("id_", UniqueIdUtil.getId());
                         data.put("wai_jian_", pId);
                         data.put("bu_men_", deptId);
@@ -189,10 +189,11 @@ public class BinXiangJob extends AbstractJob {
                         data.put("fang_jian_", fangJian);
                         data.put("shi_fou_guo_shen_", "已完成");
                         data.put("wen_kong_zhi_fan_", min + "~" + max + "℃");
-                        data.put("shi_ji_shi_jian_", map.get("cai_ji_shi_jian_"));
-                        data.put("gang_wei_", StringUtil.defaultString(eqMap.get("jian_ce_gang_wei_").toString(),""));
+                        data.put("shi_ji_shi_jian_", caiJiShiJian);
+                        data.put("gang_wei_", gangWei);
                         data.put("bian_zhi_ren_", "1");
-                        data.put("bei_zhu_", sheBeiId+map.get("she_bei_ming_cheng_")+":采集时间:"+ map.get("cai_ji_shi_jian_") + "，温度："+ wenDu + "℃");
+                        data.put("bei_zhu_", sheBeiId + sheBeiMingCheng+"，采集时间："+ caiJiShiJian + "，温度："+ wenDu + "℃");
+                        data.put("config_id_", subId);
                         commonDao.execute(buildInsertSql(data,"t_bxwdjkjlb"));
                     }
                 }