From d4e8fef039001cbf85996f51ad3b361698bdb50f Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 4 Jan 2022 15:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/controller/OrderLogController.java | 36 ++++++++++--- .../log/controller/PileLogController.java | 35 ++++++++++--- .../log/controller/StationLogController.java | 17 ++++--- .../log/controller/SystemLogController.java | 12 ++++- .../com/xhpc/log/mapper/SysOperLogMapper.java | 2 +- .../log/mapper/XhpcChargingPileMapper.java | 6 +-- .../log/mapper/XhpcChargingStationMapper.java | 2 +- .../log/mapper/XhpcDeviceMessageMapper.java | 3 ++ .../log/mapper/XhpcHistoryOrderMapper.java | 2 +- .../xhpc/log/mapper/XhpcMessageMapper.java | 3 ++ .../com/xhpc/log/service/OrderLogService.java | 5 +- .../com/xhpc/log/service/PileLogService.java | 4 +- .../xhpc/log/service/StationLogService.java | 2 +- .../xhpc/log/service/SystemLogService.java | 2 +- .../log/service/impl/OrderLogServiceImpl.java | 40 ++++++++++++++- .../log/service/impl/PileLogServiceImpl.java | 36 ++++++++++++- .../service/impl/StationLogServiceImpl.java | 4 +- .../service/impl/SystemLogServiceImpl.java | 4 +- .../resources/mapper/SysOperLogMapper.xml | 4 +- .../mapper/XhpcChargingPileMapper.xml | 11 ++-- .../mapper/XhpcChargingStationMapper.xml | 11 ++-- .../mapper/XhpcDeviceMessageMapper.xml | 40 +++++++++++++++ .../mapper/XhpcHistoryOrderMapper.xml | 11 ++-- .../resources/mapper/XhpcMessageMapper.xml | 51 ++++++++++++++++--- 24 files changed, 277 insertions(+), 66 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 a10e6a0f..d36403e1 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 @@ -3,14 +3,15 @@ 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.common.enums.StationDeviceEnum; import com.xhpc.log.service.OrderLogService; import lombok.extern.java.Log; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; /** @@ -24,11 +25,15 @@ public class OrderLogController extends BaseController { OrderLogService orderLogService; @GetMapping("/getPage") - public TableDataInfo getOrderPage(){ - startPage(); - Long operatorId = SecurityUtils.getUserId(); + public TableDataInfo getOrderPage(@RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number){ - return getDataTable(orderLogService.getOrderPage(operatorId, null)); + startPage(); + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("tenantId", tenantId); + return getDataTable(orderLogService.getOrderPage(params)); } @@ -38,4 +43,19 @@ public class OrderLogController extends BaseController { return getDataTable(orderLogService.getOrderDetailPage(orderId)); } + + @GetMapping("/export") + public void export(HttpServletResponse response, + @RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number, + @RequestParam(required = false) String serialNumber) throws Exception { + + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("serialNumber", serialNumber); + params.put("tenantId", tenantId); + 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 2807957f..9d50a7f8 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 @@ -4,13 +4,14 @@ 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.common.enums.StationDeviceEnum; import com.xhpc.log.service.PileLogService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; /** @@ -25,10 +26,15 @@ public class PileLogController extends BaseController { @GetMapping("/getPage") - public TableDataInfo getPilePage() { - Long operatorId = SecurityUtils.getUserId(); + public TableDataInfo getPilePage(@RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number) { startPage(); - return getDataTable(pileLogService.getPilePage(operatorId, null)); + + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("tenantId", tenantId); + return getDataTable(pileLogService.getPilePage(params)); } @@ -38,4 +44,19 @@ public class PileLogController extends BaseController { return getDataTable(pileLogService.getPileRunLogPage(pileId)); } + @GetMapping("/export") + public void export(HttpServletResponse response, + @RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number, + @RequestParam(required = false) String serialNumber) throws Exception { + + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("type", StationDeviceEnum.PILE.getCode()); + params.put("serialNumber", serialNumber); + params.put("tenantId", tenantId); + pileLogService.export(response, params); + } + } 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 90f69f89..52f3afdf 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 @@ -6,12 +6,11 @@ import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.log.service.StationLogService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; @RestController @RequestMapping("/log/station") @@ -22,10 +21,14 @@ public class StationLogController extends BaseController { StationLogService stationLogService; @GetMapping("/getPage") - public TableDataInfo getPilePage() { + public TableDataInfo getPilePage(@RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number) { startPage(); - Long operatorId = SecurityUtils.getUserId(); - return getDataTable(stationLogService.getStationPage(operatorId, null)); + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("tenantId", tenantId); + return getDataTable(stationLogService.getStationPage(params)); } 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 f90dce2d..3ec85d2a 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 @@ -1,14 +1,18 @@ 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.SystemLogService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; /** * 系统操作日志 @@ -23,8 +27,12 @@ public class SystemLogController extends BaseController { @GetMapping("/oper/getPage") - public TableDataInfo getPage(){ + public TableDataInfo getPage(@RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number){ startPage(); - return getDataTable(systemLogService.getPage(null)); + Map params = new HashMap<>(); + params.put("operName", SecurityUtils.getUsername()); + params.put("tenantId", tenantId); + return getDataTable(systemLogService.getPage(params)); } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java index 5035b7cd..84571810 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java @@ -12,6 +12,6 @@ import java.util.Map; */ public interface SysOperLogMapper { - List> selectUserOperLog(@Param("operName") String operName); + List> selectUserOperLog(@Param("params") Map params); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java index 138406e2..3712feba 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java @@ -16,12 +16,8 @@ public interface XhpcChargingPileMapper { /** * 桩列表 * - * @param serialNumber 桩编号 - * @param type 桩类型 - * @param name 桩名称 - * @return */ - List> selectXhpcChargingPileList(@Param("operatorId")Long operatorId, @Param("number")Integer number); + List> selectXhpcChargingPileList(@Param("params")Map params); /** * 终端 diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java index 2bb533cb..119f695f 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java @@ -18,7 +18,7 @@ public interface XhpcChargingStationMapper { * * @return 电站集合 */ - List> selectXhpcChargingStationList(@Param("operatorId")Long operatorId,@Param("type")Integer type); + List> selectXhpcChargingStationList(@Param("params")Map params); List> selectRateListByStationId(@Param("stationId")Long stationId); 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 5f3ff19a..7f6dda18 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 @@ -12,4 +12,7 @@ public interface XhpcDeviceMessageMapper { List> selectListByTypeAndSerialNumber(@Param("type") String type, @Param("serialNumber")String serialNumber); + + + List> selectListByParams(@Param("params")Map params); } 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 609a1244..fbe1baa4 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 @@ -10,6 +10,6 @@ import java.util.Map; public interface XhpcHistoryOrderMapper { - List> getOrderPage(@Param("operatorId") Long operatorId, @Param("number") Integer number); + List> getOrderPage(@Param("params")Map params); } \ 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 d0005ac6..420215ad 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 @@ -13,4 +13,7 @@ public interface XhpcMessageMapper { List> getOrderMessagePage(@Param("serialNumber")String serialNumber); + + + List> getOrderMessageByParams(@Param("params")Map params); } 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 244abd4b..604b7475 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 @@ -1,14 +1,17 @@ package com.xhpc.log.service; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; public interface OrderLogService { - List> getOrderPage(Long operatorId, Integer type); + List> getOrderPage(Map params); List> getOrderDetailPage(String orderId); + + void export(HttpServletResponse response, Map params) throws Exception; } 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 63992ed9..b57710b9 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 @@ -1,14 +1,16 @@ package com.xhpc.log.service; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; public interface PileLogService { - List> getPilePage(Long operatorId, Integer type); + List> getPilePage(Map params); List> getPileRunLogPage(String pileId); + void export(HttpServletResponse response, Map params) throws Exception; } 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 f019d219..955ee274 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, Integer type); + List> getStationPage(Map params); List> getStationRatePage(Long stationId); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java index 4008e008..4ae604db 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java @@ -6,6 +6,6 @@ import java.util.Map; public interface SystemLogService { - List> getPage(String userName); + List> getPage(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 8037e014..015256f4 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 @@ -1,12 +1,17 @@ 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.XhpcHistoryOrderMapper; import com.xhpc.log.mapper.XhpcMessageMapper; import com.xhpc.log.service.OrderLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -21,8 +26,8 @@ public class OrderLogServiceImpl implements OrderLogService { @Override - public List> getOrderPage(Long operatorId, Integer type){ - return historyOrderMapper.getOrderPage(operatorId, type); + public List> getOrderPage(Map params){ + return historyOrderMapper.getOrderPage(params); } @@ -30,4 +35,35 @@ public class OrderLogServiceImpl implements OrderLogService { public List> getOrderDetailPage(String orderId){ return messageMapper.getOrderMessagePage(orderId); } + + + @Override + public void export(HttpServletResponse response, Map params) throws Exception{ + List> list = messageMapper.getOrderMessageByParams(params); + + ExcelWriter writer = ExcelUtil.getWriter(true); + writer.addHeaderAlias("serialNumber", "订单号"); + writer.addHeaderAlias("sourceName", "订单来源"); + writer.addHeaderAlias("chargingDegree", "充电电量"); + writer.addHeaderAlias("amountCharged", "总金额"); + writer.addHeaderAlias("chargingTime", "充电时长"); + writer.addHeaderAlias("startSOc", "充电启始soc"); + writer.addHeaderAlias("endSoc", "结束soc"); + writer.addHeaderAlias("startTime", "充电开始时间"); + writer.addHeaderAlias("endTime", "充电结束时间"); + writer.addHeaderAlias("power", "电桩功率(KW)"); + writer.addHeaderAlias("content", "充电报文"); + writer.addHeaderAlias("remark", "备注描述"); + writer.addHeaderAlias("createTime", "发送时间"); + + writer.setOnlyAlias(true); + writer.write(list, true); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + ServletOutputStream out = response.getOutputStream(); + + writer.flush(out, true); + writer.close(); + IoUtil.close(out); + } } 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 a926df7c..0b817f6f 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,5 +1,8 @@ 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.common.enums.StationDeviceEnum; import com.xhpc.log.mapper.XhpcChargingPileMapper; import com.xhpc.log.mapper.XhpcDeviceMessageMapper; @@ -7,6 +10,8 @@ import com.xhpc.log.service.PileLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -21,9 +26,9 @@ public class PileLogServiceImpl implements PileLogService { XhpcDeviceMessageMapper deviceMessageMapper; @Override - public List> getPilePage(Long operatorId, Integer type){ + public List> getPilePage(Map params){ - return pileMapper.selectXhpcChargingPileList(operatorId , type); + return pileMapper.selectXhpcChargingPileList(params); } @@ -31,4 +36,31 @@ public class PileLogServiceImpl implements PileLogService { public List> getPileRunLogPage(String pileId){ return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId); } + + @Override + public void export(HttpServletResponse response, Map params) throws Exception{ + List> list = deviceMessageMapper.selectListByParams(params); + + ExcelWriter writer = ExcelUtil.getWriter(true); + writer.addHeaderAlias("chargingStationName", "场站名称"); + writer.addHeaderAlias("chargingPileName", "充电桩名称"); + writer.addHeaderAlias("serialNumber", "桩编码"); + writer.addHeaderAlias("brandModel", "费率"); + writer.addHeaderAlias("pileType", "电桩类型"); + writer.addHeaderAlias("power", "电桩功率(KW)"); + writer.addHeaderAlias("content", "充电桩上传平台报文"); + writer.addHeaderAlias("replyContent", "平台回复报文"); + writer.addHeaderAlias("remark", "备注描述"); + writer.addHeaderAlias("createTime", "发送时间"); + + writer.setOnlyAlias(true); + writer.write(list, true); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + ServletOutputStream out = response.getOutputStream(); + + writer.flush(out, true); + writer.close(); + IoUtil.close(out); + } } 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 2903ce71..c7f1f066 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,8 +16,8 @@ public class StationLogServiceImpl implements StationLogService { XhpcChargingStationMapper stationMapper; @Override - public List> getStationPage(Long operatorId, Integer type){ - return stationMapper.selectXhpcChargingStationList(operatorId, type); + public List> getStationPage(Map params){ + return stationMapper.selectXhpcChargingStationList(params); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java index 1f780455..67dfb434 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java @@ -16,7 +16,7 @@ public class SystemLogServiceImpl implements SystemLogService { SysOperLogMapper operLogMapper; @Override - public List> getPage(String userName){ - return operLogMapper.selectUserOperLog(userName); + public List> getPage(Map params){ + return operLogMapper.selectUserOperLog(params); } } 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 fb09f884..72b22665 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml @@ -24,8 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" oper_time as 'operTime' from sys_oper_log - - oper_name = #{operName} + + oper_name = #{params.operName} diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml index 6d643d30..ae681be0 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -98,11 +98,14 @@ - - and cp.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{operatorId}) + + and cp.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) - - and cp.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{operatorId}) + + and cp.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId}) + + + and cp.tenant_id = #{params.tenantId} order by cp.create_time desc diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml index a39403b3..5a0e6bc0 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -16,11 +16,14 @@ from xhpc_charging_station as cs left join xhpc_operator as ope on cs.operator_id = ope.operator_id where cs.del_flag =0 - - and cs.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{operatorId}) + + and cs.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) - - and cs.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{operatorId}) + + and cs.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId}) + + + and cs.tenant_id=#{params.tenantId} 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 6aee2818..599fca67 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -20,4 +20,44 @@ where type=#{type} and serial_number=#{serialNumber} + + + diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 3154c4a2..13134066 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -15,11 +15,14 @@ from xhpc_charge_order as co left join xhpc_charging_station as st on st.charging_station_id =co.charging_station_id where co.del_flag =0 - - and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{operatorId}) + + and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) - - and co.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{operatorId}) + + and co.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId}) + + + and co.tenant_id = #{params.tenantId} order by co.create_time desc 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 6cee0abd..a5c6585e 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml @@ -4,14 +4,49 @@ + + +