ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -22,7 +22,6 @@ * @since 2024-08-08 */ @Data @EqualsAndHashCode(callSuper = false) @TableName("t_parking_record") @ApiModel(value="TParkingRecord对象", description="") public class TParkingRecord implements Serializable { ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -28,7 +28,9 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.integration.api.feignClient.IntegrationClient; import com.ruoyi.integration.api.feignClient.IotInterfaceClient; import com.ruoyi.integration.api.feignClient.SendMessageClient; import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient; import com.ruoyi.integration.api.model.QrCodeDelivery; import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData; import com.ruoyi.integration.api.vo.AddDevice; import com.ruoyi.integration.api.vo.AddDeviceResp; @@ -112,6 +114,9 @@ @Resource private TAccountingStrategyDetailService accountingStrategyDetailService; @Resource private SendMessageClient sendMessageClient; @@ -248,6 +253,25 @@ return AjaxResult.error("设备编号已存在"); } this.updateById(chargingPile); List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0)); for (TChargingGun chargingGun : list) { TChargingGun chargingGun1 = new TChargingGun(); chargingGun1.setId(chargingGun.getId()); chargingGun1.setFullNumber(chargingPile.getCode() + chargingGun.getCode()); chargingGunService.updateById(chargingGun1); //下发硬件充电二维码 String code_prefix = "https://mxcd.zhinenganguan.com?No="; QrCodeDelivery qrCodeDelivery = new QrCodeDelivery(); qrCodeDelivery.setCharging_pile_code(chargingPile.getCode()); qrCodeDelivery.setCharging_gun_code(chargingGun.getCode()); qrCodeDelivery.setCode_format(1); qrCodeDelivery.setPrefix_length(code_prefix.length()); qrCodeDelivery.setCode_prefix(code_prefix); qrCodeDelivery.setQr_code(code_prefix + chargingPile.getCode() + chargingGun.getCode()); sendMessageClient.qrCodeDelivery(qrCodeDelivery); } return AjaxResult.success(); }
@@ -60,7 +60,6 @@ } /** * 线下停车场入场 * @param order ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java
@@ -1,12 +1,10 @@ package com.ruoyi.integration.barrierGate.model; import lombok.Data; /** * @author zhibing.pu * @Date 2024/9/5 11:29 */ @Data public class BaseResponse<T> { private Integer code; @@ -15,17 +13,46 @@ private T data; public Integer getCode() { return code; } public void setCode(Integer code) { this.code = code; } public String getMsg() { return msg; } public void setMsg(String msg) { this.msg = msg; } public T getData() { return data; } public void setData(T data) { this.data = data; } public BaseResponse() { } public BaseResponse(Integer code, String msg, T data) { this.code = code; this.msg = msg; this.data = data; } public static BaseResponse ok(){ return ok(new Object()); return ok(null); } public static <T> BaseResponse<T> ok(T data){ BaseResponse baseResponse = new BaseResponse(); baseResponse.setCode(0); baseResponse.setData(data); baseResponse.setMsg("成功"); BaseResponse baseResponse = new BaseResponse(0, "成功", data); return baseResponse; } } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2490,8 +2490,8 @@ return null; } TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserCarId, appUserCar.getId()) .eq(TChargingOrder::getDelFlag, 0).gt(TChargingOrder::getStartTime, query.getStartTime()) .eq(TChargingOrder::getRechargePaymentStatus, 2).ne(TChargingOrder::getStatus, 5)); .eq(TChargingOrder::getDelFlag, 0).between(TChargingOrder::getStartTime, query.getStartTime(), LocalDateTime.now()) .eq(TChargingOrder::getRechargePaymentStatus, 2).in(TChargingOrder::getStatus, Arrays.asList(4, 5))); return one; }
