update 打印日志

jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java

@@ -563,25 +563,25 @@ public class PersonPileController extends BaseController {
     }
 
     /**
-     * 羽信主板取消预约充电
+     * 羽信主板修改预约充电状态
-     * http://localhost:8080/uniapp/personalPile/yuxin/cancelReservation
+     * http://localhost:8080/uniapp/personalPile/yuxin/updateReservedStatus
      */
-    @PostMapping("/yuxin/cancelReservation")
+    @PostMapping("/yuxin/updateReservedStatus")
     public RestApiResponse<?> cancelYuxinReservation(HttpServletRequest request, @RequestBody YuxinReservationChargingDTO dto) {
         RestApiResponse<?> response = null;
         try {
             String memberId = getMemberIdByAuthorization(request);
             dto.setMemberId(memberId);
-            yuxinReservationChargingService.cancelReservation(dto);
+            yuxinReservationChargingService.updateReservedStatus(dto);
             response = new RestApiResponse<>();
         } catch (BusinessException e) {
-            logger.error("羽信取消预约充电error, params:{}", dto, e);
+            logger.error("羽信修改预约充电状态error, params:{}", dto, e);
             response = new RestApiResponse<>(e.getCode(), e.getMessage());
         } catch (Exception e) {
-            logger.error("羽信取消预约充电error, params:{}", dto, e);
+            logger.error("羽信修改预约充电状态error, params:{}", dto, e);
             response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR);
         }
-        logger.info("羽信取消预约充电params:{}, result:{}", dto, response);
+        logger.info("羽信修改预约充电状态params:{}, result:{}", dto, response);
         return response;
     }
 

jsowell-pile/src/main/java/com/jsowell/pile/dto/YuxinReservationChargingDTO.java

@@ -23,6 +23,11 @@ public class YuxinReservationChargingDTO {
      */
     private String reservedId;
 
+    /**
+     * 状态 （0-停用；1-启用）
+     */
+    private String status;
+
     /**
      * 充电桩编号
      */

jsowell-pile/src/main/java/com/jsowell/pile/service/YuxinReservationChargingService.java

@@ -14,4 +14,6 @@ public interface YuxinReservationChargingService {
     void deleteReservation(YuxinReservationChargingDTO dto);
 
     PileReservationInfoVO queryReservationInfo(YuxinReservationChargingDTO dto);
+
+    void updateReservedStatus(YuxinReservationChargingDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YuxinReservationChargingServiceImpl.java

@@ -181,6 +181,11 @@ public class YuxinReservationChargingServiceImpl implements YuxinReservationChar
                 .build();
     }
 
+    @Override
+    public void updateReservedStatus(YuxinReservationChargingDTO dto) {
+
+    }
+
     private void fillReservationInfo(PileReservationInfo reservationInfo, YuxinReservationChargingDTO dto) {
         reservationInfo.setMemberId(dto.getMemberId());
         reservationInfo.setPileSn(dto.getPileSn());

jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java

@@ -91,8 +91,8 @@ public class JsowellTask {
     public void setBarrier() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行");
-            // return;
+            return;
         }
     }
 
@@ -103,7 +103,7 @@ public class JsowellTask {
     public void close15MinutesOfUnpaidOrders() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，关闭15分钟未支付的订单");
             return;
         }
         // log.info("关闭15分钟未支付的订单");
@@ -117,8 +117,8 @@ public class JsowellTask {
     public void closeStartFailedOrder() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，关闭启动失败的订单");
-            // return;
+            return;
         }
         // 查询出最近2天支付成功，并且订单状态为未启动的订单
         String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addDays(new Date(), -2));
@@ -132,7 +132,7 @@ public class JsowellTask {
     public void appointmentOrderStart() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，查询预约充电的订单并启动");
             return;
         }
         // 查询出 已支付 设置预约充电 未启动 的订单
@@ -189,7 +189,7 @@ public class JsowellTask {
     public void dailyProofreadTimeForYkcV160(Long intervalMillis) {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，云快充1.6每日自动对时");
             return;
         }
 
@@ -252,7 +252,7 @@ public class JsowellTask {
     public void calculateTheSiteOrdersReport() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，计算站点订单报表");
             return;
         }
         // 查询出所有站点
@@ -281,7 +281,7 @@ public class JsowellTask {
     public void pushToAMap() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，站点的枪口数据推送到高德");
             return;
         }
         Set<String> stationIds = redisCache.getCacheSet(CacheConstants.PUSH_STATION_CONNECTOR);
@@ -306,7 +306,7 @@ public class JsowellTask {
     public void pushStationRealTimePowerInfo() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，贵州省平台推送充电站实时功率");
             return;
         }
 
@@ -346,7 +346,7 @@ public class JsowellTask {
     public void pushStatisticsInfo() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，推送统计信息 24小时执行一次");
             return;
         }
 
@@ -387,7 +387,7 @@ public class JsowellTask {
     public void processOrderSplitting() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，定时任务, 订单分账");
             return;
         }
         // 查询运营商列表
@@ -426,7 +426,7 @@ public class JsowellTask {
     public void generateMerchantBill() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，生成运营商日报表");
             return;
         }
         // 查询运营商列表
@@ -455,7 +455,7 @@ public class JsowellTask {
     public void automaticPayouts() {
         String env = SpringUtils.getActiveProfile();
         if (StringUtils.equalsIgnoreCase(env, "pre")) {
-            log.debug("PRE环境不执行");
+            log.info("PRE环境不执行，定时任务，自动提现");
             return;
         }
         // 查询开启自动提现运营商列表