From b5b296cc01699f96029b07073fe9d0078bedd445 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 26 二月 2024 16:32:35 +0800
Subject: [PATCH] 2024-02-26 朱宝民 解决添加用户主键不自动创建的问题，部分微信支付代码
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 82 +++++++++++++----------------------------
1 files changed, 26 insertions(+), 56 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
index 4e13d52..ebd0896 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
@@ -1,9 +1,19 @@
package com.dy.aceMw.server.rtuData.p206V1_0_0;
import com.dy.aceMw.server.rtuData.TaskSurpport;
+import com.dy.aceMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
+import com.dy.common.springUtil.SpringContextUtil;
+import com.dy.common.util.DateTime;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
public class TkPreGenObjs extends TaskSurpport {
@@ -17,67 +27,27 @@
* @param data 闇�瑕佸鐞嗙殑鏁版嵁
*/
@Override
- public void execute(Object data) {
+ public void execute(Object data) throws ParseException {
Data d = (Data)data ;
- String rtuAddr = d.getRtuAddr() ;
- log.info("RTU" + rtuAddr + "鏁版嵁鍒版锛岃繕鏈疄鐜板鐞�:" + data.toString());
- //寰楀埌鏈湴RTU 鏁版嵁锛屼互澶囧悗闈㈣妭鐐瑰簲鐢�
- /*
- BuziInterface baseBusi = BuziGeter.getBaseBusi() ;
- BuziInterface orgBusi = null ;
- SyRtu nbRtu = null ;
- SyRtuTramp rtuTramp = null ;
- if(baseBusi != null){
- nbRtu = DbSyBuzi.getRtu(baseBusi, imei) ;
- if(nbRtu != null){
- //鏁版嵁搴撲腑鏌ヨ鍒癗B浜у搧锛圧TU瀹炰綋锛�
- if(nbRtu.orgTag != null && !nbRtu.orgTag.trim().equals("")){
- orgBusi = BuziGeter.getBusi(nbRtu.orgTag) ;
- if(orgBusi == null){
- log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒版爣绛句负" + nbRtu.orgTag + "鐨勪緵姘存満鏋勬暟鎹簱涓氬姟Busi");
- }else{
- BaMeter meter = DbOrgBuzi.getMeterByImeiAndNo(orgBusi, imei, rtuAddr) ;
- //鍙兘鏈煡璇㈠埌meter锛屽嵆浠嶆槸娴佹氮鑰匯TU锛屼絾浠嶈鍚庣画澶勭悊锛氾紙1锛夈�佷粛鑳借瘑鍒嚭娴佹氮鑰匯TU锛岋紙2锛夈�佷粛瑕佽褰曞叾涓婃姤鏁版嵁
- if(meter != null){
- String protocol = d.getProtocol() ;
- if(protocol != null){
- protocol = protocol.trim();
- if(!protocol.equals("")){
- if(meter.protocol == null
- || meter.protocol.trim().equals("")
- || !meter.protocol.trim().equals(protocol)){
- //闇�瑕佹洿鏂板崗璁悕绉�
- DbOrgBuzi.updateMeter4Protocol(orgBusi, meter.id, protocol);
- }
- }
- }
- }
- this.taskResult = new Object[]{baseBusi, orgBusi, nbRtu, null, meter} ;
- this.toNextTasks(data);
- }
- }else{
- //NB浜у搧锛圧TU瀹炰綋锛夋湭鍒嗛厤缁欏叿浣撶殑渚涙按鏈烘瀯
- //娴佹氮鑰匯TU
- rtuTramp = DbSyBuzi.getSyRtuTramp(baseBusi, imei, rtuAddr) ;
- if(rtuTramp == null){
- rtuTramp = new SyRtuTramp(imei, rtuAddr) ;
- }
- this.taskResult = new Object[]{baseBusi, orgBusi, nbRtu, rtuTramp, null} ;
- this.toNextOneTask(data, TkDealRtuTramp.taskId);
- }
- }else{
- //鏁版嵁搴撲腑鏈煡璇㈠埌NB浜у搧锛圧TU瀹炰綋锛�
- //娴佹氮鑰匯TU
- rtuTramp = DbSyBuzi.getSyRtuTramp(baseBusi, imei, rtuAddr) ;
+ String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖
+ DbSv sv = (DbSv)SpringContextUtil.getBean(DbSv.class) ;
+ if(sv != null){
+ PrController controller = sv.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
+ if(controller == null){
+ //鏁版嵁搴撲腑鏈煡璇�(宸茬粡缁戝畾涓旀帶鍒跺櫒鍦板潃鐩哥)鍒版帶鍒跺櫒锛圧TU瀹炰綋锛�
+ //娴佹氮鑰呮帶鍒跺櫒
+ PrControllerTramp rtuTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr);
if(rtuTramp == null){
- rtuTramp = new SyRtuTramp(imei, rtuAddr) ;
+ rtuTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), new Date()) ;
+ this.taskResult = new Object[]{sv, null, rtuTramp} ;
+ this.toNextOneTask(data, TkDealControllerTramp.taskId);
}
- this.taskResult = new Object[]{baseBusi, orgBusi, nbRtu, rtuTramp, null} ;
- this.toNextOneTask(data, TkDealRtuTramp.taskId);
}
+ //涓嶈鏄惁涓烘祦娴帶鍒跺櫒锛圧TU瀹炰綋锛夛紝閮借杩涜涓嬫宸ヤ綔
+ this.taskResult = new Object[]{sv, controller, null} ;
+ this.toNextTasks(data);
}else{
- log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒癇aseBusi瀵硅薄");
+ log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒癉bSv瀵硅薄");
}
- */
}
}
--
Gitblit v1.8.0