From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java
index d809aa1..ef6bcaa 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_98_Down.java
@@ -1,13 +1,15 @@
package com.dy.common.mw.protocol.p206V1_0_0.parse;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ParseParamsForDownV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
+import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
-import com.dy.common.util.ByteUtilUnsigned;
/**
* @Author liurunyu
@@ -23,14 +25,15 @@
@Override
public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback) throws Exception {
ParseParamsForDownV1_0_1 para = (ParseParamsForDownV1_0_1) params ;
- byte[] bs = this.doParse(para) ;
-
MidResultToRtu midRs = new MidResultToRtu() ;
+ byte[] bs = this.doParse(midRs, para) ;
+
midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downCodeName = CodeV1_0_1.getCodeName(para.commandCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
@@ -47,11 +50,12 @@
/**
* 鏋勯�犱笅琛屾暟鎹�
+ * @param midRs 鍙傛暟
* @param para 鍙傛暟
* @return 瀛楄妭鏁扮粍
* @throws Exception 寮傚父
*/
- public byte[] doParse(ParseParamsForDownV1_0_1 para) throws Exception {
+ public byte[] doParse(MidResultToRtu midRs, ParseParamsForDownV1_0_1 para) throws Exception {
CommonV1_0_1 commonV1_0_1 = new CommonV1_0_1() ;
byte[] bytes ;
byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
@@ -73,16 +77,27 @@
ByteUtil.hex2Bytes(para.commandCode, bsHead, index) ;
- /*
- 鍙傛暟鏍煎紡锛� 铏氭嫙鍗″彿
- */
- if(para.param == null ||((String)para.param).trim().equals("")){
- throw new Exception("鏈彁渚涘懡浠ゅ弬鏁版暟鎹紝涓嶈兘鏋勯�犲姛鑳界爜涓�" + para.commandCode + "鐨勪笅琛屽懡浠�") ;
- }else{
- byte[] bs = new byte[5] ;
- ByteUtil.string2BCD_LE(bs, ((String)para.param).trim(), 0) ;
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+ JSONObject obj = (JSONObject)para.param;
+ String json = obj.toJSONString();
+ Com98Vo cvo = JSON.parseObject(json, Com98Vo.class) ;
+ if(cvo == null){
+ throw new Exception("json杞珻om97Vo涓簄ull") ;
}
+ if(cvo.icCardNo == null){
+ throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
+ }
+
+ //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ //if(icCardNoGrp[0] != null){
+ // midRs.param = icCardNoGrp[0] ;
+ //}
+ //byte[] bs = new byte[5] ;
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], 0) ;
+ byte[] bs = new byte[8] ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
+
+
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
--
Gitblit v1.8.0