物料数据采集(物料X)，更改实绩产量逻辑，更改原材料逻辑，更改计量小时逻辑(加入物料X)，更改计量日逻辑(加入物料X)

src/main/java/com/steerinfo/ems/rttable/mapper/RttableMapper.xml

@@ -286,7 +286,7 @@
     SELECT p.ALTID,p.RTVALUE,BTYPE2 AS NOTE
     FROM T_RM_CALPOINT c
     INNER JOIN RTTABLE p ON c.TAGID = p.ALTID
-    AND c.ENERGYTYPEID = 'P' AND c.ITEMTYPE='AUTO'  AND c.USEFLAG = '1' AND RTVALUE IS NOT NULL
+    AND c.ENERGYTYPEID  IN ('P','X') AND c.ITEMTYPE='AUTO'  AND c.USEFLAG = '1' AND RTVALUE IS NOT NULL
   </select>
   <select id="selectElectricAltId" resultMap="BaseResultMap">
     SELECT p.ALTID,p.RTVALUE,BTYPE2 AS NOTE

src/main/java/com/steerinfo/ems/trmcalpoint/service/impl/TRmCalpointServiceImpl.java

@@ -322,7 +322,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
         Map<String, Object> m = new HashMap<String, Object>();
         m.put("useflag", "1");
         m.put("itemtype", "AUTO");
-        m.put("energytypeid", "'P','W'");
+        m.put("energytypeid", "'P','W','X'");
         //业务变更，暂时只读取动力
         //m.put("energytypeid", "'P'");
         List<TRmCalpoint> l = tRmCalpointMapper.selectLikeByParameters(m);
@@ -522,7 +522,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
         Map<String, Object> m = new HashMap<String, Object>();
         m.put("useflag", "1");
         m.put("itemtype", "AUTO");
-        m.put("energytypeid", "'P','W'");
+        m.put("energytypeid", "'P','W','X'");
         //业务变更，暂时只读取动力
         //m.put("energytypeid", "'P'");
         List<TRmCalpoint> l = tRmCalpointMapper.selectLikeByParameters(m);
@@ -690,7 +690,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
         if (!tc.getItemtype().equalsIgnoreCase("AUTO")) {
             return "只计算自动采集计量点";
         }
-        if (!tc.getEnergytypeid().equalsIgnoreCase("W") && !tc.getEnergytypeid().equalsIgnoreCase("P")) {
+        if (!tc.getEnergytypeid().equalsIgnoreCase("W") && !tc.getEnergytypeid().equalsIgnoreCase("P") && !tc.getEnergytypeid().equalsIgnoreCase("X")) {
             return "只计算水、动力计量点";
         }
         Date date = new Date();
@@ -1014,7 +1014,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                 m = new HashMap<String, Object>();
                 m.put("useflag", "1");
                 m.put("itemtype", "AUTO");
-                m.put("energytypeid", "'P','W'");
+                m.put("energytypeid", "'P','W','X'");
             } else {
                 m = new HashMap<String, Object>();
                 m.put("itemid", itemid);

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/controller/TRmWorkprocMaterialValueController.java

@@ -254,9 +254,6 @@ public class TRmWorkprocMaterialValueController extends BaseRESTfulController {
 			TRmWorkprocMaterial t = l.get(i);
 			res = formulaService.reItemVal(t.getItemid(),clock,timegranid,clocke);
 		}
-        //根据报表中的原料数据生成
-        //tRmWorkprocMaterialValueService.getReportValue(parmas);
-        tRmWorkprocMaterialValueService.getMaterialValue(parmas);
 		if(!res.isEmpty()){
 			return failed(null, res);
 		}

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/service/impl/TRmWorkprocMaterialValueServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 /**
@@ -755,6 +756,18 @@ public class TRmWorkprocMaterialValueServiceImpl extends BaseServiceImpl<TRmWork
     	this.synchronousData4();
     	this.synchronousData5();
     	Calendar calendar = Calendar.getInstance();
+			//region 新的业务逻辑，从报表获取数据。
+			//这里是傻逼bug，YYYY-MM-dd 将本周定位下一年。yyyy-MM-dd 是将以天作为年期限。
+			DateFormat dateForm = new SimpleDateFormat("yyyy-MM-dd");
+			calendar.set(Calendar.HOUR_OF_DAY, -24 * 7);
+			HashMap<String, Object> hs = new HashMap<>(8);
+			hs.put("clock", dateForm.format(calendar.getTime()));
+			calendar.set(Calendar.HOUR_OF_DAY, 24 * 6);
+			hs.put("clocke", dateForm.format(calendar.getTime()));
+			//根据报表中的产量数据生成
+			hs.put("useflag", "1");
+			this.getMaterialValue(hs);
+			//endregion
     	calendar.setTime(date);
         // 获取项目信息-用于每日计算
         Set<TRmWorkprocMaterial> models = tRmWorkprocMaterialService.getIdAndDigits();

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/controller/TRmWorkprocProductValueController.java

@@ -440,9 +440,6 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
 			TRmWorkprocProduct t = l.get(i);
 			res = formulaService.reItemVal(t.getItemid(),clock,timegranid,clocke);
 		}
-        //根据报表中的产量数据生成
-        tRmWorkprocProductValueService.getReportValue(parmas);
-        tRmWorkprocProductValueService.getReportProductValue(parmas);
 		if(!res.isEmpty()){
 			return failed(null, res);
 		}

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/service/impl/TRmWorkprocProductValueServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -681,6 +682,19 @@ public class TRmWorkprocProductValueServiceImpl extends BaseServiceImpl<TRmWorkp
     	this.synchronousData();
     	//this.synchronousOrderData();
     	Calendar calendar = Calendar.getInstance();
+		//region 新的业务逻辑，从报表获取数据。
+		//这里是傻逼bug，YYYY-MM-dd 将本周定位下一年。yyyy-MM-dd 是将以天作为年期限。
+		DateFormat dateForm = new SimpleDateFormat("yyyy-MM-dd");
+		calendar.set(Calendar.HOUR_OF_DAY, -24 * 7);
+		HashMap<String, Object> hs = new HashMap<>(8);
+		hs.put("clock", dateForm.format(calendar.getTime()));
+		calendar.set(Calendar.HOUR_OF_DAY, 24 * 6);
+		hs.put("clocke", dateForm.format(calendar.getTime()));
+		//根据报表中的产量数据生成
+		hs.put("useflag", "1");
+		this.getReportValue(hs);
+		this.getReportProductValue(hs);
+		//endregion
     	calendar.setTime(date);
         // 获取项目信息-用于每日计算,包括实绩与计划
         List<TRmWorkprocProduct> models = tRmWorkprocProductService.getIdAndDigits("");

src/main/java/com/steerinfo/task/SpringCronTask.java

@@ -46,9 +46,7 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.stereotype.Service;
 
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
@@ -253,20 +251,6 @@ public class SpringCronTask implements SchedulingConfigurer{
 					}
 					tRmWorkprocProductValueService.setDate(new Date()); // 产品实绩产量、产品计划数据维护
 					tRmWorkprocMaterialValueService.setDate(new Date()); // 原材料数据维护
-					 //新的业务逻辑，从报表获取数据。
-					 //这里是傻逼bug，YYYY-MM-dd 将本周定位下一年。yyyy-MM-dd 是将以天作为年期限。
-					 DateFormat dateForm = new SimpleDateFormat("yyyy-MM-dd");
-					 Calendar calendar=Calendar.getInstance();
-					 calendar.set(Calendar.HOUR_OF_DAY,-24*7);
-					 HashMap<String,Object> hs =new HashMap<>(8);
-					 hs.put("clock",dateForm.format(calendar.getTime()));
-					 calendar.set(Calendar.HOUR_OF_DAY,24*6);
-					 hs.put("clocke", dateForm.format(calendar.getTime()));
-					 //根据报表中的产量数据生成
-					 hs.put("useflag", "1");
-					 tRmWorkprocProductValueService.getReportValue(hs);
-					 tRmWorkprocProductValueService.getReportProductValue(hs);
-					 tRmWorkprocMaterialValueService.getMaterialValue(hs);
 					logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");
 				}
 				else if (taskId.equalsIgnoreCase("119")) {
@@ -311,7 +295,7 @@ public class SpringCronTask implements SchedulingConfigurer{
 						 logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");
 				 }
 				 else if(taskId.equalsIgnoreCase("116")){
-					// 动力、水(计量点)小时表定时统计（自动补全24小时内的小时用量值）
+					// 动力、水、物料(计量点)小时表定时统计（自动补全24小时内的小时用量值）
 					long start = System.currentTimeMillis();
 					tRmCalpointService.statHourData();
 					////水计量点统计，获取水系统历史数据，弃用,数据不准确