From a5323c7df447bed2695744095400ce21531f6c82 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 25 Feb 2022 11:21:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A9=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/{log => }/XhpcLogApplication.java | 2 +- .../log/controller/OrderLogController.java | 16 ++++++++++-- .../log/controller/PileLogController.java | 26 ++++++++++++++----- .../mapper/XhpcChargingPileMapper.xml | 6 +++++ .../mapper/XhpcHistoryOrderMapper.xml | 7 +++++ 5 files changed, 47 insertions(+), 10 deletions(-) rename xhpc-modules/xhpc-log/src/main/java/com/xhpc/{log => }/XhpcLogApplication.java (96%) diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/XhpcLogApplication.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/XhpcLogApplication.java similarity index 96% rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/XhpcLogApplication.java rename to xhpc-modules/xhpc-log/src/main/java/com/xhpc/XhpcLogApplication.java index cbb90fdd..2275b657 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/XhpcLogApplication.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/XhpcLogApplication.java @@ -1,4 +1,4 @@ -package com.xhpc.log; +package com.xhpc; import com.xhpc.common.security.annotation.EnableCustomConfig; import com.xhpc.common.security.annotation.EnableRyFeignClients; 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 fd78ded5..1a52f566 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 @@ -4,11 +4,14 @@ 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.common.util.LogUserUtils; import com.xhpc.log.service.OrderLogService; +import com.xhpc.system.api.model.LoginUser; import lombok.extern.java.Log; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; @@ -24,20 +27,29 @@ public class OrderLogController extends BaseController { @Resource OrderLogService orderLogService; + @Resource + LogUserUtils logUserUtils; + @GetMapping("/getPage") public TableDataInfo getOrderPage( + HttpServletRequest request, @RequestParam(required = false) String orderId, @RequestParam(required = false) String phone, - @RequestParam(required = false) String tenantId, + @RequestParam(required = false) String startTime, + @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer number){ + LoginUser loginUser = logUserUtils.getLogUser(request); + startPage(); Map params = new HashMap<>(); params.put("orderId", orderId); params.put("phone", phone); + params.put("startTime", startTime); + params.put("endTime", endTime); params.put("operatorId", SecurityUtils.getUserId()); params.put("number", number); - params.put("tenantId", tenantId); + params.put("tenantId", loginUser.getTenantId()); return getDataTable(orderLogService.getOrderPage(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 fdb9c66a..60e6b2e7 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 @@ -5,10 +5,13 @@ 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.common.util.LogUserUtils; import com.xhpc.log.service.PileLogService; +import com.xhpc.system.api.model.LoginUser; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; @@ -24,42 +27,51 @@ public class PileLogController extends BaseController { @Resource PileLogService pileLogService; + @Resource + LogUserUtils logUserUtils; + @GetMapping("/getPage") public TableDataInfo getPilePage( + HttpServletRequest request, @RequestParam(required = false) String stationName, - @RequestParam(required = false) String tenantId, - @RequestParam(required = false) Integer number) { + @RequestParam(required = false) String pileName, + @RequestParam(required = false) String pileSerialNumber, + @RequestParam(required = false) Integer number) { + + LoginUser loginUser = logUserUtils.getLogUser(request); + startPage(); Map params = new HashMap<>(); params.put("stationName", stationName); + params.put("pileName", pileName); params.put("operatorId", SecurityUtils.getUserId()); params.put("number", number); - params.put("tenantId", tenantId); + params.put("pileSerialNumber", pileSerialNumber); + params.put("tenantId", loginUser.getTenantId()); return getDataTable(pileLogService.getPilePage(params)); } - @GetMapping("/detail") public TableDataInfo getPileDetailPage(@RequestParam("pileId") String pileId, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) { + startPage(); return getDataTable(pileLogService.getPileRunLogPage(pileId, startTime, endTime)); } - @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, + @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, - @RequestParam(required = false) String serialNumber) throws Exception { + @RequestParam(required = false) String serialNumber) throws Exception { Map params = new HashMap<>(); params.put("operatorId", SecurityUtils.getUserId()); 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 90fb4f68..b9db0969 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -98,6 +98,12 @@ + + and cp.serial_number = #{params.pileSerialNumber} + + + and concat(cp.name,'号桩') like concat ('%', #{params.pileName},'%') + and st.name like CONCAT('%',#{params.stationName},'%') 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 f270986a..42e944a0 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -27,6 +27,13 @@ and co.tenant_id = #{params.tenantId} + + and co.start_time = ]]> #{params.startTime} + + + and co.create_time #{params.endTime} + + order by co.create_time desc