From 74b5d60307823de027c220d9a5e98ce6104822aa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 09:12:55 +0800
Subject: [PATCH] 汉字“整点”改为"定点"，为了以后兼容王江海制定的协议
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java | 4 ++--
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml | 2 +-
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index c8e5bc5..3cdd850 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -68,9 +68,9 @@
private RmTimingReportLastMapper rmTimingReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
@Autowired
- private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 鏁寸偣涓婃姤鍘嗗彶鏁版嵁DAO
+ private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 瀹氱偣涓婃姤鍘嗗彶鏁版嵁DAO
@Autowired
- private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
+ private RmOnHourReportLastMapper rmOnHourReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
//@Autowired
@@ -268,12 +268,12 @@
/////////////////////////////////////////////////
//
- // 鏁寸偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
+ // 瀹氱偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
//
////////////////////////////////////////////////
/**
- * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ュ巻鍙叉暟鎹�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ュ巻鍙叉暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -282,7 +282,7 @@
}
/**
- * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
+ * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇瀹氱偣涓婃姤鏈�鏂版暟鎹�
* @param intakeId
* @return
*/
@@ -296,7 +296,7 @@
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ユ渶鏂版暟鎹�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ユ渶鏂版暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -305,7 +305,7 @@
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ョ姜琛屾暟鎹�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ョ姜琛屾暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java
index 5e8dc51..ba8c3b0 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java
@@ -22,7 +22,7 @@
* @Author liurunyu
* @Date 2024/1/16 14:11
* @LastEditTime 2024/1/16 14:11
- * @Description 鎺у埗鍣ㄨ嚜鎶ュ疄鏃舵暟鎹紙鍔熻兘鐮佷负C0锛夛紙鏁寸偣涓婃姤锛�
+ * @Description 鎺у埗鍣ㄨ嚜鎶ュ疄鏃舵暟鎹紙鍔熻兘鐮佷负C0锛夛紙瀹氱偣涓婃姤锛�
*/
public class TkDealOnHourReport extends TaskSurpport {
@@ -47,7 +47,7 @@
try{
this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, (DataCdC0Vo)cdObj);
}catch (Exception e){
- log.error("淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ユ暟鎹椂鍙戠敓寮傚父", e);
+ log.error("淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ユ暟鎹椂鍙戠敓寮傚父", e);
}
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
index 5068328..3e4b00d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
@@ -18,7 +18,7 @@
<task id="TkDealAlarmStatus" name="鎺у埗鍣ㄦ姤璀︿笌鐘舵�佸強鍚戦拤閽夊彂閫佹姤璀︿俊鎭�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealAlarmStatus">
<task id="TkDealVirCardState" name="铏氭嫙鍗″崰鐢ㄧ姸鎬佹仮澶�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealVirCardState" />
</task>
- <task id="TkDealOnHourReport" name="鎺у埗鍣ㄨ嚜鎶ユ暟鎹紙鏁寸偣鎶ワ級(鍔熻兘鐮丆0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealOnHourReport" />
+ <task id="TkDealOnHourReport" name="鎺у埗鍣ㄨ嚜鎶ユ暟鎹紙瀹氱偣鎶ワ級(鍔熻兘鐮丆0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealOnHourReport" />
<task id="TkDealWorkReport" name="鎺у埗鍣ㄩ榾寮�宸ヤ綔涓婃姤(鍔熻兘鐮�84)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealWorkReport" />
<task id="TkDealOpenValveReport" name="鎺у埗鍣ㄥ紑闃�涓婃姤(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealOpenValveReport" />
<task id="TkDealCloseValveReport" name="鎺у埗鍣ㄥ叧闃�涓婃姤(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealCloseValveReport" />
--
Gitblit v1.8.0