|
@@ -542,8 +542,8 @@ public class KprAimTapWaterBizFun {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("OPC_SC.HSS.HSS1.AI.LJLL1.F_CV".equals(tagTag) ||
|
|
|
|
- "OPC_SC.HSS.HSS1.AI.LJLL2.F_CV".equals(tagTag) ||
|
|
|
|
|
|
+ if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("SS.SSCOM.F36:2".equals(tagTag) ||
|
|
|
|
+ "SS.SSCOM.F36:5".equals(tagTag) ||
|
|
"OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(tagTag))) {
|
|
"OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(tagTag))) {
|
|
Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
|
|
Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
|
|
" WHERE TAG_CODE = '" + tagTag + "' " +
|
|
" WHERE TAG_CODE = '" + tagTag + "' " +
|
|
@@ -644,8 +644,8 @@ public class KprAimTapWaterBizFun {
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
// 解析字符串以创建 LocalDateTime 实例
|
|
// 解析字符串以创建 LocalDateTime 实例
|
|
LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
|
|
LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
|
|
- if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("OPC_SC.HSS.HSS1.AI.LJLL1.F_CV".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
- "OPC_SC.HSS.HSS1.AI.LJLL2.F_CV".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
|
|
+ if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("SS.SSCOM.F36:2".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
+ "SS.SSCOM.F36:5".equals(item.get("collcation_tag").toString()) ||
|
|
"OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
|
|
"OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
|
|
Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
|
|
Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
|
|
" WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
|
|
" WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
|
|
@@ -791,8 +791,8 @@ public class KprAimTapWaterBizFun {
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
// 解析字符串以创建 LocalDateTime 实例
|
|
// 解析字符串以创建 LocalDateTime 实例
|
|
LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
|
|
LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
|
|
- if (dateTime.getHour()==1&&("OPC_SC.HSS.HSS1.AI.LJLL1.F_CV".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
- "OPC_SC.HSS.HSS1.AI.LJLL2.F_CV".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
|
|
+ if (dateTime.getHour()==1&&("SS.SSCOM.F36:2".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
+ "SS.SSCOM.F36:5".equals(item.get("collcation_tag").toString()) ||
|
|
"OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
|
|
"OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
|
|
Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
|
|
Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
|
|
" WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
|
|
" WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
|
|
@@ -1137,8 +1137,8 @@ public class KprAimTapWaterBizFun {
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
// 解析字符串以创建 LocalDateTime 实例
|
|
// 解析字符串以创建 LocalDateTime 实例
|
|
LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
|
|
LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
|
|
- if (dateTime.getHour()==1&&("OPC_SC.HSS.HSS1.AI.LJLL1.F_CV".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
- "OPC_SC.HSS.HSS1.AI.LJLL2.F_CV".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
|
|
+ if (dateTime.getHour()==1&&("SS.SSCOM.F36:2".equals(item.get("collcation_tag").toString()) ||
|
|
|
|
+ "SS.SSCOM.F36:5".equals(item.get("collcation_tag").toString()) ||
|
|
"OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
|
|
"OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
|
|
Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
|
|
Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
|
|
" WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
|
|
" WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
|