From c322d3be15f48adbc8b64ac9168b525744977128 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 08:50:18 +0800
Subject: [PATCH] 1、RTU日志信息中增加功能码名称； 2、得不到RTU日志文件时，输出一些信息。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
index 11fd9a7..0aefe2b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_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.Com97Vo;
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,30 +77,64 @@
ByteUtil.hex2Bytes(para.commandCode, bsHead, index) ;
- /*
- 鍙傛暟鏍煎紡锛� 铏氭嫙鍗″彿,鐢靛瓙閽卞寘浣欓,姘翠环
- */
- String param = (String)para.param ;
- if(param == null || param.trim().equals("")){
- throw new Exception("鏈彁渚涘懡浠ゅ弬鏁版暟鎹紝涓嶈兘鏋勯�犲姛鑳界爜涓�" + para.commandCode + "鐨勪笅琛屽懡浠�") ;
- }else{
- String[] params = ((String)para.param).split(",") ;
- if(params == null || params.length != 3){
- throw new Exception("鍛戒护鍙傛暟鏁版嵁涓嶆纭紝涓嶈兘鏋勯�犲姛鑳界爜涓�" + para.commandCode + "鐨勪笅琛屽懡浠�") ;
- }else{
- byte index1 = 0 ;
- byte[] bs = new byte[11] ;
- ByteUtil.string2BCD_LE(bs, params[0], 0) ;
+ JSONObject obj = (JSONObject)para.param;
+ String json = obj.toJSONString();
+ Com97Vo cvo = JSON.parseObject(json, Com97Vo.class) ;
+ if(cvo == null){
+ throw new Exception("json杞珻om97Vo涓簄ull") ;
+ }
+ if(cvo.icCardNo == null){
+ throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
+ }
+ if(cvo.moneyRemain == null){
+ throw new Exception("鍓╀綑閲戦涓嶈兘涓虹┖") ;
+ }
+ if(cvo.waterPrice == null){
+ throw new Exception("姘翠环涓嶈兘涓虹┖") ;
+ }
- Integer money = (Double.valueOf(Double.parseDouble(params[1]) * 100)).intValue() ;
- ByteUtilUnsigned.int2Bytes_LE(bs, money, 4);
+ //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ //if(icCardNoGrp[0] != null){
+ // midRs.param = icCardNoGrp[0] ;
+ //}
- Short price = (Double.valueOf(Double.parseDouble(params[2]) * 100)).shortValue() ;
- ByteUtilUnsigned.short2Bytes_LE(bs, price, 8);
+ byte[] bs = new byte[14] ;
+ index = 0 ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+ index += 8 ;
+ Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
+ byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
+ int bTempLen = bTemp.length ;
+ int count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 4){
+ break ;
}
}
+ for(; count < 4; count++){
+ bs[index++] = 0 ;
+ }
+
+ Integer price = Double.valueOf(cvo.waterPrice * 100.0D).intValue() ;
+ bTemp = ByteUtil.int2BCD_LE(price) ;
+ bTempLen = bTemp.length ;
+ count = 0 ;
+ for(int i = 0 ; i < bTempLen; i++){
+ bs[index++] = bTemp[i] ;
+ count ++ ;
+ if(count >= 2){
+ break ;
+ }
+ }
+ for(; count < 2; count++){
+ bs[index++] = 0 ;
+ }
+
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
--
Gitblit v1.8.0