From 89a4aa5dbe23feb7c25d7c6fcc2423bb0de8b5d4 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 18 Jan 2022 18:08:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml | 1 + .../src/main/resources/mapper/XhpcDeviceMessageMapper.xml | 1 + 2 files changed, 2 insertions(+) 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 72b22665..fd2e2dd3 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml @@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" oper_name = #{params.operName} + order by oper_time desc 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 fb4efb79..ba772080 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,7 @@ update_by as 'updateBy' from xhpc_device_message where type=#{type} and serial_number=#{serialNumber} + order by create_time desc From 37f45722c132f0898e7bb59e004f389f13567a7b Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 19 Jan 2022 10:53:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=83=E8=B7=B3?= =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E6=8A=A5=E6=96=87=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/server/HBCheckTask.java | 1 - 1 file changed, 1 deletion(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java index f371b1c9..887cd00e 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java @@ -44,7 +44,6 @@ public class HBCheckTask { String pileId= StrUtil.sub(gunkey.substring(gunkey.lastIndexOf(":") + 1), 0, -2); deviceMessage.setSerialNumber(pileId); - deviceMessage.setContent(JSON.toJSONString(cacheGun)); deviceMessage.setStatus(0); deviceMessage.setRemark("充电桩心跳掉线"); deviceMessageMapper.insertByDomain(deviceMessage); From 5f120ec4635a8896020c5358baa978ad8af84114 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 19 Jan 2022 11:05:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=A9=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=97=A5=E5=BF=97=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xhpc/log/controller/PileLogController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2894c7e2..9ab9f8bb 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 @@ -45,7 +45,7 @@ public class PileLogController extends BaseController { return getDataTable(pileLogService.getPileRunLogPage(pileId)); } - @GetMapping("/export") + @PostMapping("/export") public void export(HttpServletResponse response, @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, From 41c1d97624d6b08eae13371073d1422a4b49b9ca Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 19 Jan 2022 13:04:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A9=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=97=A5=E5=BF=97=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/log/controller/PileLogController.java | 10 ++++++++-- .../xhpc/log/mapper/XhpcDeviceMessageMapper.java | 4 +++- .../java/com/xhpc/log/service/PileLogService.java | 2 +- .../xhpc/log/service/impl/PileLogServiceImpl.java | 7 +++---- .../resources/mapper/XhpcDeviceMessageMapper.xml | 15 ++++++++++++++- 5 files changed, 29 insertions(+), 9 deletions(-) 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 From 510510109b0a13af601741178a8981e184d6c7b3 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 19 Jan 2022 16:20:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/controller/OrderLogController.java | 8 ++- .../log/controller/PileLogController.java | 2 + .../log/mapper/XhpcDeviceMessageMapper.java | 7 ++ .../log/service/impl/OrderLogServiceImpl.java | 8 ++- .../mapper/XhpcDeviceMessageMapper.xml | 67 +++++++++++++++++++ 5 files changed, 86 insertions(+), 6 deletions(-) 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 d36403e1..5050d522 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 @@ -37,15 +37,16 @@ public class OrderLogController extends BaseController { } - @GetMapping("/{orderId}") - public TableDataInfo getOrderDetailPage(@PathVariable("orderId") String orderId){ + @GetMapping("/detail") + public TableDataInfo getOrderDetailPage(@RequestParam("orderId") String orderId){ startPage(); return getDataTable(orderLogService.getOrderDetailPage(orderId)); } - @GetMapping("/export") + @PostMapping("/export") public void export(HttpServletResponse response, + @RequestParam(required = false) String orderId, @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, @RequestParam(required = false) String serialNumber) throws Exception { @@ -55,6 +56,7 @@ public class OrderLogController extends BaseController { params.put("number", number); params.put("serialNumber", serialNumber); params.put("tenantId", tenantId); + params.put("orderId", orderId); orderLogService.export(response, params); } 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 7351eb23..62c8da67 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 @@ -49,6 +49,7 @@ public class PileLogController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, + @RequestParam("pileId") String pileId, @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, @RequestParam(required = false) String startTime, @@ -63,6 +64,7 @@ public class PileLogController extends BaseController { params.put("tenantId", tenantId); params.put("startTime", startTime); params.put("endTime", endTime); + params.put("pileId", pileId); 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 ab805788..c9f267ad 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 @@ -17,4 +17,11 @@ public interface XhpcDeviceMessageMapper { List> selectListByParams(@Param("params")Map params); + + + List> selectListByChargeOrderNo(@Param("chargeOrderNo") String chargeOrderNo); + + + + List> getOrderMessageByParams(@Param("params")Map params); } 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 015256f4..e67291d5 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 @@ -4,6 +4,7 @@ package com.xhpc.log.service.impl; import cn.hutool.core.io.IoUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; +import com.xhpc.log.mapper.XhpcDeviceMessageMapper; import com.xhpc.log.mapper.XhpcHistoryOrderMapper; import com.xhpc.log.mapper.XhpcMessageMapper; import com.xhpc.log.service.OrderLogService; @@ -21,8 +22,9 @@ public class OrderLogServiceImpl implements OrderLogService { @Resource XhpcHistoryOrderMapper historyOrderMapper; + @Resource - XhpcMessageMapper messageMapper; + XhpcDeviceMessageMapper deviceMessageMapper; @Override @@ -33,13 +35,13 @@ public class OrderLogServiceImpl implements OrderLogService { @Override public List> getOrderDetailPage(String orderId){ - return messageMapper.getOrderMessagePage(orderId); + return deviceMessageMapper.selectListByChargeOrderNo(orderId); } @Override public void export(HttpServletResponse response, Map params) throws Exception{ - List> list = messageMapper.getOrderMessageByParams(params); + List> list = deviceMessageMapper.getOrderMessageByParams(params); ExcelWriter writer = ExcelUtil.getWriter(true); writer.addHeaderAlias("serialNumber", "订单号"); 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 cd1a96ae..18b1c9f6 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -28,6 +28,26 @@ + + + + + + +