[task-1834]【七院】-冰箱温度监控优化

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

@@ -1,5 +1,6 @@
 package com.lc.ibps.platform.plan.job;
 
+import com.lc.ibps.base.core.constants.StringPool;
 import com.lc.ibps.base.core.util.AppUtil;
 import com.lc.ibps.base.core.util.BeanUtils;
 import com.lc.ibps.base.core.util.JacksonUtil;
@@ -57,18 +58,23 @@ public class BinXiangJob extends AbstractJob {
                 List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(bxSql);
                 if (BeanUtils.isNotEmpty(list)){
                     int control = 0;
+                    StringBuilder beiZhu = new StringBuilder();
                     for (Map<String,Object> map : list){
                         double wenDu = Double.parseDouble(map.get("wen_du_").toString());
                         double max = Double.parseDouble(map.get("wen_du_shang_xian").toString());
                         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");
                         }else {
                             control=0;
                         }
                         if (control==4){
                             //如果有，走温度失控流程。  设施环境处理--设施环境监控--设施环境失控与处理
-                            addWenDuSkData(map.get("she_bei_bian_hao_").toString(),map.get("dept_id_").toString());
+                            String caiJiShiJian = StringUtil.defaultString(map.get("cai_ji_shi_jian_").toString(),"");
+                            String sheBeiBianHao = StringUtil.defaultString(map.get("she_bei_bian_hao_").toString(),"");
+                            String deptId = StringUtil.defaultString(map.get("dept_id_").toString(),"");
+                            addWenDuSkData( sheBeiBianHao , deptId , beiZhu.toString() , uncontrolTimes , caiJiShiJian);
                             break;
                         }
                     }
@@ -78,7 +84,7 @@ public class BinXiangJob extends AbstractJob {
         startFlowStep();
     }
 
-    private void addWenDuSkData(String sheBeiBianHao,String deptId) throws Exception {
+    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_";
         roomSql = String.format(roomSql,sheBeiBianHao);
@@ -88,7 +94,7 @@ public class BinXiangJob extends AbstractJob {
             data.put("id_", UniqueIdUtil.getId());
             data.put("create_time_", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             data.put("bian_zhi_shi_jian", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            data.put("fa_xian_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_"));
@@ -96,7 +102,7 @@ public class BinXiangJob extends AbstractJob {
             data.put("fang_jian_id_", room.get("fang_jian_id_"));
             data.put("fang_jian_", room.get("fang_jian_ming_"));
             data.put("jie_guo_", "是");
-            data.put("qing_kuang_", "原设备编号为："+sheBeiBianHao+"的设备连续4个时间点温度失控");
+            data.put("qing_kuang_", "原设备编号为："+sheBeiBianHao+"的设备连续"+uncontrolTimes+"个时间点温度失控，\n失控记录：\n"+beiZhu);
             data.put("shi_fou_guo_shen_", "待分析处理");
             commonDao.execute(this.buildInsertSql(data,skTable));
         }
@@ -135,7 +141,7 @@ public class BinXiangJob extends AbstractJob {
                     String pId = UniqueIdUtil.getId();
                     String sheBeiId = StringUtil.defaultString(map.get("she_bei_bian_hao_").toString(),"");
 
-                    String eqSql = "  select b.deviceno1_ she_bei_bian_hao_,b.devicename1_ she_bei_ming_cheng_,b.di_dian_," +
+                    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";
                     eqSql = String.format(eqSql,sheBeiId);
@@ -157,6 +163,7 @@ public class BinXiangJob extends AbstractJob {
                         }
                         // 添加子表数据
                         double max = Double.parseDouble(map.get("wen_du_shang_xian").toString());
+                        double min = Double.parseDouble(map.get("wen_du_xia_xian_").toString());
                         String wenDu = StringUtil.defaultString(map.get("wen_du_").toString(),"");
                         if (max>0){
                             data.put("leng_cang_wen_du_", wenDu);
@@ -173,6 +180,11 @@ public class BinXiangJob extends AbstractJob {
                         data.put("qu_yu_ming_cheng_", quYuMingCheng);
                         data.put("fang_jian_", fangJian);
                         data.put("shi_fou_guo_shen_", "已完成");
+                        data.put("wen_kong_zhi_fan_", min + StringPool.DASH + 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("bian_zhi_ren_", "1");
+                        data.put("bei_zhu_", sheBeiId+map.get("she_bei_ming_cheng_")+":采集时间:"+ map.get("cai_ji_shi_jian_") + "，温度："+ wenDu + "℃");
                         commonDao.execute(buildInsertSql(data,"t_bxwdjkjlb"));
                     }
                 }