|
@@ -585,7 +585,8 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
|
|
|
ca.add(Calendar.HOUR_OF_DAY, -8);
|
|
|
qck = sf.format(ca.getTime());
|
|
|
}else if(timegranid.equalsIgnoreCase("DAY")){
|
|
|
- qck = clock + " 00";
|
|
|
+ // 数据丛1点对一点
|
|
|
+ qck = clock + " 01";
|
|
|
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
|
|
|
Date end = new Date();
|
|
|
try {
|
|
@@ -598,7 +599,8 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
|
|
|
ca.add(Calendar.DAY_OF_YEAR, 1);
|
|
|
qmk = sf.format(ca.getTime());
|
|
|
}else if(timegranid.equalsIgnoreCase("MONTH")){
|
|
|
- qck = clock + "-01 00";
|
|
|
+ // 数据丛1点对一点
|
|
|
+ qck = clock + "-01 01";
|
|
|
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
|
|
|
Date end = new Date();
|
|
|
try {
|
|
@@ -611,7 +613,8 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
|
|
|
ca.add(Calendar.MONTH, 1);
|
|
|
qmk = sf.format(ca.getTime());
|
|
|
}else if(timegranid.equalsIgnoreCase("YEAR")){
|
|
|
- qck = clock + "-01-01 00";
|
|
|
+ // 数据丛1点对一点
|
|
|
+ qck = clock + "-01-01 01";
|
|
|
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH");
|
|
|
Date end = new Date();
|
|
|
try {
|
|
@@ -937,7 +940,8 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
|
|
|
String sql2 = "select qm from (select nvl(round("+tagCol+", "+digits2+"),0) qm from "+tagTable + "_ORG where clock>= ? and clock<= ? order by clock desc) where rownum=1";
|
|
|
if(tagTable != null && tagCol!=null && !tagTable.trim().isEmpty() && !tagCol.trim().isEmpty()){
|
|
|
try {
|
|
|
- qc = jdbcTemplate.queryForObject(sqlqc, new Object[]{qc_clk + " 00"}, Double.class);
|
|
|
+ // 数据丛1点对一点
|
|
|
+ qc = jdbcTemplate.queryForObject(sqlqc, new Object[]{qc_clk + " 01"}, Double.class);
|
|
|
if(qc!=null && Math.abs(qc) > Integer.MAX_VALUE){
|
|
|
logger.error("仪表数值异常:" + qc);
|
|
|
qc = 0d;
|
|
@@ -947,7 +951,8 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
|
|
|
qc = tagBad;
|
|
|
}
|
|
|
try {
|
|
|
- qm = jdbcTemplate.queryForObject(sql2, new Object[]{qm_clk + " 00", qm_clk2 + " 00"}, Double.class);
|
|
|
+ // 数据丛1点对一点
|
|
|
+ qm = jdbcTemplate.queryForObject(sql2, new Object[]{qm_clk + " 01", qm_clk2 + " 01"}, Double.class);
|
|
|
if(qm!=null && Math.abs(qm) > Integer.MAX_VALUE){
|
|
|
logger.error("仪表数值异常:" + qm);
|
|
|
qm = 0d;
|
|
@@ -975,7 +980,8 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
|
|
|
}
|
|
|
// 当日期初
|
|
|
try {
|
|
|
- qc2 = jdbcTemplate.queryForObject(sqlqc, new Object[]{end + " 00"}, Double.class);
|
|
|
+ // 数据丛1点对一点
|
|
|
+ qc2 = jdbcTemplate.queryForObject(sqlqc, new Object[]{end + " 01"}, Double.class);
|
|
|
if(qc2!=null && Math.abs(qc2) > Integer.MAX_VALUE){
|
|
|
qc2 = 0d;
|
|
|
}
|