Merge remote-tracking branch 'origin/matser' into matser

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

@@ -1,6 +1,5 @@
 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;
@@ -168,8 +167,10 @@ public class BinXiangJob extends AbstractJob {
                         double wenDu = Double.parseDouble(map.get("wen_du_").toString());
                         if (max>0){
                             data.put("leng_cang_wen_du_", wenDu);
+                            data.put("cang_wen_xiu_", wenDu);
                         }else if (max<0){
                             data.put("leng_dong_wen_du_", wenDu);
+                            data.put("dong_wen_xiu_", wenDu);
                         }
                         if (wenDu>max || wenDu<min){
                             data.put("shi_kong_zhuang_t","失控");
@@ -192,8 +193,10 @@ public class BinXiangJob extends AbstractJob {
                         data.put("shi_ji_shi_jian_", caiJiShiJian);
                         data.put("gang_wei_", gangWei);
                         data.put("bian_zhi_ren_", "1");
-                        data.put("bei_zhu_", sheBeiId + sheBeiMingCheng+"，采集时间："+ caiJiShiJian + "，温度："+ wenDu + "℃");
+                        //data.put("bei_zhu_", sheBeiId + sheBeiMingCheng+"，采集时间："+ caiJiShiJian + "，温度："+ wenDu + "℃");
                         data.put("config_id_", subId);
+                        data.put("yue_ri_qi_", new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                        data.put("shi_jian_shi_fen_", new SimpleDateFormat("HH:mm").format(new Date()));
                         commonDao.execute(buildInsertSql(data,"t_bxwdjkjlb"));
                     }
                 }