From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:41 +0800
Subject: [PATCH] 1、完善代码和application.yml配置文件，去掉不用的引入文件； 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断； 3、凡是有Server的应用，加载资源方式改为用springboot的工具类加载； 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2，以实现可以在jar包情况下能够扫描类（.class）注解。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
index b7df2fa..62c90c5 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
@@ -1,5 +1,7 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
+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 com.dy.common.mw.protocol.Data;
@@ -11,6 +13,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @Author liurunyu
* @Date 2024/2/27 14:20
@@ -20,6 +25,8 @@
public class TkDealWorkReport extends TaskSurpport {
private static final Logger log = LogManager.getLogger(TkDealWorkReport.class.getName()) ;
+
+ private static final Map<String, Integer> RtuReportTimes = new HashMap<>();
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
public static final String taskId = "TkDealWorkReport" ;
@@ -34,46 +41,69 @@
DataV1_0_1 dV1_0_1 = (DataV1_0_1) d.getSubData();//鍓嶉潰浠诲姟宸茬粡鍒ゆ柇涓嶄负null
Object cdObj = dV1_0_1.subData;
if (cdObj != null && cdObj instanceof DataCd84Vo) {
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
- DbSv sv = (DbSv)objs[0] ;
- PrController controller = (PrController)objs[1] ;
- try{
- this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, (DataCd84Vo)cdObj) ;
- }catch (Exception e){
- log.error("淇濆瓨鎺у埗鍣ㄩ榾寮�宸ヤ綔鎶ユ椂鍙戠敓寮傚父", e);
+ 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) ;
+ }
+ if(deal){
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
+ DbSv sv = (DbSv)objs[0] ;
+ PrController controller = (PrController)objs[1] ;
+ SeClient clientVo = (SeClient)objs[3] ;//杩欎釜鍊煎璞′腑鍙湁id鍜宯ame浼氭湁鍊�
+ try{
+ this.doDeal(sv, clientVo, controller, d.getRtuAddr(), dV1_0_1, (DataCd84Vo)cdObj) ;
+ }catch (Exception e){
+ log.error("淇濆瓨鎺у埗鍣ㄩ榾寮�宸ヤ綔鎶ユ椂鍙戠敓寮傚父", e);
+ }
}
}
}
/**
* 澶勭悊闃�寮�宸ヤ綔鎶ユ暟鎹�
* @param sv 鏈嶅姟
+ * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
* @param controller 鎺у埗鍣ㄥ璞�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @param dataCd84Vo 宸ヤ綔鎶ユ暟鎹璞�
*/
- private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
- this.saveOrUpdateLast(sv, controller, rtuAddr, dV1_0_1, dataCd84Vo);
- this.saveHistory(sv, controller, rtuAddr, dV1_0_1, dataCd84Vo);
+ private void doDeal(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
+ this.saveOrUpdateLast(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd84Vo);
+ this.saveHistory(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd84Vo);
}
/**
* 淇濆瓨闃�寮�宸ヤ綔鎶ユ渶鏂版暟鎹�
* @param sv
+ * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
* @param controller
* @param rtuAddr
* @param dV1_0_1
* @param cdData
*/
- private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo cdData) throws Exception {
+ private void saveOrUpdateLast(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo 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(dV1_0_1, 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(dV1_0_1, cdData);
@@ -83,13 +113,16 @@
/**
* 淇濆瓨闃�寮�宸ヤ綔鎶ュ巻鍙叉暟鎹�
* @param sv
+ * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
* @param controller
* @param rtuAddr
* @param dV1_0_1
* @param cdData
*/
- private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo cdData) throws Exception {
+ private void saveHistory(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo 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