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

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

@@ -11,7 +11,6 @@ import com.lc.ibps.base.saas.token.ITenantTokenService;
 import com.lc.ibps.base.web.context.ContextUtil;
 import com.lc.ibps.bpmn.api.IBpmInstService;
 import com.lc.ibps.cloud.entity.APIResult;
-import com.lc.ibps.components.quartz.BaseJob2;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
@@ -31,13 +30,17 @@ 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 String skTable = "t_sshjskycljlb";
+    private static final String skTable = "t_sshjskycljlb";
+    public static final String ENABLE_SKLC = "enable-sklc";
 
     @Override
     public void executeJob(JobExecutionContext context) throws Exception {
         Map<String, Object> objectMap = buildQueryParam(context);
-        //检查失控数据
-        checkUncontrolBx((String)objectMap.get(UNCONTROL_TIMES));
+
+        if ("true".equals(objectMap.get(ENABLE_SKLC))){
+            //检查失控数据
+            checkUncontrolBx((String)objectMap.get(UNCONTROL_TIMES));
+        }
 
         //创建日记录
         createDailyRecord((String[])objectMap.get(PLAN_TIME));
@@ -164,12 +167,17 @@ 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(),"");
+                        double wenDu = Double.parseDouble(map.get("wen_du_").toString());
                         if (max>0){
                             data.put("leng_cang_wen_du_", wenDu);
                         }else {
                             data.put("leng_dong_wen_du_", wenDu);
                         }
+                        if (wenDu>max || wenDu<min){
+                            data.put("shi_kong_zhuang_t","失控");
+                        }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(),"");
@@ -180,7 +188,7 @@ 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("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("bian_zhi_ren_", "1");
@@ -208,9 +216,14 @@ public class BinXiangJob extends AbstractJob {
         if(StringUtil.isNotBlank(dataMap.getString(UNCONTROL_TIMES))){
             uncontrolTimes = dataMap.getString(UNCONTROL_TIMES);
         }
+        String enableSk = "false";
+        if(StringUtil.isNotBlank(dataMap.getString(ENABLE_SKLC))){
+            enableSk = dataMap.getString(ENABLE_SKLC);
+        }
         HashMap map = new HashMap<String,Object>();
         map.put(PLAN_TIME,planTime);
         map.put(UNCONTROL_TIMES,uncontrolTimes);
+        map.put(ENABLE_SKLC,enableSk);
         return map;
     }
 }