From 556dede791168ed21095c8096ddb7bccbe8fa03a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 20 八月 2024 21:02:12 +0800
Subject: [PATCH] 数据库配置文件增加备份目录及备份文件
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java
index 668b478..d0a2096 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java
@@ -1,16 +1,14 @@
package com.dy.common.mw.protocol.p206V202404.parse;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.ParseParamsForDownV202404;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd23Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd24Vo;
import com.dy.common.mw.protocol.p206V202404.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
import com.dy.common.util.NumUtil;
-
-import java.nio.charset.StandardCharsets;
@AnnotationCodeDown(ifAny={
CodeV202404.cd_24
@@ -24,6 +22,7 @@
MidResultToRtu midRs = new MidResultToRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -50,7 +49,8 @@
public byte[] doParse(ParseParamsForDownV202404 para) throws Exception {
byte[] bytes = GlCreate.createStart2Cd(para.rtuAddr, para.commandCode);
if(para.param != null){
- String json = (String)para.param;
+ JSONObject obj = (JSONObject)para.param;
+ String json = obj.toJSONString();
ComCd24Vo cvo = JSON.parseObject(json, ComCd24Vo.class) ;
if(cvo == null){
throw new Exception("json杞珻omCd24Vo涓簄ull") ;
@@ -81,12 +81,12 @@
bytes = ByteUtil.bytesMerge(bytes, bs) ;
- byte[] bsRg = ByteUtil.hexToBytes(cvo.registerNo) ;
+ byte[] bsRg = ByteUtil.hex2Bytes(cvo.registerNo) ;
bytes = ByteUtil.bytesMerge(bytes, bsRg) ;
byte[] bs1 = new byte[7] ;
- index ++ ;
+ index = 0 ;
GlCreate.createPw(bs1, index);
index += 2 ;
--
Gitblit v1.8.0