大宗煤气热值的名称修改。从三电厂，高焦转-》计量高焦转

src/main/java/com/steerinfo/ems/dzmaterialsf/service/impl/DzMaterialSfServiceImpl.java

@@ -55,16 +55,21 @@ public class DzMaterialSfServiceImpl extends CBaseServiceImpl<DzMaterialSf, Stri
             DzMaterialSf model;
             HashMap<String, Object> hashMap = new HashMap<>();
             for (DzMaterialSf dzMaterialSf : dzMaterialSfList){
-                if(dzMaterialSf.getCinvccode() == null || ("").equals(dzMaterialSf.getCinvccode())) {
-                    dzMaterialSf.setCinvccode("0");
-                }
-                dzMaterialSf.setReadtime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                dzMaterialSf.setUpdateman("系统");
-                dzMaterialSf.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                if(dzMaterialSfMapper.updateByPrimaryKeySelective(dzMaterialSf)==0){
-                    dzMaterialSf.setCreateman("系统");
-                    dzMaterialSf.setCreatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                    addSize+= dzMaterialSfMapper.insertSelective(dzMaterialSf);
+                try {
+                    if(dzMaterialSf.getCinvccode() == null || ("").equals(dzMaterialSf.getCinvccode())) {
+                        dzMaterialSf.setCinvccode("0");
+                    }
+                    dzMaterialSf.setReadtime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+                    dzMaterialSf.setUpdateman("系统");
+                    dzMaterialSf.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+                    if(dzMaterialSfMapper.updateByPrimaryKeySelective(dzMaterialSf)==0){
+                        dzMaterialSf.setCreateman("系统");
+                        dzMaterialSf.setCreatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+                        addSize+= dzMaterialSfMapper.insertSelective(dzMaterialSf);
+                    }
+                } catch (Exception e) {
+                    logger.info("本次大宗物料收发数据出错" );
+                    e.printStackTrace();
                 }
             }
         } catch (Exception e) {

src/main/java/com/steerinfo/ems/foldthevalues/mapper/FoldTheValuesMapper.xml

@@ -364,15 +364,15 @@
   <!---->
   <select id="getNewData" resultMap="BaseResultMap">
   select t.batchno as id,
-          '三电厂' as materialsource,
+          POWERMONITORNAME as materialsource,
           to_char(to_date(t.monitordate, 'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd') as clock,
           t.monitoringvalue as estimatedvalue,
           (t.MONITORINGVALUE * 0.03412 / 100) as code,
           t.powersystemname as materialno
      from t_cm_0348 t
     where t.SITEM = 'BFHYD_05'
-      and t.powersystemname in ('P00006', 'P00007', 'P00008')
-      and t.powermonitorname in ('007', '008', '009')
+      and t.powersystemname in ('P00006', 'P00007', 'P00008','P00072', 'P00071', 'P00070')
+      --and t.powermonitorname in ('007', '008', '009')
       and t.batchno not in (select distinct ID from FOLD_THE_VALUES)
   </select>
   <!--获取最近最新的数据-->