From b3b17b231e2f2840332ce6eb96f791865fdec6d5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 14 四月 2025 16:38:16 +0800
Subject: [PATCH] 代码优化
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java
index c0f5409..185f239 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java
@@ -6,10 +6,15 @@
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory;
import com.dy.pipIrrGlobal.pojoRm.RmWorkReportLast;
+import com.dy.pipIrrGlobal.pojoSe.SeClient;
+import com.dy.rtuMw.server.ServerProperties;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* @Author: liurunyu
@@ -19,6 +24,8 @@
public class TkDealWorkingReportV202404 extends TaskSurpport {
private static final Logger log = LogManager.getLogger(TkDealWorkingReportV202404.class.getName());
+
+ private static final Map<String, Integer> RtuReportTimes = new HashMap<>();
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
public static final String taskId = "TkDealWorkingReportV202404";
@@ -34,16 +41,32 @@
DataV202404 dV202404 = (DataV202404)d.getSubData() ;
Object cdObj = dV202404.subData ;
//鍓嶉潰浠诲姟宸茬粡鍒ゆ柇cdObj涓嶄负null
- try {
- Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
- if (cdObj instanceof DataCd80_5BVo) {
- DataCd80_5BVo cdData = (DataCd80_5BVo) (cdObj);
- this.doDeal(sv, controller, d.getRtuAddr(), dV202404, (DataCd80_5BVo)cdObj);
+ if (cdObj instanceof DataCd80_5BVo) {
+ boolean deal = false ;
+ Integer times = RtuReportTimes.get(d.rtuAddr) ;
+ if(times == null){
+ times = 1 ;
+ RtuReportTimes.put(d.rtuAddr, times) ;
+ deal = true ;//绗竴娆�
+ }else{
+ times++ ;
+ if(times > ServerProperties.workReportDealOneByTimes){
+ times = 1 ;//寰幆绗竴娆�
+ deal = true ;
+ }
+ RtuReportTimes.put(d.rtuAddr, times) ;
}
- } catch (Exception e) {
- log.error("淇濆瓨澶勭悊鎺у埗鍣ㄥ伐浣滄姤鏁版嵁鏃跺彂鐢熷紓甯�", e);
+ if(deal){
+ try {
+ Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ SeClient clientVo = (SeClient)objs[3] ;//杩欎釜鍊煎璞′腑鍙湁id鍜宯ame浼氭湁鍊�
+ this.doDeal(sv, clientVo, controller, d.getRtuAddr(), dV202404, (DataCd80_5BVo)cdObj);
+ } catch (Exception e) {
+ log.error("澶勭悊淇濆瓨鎺у埗鍣ㄥ伐浣滄姤鏁版嵁鏃跺彂鐢熷紓甯�", e);
+ }
+ }
}
}
/**
@@ -54,29 +77,34 @@
* @param dataV202404 鍗忚鏁版嵁
* @param cdData 鍔熻兘鏁版嵁
*/
- private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd80_5BVo cdData) throws Exception {
- this.saveOrUpdateLast(sv, controller, rtuAddr, dataV202404, cdData);
- this.saveHistory(sv, controller, rtuAddr, dataV202404, cdData);
+ private void doDeal(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd80_5BVo cdData) throws Exception {
+ this.saveOrUpdateLast(sv, clientVo, controller, rtuAddr, dataV202404, cdData);
+ this.saveHistory(sv, clientVo, controller, rtuAddr, dataV202404, cdData);
}
/**
* 淇濆瓨鎴栨洿鏂版帶鍒跺櫒宸ヤ綔鎶ユ渶鏂版暟鎹�
* @param sv 鏈嶅姟bean
+ * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
* @param controller 鎺у埗鍣ㄥ璞�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @param dataV202404 鍗忚鏁版嵁
* @param cdData 鍔熻兘鏁版嵁
*/
- private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd80_5BVo cdData)throws Exception {
- RmWorkReportLast po = sv.getRmWorkReportLast(rtuAddr) ;
+ private void saveOrUpdateLast(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd80_5BVo cdData)throws Exception {
+ RmWorkReportLast po = sv.getRmWorkReportLast(controller.getIntakeId()) ;
if(po == null){
po = new RmWorkReportLast();
+ po.clientId = clientVo==null?null:clientVo.getId() ;
+ po.clientName = clientVo==null?null:clientVo.getName() ;
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.rtuAddr = rtuAddr;
po.valueFrom(dataV202404, cdData);
sv.saveRmWorkReportLast(po) ;
}else{
+ po.clientId = clientVo==null?null:clientVo.getId() ;
+ po.clientName = clientVo==null?null:clientVo.getName() ;
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.valueFrom(dataV202404, cdData);
@@ -87,13 +115,16 @@
/**
* 淇濆瓨鎺у埗鍣ㄥ伐浣滄姤鍘嗗彶鏁版嵁
* @param sv 鏈嶅姟bean
+ * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
* @param controller 鎺у埗鍣ㄥ璞�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @param dataV202404 鍗忚鏁版嵁
* @param cdData 鍔熻兘鏁版嵁
*/
- private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd80_5BVo cdData)throws Exception {
+ private void saveHistory(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd80_5BVo cdData)throws Exception {
RmWorkReportHistory po = new RmWorkReportHistory();
+ po.clientId = clientVo==null?null:clientVo.getId() ;
+ po.clientName = clientVo==null?null:clientVo.getName() ;
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.rtuAddr = rtuAddr;
--
Gitblit v1.8.0