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 9ab9f8bb..7351eb23 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 @@ -40,15 +40,19 @@ public class PileLogController extends BaseController { @GetMapping("/detail") - public TableDataInfo getPileDetailPage(@RequestParam("pileId") String pileId) { + public TableDataInfo getPileDetailPage(@RequestParam("pileId") String pileId, + @RequestParam(required = false) String startTime, + @RequestParam(required = false) String endTime) { startPage(); - return getDataTable(pileLogService.getPileRunLogPage(pileId)); + return getDataTable(pileLogService.getPileRunLogPage(pileId, startTime, endTime)); } @PostMapping("/export") public void export(HttpServletResponse response, @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, + @RequestParam(required = false) String startTime, + @RequestParam(required = false) String endTime, @RequestParam(required = false) String serialNumber) throws Exception { Map params = new HashMap<>(); @@ -57,6 +61,8 @@ public class PileLogController extends BaseController { params.put("type", StationDeviceEnum.PILE.getCode()); params.put("serialNumber", serialNumber); params.put("tenantId", tenantId); + params.put("startTime", startTime); + params.put("endTime", endTime); pileLogService.export(response, params); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java index 7f6dda18..ab805788 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java @@ -11,7 +11,9 @@ import java.util.Map; public interface XhpcDeviceMessageMapper { List> selectListByTypeAndSerialNumber(@Param("type") String type, - @Param("serialNumber")String serialNumber); + @Param("serialNumber")String serialNumber, + @Param("startTime") String startTime, + @Param("endTime") String endTime); List> selectListByParams(@Param("params")Map params); 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 b57710b9..4243d1e4 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 @@ -10,7 +10,7 @@ public interface PileLogService { List> getPilePage(Map params); - List> getPileRunLogPage(String pileId); + List> getPileRunLogPage(String pileId, String startTime, String endTime); void export(HttpServletResponse response, Map params) throws Exception; } 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 0b817f6f..70387e76 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 @@ -33,8 +33,8 @@ public class PileLogServiceImpl implements PileLogService { @Override - public List> getPileRunLogPage(String pileId){ - return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId); + public List> getPileRunLogPage(String pileId, String startTime, String endTime){ + return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId, startTime, endTime); } @Override @@ -45,11 +45,10 @@ public class PileLogServiceImpl implements PileLogService { writer.addHeaderAlias("chargingStationName", "场站名称"); writer.addHeaderAlias("chargingPileName", "充电桩名称"); writer.addHeaderAlias("serialNumber", "桩编码"); - writer.addHeaderAlias("brandModel", "费率"); + writer.addHeaderAlias("brandModel", "规则型号"); writer.addHeaderAlias("pileType", "电桩类型"); writer.addHeaderAlias("power", "电桩功率(KW)"); writer.addHeaderAlias("content", "充电桩上传平台报文"); - writer.addHeaderAlias("replyContent", "平台回复报文"); writer.addHeaderAlias("remark", "备注描述"); writer.addHeaderAlias("createTime", "发送时间"); diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml index ba772080..cd1a96ae 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -18,6 +18,12 @@ update_by as 'updateBy' from xhpc_device_message where type=#{type} and serial_number=#{serialNumber} + + and create_time = ]]> #{startTime} + + + and create_time #{endTime} + order by create_time desc @@ -39,7 +45,7 @@ m.remark as 'remark', m.create_time as 'createTime', m.create_by as 'createBy', - m.update_time as 'updateTime', + m.update_time as 'updateTime' from xhpc_device_message m left join xhpc_charging_pile cp on cp.serial_number=m.serial_number left join xhpc_charging_station st on st.charging_station_id =cp.charging_station_id @@ -62,6 +68,13 @@ and m.charge_order_no=#{params.chargeOrderNo} + + and m.create_time = ]]> #{params.startTime} + + + and m.create_time #{params.endTime} + + order by m.create_time desc