diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/controller/BaseController.java index 1f6bd1da..6b5473b4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/controller/BaseController.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/controller/BaseController.java @@ -59,7 +59,19 @@ public class BaseController PageHelper.startPage(pageNum, pageSize, orderBy); } } + /** + * 设置请求分页数据 + */ + protected void startPage(Integer pageNum,Integer pageSize) + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) + { + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + PageHelper.startPage(pageNum, pageSize, orderBy); + } + } /** * 响应请求分页数据 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/service/BaseService.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/service/BaseService.java new file mode 100644 index 00000000..f205e37b --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/web/service/BaseService.java @@ -0,0 +1,27 @@ +package com.xhpc.common.core.web.service; + +import com.github.pagehelper.PageHelper; +import com.xhpc.common.core.utils.StringUtils; +import com.xhpc.common.core.utils.sql.SqlUtil; +import com.xhpc.common.core.web.page.PageDomain; +import com.xhpc.common.core.web.page.TableSupport; + +/** + * @author yuyang + * @date 2022/1/12 10:54 + */ +public class BaseService { + + protected void startPage() + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) + { + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + PageHelper.startPage(pageNum, pageSize, orderBy); + } + } + +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java index 6e908c0c..6d783c28 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java @@ -38,8 +38,6 @@ public class XhpcChargingPileController extends BaseController { */ @GetMapping("/list") public TableDataInfo list(HttpServletRequest request,String name, Integer type, String serialNumber, Long chargingStationId) { - - startPage(); List> list = xhpcChargingPileService.selectXhpcChargingPileList(request,name, type, serialNumber, chargingStationId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java index a7d2f176..39c08b04 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java @@ -71,7 +71,6 @@ public class XhpcChargingStationController extends BaseController { //@PreAuthorize(hasPermi = "system:station:list") @GetMapping("/list") public TableDataInfo list(HttpServletRequest request,String name, String operatorName) { - startPage(); List> list = xhpcChargingStationService.selectXhpcChargingStationList(request,name, operatorName); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java index f498ed7b..e46c38ff 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java @@ -39,8 +39,6 @@ public class XhpcTerminalController extends BaseController { //@PreAuthorize(hasPermi = "system:station:list") @GetMapping("/list") public TableDataInfo list(HttpServletRequest request, String serialNumber, Integer type, Integer status, String workStatus, Long chargingStationId) { - - startPage(); List> list = xhpcTerminalService.getXhpcTerminalList(request,serialNumber, type, status, workStatus, chargingStationId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java index 0515f0e5..d3457f96 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java @@ -21,7 +21,7 @@ public interface IXhpcChargingPileService { * @param name 桩名称 * @return */ - List> selectXhpcChargingPileList(HttpServletRequest request, String name, Integer type, String serialNumber, Long chargingStationId); + List> selectXhpcChargingPileList(HttpServletRequest request,String name, Integer type, String serialNumber, Long chargingStationId); /** 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 9f0f0b6a..799351a5 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 @@ -15,6 +15,7 @@ import com.xhpc.common.core.exception.CustomException; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.domain.XhpcChargingPile; import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.domain.XhpcTerminal; @@ -41,7 +42,7 @@ import static com.aliyun.oss.internal.OSSConstants.URL_ENCODING; * @date 2021/7/27 14:36 */ @Service -public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { +public class XhpcChargingPileServiceImpl extends BaseService implements IXhpcChargingPileService{ @Autowired private XhpcChargingPileMapper xhpcChargingPileMapper; @@ -92,6 +93,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { Map landUser = xhpcChargingStationService.getLandUser(userId); if(landUser !=null){ if(landUser.get("userType") !=null){ + startPage(); if("01".equals(landUser.get("userType").toString())){ Long operatorId = Long.valueOf(landUser.get("operatorId").toString()); list= xhpcChargingPileMapper.selectXhpcChargingPileList(name, type, serialNumber, chargingStationId,operatorId,1,tenantId); @@ -101,10 +103,9 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { } } }else{ + startPage(); list= xhpcChargingPileMapper.selectXhpcChargingPileList(name, type, serialNumber, chargingStationId,userId,0,tenantId); } - - return list; } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index 856838be..c42e327d 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -12,6 +12,7 @@ import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.DateUtils; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.data.redis.CacheRateModel; import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.domain.XhpcRate; @@ -41,7 +42,7 @@ import java.util.regex.Pattern; * @date 2021-07-19 */ @Service -public class XhpcChargingStationServiceImpl implements IXhpcChargingStationService { +public class XhpcChargingStationServiceImpl extends BaseService implements IXhpcChargingStationService { @Autowired private XhpcChargingStationMapper xhpcChargingStationMapper; @@ -133,6 +134,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi Map landUser = xhpcChargingStationMapper.getLandUser(userId); if(landUser !=null){ if(landUser.get("userType") !=null){ + startPage(); if("01".equals(landUser.get("userType").toString())){ Long operatorId = Long.valueOf(landUser.get("operatorId").toString()); //运营商看自己的场站 @@ -144,6 +146,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi } } }else{ + startPage(); list = xhpcChargingStationMapper.selectXhpcChargingStationList(name, operatorName,userId,0,tenantId); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java index 493917d7..b8adbcb9 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java @@ -3,6 +3,7 @@ package com.xhpc.charging.station.service; import cn.hutool.core.date.DateUtil; import com.xhpc.charging.station.mapper.XhpcTerminalMapper; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.domain.XhpcTerminal; import com.xhpc.common.util.LogUserUtils; import com.xhpc.system.api.model.LoginUser; @@ -19,7 +20,7 @@ import java.util.*; * @date 2021-07-20 */ @Service -public class XhpcTerminalServiceImpl implements IXhpcTerminalService { +public class XhpcTerminalServiceImpl extends BaseService implements IXhpcTerminalService { @Autowired private XhpcTerminalMapper xhpcTerminalMapper; @@ -46,6 +47,7 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService { @Override public List> getXhpcTerminalList(HttpServletRequest request, String serialNumber, Integer type, Integer status, String workStatus, Long chargingStationId) { LoginUser logUser = logUserUtils.getLogUser(request); + startPage(); List> list = xhpcTerminalMapper.getXhpcTerminalList(serialNumber, type, status, workStatus, chargingStationId,logUser.getTenantId()); if(list !=null && list.size()>0){ for (int i = 0; i > list = iXhpcChargeOrderService.getHistotyChargeOrderStatusList(request); return getDataTable(list); } @@ -107,7 +105,6 @@ public class XhpcChargeOrderController extends BaseController { @GetMapping("/list") public TableDataInfo list(HttpServletRequest request) { - startPage(); List> list = xhpcHistoryOrderService.list(request); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 8339dc94..7856827a 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -55,16 +55,7 @@ public class XhpcPileOrderController extends BaseController { @Autowired private UserTypeService userTypeService; - private static final Logger logger = LoggerFactory.getLogger(XhpcPileOrderController.class); - /** - * 测试 - */ - @GetMapping("/test/chargeOrder/pileStartup") - private R test(@RequestParam String orderNo, @RequestParam Integer status, @RequestParam String remark) { - return null; - } - /** * 桩启动回调接口 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index b0ac2605..bca87578 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -82,7 +82,6 @@ public class XhpcHistoryOrderController extends BaseController { String affiliationOrganization,String evcsOrderNo,String plateNum,Integer internetId,String internetSerialNumber,String terminalName,String vinCode,String overStartTime,String overEndTime,Long personnelId) { - startPage(); List> listPage = xhpcHistoryOrderService.getListPage(phone, transactionNumber, status, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId); return getDataTable(listPage); } @@ -426,14 +425,11 @@ public class XhpcHistoryOrderController extends BaseController { @GetMapping("/test") @Scheduled(cron = "0 0/2 * * * ?") public void test(){ - logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); - logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); //小时统计 List list = xhpcHistoryOrderService.getStatistisList(3000,0); if(list !=null && list.size()>0){ for (XhpcChargeHistoryOrder xhpc:list) { - try{ //开始时间、结束时间、模型id、状态、用户id、运营商、订单id、场站id、终端id、历史订单id、时间 Date startTime = xhpc.getStartTime(); @@ -508,8 +504,6 @@ public class XhpcHistoryOrderController extends BaseController { @GetMapping("/test8") //@Scheduled(cron = "0 0/5 * * * ?") public void test8(){ - logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); - logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); //获取500条待统计历史订单 //跨时段，跨费率，计费模型 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java index 6a477e0c..04eeeede 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java @@ -66,7 +66,6 @@ public class XhpcHistoryOrderReconciliationStatusController extends BaseControll @GetMapping("/page") @ApiOperation(value = "流量用户对账分页列表") public TableDataInfo page(@RequestParam Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { - startPage(); List> list = iXhpcHistoryOrderReconciliationStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java index 5c5907a7..cbb246fe 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java @@ -68,7 +68,6 @@ public class XhpcHistoryOrderSortingStatusController extends BaseController { @GetMapping("/page") @ApiOperation(value = "运营商清分分页列表") public TableDataInfo page(@RequestParam Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { - startPage(); List> list = iXhpcHistoryOrderSortingStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java index d96eea0b..a3fe89db 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java @@ -50,7 +50,6 @@ public class XhpcRealTimeOrderController extends BaseController { public TableDataInfo list(String phone,String transactionNumber,Integer source,String chargingStationName,String terminalName,Long operatorId,String startTime,String endTime,@RequestParam("status") Integer status,@RequestParam("userId") Long userId,@RequestParam("type") Integer type, String affiliationOrganization,String plateNum,Integer internetId,String internetSerialNumber) { - startPage(); List> list = xhpcRealTimeOrderService.list(phone, transactionNumber, source, chargingStationName,terminalName, operatorId, startTime, endTime,status,userId,type,affiliationOrganization,plateNum,internetId,internetSerialNumber); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java index b5ce35e4..c99ff053 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java @@ -44,7 +44,6 @@ public class XhpcStatisticsController extends BaseController { @GetMapping("/getTimeIntervalPage") public TableDataInfo getTimeIntervalPage(String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); List> list = xhpcStatisticsService.getTimeIntervalPage(chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -63,7 +62,6 @@ public class XhpcStatisticsController extends BaseController { @GetMapping("/getDateIntervalPage") public TableDataInfo getDateIntervalPage(String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); List> list = xhpcStatisticsService.getDateIntervalPage(chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -82,7 +80,6 @@ public class XhpcStatisticsController extends BaseController { @GetMapping("/getStationIntervalPage") public TableDataInfo getStationIntervalPage(String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); List> list = xhpcStatisticsService.getStationIntervalPage(chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -100,7 +97,6 @@ public class XhpcStatisticsController extends BaseController { @GetMapping("/getOperatorIntervalPage") public TableDataInfo getOperatorIntervalPage(String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); List> list = xhpcStatisticsService.getOperatorIntervalPage(operatorIds,operatorId,startTime,endTime,userId,type); return getDataTable(list); } @@ -138,7 +134,6 @@ public class XhpcStatisticsController extends BaseController { @GetMapping("/getTerminalIntervalPage") public TableDataInfo getTerminalIntervalPage(String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) { - startPage(); List> list = xhpcStatisticsService.getTerminalIntervalPage(chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java index c106d027..f682d2e6 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java @@ -54,12 +54,12 @@ public interface XhpcChargeOrderMapper { /** * 判断用户是否在充电中 */ - String countXhpcRealTimeOrder(@Param("userId")Long userId); + String countXhpcRealTimeOrder(@Param("userId")Long userId,@Param("source")Integer source,@Param("tenantId")String tenantId); /** * 判断用户是否有异常订单未处理 */ - int countXhpcChargeOrder(@Param("userId")Long userId); + int countXhpcChargeOrder(@Param("userId")Long userId,@Param("source")Integer source,@Param("tenantId")String tenantId); /** * 获取终端信息 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index e6ca05bb..76be4198 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -6,6 +6,7 @@ import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.redis.CacheRealtimeData; import com.xhpc.common.data.redis.StaticBeanUtil; @@ -20,6 +21,7 @@ import com.xhpc.order.mapper.XhpcChargeOrderMapper; import com.xhpc.order.mapper.XhpcInternetUserMapper; import com.xhpc.order.service.IXhpcChargeOrderService; import com.xhpc.system.api.model.LoginUser; +import org.bouncycastle.jcajce.provider.asymmetric.util.BaseAgreementSpi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +42,7 @@ import static com.xhpc.common.data.redis.StaticBeanUtil.genOrder; * @date 2021/8/4 9:54 */ @Service -public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { +public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChargeOrderService { public static RedisService REDIS; @@ -87,6 +89,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { @Override public List> getHistotyChargeOrderStatusList(HttpServletRequest request) { LoginUser loginUser = tokenService.getLoginUser(request); + startPage(); return xhpcChargeOrderMapper.getHistotyChargeOrderStatusList(loginUser.getUserid(),loginUser.getTenantId(),loginUser.getUserType()); } @@ -124,7 +127,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { return AjaxResult.error(1100, "金额小于5元,不能充电，请充值后再进行充电"); } //充电用户是否存在异常的订单 - int j = xhpcChargeOrderMapper.countXhpcChargeOrder(userId); + int j = xhpcChargeOrderMapper.countXhpcChargeOrder(userId,userType,tenantId); if (j > 0) { return AjaxResult.error(1103, "你有异常订单未解决，请拨打客服电话进行解决"); } @@ -133,7 +136,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { return AjaxResult.error(1101, "你有申请退款订单在审核中,需要充电请取消申请退款"); } //充电用户是否在充电中 - String i = xhpcChargeOrderMapper.countXhpcRealTimeOrder(userId); + String i = xhpcChargeOrderMapper.countXhpcRealTimeOrder(userId,userType,tenantId); if (!"".equals(i) && i!=null) { return AjaxResult.error(1102, "车辆正在充电,请查询车辆充电信息"); } @@ -246,8 +249,9 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { xhpcChargeOrder.setTerminalId(xhpcTerminal.getTerminalId()); xhpcChargeOrder.setGunId(xhpcTerminal.getSerialNumber()); xhpcChargeOrder.setSerialNumber(orderNo); - xhpcChargeOrder.setSource(0); + xhpcChargeOrder.setSource(userType); xhpcChargeOrder.setStatus(-1); + xhpcChargeOrder.setTenantId(tenantId); if (xhpcChargingPileById != null && xhpcChargingPileById.get("power") != null) { xhpcChargeOrder.setPower(xhpcChargingPileById.get("power").toString()); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java index f298f344..27482127 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java @@ -4,6 +4,7 @@ import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.redis.service.RedisService; import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.order.domain.XhpcHistoryOrderReconciliationStatus; @@ -23,7 +24,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHistoryOrderReconciliationStatusService { +public class XhpcHistoryOrderReconciliationStatusServiceImpl extends BaseService implements IXhpcHistoryOrderReconciliationStatusService { @Autowired private XhpcHistoryOrderReconciliationStatusMapper xhpcHistoryOrderReconciliationStatusMapper; @@ -126,6 +127,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if (StringUtils.isNotEmpty(privilege)) { + startPage(); if (StatusConstants.OPERATION_POWER_TYPE == Integer.parseInt(privilege)) { String operatorId = StringUtils.valueOf(map.get("operatorId")); return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, operatorId, null); @@ -134,6 +136,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis } } } + startPage(); return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index 9919f83b..4b339a87 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.data.redis.CacheRealtimeData; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; @@ -47,7 +48,7 @@ import java.util.concurrent.Executors; * @date 2021/8/3 21:23 */ @Service -public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { +public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHistoryOrderService { @Resource private XhpcHistoryOrderMapper xhpcHistoryOrderMapper; @@ -87,6 +88,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); if (userMessage == null) { + startPage(); return xhpcHistoryOrderMapper.list(userid,userType,tenantId); } } @@ -134,6 +136,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { Map landUser = xhpcHistoryOrderMapper.getLandUser(logUserId); if (landUser != null) { if (landUser.get("userType") != null) { + startPage(); if ("01".equals(landUser.get("userType").toString())) { Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); //运营商看自己的场站 @@ -146,6 +149,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { } } else { + startPage(); list = xhpcHistoryOrderMapper.getListPage(phone, transactionNumber, 0, chargingStationName, operatorId, source, beginStartTime, beginEndTime, userId, type, number,affiliationOrganization,evcsOrderNo,plateNum,internetId,internetSerialNumber,terminalName,vinCode,overStartTime,overEndTime,personnelId); } return list; diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java index 4a38c6aa..b44abdc2 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java @@ -4,6 +4,7 @@ import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.redis.service.RedisService; import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.order.domain.XhpcHistoryOrderSortingStatus; @@ -23,7 +24,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrderSortingStatusService { +public class XhpcHistoryOrderSortingStatusServiceImpl extends BaseService implements IXhpcHistoryOrderSortingStatusService { @Autowired private XhpcHistoryOrderSortingStatusMapper xhpcHistoryOrderSortingStatusMapper; @@ -127,6 +128,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if (StringUtils.isNotEmpty(privilege)) { + startPage(); if (StatusConstants.OPERATION_POWER_TYPE == Integer.parseInt(privilege)) { String operatorId = StringUtils.valueOf(map.get("operatorId")); return xhpcHistoryOrderSortingStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, operatorId, null); @@ -135,6 +137,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd } } } + startPage(); return xhpcHistoryOrderSortingStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java index 233204ed..030ba1fc 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.xhpc.common.api.RefundOrderService; import com.xhpc.common.api.SmsService; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.data.redis.CacheOrderData; import com.xhpc.common.data.redis.CacheRealtimeData; import com.xhpc.common.redis.service.RedisService; @@ -33,7 +34,7 @@ import java.util.concurrent.Executors; * @date 2021/8/7 15:07 */ @Service -public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService { +public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRealTimeOrderService { @Autowired private XhpcRealTimeOrderMapper xhpcRealTimeOrderMapper; @@ -84,6 +85,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService { if(logUserId !=1) { Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); if(landUser !=null){ + startPage(); if(landUser.get("userType") !=null){ if("01".equals(landUser.get("userType").toString())){ Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); @@ -96,6 +98,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService { } } }else{ + startPage(); list = xhpcRealTimeOrderMapper.list(phone,transactionNumber,source,chargingStationName,terminalName,operatorId,startTime,endTime,number,status,logUserId,0,affiliationOrganization,plateNum,internetId,internetSerialNumber); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java index 96dc351a..61333dea 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.order.domain.XhpcStatisticsStation; import com.xhpc.order.domain.XhpcStatisticsTimeInterval; import com.xhpc.order.mapper.XhpcStatisticsServiceMapper; @@ -28,7 +29,7 @@ import java.util.*; * @Version 1.0 */ @Service -public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { +public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStatisticsService { @Autowired private XhpcStatisticsServiceMapper xhpcStatisticsServiceMapper; @@ -49,6 +50,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(logUserId !=1){ Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); if(landUser !=null){ + startPage(); if(landUser.get("userType") !=null){ if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); @@ -61,6 +63,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } } }else{ + startPage(); list =xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,logUserId); } List> page =new ArrayList<>(); @@ -171,6 +174,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(logUserId !=1){ Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); if(landUser !=null){ + startPage(); if(landUser.get("userType") !=null){ if("01".equals(landUser.get("userType").toString())){ Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); @@ -183,6 +187,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } } }else{ + startPage(); list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,logUserId); } @@ -209,6 +214,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(logUserId !=1){ Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); if(landUser !=null){ + startPage(); if(landUser.get("userType") !=null){ if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); @@ -221,6 +227,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } } }else{ + startPage(); list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,0,logUserId); } @@ -244,6 +251,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(logUserId !=1){ Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); if(landUser !=null){ + startPage(); if(landUser.get("userType") !=null){ if("01".equals(landUser.get("userType").toString()) || "03".equals(landUser.get("userType").toString())){ Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); @@ -256,6 +264,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } } }else{ + startPage(); list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 0,logUserId); } @@ -286,6 +295,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { if(logUserId !=1){ Map landUser = xhpcHistoryOrderService.getLandUser(logUserId); if(landUser !=null){ + startPage(); if(landUser.get("userType") !=null){ if("01".equals(landUser.get("userType").toString())){ Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString()); @@ -298,6 +308,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService { } } }else{ + startPage(); list =xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, 0,logUserId); } diff --git a/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml index 5571b791..ea99137c 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml @@ -23,6 +23,3 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.xhpc.order.mapper: debug \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index 7d3ef5a2..ece34bd9 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -128,11 +128,31 @@ update xhpc_app_user set balance=#{balance} where app_user_id=#{userId} @@ -230,6 +230,12 @@ AND xro.type = #{type} + + AND xro.source = #{source} + + + and xro.user_id=#{userId} + ORDER BY xro.create_time DESC diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml index 0b78d504..b747274e 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml @@ -90,4 +90,38 @@ ORDER BY xra.create_time DESC + + + + UPDATE xhpc_community_personnel + + surplus_money = #{surplusMoney}, + is_refund_application = #{isRefundApplication}, + + WHERE community_personnel_id = #{communityPersonnelId} + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml index 99a16e8e..d3d5154b 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml @@ -171,7 +171,7 @@ @@ -302,11 +308,31 @@ + + + UPDATE xhpc_community_personnel set is_refund_application=#{isRefundApplication} where community_personnel_id=#{userId} + \ No newline at end of file diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml index ce2dd28a..0f020fd3 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml @@ -69,7 +69,10 @@ remark, - source + source, + + + tenant_id @@ -116,7 +119,10 @@ #{remark}, - #{source} + #{source}, + + + #{tenantId}, diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java index 146449dc..0a7ed380 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java @@ -73,7 +73,6 @@ public class XhpcAppUserController extends BaseController { //@PreAuthorize(hasPermi = "app:user:page") @GetMapping("/page") public TableDataInfo page(HttpServletRequest request,String phone) { - startPage(); List> list = iXhpcAppUserUserService.selectAppUserList(request,phone); return getDataTable(list); } @@ -286,8 +285,8 @@ public class XhpcAppUserController extends BaseController { */ @ApiOperation("注销账号") @PostMapping("/logout") - public R logout(String phone, String code) { - return iXhpcAppUserUserService.logout(phone, code); + public R logout(HttpServletRequest request,String phone, String code) { + return iXhpcAppUserUserService.logout(request,phone, code); } @@ -315,7 +314,6 @@ public class XhpcAppUserController extends BaseController { @PostMapping("/batteryProtect") public R batteryProtect(HttpServletRequest request,@RequestBody Map map) { if(map !=null){ - Integer soc = Integer.parseInt(map.get("soc").toString()); Integer socProtect = Integer.parseInt(map.get("socProtect").toString()); Integer userType = Integer.parseInt(map.get("userType").toString()); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java index 8accd938..e70eb708 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommunityController.java @@ -11,6 +11,7 @@ import com.xhpc.user.service.IXhpcCommunityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -29,9 +30,8 @@ public class XhpcCommunityController extends BaseController { * 社区组树列表 */ @GetMapping("/list") - public TableDataInfo list(String name) { - startPage(); - List> list = xhpcCommunityService.list(name); + public TableDataInfo list(HttpServletRequest request, String name) { + List> list = xhpcCommunityService.list(request,name); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java index a372f622..baf20483 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCustomersController.java @@ -29,9 +29,8 @@ public class XhpcCustomersController extends BaseController { * 大客户组树列表 */ @GetMapping("/list") - public TableDataInfo list(String name) { - startPage(); - List> list = xhpcCustomersService.list(name); + public TableDataInfo list(HttpServletRequest request,String name) { + List> list = xhpcCustomersService.list(request,name); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java index 55e7aa99..249a49ec 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java @@ -173,6 +173,7 @@ public class XhpcInternetUserController extends BaseController { //@PreAuthorize(hasPermi = "user:internet:list") @GetMapping("/list") public TableDataInfo list(String name) { + startPage(); List> list = iXhpcInternetUserService.list(name); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java index ef090e2f..efc9cb8f 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorInternetBlacklistController.java @@ -49,6 +49,7 @@ public class XhpcOperatorInternetBlacklistController extends BaseController { //@PreAuthorize(hasPermi = "operator:internet:list") @GetMapping("/list") public TableDataInfo list(@RequestParam String operatorId) { + startPage(); List> list = xhpcOperatorInternetBlacklistService.list(operatorId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java index cc6dd9f7..6be2c863 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java @@ -59,16 +59,15 @@ public class XhpcStationInternetBlacklistController extends BaseController { //@PreAuthorize(hasPermi = "station:internet:list") @GetMapping("/list") public TableDataInfo list(@RequestParam String internetUserId) { + startPage(); List> list = iXhpcStationInternetBlacklistService.list(internetUserId); return getDataTable(list); } @GetMapping("/list1") public TableDataInfo list1(@RequestParam String internetUserId) { + startPage(); List> list = iXhpcStationInternetBlacklistService.list(internetUserId); - - - return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java index 500de840..fc97e669 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java @@ -115,7 +115,6 @@ public class XhpcUserController extends BaseController { //@PreAuthorize(hasPermi = "user:operator:page") @GetMapping("/operator/page") public TableDataInfo operatorPage(String userName, String nickName, Long operatorId) { - startPage(); List> list = iXhpcUserService.selectOperatorUserList(userName, nickName, operatorId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java index 6d28be21..3e5085af 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java @@ -3,6 +3,7 @@ package com.xhpc.user.mapper; import com.xhpc.user.domain.XhpcAppUser; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -81,7 +82,7 @@ public interface XhpcAppUserMapper { /** * 记录登录用户的最后一次数据 */ - int addUserLoginTime(@Param("appUserId")Long appUserId, @Param("account")String account, @Param("userType")Integer userType, @Param("openId")String openId,@Param("type")Integer type,@Param("status")Integer status,@Param("tenantId")String tenantId); + int addUserLoginTime(@Param("appUserId")Long appUserId, @Param("account")String account, @Param("userType")Integer userType, @Param("openId")String openId, @Param("type")Integer type, @Param("status")Integer status, @Param("tenantId")String tenantId, @Param("createTime") Date createTime); /** * 修改社区用户信息 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommunityMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommunityMapper.java index b65c810d..2b64041f 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommunityMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommunityMapper.java @@ -20,7 +20,7 @@ public interface XhpcCommunityMapper { * @param name 桩名称 * @return */ - List> list(@Param("name") String name); + List> list(@Param("name") String name,@Param("tenantId") String tenantId); /** * 添加社区组 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCustomersMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCustomersMapper.java index d758e985..5fef93b9 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCustomersMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCustomersMapper.java @@ -25,7 +25,7 @@ public interface XhpcCustomersMapper { * @param name 桩名称 * @return */ - List> list(@Param("name") String name,@Param("operatorId") Long operatorId); + List> list(@Param("name") String name,@Param("operatorId") Long operatorId,@Param("tenantId") String tenantId); /** * 查询大客户组 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java index 42812998..32c75c39 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcAppUserUserService.java @@ -97,7 +97,7 @@ public interface IXhpcAppUserUserService { * @param code * @return */ - public R logout(String phone, String code); + public R logout(HttpServletRequest request,String phone, String code); /** * 设置小程序用户自动退款功能 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommunityService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommunityService.java index f1a12a81..11a5ab2c 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommunityService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommunityService.java @@ -5,6 +5,7 @@ import com.xhpc.common.domain.XhpcChargingPile; import com.xhpc.user.domain.XhpcCommunity; import com.xhpc.user.domain.XhpcCommunityPersonnel; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -21,7 +22,7 @@ public interface IXhpcCommunityService { * @param name 桩名称 * @return */ - List> list(String name); + List> list(HttpServletRequest request, String name); /** * 新增社区组树 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCustomersService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCustomersService.java index a55526bc..d30fdaea 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCustomersService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCustomersService.java @@ -21,7 +21,7 @@ public interface IXhpcCustomersService { * @param name 桩名称 * @return */ - List> list(String name); + List> list(HttpServletRequest request,String name); /** * 新增大客户组树 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java index d527c3c7..a700e5eb 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -11,6 +11,7 @@ import com.xhpc.common.core.enums.UserStatus; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; @@ -37,7 +38,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { +public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserUserService { @Autowired private XhpcAppUserMapper xhpcAppUserMapper; @@ -88,7 +89,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { @Override public List> selectAppUserList(HttpServletRequest request,String phone) { LoginUser logUser = logUserUtils.getLogUser(request); - + startPage(); return xhpcAppUserMapper.selectAppUserList(phone,logUser.getTenantId()); } @@ -162,7 +163,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { } } //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(info.getAppUserId(),info.getPhone(),UserTypeUtil.USER_TYPE,openid,Integer.valueOf(type),null,tenantId); + xhpcAppUserMapper.addUserLoginTime(info.getAppUserId(),info.getPhone(),UserTypeUtil.USER_TYPE,openid,Integer.valueOf(type),null,tenantId,new Date()); return R.fail(HttpStatus.ALREADY_EXISTING, "账号已存在"); } XhpcAppUser xhpcAppUser = new XhpcAppUser(); @@ -259,7 +260,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { } } //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(appUserId,username,userInfo.getUserType(),openid,Integer.valueOf(type),null,tenantId); + xhpcAppUserMapper.addUserLoginTime(appUserId,username,userInfo.getUserType(),openid,Integer.valueOf(type),null,tenantId,new Date()); redisService.deleteObject("pvToken:" + username); // 获取登录token @@ -323,7 +324,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { redisService.deleteObject("pvToken:" + user.getPhone()); //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(user.getAppUserId(),username,userInfo.getUserType(),openid,Integer.valueOf(type),UserConstants.LOGIN,tenantId); + xhpcAppUserMapper.addUserLoginTime(user.getAppUserId(),username,userInfo.getUserType(),openid,Integer.valueOf(type),UserConstants.LOGIN,tenantId,new Date()); // 获取登录token return R.ok(tokenService.createToken(userInfo)); } @@ -356,7 +357,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { } xhpcAppUserMapper.update(appUser); //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(appUser.getAppUserId(),username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId); + xhpcAppUserMapper.addUserLoginTime(appUser.getAppUserId(),username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId,new Date()); } }else if(UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ if (StatusConstants.OPERATION_WX_TYPE.equals(type)) { @@ -365,7 +366,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { xhpcAppUserMapper.updateCommunityPersonnel(userid,null,null,null,UserConstants.NO_LOGIN); } //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(userid,username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId); + xhpcAppUserMapper.addUserLoginTime(userid,username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId,new Date()); }else if(UserTypeUtil.CUSTOMERS_TYPE.equals(userType)){ if (StatusConstants.OPERATION_WX_TYPE.equals(type)) { xhpcAppUserMapper.updateCustomersPersonnel(userid,null,null,UserConstants.NO_LOGIN,null); @@ -373,7 +374,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { xhpcAppUserMapper.updateCustomersPersonnel(userid,null,null,null,UserConstants.NO_LOGIN); } //添加最后一次登录数据 - xhpcAppUserMapper.addUserLoginTime(userid,username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId); + xhpcAppUserMapper.addUserLoginTime(userid,username,userType,openId,Integer.valueOf(type),UserConstants.NO_LOGIN,tenantId,new Date()); } } // 删除用户缓存记录 @@ -440,10 +441,8 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { map.put("servicePhone",servicePhone); map.put("activity",1); map.put("activitySize",1); - map.put("activityImg","https://www.scxhua.cn/static/img/logo1.8460b7f4.png"); - map.put("socSize",98); - map.put("socUser",80); - map.put("socProtect",1); + map.put("activityImg","https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/bunengshanchu/1.png"); + map.put("socSize",redisService.getCacheObject("global:SOC")); return AjaxResult.success(map); }else{ @@ -460,7 +459,8 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { */ @Override @Transactional - public R logout(String phone, String code) { + public R logout(HttpServletRequest request,String phone, String code) { + if (StringUtils.isEmpty(code)) { return R.fail(HttpStatus.NOT_NULL, "验证码不能为空"); } @@ -471,11 +471,19 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { if (!code.equalsIgnoreCase(captcha)) { return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); } - XhpcAppUser xhpcAppUser = xhpcAppUserMapper.getAppUserByPhone(phone); - if (StringUtils.isNull(xhpcAppUser)) { - return R.fail(HttpStatus.ERROR_STATUS, "用户不存在"); + LoginUser loginUser = tokenService.getLoginUser(request); + Long userid = loginUser.getUserid(); + Integer userType = loginUser.getUserType(); + String tenantId = loginUser.getTenantId(); + if(UserTypeUtil.USER_TYPE.equals(userType)){ + XhpcAppUser xhpcAppUser = xhpcAppUserMapper.getAppUserByPhone(phone); + if (StringUtils.isNull(xhpcAppUser)) { + return R.fail(HttpStatus.ERROR_STATUS, "用户不存在"); + } + xhpcAppUserMapper.deleteById(xhpcAppUser.getAppUserId()); + }else{ + return R.fail(HttpStatus.ERROR_STATUS, "用户不能注销"); } - xhpcAppUserMapper.deleteById(xhpcAppUser.getAppUserId()); redisService.deleteObject("pvToken:" + phone); return R.ok(); } @@ -507,11 +515,8 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { @Override public R batteryProtect(HttpServletRequest request, Integer soc,Integer socProtect,Integer userType) { LoginUser loginUser = logUserUtils.getLogUser(request); - Object version = redisService.getCacheObject("global:version"); - Object servicePhone = redisService.getCacheObject("global:phone"); //根据不同的用户类型查询不同的信息 Long userid = loginUser.getUserid(); - R user = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null,loginUser.getTenantId()); if(user !=null && user.getData() !=null){ Map map = (Map)user.getData(); @@ -525,7 +530,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { }else if(UserTypeUtil.CUSTOMERS_TYPE.equals(userType)){ xhpcAppUserMapper.updateCustomersSocProtect(userid,socProtect,soc); } - return R.fail(HttpStatus.ERROR_STATUS, "设置失败"); + return R.fail(HttpStatus.SUCCESS, "设置成功"); } return R.fail(HttpStatus.ERROR_STATUS, "设置失败"); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommunityServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommunityServiceImpl.java index a1dcd9ab..463ac272 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommunityServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommunityServiceImpl.java @@ -1,8 +1,12 @@ package com.xhpc.user.service.impl; +import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; +import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; +import com.xhpc.system.api.model.LoginUser; import com.xhpc.user.domain.XhpcCommunity; import com.xhpc.user.domain.XhpcCommunityPersonnel; import com.xhpc.user.mapper.XhpcCommunityMapper; @@ -12,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -23,23 +28,25 @@ import java.util.Map; * @date 2021/12/20 9:59 */ @Service -public class XhpcCommunityServiceImpl implements IXhpcCommunityService { +public class XhpcCommunityServiceImpl extends BaseService implements IXhpcCommunityService { @Autowired private XhpcCommunityMapper xhpcCommunityMapper; @Autowired private IMechanismService mechanismService; + @Autowired + private TokenService tokenService; @Override - public List> list(String name) { + public List> list(HttpServletRequest request, String name) { Long userId = SecurityUtils.getUserId(); List> list =new ArrayList<>(); + LoginUser loginUser = tokenService.getLoginUser(request); if(userId !=null){ - Map landUser = xhpcCommunityMapper.getLandUser(userId); - if(landUser !=null && landUser.get("userType") !=null){ - if("00".equals(landUser.get("userType").toString())){ - list = xhpcCommunityMapper.list(name); - } + startPage(); + String userType = loginUser.getSysUser().getUserType(); + if(UserTypeUtil.SYS_USER_TYPE_ZERO.equals(userType)){ + list = xhpcCommunityMapper.list(name,loginUser.getTenantId()); } } return list; @@ -48,6 +55,10 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { @Override public AjaxResult addCommunity(XhpcCommunity xhpcCommunity) { + R r= judgeXhpcCommunity(xhpcCommunity); + if(r.getCode() !=200){ + return AjaxResult.error(r.getMsg()); + } //名称重复不能入库 Map communityById = xhpcCommunityMapper.getCommunityById(null, xhpcCommunity.getName(), null); if(communityById !=null){ @@ -84,6 +95,11 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { @Override public AjaxResult updateCommunity(XhpcCommunity xhpcCommunity) { + + R r = judgeXhpcCommunity(xhpcCommunity); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } //名称重复不能入库 Map communityById = xhpcCommunityMapper.getCommunityById(xhpcCommunity.getCommunityId(), xhpcCommunity.getName(), 2); if(communityById !=null){ @@ -118,6 +134,10 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { @Override @Transactional public AjaxResult addCommunityPersonnel(XhpcCommunityPersonnel xhpcCommunityPersonnel) { + R r = judgeXhpcCommunityPersonnel(xhpcCommunityPersonnel); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } String phone = xhpcCommunityPersonnel.getPhone(); String account = xhpcCommunityPersonnel.getAccount(); Map communityPersonnelById = xhpcCommunityMapper.getCommunityPersonnelById(null, phone, account, 3); @@ -149,6 +169,10 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { @Override public AjaxResult updateCommunityPersonnel(XhpcCommunityPersonnel xhpcCommunityPersonnel) { + R r = judgeXhpcCommunityPersonnel(xhpcCommunityPersonnel); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } Long communityPersonnelId = xhpcCommunityPersonnel.getCommunityPersonnelId(); String phone = xhpcCommunityPersonnel.getPhone(); String account = xhpcCommunityPersonnel.getAccount(); @@ -189,7 +213,7 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { BigDecimal rechargeMoney = xhpcCommunityPersonnel.getRechargeMoney(); Long communityPersonnelId = xhpcCommunityPersonnel.getCommunityPersonnelId(); - if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ + if(rechargeMoney !=null &&new BigDecimal(0).compareTo(rechargeMoney)==-1){ //增加社区用户的剩余金额 Map communityPersonnelById = xhpcCommunityMapper.getCommunityPersonnelById(communityPersonnelId, null, null, 1); if(communityPersonnelById !=null){ @@ -217,4 +241,38 @@ public class XhpcCommunityServiceImpl implements IXhpcCommunityService { } return AjaxResult.error("充值金额必需大于0"); } + + public R judgeXhpcCommunity(XhpcCommunity xhpcCommunity){ + + if(xhpcCommunity.getName()==null || "".equals(xhpcCommunity.getName())){ + return R.fail("名称必填"); + } + if(xhpcCommunity.getContactName()==null || "".equals(xhpcCommunity.getContactName())){ + return R.fail("联系人必填"); + } + if(xhpcCommunity.getContactPhone()==null || "".equals(xhpcCommunity.getContactPhone())){ + return R.fail("联系人电话必填"); + } + if(xhpcCommunity.getAddress()==null || "".equals(xhpcCommunity.getAddress())){ + return R.fail("地址必填"); + } + return R.ok(); + } + + public R judgeXhpcCommunityPersonnel(XhpcCommunityPersonnel xhpcCommunityPersonnel){ + + if(xhpcCommunityPersonnel.getName()==null || "".equals(xhpcCommunityPersonnel.getName())){ + return R.fail("名称必填"); + } + if(xhpcCommunityPersonnel.getAccount()==null || "".equals(xhpcCommunityPersonnel.getAccount()) || !"ST".equals(xhpcCommunityPersonnel.getAccount().substring(0,2))){ + return R.fail("账号必填且ST开头10位"); + } + if(xhpcCommunityPersonnel.getPhone()==null || "".equals(xhpcCommunityPersonnel.getPhone()) || xhpcCommunityPersonnel.getPhone().length()!=11){ + return R.fail("绑定手机号必填"); + } + + return R.ok(); + } + + } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java index 6e0a20c8..d5c71d37 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java @@ -1,10 +1,13 @@ package com.xhpc.user.service.impl; +import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.common.security.service.TokenService; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.system.api.model.LoginUser; +import com.xhpc.user.domain.XhpcCommunity; import com.xhpc.user.domain.XhpcCustomers; import com.xhpc.user.domain.XhpcCustomersPersonnel; import com.xhpc.user.mapper.XhpcCustomersMapper; @@ -26,7 +29,7 @@ import java.util.Map; * @date 2021/12/23 15:53 */ @Service -public class XhpcCustomersServiceImpl implements IXhpcCustomersService { +public class XhpcCustomersServiceImpl extends BaseService implements IXhpcCustomersService { @Autowired private XhpcCustomersMapper xhpcCustomersMapper; @@ -35,25 +38,25 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { @Autowired private TokenService tokenService; @Override - public List> list(String name) { - Long userId = SecurityUtils.getUserId(); + public List> list(HttpServletRequest request,String name) { List> list =new ArrayList<>(); - if(userId !=null){ - Map landUser = xhpcCustomersMapper.getLandUser(userId); - if(landUser !=null && landUser.get("userType") !=null){ - if("00".equals(landUser.get("userType").toString()) ){ - list = xhpcCustomersMapper.list(name,null); - }else{ - list = xhpcCustomersMapper.list(name,Long.parseLong(landUser.get("operatorId").toString())); - } - } + LoginUser loginUser = tokenService.getLoginUser(request); + startPage(); + String userType = loginUser.getSysUser().getUserType(); + if(UserTypeUtil.SYS_USER_TYPE_ZERO.equals(userType)){ + list = xhpcCustomersMapper.list(name,null,loginUser.getTenantId()); + }else{ + list = xhpcCustomersMapper.list(name,loginUser.getSysUser().getOperatorId(),loginUser.getTenantId()); } return list; } @Override public AjaxResult addCustomers(HttpServletRequest request, XhpcCustomers xhpcCustomers) { - + R r = judgeXhpcCustomers(xhpcCustomers); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } //名称重复不能入库 Map communityById = xhpcCustomersMapper.getCustomersById(null, xhpcCustomers.getName(), null); if(communityById !=null){ @@ -109,6 +112,10 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { @Override public AjaxResult updateCustomers(XhpcCustomers xhpcCustomers) { + R r = judgeXhpcCustomers(xhpcCustomers); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } //名称重复不能入库 Map customersById = xhpcCustomersMapper.getCustomersById(xhpcCustomers.getCustomersId(), xhpcCustomers.getName(), 2); if(customersById !=null){ @@ -135,6 +142,10 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { @Override public AjaxResult addCustomersPersonnel(XhpcCustomersPersonnel xhpcCustomersPersonnel) { + R r = judgeXhpcCustomersPersonnel(xhpcCustomersPersonnel); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } String phone = xhpcCustomersPersonnel.getPhone(); String account = xhpcCustomersPersonnel.getAccount(); Map communityPersonnelById = xhpcCustomersMapper.getCustomersPersonnelById(null, phone, account, 3); @@ -147,14 +158,18 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { } } BigDecimal rechargeMoney = xhpcCustomersPersonnel.getRechargeMoney(); - if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ - //增加社区用户的剩余金额 - xhpcCustomersPersonnel.setSurplusMoney(rechargeMoney); + if(rechargeMoney !=null){ + if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ + //增加社区用户的剩余金额 + xhpcCustomersPersonnel.setSurplusMoney(rechargeMoney); + } } xhpcCustomersMapper.addCustomersPersonnel(xhpcCustomersPersonnel); - //增加一条充值记录 - if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ - mechanismService.addRechargeOrder(xhpcCustomersPersonnel.getCustomersPersonnelId(),UserTypeUtil.CUSTOMERS_TYPE,rechargeMoney,rechargeMoney,UserTypeUtil.RECHARGE_PT); + if(rechargeMoney !=null){ + //增加一条充值记录 + if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ + mechanismService.addRechargeOrder(xhpcCustomersPersonnel.getCustomersPersonnelId(),UserTypeUtil.CUSTOMERS_TYPE,rechargeMoney,rechargeMoney,UserTypeUtil.RECHARGE_PT); + } } return AjaxResult.success(); } @@ -166,6 +181,10 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { @Override public AjaxResult updateCustomersPersonnel(XhpcCustomersPersonnel xhpcCustomersPersonnel) { + R r = judgeXhpcCustomersPersonnel(xhpcCustomersPersonnel); + if(r.getCode()!=200){ + return AjaxResult.error(r.getMsg()); + } Long customersPersonnelId = xhpcCustomersPersonnel.getCustomersPersonnelId(); String phone = xhpcCustomersPersonnel.getPhone(); String account = xhpcCustomersPersonnel.getAccount(); @@ -199,7 +218,7 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { public AjaxResult addRecharge(XhpcCustomersPersonnel xhpcCustomersPersonnel) { BigDecimal rechargeMoney = xhpcCustomersPersonnel.getRechargeMoney(); Long customersPersonnelId = xhpcCustomersPersonnel.getCustomersPersonnelId(); - if(new BigDecimal(0).compareTo(rechargeMoney)==-1){ + if(rechargeMoney !=null && new BigDecimal(0).compareTo(rechargeMoney)==-1){ //增加社区用户的剩余金额 Map communityPersonnelById = xhpcCustomersMapper.getCustomersPersonnelById(customersPersonnelId, null, null, 1); if(communityPersonnelById !=null){ @@ -231,4 +250,36 @@ public class XhpcCustomersServiceImpl implements IXhpcCustomersService { public void updateCustomersPersonnelStatus(XhpcCustomersPersonnel xhpcCustomersPersonnel) { xhpcCustomersMapper.updateCustomersPersonnelStatus(xhpcCustomersPersonnel.getCustomersPersonnelId(),xhpcCustomersPersonnel.getStatus()); } + + public R judgeXhpcCustomers(XhpcCustomers xhpcCustomers){ + + if(xhpcCustomers.getName()==null || "".equals(xhpcCustomers.getName())){ + return R.fail("名称必填"); + } + if(xhpcCustomers.getContactName()==null || "".equals(xhpcCustomers.getContactName())){ + return R.fail("联系人必填"); + } + if(xhpcCustomers.getContactPhone()==null || "".equals(xhpcCustomers.getContactPhone())){ + return R.fail("联系人电话必填"); + } + if(xhpcCustomers.getAddress()==null || "".equals(xhpcCustomers.getAddress())){ + return R.fail("地址必填"); + } + return R.ok(); + } + + public R judgeXhpcCustomersPersonnel(XhpcCustomersPersonnel xhpcCustomersPersonnel){ + + if(xhpcCustomersPersonnel.getName()==null || "".equals(xhpcCustomersPersonnel.getName())){ + return R.fail("名称必填"); + } + if(xhpcCustomersPersonnel.getAccount()==null || "".equals(xhpcCustomersPersonnel.getAccount()) || "BE".equals(xhpcCustomersPersonnel.getAccount().substring(0,2))){ + return R.fail("账号必填且BE开头10位"); + } + if(xhpcCustomersPersonnel.getPhone()==null || "".equals(xhpcCustomersPersonnel.getPhone()) || xhpcCustomersPersonnel.getPhone().length() !=11){ + return R.fail("绑定手机号必填"); + } + return R.ok(); + } + } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java index ca0dd144..e365a4a8 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java @@ -4,6 +4,7 @@ import com.xhpc.common.core.constant.StatusConstants; import com.xhpc.common.core.constant.UserConstants; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.utils.StringUtils; +import com.xhpc.common.core.web.service.BaseService; import com.xhpc.system.api.domain.SysRole; import com.xhpc.system.api.domain.SysUser; import com.xhpc.user.domain.SysUserRole; @@ -23,7 +24,7 @@ import java.util.Map; * @author ruoyi */ @Service -public class XhpcUserServiceImpl implements IXhpcUserService { +public class XhpcUserServiceImpl extends BaseService implements IXhpcUserService { @Autowired private XhpcUserMapper xhpcUserMapper; @@ -74,6 +75,7 @@ public class XhpcUserServiceImpl implements IXhpcUserService { public List> selectOperatorUserList(String userName, String nickName, Long operatorId) { Long userId = SecurityUtils.getUserId(); SysUser sysUser = xhpcUserMapper.selectUserByUserId(userId); + startPage(); if (StatusConstants.SYSTEM_USER_TYPE.equals(sysUser.getUserType())) { return xhpcUserMapper.selectOperatorUserList(userName, nickName, operatorId,sysUser.getUserType()); } else { diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml index fae76807..b1c3105a 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml @@ -296,5 +296,5 @@ #{source}, -= + diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml index 77f5dadb..cd7d2321 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml @@ -277,7 +277,10 @@ status, - tenant_id + tenant_id, + + + create_time, @@ -302,6 +305,9 @@ #{tenantId}, + + #{createTime}, + @@ -338,6 +344,7 @@ and tenant_id=#{tenantId} + order by create_time desc limit 1 diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml index c100293e..ccb3e0c2 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml @@ -12,7 +12,7 @@ phone as phone, is_refund_application as isRefundApplication, is_refund as isRefund, - soc as soc, + soc as socUser, balance as balance, avatar as avatar, status, @@ -24,6 +24,7 @@ concat(0) as userType, concat("C") as userTypeName, tenant_id tenantId, + soc_protect socProtect, create_time as createTime from xhpc_app_user where del_flag=0 @@ -45,7 +46,7 @@ phone as phone, is_refund_application as isRefundApplication, is_refund as isRefund, - soc as soc, + soc as socUser, surplus_money as balance, avatar as avatar, status, @@ -56,6 +57,7 @@ tenant_id tenantId, del_flag delFlag, concat(2) as userType, + soc_protect socProtect, concat("ST") as userTypeName, (select count(charging_station_id) from xhpc_mechanism where community_id=mechanism_id and source=0 and charging_station_id in (select charging_station_id from xhpc_terminal where 1=1 and del_flag=0 and serial_number=#{serialNumber})) as number, @@ -81,7 +83,7 @@ phone as phone, is_refund_application as isRefundApplication, is_refund as isRefund, - soc as soc, + soc as socUser, surplus_money as balance, avatar as avatar, status, @@ -92,6 +94,7 @@ del_flag delFlag, tenant_id tenantId, concat(3) as userType, + soc_protect socProtect, concat("BE") as userTypeName, (select count(charging_station_id) from xhpc_mechanism where customers_id=mechanism_id and source=1 and charging_station_id in (select charging_station_id from xhpc_terminal where 1=1 and del_flag=0 and serial_number=#{serialNumber})) as number, diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml index c5849223..ef6c311f 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommunityMapper.xml @@ -2,6 +2,7 @@ + @@ -37,6 +38,9 @@ and name like CONCAT('%',#{name},'%') + + and tenant_id=#{tenantId} + order by create_time desc @@ -147,8 +151,8 @@ contact_name = #{contactName}, contact_phone = #{contactPhone}, address = #{address}, - address = #{dimension}, - address = #{status}, + dimension = #{dimension}, + status = #{status}, del_flag = #{delFlag}, create_time = #{createTime}, create_by = #{createBy}, @@ -379,6 +383,7 @@ update_time = #{updateTime}, update_by = #{updateBy}, remark = #{remark}, + is_refund_application = #{isRefundApplication}, where community_personnel_id=#{communityPersonnelId} @@ -390,4 +395,5 @@ update xhpc_community_personnel set status=#{status} where community_personnel_id=#{communityPersonnelId} + diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml index 4d156835..a4e4ff34 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCustomersMapper.xml @@ -39,6 +39,9 @@ and operator_id=#{operatorId} + + and tenant_id=#{tenantId} + order by create_time desc @@ -142,8 +145,8 @@ contact_name = #{contactName}, contact_phone = #{contactPhone}, address = #{address}, - address = #{dimension}, - address = #{status}, + dimension = #{dimension}, + status = #{status}, del_flag = #{delFlag}, create_time = #{createTime}, create_by = #{createBy},