From 38211b6057c02f6217e77e4949c30867fd66b366 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 30 Dec 2021 11:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/XhpcChargingPileServiceImpl.java | 4 ++-- .../xhpc/log/controller/OrderLogController.java | 6 ++++-- .../xhpc/log/controller/PileLogController.java | 8 +++++--- .../log/controller/StationLogController.java | 9 ++++----- .../xhpc/log/controller/SystemLogController.java | 2 +- .../xhpc/log/mapper/XhpcHistoryOrderMapper.java | 1 - .../com/xhpc/log/mapper/XhpcMessageMapper.java | 6 ++++++ .../com/xhpc/log/service/OrderLogService.java | 2 +- .../com/xhpc/log/service/PileLogService.java | 4 ++-- .../com/xhpc/log/service/StationLogService.java | 2 +- .../log/service/impl/OrderLogServiceImpl.java | 11 +++++++---- .../log/service/impl/PileLogServiceImpl.java | 16 ++++++++++------ .../log/service/impl/StationLogServiceImpl.java | 2 +- .../main/resources/mapper/SysOperLogMapper.xml | 2 +- .../resources/mapper/XhpcHistoryOrderMapper.xml | 12 ------------ .../main/resources/mapper/XhpcMessageMapper.xml | 11 +++++++++++ 16 files changed, 56 insertions(+), 42 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index 727372a3..9f0f0b6a 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -19,7 +19,7 @@ import com.xhpc.common.domain.XhpcChargingPile; import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.domain.XhpcTerminal; import com.xhpc.common.enums.ConnectorTypeEnum; -import com.xhpc.common.enums.EquipmentTypeEnum; +import com.xhpc.common.enums.PileEquipmentTypeEnum; import com.xhpc.common.enums.PowerTypeEnum; import com.xhpc.common.util.LogUserUtils; import com.xhpc.system.api.model.LoginUser; @@ -371,7 +371,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { pile.setType(PowerTypeEnum.getCodeByName(pile.getTypeName())); pile.setConnectorType(ConnectorTypeEnum.getCodeByName(pile.getConnectorTypeName())); - pile.setEquipmentType(EquipmentTypeEnum.getCodeByName(pile.getEquipmentTypeName())); + pile.setEquipmentType(PileEquipmentTypeEnum.getCodeByName(pile.getEquipmentTypeName())); XhpcChargingStation station = xhpcChargingStationService.selectXhpcChargingStationByName(pile.getChargingStationName()); if(station == null){ diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java index a4f84ec0..a2a8911d 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java @@ -1,5 +1,6 @@ package com.xhpc.log.controller; +import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.log.service.OrderLogService; @@ -24,12 +25,13 @@ public class OrderLogController extends BaseController { @GetMapping("/getPage") public TableDataInfo getOrderPage(){ startPage(); + Long operatorId = SecurityUtils.getUserId(); - return getDataTable(orderLogService.getOrderPage()); + return getDataTable(orderLogService.getOrderPage(operatorId, null)); } - @GetMapping("/order/{orderId}") + @GetMapping("/{orderId}") public TableDataInfo getOrderDetailPage(@PathVariable("orderId") String orderId){ startPage(); return getDataTable(orderLogService.getOrderDetailPage(orderId)); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java index d7a955dc..2807957f 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java @@ -1,6 +1,7 @@ package com.xhpc.log.controller; +import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.log.service.PileLogService; @@ -25,13 +26,14 @@ public class PileLogController extends BaseController { @GetMapping("/getPage") public TableDataInfo getPilePage() { + Long operatorId = SecurityUtils.getUserId(); startPage(); - return getDataTable(pileLogService.getPilePage()); + return getDataTable(pileLogService.getPilePage(operatorId, null)); } - @GetMapping("/pile/{pileId}") - public TableDataInfo getPileDetailPage(@PathVariable("pileId") Long pileId) { + @GetMapping("/{pileId}") + public TableDataInfo getPileDetailPage(@PathVariable("pileId") String pileId) { startPage(); return getDataTable(pileLogService.getPileRunLogPage(pileId)); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java index d7df3d68..c52ad733 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java @@ -26,15 +26,14 @@ public class StationLogController extends BaseController { public TableDataInfo getPilePage() { startPage(); Long operatorId = SecurityUtils.getUserId(); - int type = 1; - return getDataTable(stationLogService.getStationPage(operatorId, type)); + return getDataTable(stationLogService.getStationPage(operatorId, null)); } - @GetMapping("/pile/{pileId}") - public TableDataInfo getPileDetailPage(@PathVariable("pileId") Long pileId) { + @GetMapping("/{stationId}") + public TableDataInfo getPileDetailPage(@PathVariable("stationId") Long stationId) { startPage(); - return getDataTable(stationLogService.getStationRatePage(pileId)); + return getDataTable(stationLogService.getStationRatePage(stationId)); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java index 761a201b..f90dce2d 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java @@ -22,7 +22,7 @@ public class SystemLogController extends BaseController { SystemLogService systemLogService; - @GetMapping("/getPage") + @GetMapping("/oper/getPage") public TableDataInfo getPage(){ startPage(); return getDataTable(systemLogService.getPage(null)); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java index 9b682b16..609a1244 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java @@ -12,5 +12,4 @@ public interface XhpcHistoryOrderMapper { List> getOrderPage(@Param("operatorId") Long operatorId, @Param("number") Integer number); - List> getOrderMessagePage(@Param("serialNumber")String serialNumber); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java index c44a3106..d0005ac6 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java @@ -2,9 +2,15 @@ package com.xhpc.log.mapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; @Mapper public interface XhpcMessageMapper { + + List> getOrderMessagePage(@Param("serialNumber")String serialNumber); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java index f1841056..244abd4b 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java @@ -6,7 +6,7 @@ import java.util.Map; public interface OrderLogService { - List> getOrderPage(); + List> getOrderPage(Long operatorId, Integer type); List> getOrderDetailPage(String orderId); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java index adaf23f1..84fbb8b6 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java @@ -8,9 +8,9 @@ import java.util.Map; public interface PileLogService { - List> getPilePage(); + List> getPilePage(Long operatorId, Integer type); - List> getPileRunLogPage(Long pileId); + List> getPileRunLogPage(String pileId); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java index b21b7b27..f019d219 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java @@ -6,7 +6,7 @@ import java.util.Map; public interface StationLogService { - List> getStationPage(Long operatorId, int type); + List> getStationPage(Long operatorId, Integer type); List> getStationRatePage(Long stationId); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java index 424fc235..a3174e14 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java @@ -3,6 +3,7 @@ package com.xhpc.log.service.impl; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.log.mapper.XhpcHistoryOrderMapper; +import com.xhpc.log.mapper.XhpcMessageMapper; import com.xhpc.log.service.OrderLogService; import org.springframework.stereotype.Service; @@ -16,16 +17,18 @@ public class OrderLogServiceImpl implements OrderLogService { @Resource XhpcHistoryOrderMapper historyOrderMapper; + @Resource + XhpcMessageMapper messageMapper; + @Override - public List> getOrderPage(){ - Long operatorId = SecurityUtils.getUserId(); - return historyOrderMapper.getOrderPage(operatorId, 1); + public List> getOrderPage(Long operatorId, Integer type){ + return historyOrderMapper.getOrderPage(operatorId, type); } @Override public List> getOrderDetailPage(String orderId){ - return historyOrderMapper.getOrderMessagePage(orderId); + return messageMapper.getOrderMessagePage(orderId); } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java index 1c1deb63..d189a809 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java @@ -1,7 +1,9 @@ package com.xhpc.log.service.impl; import com.xhpc.common.core.utils.SecurityUtils; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.log.mapper.XhpcChargingPileMapper; +import com.xhpc.log.mapper.XhpcDeviceMessageMapper; import com.xhpc.log.service.PileLogService; import org.springframework.stereotype.Service; @@ -16,16 +18,18 @@ public class PileLogServiceImpl implements PileLogService { @Resource XhpcChargingPileMapper pileMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override - public List> getPilePage(){ - Long operatorId = SecurityUtils.getUserId(); - return pileMapper.selectXhpcChargingPileList(operatorId , 1); + public List> getPilePage(Long operatorId, Integer type){ + + return pileMapper.selectXhpcChargingPileList(operatorId , type); } @Override - public List> getPileRunLogPage(Long pileId){ - // todo 待完善电桩运行日志 - return null; + public List> getPileRunLogPage(String pileId){ + return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId); } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java index eaae787e..2903ce71 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java @@ -16,7 +16,7 @@ public class StationLogServiceImpl implements StationLogService { XhpcChargingStationMapper stationMapper; @Override - public List> getStationPage(Long operatorId, int type){ + public List> getStationPage(Long operatorId, Integer type){ return stationMapper.selectXhpcChargingStationList(operatorId, type); } diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml index 8f5bba05..fb09f884 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml index af4c71a1..6cee0abd 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml @@ -3,4 +3,15 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +