电计量点改为0点到0点

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

@@ -587,6 +587,9 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 			}else if(timegranid.equalsIgnoreCase("DAY")){
 				// 数据丛1点对一点
 				qck = clock + " 01";
+				if(energytypeid.equalsIgnoreCase("E")){
+					qck = clock + " 00";
+				}
 				SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
 				Date end = new Date();
 				try {
@@ -601,6 +604,9 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 			}else if(timegranid.equalsIgnoreCase("MONTH")){
 				// 数据丛1点对一点
 				qck = clock + "-01 01";
+				if(energytypeid.equalsIgnoreCase("E")){
+					qck = clock + "-01 00";
+				}
 				SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
 				Date end = new Date();
 				try {
@@ -615,6 +621,9 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 			}else if(timegranid.equalsIgnoreCase("YEAR")){
 				// 数据丛1点对一点
 				qck = clock + "-01-01 01";
+				if(energytypeid.equalsIgnoreCase("E")){
+					qck = clock + "-01-01 00";
+				}
 				SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
 				Date end = new Date();
 				try {
@@ -967,6 +976,9 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 				try {
 					// 数据丛1点对一点
 					qc = jdbcTemplate.queryForObject(sqlqc, new Object[]{qc_clk + " 01"}, Double.class);
+					if(energytypeid.equalsIgnoreCase("E")){
+						qc = jdbcTemplate.queryForObject(sqlqc, new Object[]{qc_clk + " 00"}, Double.class);
+					}
 					if(qc!=null && Math.abs(qc) > Integer.MAX_VALUE){
 						logger.error("仪表数值异常：" + qc);
 						qc = 0d;
@@ -978,6 +990,9 @@ 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")){
+						qm = jdbcTemplate.queryForObject(sql2, new Object[]{qm_clk + " 00", qm_clk2 + " 00"}, Double.class);
+					}
 					if(qm!=null && Math.abs(qm) > Integer.MAX_VALUE){
 						logger.error("仪表数值异常：" + qm);
 						qm = 0d;
@@ -1007,6 +1022,9 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
 				try {
 					// 数据丛1点对一点
 					qc2 = jdbcTemplate.queryForObject(sqlqc, new Object[]{end + " 01"}, Double.class);
+					if(energytypeid.equalsIgnoreCase("E")){
+						qc2 = jdbcTemplate.queryForObject(sqlqc, new Object[]{end + " 00"}, Double.class);
+					}
 					if(qc2!=null && Math.abs(qc2) > Integer.MAX_VALUE){
 						qc2 = 0d;
 					}