fix bug

miniapp/src/main/java/com/kym/miniapp/aspect/AppLogAspect.java

@@ -81,7 +81,7 @@ public class AppLogAspect {
         //设置IP地址
         appLog.setIp(IPUtils.getIpAddr(request));
         //用户名、公司id、后台用户id
-        if (!apiLog.value().contains("回调") || apiLog.value().contains("通知")) {
+        if (!apiLog.value().contains("推送") && apiLog.value().contains("拉取")) {
             appLog.setUserId(StpUtil.getSession().getLong("userId"));
             appLog.setCompanyId(StpUtil.getSession().getLong("companyId"));
             appLog.setUsername(StpUtil.getSession().getString("username"));

service/src/main/java/com/kym/service/enplus/impl/EnNotifyServiceImpl.java

@@ -48,9 +48,9 @@ public class EnNotifyServiceImpl implements EnNotifyService {
      */
     @Override
     public String handleNotificationStationStatus(JSONObject json) {
-        LOGGER.info("【EN+推送】收到充电桩设备状态变化推送：{}", json);
         var data = enPlusService.signValidation(json);
-        // TODO: 2023-08-21 更新数据库中设备的状态，如有设备离线，发送通知 
+        LOGGER.info("【EN+推送】收到充电桩设备状态变化推送：\n{}，解密数据：\\n{}\"", json, data);
+        // TODO: 2023-08-21 更新数据库中设备的状态，如有设备离线，发送通知
         return """
                 {
                     "Status":%d
@@ -68,8 +68,8 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String handleNotificationStartChargeResult(JSONObject json) {
-        LOGGER.info("【EN+推送】收到启动充电结果推送：{}", json);
         var data = enPlusService.signValidation(json);
+        LOGGER.info("【EN+推送】收到启动充电结果推送：\n{}，解密数据：\n{}", json, data);
         var obj = JSONObject.parseObject(data);
         var startChargeSeq = obj.getString("StartChargeSeq");
         var startChargeSeqStat = obj.getIntValue("StartChargeSeqStat");
@@ -81,7 +81,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
         updateWrapper.eq("connector_id", connectorId);
         updateWrapper.eq("start_charge_seq", startChargeSeq);
         updateWrapper.set("charge_status", startChargeSeqStat);
-        updateWrapper.set("start_time", LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        updateWrapper.set("start_time", startTime);
         chargeOrderService.update(updateWrapper);
         return """
                 {
@@ -101,9 +101,9 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String handleNotificationEquipChargeStatus(JSONObject json) {
-        LOGGER.info("【EN+推送】收到充电状态推送：{}", json);
         var dataStr = enPlusService.signValidation(json);
         var data = JSONObject.parseObject(dataStr);
+        LOGGER.info("【EN+推送】收到充电状态推送：\n{}，解密数据：\n{}", json, data);
         var startChargeSeq = data.getString("StartChargeSeq");
         var chargeOrder = chargeOrderService.getChargingOrderByStartChargeSeq(startChargeSeq);
         // 更新订单信息
@@ -134,9 +134,9 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String handleNotificationStopChargeResult(JSONObject json) {
-        LOGGER.info("【EN+推送】收到停止充电结果推送：{}", json);
         var dataStr = enPlusService.signValidation(json);
         var data = JSONObject.parseObject(dataStr);
+        LOGGER.info("【EN+推送】收到停止充电结果推送：\n{}，解密数据：\n{}", json, data);
         var startChargeSeq = data.getString("StartChargeSeq");
         var chargeOrder = chargeOrderService.getChargingOrderByStartChargeSeq(startChargeSeq);
         if (data.containsKey("SuccStat") && data.getIntValue("SuccStat") == 0) {
@@ -162,9 +162,9 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String handleNotificationChargeOrderInfo(JSONObject json) {
-        LOGGER.info("【EN+推送】收到充电订单信息推送：{}", json);
         var dataStr = enPlusService.signValidation(json);
         var data = JSONObject.parseObject(dataStr);
+        LOGGER.info("【EN+推送】收到充电订单信息推送：\n{}，解密数据：\n{}", json, data);
         var startChargeSeq = data.getString("StartChargeSeq");
         var chargeOrder = chargeOrderService.getChargingOrderByStartChargeSeq(startChargeSeq);
         // EN+平台推送重试策略是当天失败第二天再推送一次，仅此一次。EN+订单页面可以多次手动推送，所以这里要先判断订单状态，避免重复处理。
@@ -181,7 +181,6 @@ public class EnNotifyServiceImpl implements EnNotifyService {
             chargeOrder.setOrderStatus(1);
             chargeOrderService.updateById(chargeOrder);
 
-
             // 扣费
             var account = accountService.getAccountByUserId(chargeOrder.getUserId());
             account.setBalance(account.getBalance() - chargeOrder.getTotalMoney());