diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java index 82a412c0..38cd4e2c 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java @@ -243,11 +243,11 @@ public interface IXhpcChargingStationService { /** * 添加费率 */ - void insertXhpcRate(XhpcRate xhpcRate); + int insertXhpcRate(XhpcRate xhpcRate); /** * 添加费率时段 */ - void insertXhpcRateTime(XhpcRateTime xhpcRateTime); + int insertXhpcRateTime(XhpcRateTime xhpcRateTime); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index 4158c3d5..fda598b6 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -88,8 +88,8 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc * @param xhpcRate */ @Override - public void insertXhpcRate(XhpcRate xhpcRate) { - xhpcChargingStationMapper.insertXhpcRate(xhpcRate); + public int insertXhpcRate(XhpcRate xhpcRate) { + return xhpcChargingStationMapper.insertXhpcRate(xhpcRate); } /** @@ -98,8 +98,8 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc * @param xhpcRateTime */ @Override - public void insertXhpcRateTime(XhpcRateTime xhpcRateTime) { - xhpcChargingStationMapper.insertXhpcRateTime(xhpcRateTime); + public int insertXhpcRateTime(XhpcRateTime xhpcRateTime) { + return xhpcChargingStationMapper.insertXhpcRateTime(xhpcRateTime); } /** diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java index 455dd153..9190451c 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java @@ -13,6 +13,8 @@ import com.xhpc.common.data.redis.CacheRateModel; import com.xhpc.common.domain.*; import com.xhpc.common.security.service.TokenService; import com.xhpc.system.api.model.LoginUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,6 +48,8 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I private final ExecutorService executorService = Executors.newFixedThreadPool(20); + private static final Logger logger = LoggerFactory.getLogger(XhpcTimingChargingModelServiceImpl.class); + @Override public List> list(HttpServletRequest request, String reason, Integer status, String startTime, String endTime, Long chargingStationId) { @@ -143,6 +147,7 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I xhpcTimingChargingModel.setTimingTime(xhpcTimingChargingModelDto.getTimingTime()); xhpcTimingChargingModel.setCreateTime(new Date()); xhpcTimingChargingModel.setChargingStationId(chargingStationId); + xhpcTimingChargingModel.setPhone(xhpcTimingChargingModelDto.getPhone()); if(xhpcTimingChargingModelDto.getTimingChargingModelId() !=null){ xhpcTimingChargingModel.setTimingChargingModelId(xhpcTimingChargingModelDto.getTimingChargingModelId()); xhpcTimingChargingModelMapper.updateXhpcTimingChargingModel(xhpcTimingChargingModel); @@ -430,9 +435,9 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I xhpcRateModel.setCreateTime(new Date()); int k = xhpcTimingChargingModelMapper.insertXhpcRateModel(xhpcRateModel); if(k==0){ - return R.fail("场站修改失败"); + logger.info("定时计费模型-----添加费率模型失败:"+timingCharging.getTimingChargingModelId()); + return R.fail("添加费率模型失败"); } - Long chargingStationId = timingCharging.getChargingStationId(); Long rateModelId = xhpcRateModel.getRateModelId(); Long timingChargingModelId = timingCharging.getTimingChargingModelId(); @@ -461,7 +466,12 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I xhpcRate.setRateModelId(rateModelId); xhpcRate.setRateValue(xhpcTimingChargingRate.getRateValue()); xhpcRate.setTenantId(xhpcTimingChargingRate.getTenantId()); - xhpcChargingStationService.insertXhpcRate(xhpcRate); + int number = xhpcChargingStationService.insertXhpcRate(xhpcRate); + if(number==0){ + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + logger.info("定时计费模型-----添加费率失败:"+timingCharging.getTimingChargingModelId()); + return R.fail("添加费率失败"); + } map.put(xhpcTimingChargingRate.getRateValue(), xhpcRate.getRateId()); } //添加费率时段 @@ -483,7 +493,12 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I xhpcRateTime.setRateId(rateId); xhpcRateTime.setRateValue(xhpcTimingChargingTime.getRateValue()); xhpcRateTime.setCreateTime(Calendar.getInstance().getTime()); - xhpcChargingStationService.insertXhpcRateTime(xhpcRateTime); + int number = xhpcChargingStationService.insertXhpcRateTime(xhpcRateTime); + if(number==0){ + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + logger.info("定时计费模型-----添加费率时段失败:"+timingCharging.getTimingChargingModelId()); + return R.fail("添加费率时段失败"); + } } R r =powerPileService.setStationRateModel(chargingStationId,rateModelId,cacheRateModel); if (r.getCode() != 200) { @@ -504,19 +519,20 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I if(r.getCode()==200){ k++; XhpcTimingChargingModel xhpcTimingChargingModel = xhpcTimingChargingModelMapper.getXhpcTimingChargingModelById(timingChargingModelId, tenantId); - xhpcTimingChargingModel.setStatus(1); + xhpcTimingChargingModel.setStatus(2); xhpcTimingChargingModel.setNumber(k); xhpcTimingChargingModelMapper.updateXhpcTimingChargingModel(xhpcTimingChargingModel); } }while (k>0); } }); - } + }else{ //改变定时计费模型状态 - XhpcTimingChargingModel xhpcTimingChargingModel = xhpcTimingChargingModelMapper.getXhpcTimingChargingModelById(timingChargingModelId, tenantId); - xhpcTimingChargingModel.setStatus(2); - xhpcTimingChargingModel.setErrorReason(r.getMsg()); - xhpcTimingChargingModelMapper.updateXhpcTimingChargingModel(xhpcTimingChargingModel); + XhpcTimingChargingModel xhpcTimingChargingModel = xhpcTimingChargingModelMapper.getXhpcTimingChargingModelById(timingChargingModelId, tenantId); + xhpcTimingChargingModel.setStatus(1); + xhpcTimingChargingModel.setErrorReason(r.getMsg()); + xhpcTimingChargingModelMapper.updateXhpcTimingChargingModel(xhpcTimingChargingModel); + } return R.ok(); } } diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTimingChargingModelMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTimingChargingModelMapper.xml index 683a0153..22dc145c 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTimingChargingModelMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTimingChargingModelMapper.xml @@ -107,7 +107,7 @@ and tcm.timing_time <=#{endTime} - + and tcm.tenant_id =#{tenantId}