海康服务：打印日志

ruoyi-server/ruoyi-server-hik/src/main/java/org/dromara/server/hik/controller/TestController.java

@@ -3,6 +3,7 @@ package org.dromara.server.hik.controller;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.Part;
 import lombok.RequiredArgsConstructor;
@@ -352,6 +353,7 @@ public class TestController {
                 log.warn("unknown out contentType {}", s);
                 return null;
             }
+            log.info("接收海康消费机上报数据: {}", JSONUtil.toJsonStr(jsonListString));
             return eventHandleRouter.route(jsonListString,fileByteList);
             } catch(Exception e){
                 e.printStackTrace();

ruoyi-server/ruoyi-server-hik/src/main/java/org/dromara/server/hik/event/EventHandleRouter.java

@@ -43,7 +43,7 @@ public class EventHandleRouter {
                 case ConsumptionEvent -> handler = consumptionEventHandler;
                 case TransactionRecordEvent -> handler = transactionRecordEventHandler;
                 case HeartBeat -> handler = heatBeatHandler;
-                default -> throw new ServiceException("暂不支持该事件");
+                default -> throw new ServiceException("暂不支持该事件，"+eventType);
             }
             return handler.handleEvent(jsonObject, fileContent);
         } else {

ruoyi-server/ruoyi-server-hik/src/main/java/org/dromara/server/hik/event/handler/ConsumptionEventHandler.java

@@ -63,6 +63,7 @@ public class ConsumptionEventHandler implements HikEventHandler {
             // 调用现有原始消费请求接口
             RemoteConsumeBo remoteBo = setParamBo(receive, consumptionEvent);
             remoteBo.setTermNo(termVo.getTermNo());
+            log.info("transactionPreprocessingRequest 调用消费服务的消费请求接口，入参：{}",JSONUtil.toJsonStr(remoteBo));
             RemoteResultDto result = remoteConsumeService.dealHikRequestConsume(remoteBo);
             R<ErrorInfo> errorInfo = result.getErrorInfo();
             RemoteConsumeBo updatedRemoteBo = result.getUpdatedRemoteBo();
@@ -102,6 +103,7 @@ public class ConsumptionEventHandler implements HikEventHandler {
             remoteBo.setRecordStatus(364L);
             remoteBo.setRecordId(0L);
             remoteBo.setTermNo(termVo.getTermNo());
+            log.info("transactionConfirmingRequest 调用消费服务的消费入库接口，入参：{}",JSONUtil.toJsonStr(remoteBo));
             RemoteResultDto result = remoteConsumeService.dealHikUploadRecord(remoteBo);
 //            log.info("消费机消费请求确认事件,结果：{}", JSONObject.toJSONString(result.getUpdatedRemoteBo()));
             R<ErrorInfo> errorInfo = result.getErrorInfo();

ruoyi-server/ruoyi-server-hik/src/main/java/org/dromara/server/hik/event/handler/TransactionRecordEventHandler.java

@@ -1,5 +1,6 @@
 package org.dromara.server.hik.event.handler;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import io.seata.common.util.CollectionUtils;
 import lombok.RequiredArgsConstructor;
@@ -89,6 +90,7 @@ public class TransactionRecordEventHandler implements HikEventHandler {
         try  {
             if (ModeTypeEnum.offLine.getCode().equals(modeType)) {
                 // 离线交易，调用原始消费记录请求+消费记录入库的接口,如果失败要记录入库
+                log.info("TransactionRecordEvent调用消费离线接口，离线消费机交易记录事件,入参，{}", JSONUtil.toJsonStr(remoteBo));
                 RemoteResultDto remoteResultDto = remoteConsumeService.dealHikUploadOffLineRecord(remoteBo);
                 errorInfo = remoteResultDto.getErrorInfo();
                 RemoteConsumeBo updatedRemoteBo = remoteResultDto.getUpdatedRemoteBo();
@@ -104,6 +106,7 @@ public class TransactionRecordEventHandler implements HikEventHandler {
                 List<XfConsumeDetailVo> vos = consumeDetailService.queryByTermNoAndRecordId(termNo, transactionRecordEvent.getSerialNo().longValue());
                 if (CollectionUtils.isEmpty(vos)){
                     // 组装参数，调用消费记录入库的接口 // 如果失败要记录入库
+                    log.info("TransactionRecordEvent调用消费入库接口，入参，{}", JSONUtil.toJsonStr(remoteBo));
                     RemoteResultDto remoteResultDto = remoteConsumeService.dealHikUploadRecord(remoteBo);
                     errorInfo = remoteResultDto.getErrorInfo();
                     RemoteConsumeBo updatedRemoteBo = remoteResultDto.getUpdatedRemoteBo();

ruoyi-server/ruoyi-server-hik/src/main/java/org/dromara/server/hik/event/timedtask/HandleTask.java

@@ -1,5 +1,6 @@
 package org.dromara.server.hik.event.timedtask;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import io.seata.common.util.CollectionUtils;
 import io.seata.common.util.StringUtils;
@@ -89,15 +90,17 @@ public class HandleTask {
                 RemoteResultDto rs;
                 if(ModeTypeEnum.offLine.getCode().equals(vo.getConsumeType())){
                     //  离线交易，调用原始消费记录请求+消费记录入库的接口
+                    log.info("定时任务，调用消费离线接口，离线消费机交易记录事件,入参，{}", JSONUtil.toJsonStr(remoteBo));
                     rs = remoteConsumeService.dealHikUploadOffLineRecord(remoteBo);
                 }else{
                     //  在线交易，调用消费记录入库的接口
                     // 在查询一次 消费记录，如果有则不再执行
                     List<XfConsumeDetailVo> list = consumeDetailService.queryByTermNoAndRecordId(Long.valueOf(vo.getTermNo()), Long.valueOf(vo.getTermRecordId()));
                     if(CollectionUtils.isEmpty(list)){
+                        log.info("定时任务，调用消费入库接口，消费机交易记录事件,入参，{}", JSONUtil.toJsonStr(remoteBo));
                         rs = remoteConsumeService.dealHikUploadRecord(remoteBo);
                     }else{
-                        log.info("消费机事件，已经存在消费记录，不再处理：{}", vo);
+                        log.info("消费机事件，已经存在消费记录，不再处理：{}", JSONUtil.toJsonStr(vo));
                         rs = new RemoteResultDto(R.ok(),null);
                     }
                 }