diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index f1d88d7f0..952c1f3d4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -113,7 +113,7 @@ public class PayController extends BaseController { */ @PostMapping("/payOrder") public RestApiResponse payOrder(HttpServletRequest request, @RequestBody PayOrderDTO dto) { - logger.info("支付订单接口 param:{}", dto.toString()); + // logger.info("支付订单接口 param:{}", dto.toString()); RestApiResponse response; // 支付订单加锁 @@ -150,7 +150,7 @@ public class PayController extends BaseController { redisCache.unLock(lockKey); } } - logger.info("支付订单接口 result:{}", JSONObject.toJSONString(response)); + logger.info("支付订单接口 param:{}, result:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(response)); return response; } diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/BytesUtil.java b/jsowell-common/src/main/java/com/jsowell/common/util/BytesUtil.java index a8d43eb6f..13bc5ef6c 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/BytesUtil.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/BytesUtil.java @@ -3,6 +3,7 @@ package com.jsowell.common.util; import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; +import javax.xml.bind.DatatypeConverter; import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.time.LocalDateTime; @@ -143,6 +144,15 @@ public class BytesUtil { return new BigInteger(1, bytes).toString(radix);// 这里的1代表正数 } + /** + * 将byte[]转为十六进制的字符串 + * @param bytes byte[] + * @return 转换后的字符串 + */ + public static String printHexBinary(byte[] bytes) { + return DatatypeConverter.printHexBinary(bytes); + } + /** * @函数功能: BCD码转为10进制串(阿拉伯数据) * @输入参数: BCD码 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index 255cd81d9..61203ee20 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -570,8 +570,6 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { } } - - /* 应答 确认结果 0x00 上传成功 0x01 非法账单 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java index c490eca9e..32070e879 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java @@ -17,7 +17,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.xml.bind.DatatypeConverter; import java.net.InetSocketAddress; import java.util.List; import java.util.Objects; @@ -80,13 +79,16 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter { Channel channel = ctx.channel(); // new - String hexString = DatatypeConverter.printHexBinary(msg); + // String hexString = DatatypeConverter.printHexBinary(msg); // 心跳包0x03日志太多,造成日志文件过大,改为不打印 if (!CollectionUtils.containsAny(notPrintFrameTypeList, frameType)) { - log.info("【<<<<<平台收到消息<<<<<】channel:{}, 帧类型:{}, 帧名称:{}, 序列号域:{}, 报文:{}, new报文:{}", + // log.info("【<<<<<平台收到消息<<<<<】channel:{}, 帧类型:{}, 帧名称:{}, 序列号域:{}, 报文:{}, new报文:{}", + // channel.id(), frameType, YKCFrameTypeCode.getFrameTypeStr(frameType), serialNumber, + // BytesUtil.binary(msg, 16), hexString); + log.info("【<<<<<平台收到消息<<<<<】channel:{}, 帧类型:{}, 帧名称:{}, 序列号域:{}, 报文:{}", channel.id(), frameType, YKCFrameTypeCode.getFrameTypeStr(frameType), serialNumber, - BytesUtil.binary(msg, 16), hexString); + BytesUtil.binary(msg, 16)); } // 处理数据 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index e762babe1..a8f37bb60 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -579,9 +579,11 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { } String redisKey = CacheConstants.PILE_CONNECTOR_STATUS_KEY + pileConnectorCode; String redisStatus = redisCache.getCacheObject(redisKey); - log.info("更新枪口状态-枪口编号:{}, redisKey:{}, 缓存状态:{}, 传来的状态:{}, 状态描述:{}", pileConnectorCode, redisKey, - redisStatus, status, PileConnectorDataBaseStatusEnum.getStatusDescription(status)); + // log.info("更新枪口状态-枪口编号:{}, redisKey:{}, 缓存状态:{}, 传来的状态:{}, 状态描述:{}", pileConnectorCode, redisKey, + // redisStatus, status, PileConnectorDataBaseStatusEnum.getStatusDescription(status)); if (!StringUtils.equals(redisStatus, status)) { + log.info("更新枪口状态ing-枪口编号:{}, redisKey:{}, 缓存状态:{}, 传来的状态:{}, 状态描述:{}", pileConnectorCode, redisKey, + redisStatus, status, PileConnectorDataBaseStatusEnum.getStatusDescription(status)); String pileSn = pileConnectorCode.substring(0, pileConnectorCode.length() - 2); // 只修改一个枪口的状态 num = pileConnectorInfoMapper.updateConnectorStatus(pileConnectorCode, status);