From 00467991d55cd66a1c93451583e4c02eab360126 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Mon, 21 Feb 2022 13:34:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B4=B9=E7=8E=87=E8=A1=A8?= =?UTF-8?q?=E5=86=99=E5=85=A5=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=92=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BA=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcChargingStationController.java | 9 ++- .../service/IXhpcChargingStationService.java | 4 +- .../XhpcChargingStationServiceImpl.java | 60 ++++++++++++------- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java index 39c08b04..43be0506 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java @@ -178,9 +178,8 @@ public class XhpcChargingStationController extends BaseController { */ @Log(title = "添加场站", businessType = BusinessType.INSERT) @PostMapping(value = "/addXhpcChargingStation") - public AjaxResult addXhpcChargingStation(@RequestBody XhpcChargingStationDto xhpcChargingStationDto) { - - return xhpcChargingStationService.addXhpcChargingStation(xhpcChargingStationDto); + public AjaxResult addXhpcChargingStation(HttpServletRequest request, @RequestBody XhpcChargingStationDto xhpcChargingStationDto) { + return xhpcChargingStationService.addXhpcChargingStation(request, xhpcChargingStationDto); } /** @@ -215,9 +214,9 @@ public class XhpcChargingStationController extends BaseController { */ @Log(title = "编辑电站（编辑费率）", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateXhpcRateTime") - public AjaxResult updateXhpcRateTime(@RequestBody XhpcChargingStationDto xhpcChargingStationDto) { + public AjaxResult updateXhpcRateTime(HttpServletRequest request, @RequestBody XhpcChargingStationDto xhpcChargingStationDto) { - return xhpcChargingStationService.updateXhpcRateTime(xhpcChargingStationDto); + return xhpcChargingStationService.updateXhpcRateTime(request, xhpcChargingStationDto); } } 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 94200b02..82a412c0 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 @@ -121,7 +121,7 @@ public interface IXhpcChargingStationService { * @param xhpcChargingStationDto * @return */ - AjaxResult addXhpcChargingStation(XhpcChargingStationDto xhpcChargingStationDto); + AjaxResult addXhpcChargingStation(HttpServletRequest request, XhpcChargingStationDto xhpcChargingStationDto); /** @@ -185,7 +185,7 @@ public interface IXhpcChargingStationService { * @param * @return */ - AjaxResult updateXhpcRateTime(XhpcChargingStationDto xhpcChargingStationDto); + AjaxResult updateXhpcRateTime(HttpServletRequest request, XhpcChargingStationDto xhpcChargingStationDto); /** * 上传桩编号和删除编号 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 7596acaf..77f31b45 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 @@ -314,7 +314,9 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc @Override @Transactional - public AjaxResult addXhpcChargingStation(XhpcChargingStationDto xhpcChargingStationDto) { + public AjaxResult addXhpcChargingStation(HttpServletRequest request, XhpcChargingStationDto xhpcChargingStationDto) { + LoginUser loginUser = logUserUtils.getLogUser(request); + String userName = loginUser.getUsername(); if (xhpcChargingStationDto.getName() == null || "".equals(xhpcChargingStationDto.getName())) { return AjaxResult.error(1001, "电站名称不能为空"); @@ -424,6 +426,8 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc //添加费率计费模型 XhpcRateModel xhpcRateModel = new XhpcRateModel(); BeanUtils.copyProperties(xhpcChargingStationDto, xhpcRateModel); + xhpcRateModel.setCreateBy(userName); + xhpcRateModel.setUpdateBy(userName); int i = xhpcChargingStationMapper.insertXhpcRateModel(xhpcRateModel); if (i == 0) { return AjaxResult.error("1005", "费率计费模型添加失败"); @@ -464,6 +468,8 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc xhpcRate.setServiceFee(xhpcRateDto.getServiceFee()); xhpcRate.setRateModelId(rateModelId); xhpcRate.setRateValue(xhpcRateDto.getId()); + xhpcRate.setCreateBy(userName); + xhpcRate.setUpdateBy(userName); xhpcChargingStationMapper.insertXhpcRate(xhpcRate); map.put(xhpcRateDto.getId(), xhpcRate.getRateId()); }else{ @@ -517,15 +523,15 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue); + sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); if(!endTime.equals("24:00:00")) { if(rateValue ==null || "".equals(rateValue)){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName); } }else{ if(k == 0){ @@ -534,9 +540,9 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue); + sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); }else if(k < list.size()-1){ String endTimeK = list.get(k - 1).getEndTime(); if (!endTimeK.equals(startTime)) { @@ -544,10 +550,10 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName); } //并把本条数据也添加上 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); }else{ String endTimeK = list.get(k - 1).getEndTime(); if (!endTimeK.equals(startTime)) { @@ -556,17 +562,17 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc return AjaxResult.error("请填写默认时间段费率"); } //添加一条默认费率时段 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName); } //并把本条数据也添加上 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); if (!endTime.equals("24:00:00")) { if(rateValue ==null || "".equals(rateValue)){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } //添加一条默认费率时段 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName); } } } @@ -699,7 +705,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc return map; } - private int addXhpcRateTime(Long chargingStationId, Long rateModelId, Long defaultPeriodId, String startTime, String endTime, int sort, int type, String rateValue) { + private int addXhpcRateTime(Long chargingStationId, Long rateModelId, Long defaultPeriodId, String startTime, String endTime, int sort, int type, String rateValue, String userName) { XhpcRateTime xhpcRateTime = new XhpcRateTime(); xhpcRateTime.setChargingStationId(chargingStationId); @@ -713,6 +719,8 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc xhpcRateTime.setType(type); xhpcRateTime.setRateValue(rateValue); xhpcRateTime.setCreateTime(Calendar.getInstance().getTime()); + xhpcRateTime.setCreateBy(userName); + xhpcRateTime.setUpdateBy(userName); xhpcChargingStationMapper.insertXhpcRateTime(xhpcRateTime); return sort++; } @@ -875,7 +883,10 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc @Override @Transactional - public AjaxResult updateXhpcRateTime(XhpcChargingStationDto xhpcChargingStationDto) { + public AjaxResult updateXhpcRateTime(HttpServletRequest request, XhpcChargingStationDto xhpcChargingStationDto) { + LoginUser loginUser = logUserUtils.getLogUser(request); + String userName = loginUser.getUsername(); + //电站id不能为空 if (xhpcChargingStationDto.getChargingStationId() == null) { return AjaxResult.error("1001", "电站id为空"); @@ -932,6 +943,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc BeanUtils.copyProperties(xhpcChargingStationDto, xhpcRateModel); xhpcRateModel.setRemark("修改"); xhpcRateModel.setCreateTime(new Date()); + xhpcRateModel.setCreateBy(userName); int i = xhpcChargingStationMapper.insertXhpcRateModel(xhpcRateModel); if (i == 0) { return AjaxResult.error("1005", "费率计费模型添加失败"); @@ -962,6 +974,8 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc xhpcRate.setServiceFee(xhpcRateDto.getServiceFee()); xhpcRate.setRateModelId(rateModelId); xhpcRate.setRateValue(xhpcRateDto.getId()); + xhpcRate.setUpdateBy(userName); + xhpcRate.setCreateBy(userName); xhpcChargingStationMapper.insertXhpcRate(xhpcRate); map.put(xhpcRateDto.getId(), xhpcRate.getRateId()); }else{ @@ -1015,15 +1029,15 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue); + sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); if(!endTime.equals("24:00:00")) { if(rateValue ==null || "".equals(rateValue)){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName); } }else{ if(k == 0){ @@ -1032,9 +1046,9 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue); + sort= addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, "00:00:00", startTime, sort, 2, rateValue, userName); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); }else if(k < list.size()-1){ String endTimeK = list.get(k - 1).getEndTime(); if (!endTimeK.equals(startTime)) { @@ -1042,10 +1056,10 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName); } //并把本条数据也添加上 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); }else{ String endTimeK = list.get(k - 1).getEndTime(); if (!endTimeK.equals(startTime)) { @@ -1054,17 +1068,17 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc return AjaxResult.error("请填写默认时间段费率"); } //添加一条默认费率时段 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTimeK, startTime, sort, 2, rateValue, userName); } //并把本条数据也添加上 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodIdMap, startTime, endTime, sort, 1, rateValues, userName); if (!endTime.equals("24:00:00")) { if(rateValue ==null || "".equals(rateValue)){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("请填写默认时间段费率"); } //添加一条默认费率时段 - sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue); + sort = addXhpcRateTime(chargingStationId, rateModelId, defaultPeriodId, endTime, "24:00:00", sort, 2, rateValue, userName); } } }