水修改为0-0点采集数据

src/main/java/com/steerinfo/ems/trmcalpointvalue/service/impl/TRmCalpointValueServiceImpl.java

@@ -213,7 +213,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 				Short digits2 = tRmCalpoint.getMeterScale() == null ? 4 : tRmCalpoint.getMeterScale(); // 准点值精度
 				Double qc = 0d; // 仪表期初值
 				Double qm = 0d; // 仪表期末值
-				
+
 				// 班时间粒度该项目数据是否已经存在
 				String sql = "select count(1) from T_RM_CALPOINT_VALUE where clock = ? and timegranid='SHIFT' and itemid = ?";
 				int c = jdbcTemplate.queryForObject(sql, new Object[]{clock,itemid}, Integer.class);
@@ -318,7 +318,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 			Calendar cal = Calendar.getInstance();
 			cal.add(Calendar.HOUR_OF_DAY, -1);
 			cal.add(Calendar.MINUTE, -1);
-			
+
 			// 当月，统计最后时间为昨天
 			if(new SimpleDateFormat("yyyy-MM").format(cal.getTime()).equals(clock.substring(0, 7))){
 				endDay = cal.getTime();
@@ -332,7 +332,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 				endDay = c.getTime();
 			}
 			while(!startDay.after(endDay)){
-				// 统计结束时间 
+				// 统计结束时间
 				String clk = sf.format(startDay);
 				int st = Integer.valueOf(clk.substring(11));
 				// 0点数据转成班记录24点，clock
@@ -587,7 +587,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 			}else if(timegranid.equalsIgnoreCase("DAY")){
 				// 数据丛1点对一点
 				qck = clock + " 01";
-				if(energytypeid.equalsIgnoreCase("E")){
+				if(energytypeid.equalsIgnoreCase("E")||energytypeid.equalsIgnoreCase("W")){
 					qck = clock + " 00";
 				}
 				SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
@@ -604,7 +604,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 			}else if(timegranid.equalsIgnoreCase("MONTH")){
 				// 数据丛1点对一点
 				qck = clock + "-01 01";
-				if(energytypeid.equalsIgnoreCase("E")){
+				if(energytypeid.equalsIgnoreCase("E")||energytypeid.equalsIgnoreCase("W")){
 					qck = clock + "-01 00";
 				}
 				SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
@@ -621,7 +621,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 			}else if(timegranid.equalsIgnoreCase("YEAR")){
 				// 数据丛1点对一点
 				qck = clock + "-01-01 01";
-				if(energytypeid.equalsIgnoreCase("E")){
+				if(energytypeid.equalsIgnoreCase("E")||energytypeid.equalsIgnoreCase("W")){
 					qck = clock + "-01-01 00";
 				}
 				SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
@@ -976,7 +976,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 				try {
 					// 数据丛1点对一点
 					qc = jdbcTemplate.queryForObject(sqlqc, new Object[]{qc_clk + " 01"}, Double.class);
-					if(energytypeid.equalsIgnoreCase("E")){
+					if(energytypeid.equalsIgnoreCase("E")||energytypeid.equalsIgnoreCase("W")){
 						qc = jdbcTemplate.queryForObject(sqlqc, new Object[]{qc_clk + " 00"}, Double.class);
 					}
 					if(qc!=null && Math.abs(qc) > Integer.MAX_VALUE){
@@ -990,7 +990,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 				try {
 					// 数据丛1点对一点
 					qm = jdbcTemplate.queryForObject(sql2, new Object[]{qm_clk + " 01", qm_clk2 + " 01"}, Double.class);
-					if(energytypeid.equalsIgnoreCase("E")){
+					if(energytypeid.equalsIgnoreCase("E")||energytypeid.equalsIgnoreCase("W")){
 						qm = jdbcTemplate.queryForObject(sql2, new Object[]{qm_clk + " 00", qm_clk2 + " 00"}, Double.class);
 					}
 					if(qm!=null && Math.abs(qm) > Integer.MAX_VALUE){
@@ -1022,7 +1022,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 				try {
 					// 数据丛1点对一点
 					qc2 = jdbcTemplate.queryForObject(sqlqc, new Object[]{end + " 01"}, Double.class);
-					if(energytypeid.equalsIgnoreCase("E")){
+					if(energytypeid.equalsIgnoreCase("E")||energytypeid.equalsIgnoreCase("W")){
 						qc2 = jdbcTemplate.queryForObject(sqlqc, new Object[]{end + " 00"}, Double.class);
 					}
 					if(qc2!=null && Math.abs(qc2) > Integer.MAX_VALUE){