diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java index 88c451db..d988f314 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java @@ -36,7 +36,7 @@ public class XhpcClearingCheckoutController extends BaseController { @GetMapping("/getPage") public TableDataInfo getPage(HttpServletRequest request, String status, - String operatorId, + Long operatorId, String startTime, String endTime, String tenantId) { @@ -60,7 +60,7 @@ public class XhpcClearingCheckoutController extends BaseController { @GetMapping("/getCheckoutPage") - public TableDataInfo getCheckoutPage(String operatorId, + public TableDataInfo getCheckoutPage(Long operatorId, String tenantId) { startPage(); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java index 4ef730f5..904690a6 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java @@ -34,25 +34,31 @@ public class XhpcClearingHistoryOrderController extends BaseController { @GetMapping("/getPage") public TableDataInfo getUnclearingPage(HttpServletRequest request, + String tenantId, + Long operatorId, + Long chargingStationId, + Long chargingPileId, + Long terminalId, String startTime, String endTime, String orderNo, String userType, String internetName, - String operatorId, String stationId) { LoginUser loginUser = logUserUtils.getLogUser(request); startPage(); Map params = new HashMap<>(); - params.put("tenantId", loginUser.getTenantId()); params.put("startTime", startTime); params.put("endTime", endTime); params.put("orderNo", orderNo); params.put("userType", userType); params.put("internetName", internetName); + params.put("tenantId", tenantId); params.put("operatorId", operatorId); - params.put("stationId", stationId); + params.put("stationId", chargingStationId); + params.put("chargingPileId", chargingPileId); + params.put("terminalId", terminalId); return getDataTable(orderService.getPage(params)); } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcTradebillInternetBillController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcTradebillInternetBillController.java index 2273bb4d..16ddbd0b 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcTradebillInternetBillController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcTradebillInternetBillController.java @@ -42,13 +42,20 @@ public class XhpcTradebillInternetBillController extends BaseController { @GetMapping("/checkPage") - public TableDataInfo getCheckPage(@RequestParam(required = false) Integer uploadId, + public TableDataInfo getCheckPage( + @RequestParam(required = false) String tenantId, + @RequestParam(required = false) Long operatorId, + @RequestParam(required = false) Long chargingStationId, + @RequestParam(required = false) Integer uploadId, @RequestParam(required = false) String orderNumber, @RequestParam(required = false) String station, @RequestParam(required = false) String internetName, @RequestParam(required = false) Integer status){ Map params = new HashMap<>(); + params.put("tenantId", tenantId); + params.put("operatorId", operatorId); + params.put("chargingStationId", chargingStationId); params.put("uploadId", uploadId); params.put("orderNumber",orderNumber); params.put("stationName", station); @@ -61,13 +68,20 @@ public class XhpcTradebillInternetBillController extends BaseController { @GetMapping("/statusTotal") - public AjaxResult getStatusTotal(@RequestParam(required = false) Integer uploadId, + public AjaxResult getStatusTotal( + @RequestParam(required = false) String tenantId, + @RequestParam(required = false) Long operatorId, + @RequestParam(required = false) Long chargingStationId, + @RequestParam(required = false) Integer uploadId, @RequestParam(required = false) String orderNumber, @RequestParam(required = false) String stationName, @RequestParam(required = false) String internetName, @RequestParam(required = false) Integer status){ Map params = new HashMap<>(); + params.put("tenantId", tenantId); + params.put("operatorId", operatorId); + params.put("chargingStationId", chargingStationId); params.put("uploadId", uploadId); params.put("orderNumber",orderNumber); params.put("stationName", stationName); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java index 45d37eba..ff513061 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java @@ -20,6 +20,10 @@ import com.xhpc.activity.vo.HDTradebillVo; import com.xhpc.activity.vo.KDTradebillVo; import com.xhpc.activity.vo.XDTTradebillVo; import com.xhpc.activity.vo.XJTradeBillVo; +import com.xhpc.common.security.service.TokenService; +import com.xhpc.common.util.UserTypeUtil; +import com.xhpc.system.api.domain.SysUser; +import com.xhpc.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -43,6 +47,9 @@ public class InternetBillServiceImpl implements InternetBillService { @Resource XhpcHistoryOrderMapper historyOrderMapper; + @Resource + TokenService tokenService; + @Override public XhpcTradebillInternetCheckRecordDomain getInfoByPk(int pk) { @@ -73,14 +80,56 @@ public class InternetBillServiceImpl implements InternetBillService { @Override public List getInternetCheckList(Map params) { + //获取登陆用户 + LoginUser loginUser = tokenService.getLoginUser(); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); - return internetCheckRecordMapper.selectListByParams(params); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + params.put("type", 1); + params.put("logOperatorId", logOperatorId); + return internetCheckRecordMapper.selectListByParams(params); + }else{ + //查询赋值的场站 + params.put("type", 2); + params.put("logOperatorId", sysUserId); + return internetCheckRecordMapper.selectListByParams(params); + } + }else{ + params.put("type", 0); + params.put("logOperatorId", sysUserId); + return internetCheckRecordMapper.selectListByParams(params); + } } @Override public Map getStatusTotal(Map params) { - - List> resultList = internetCheckRecordMapper.selectTotalGroupbyStatus(params); + LoginUser loginUser = tokenService.getLoginUser(); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); + //获取登陆用户 + List> resultList =new ArrayList<>(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + params.put("type", 1); + params.put("logOperatorId", logOperatorId); + resultList = internetCheckRecordMapper.selectTotalGroupbyStatus(params); + }else{ + //查询赋值的场站 + params.put("type", 2); + params.put("logOperatorId", sysUserId); + resultList = internetCheckRecordMapper.selectTotalGroupbyStatus(params); + } + }else{ + params.put("type", 0); + params.put("logOperatorId", sysUserId); + resultList = internetCheckRecordMapper.selectTotalGroupbyStatus(params); + } int successCount = 0; int failCount = 0; int uncheckCount = 0; diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java index 9183c49f..379a91b5 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java @@ -23,6 +23,7 @@ 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; +import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -70,7 +71,29 @@ public class XhpcClearingCheckoutServiceImpl extends BaseService implements Xhpc @Override public List getPage(Map params) { - return checkoutMapper.selectByParams(params); + + LoginUser loginUser = tokenService.getLoginUser(); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + params.put("type", 1); + params.put("logOperatorId",logOperatorId); + return checkoutMapper.selectByParams(params); + }else{ + //查询赋值的场站 + params.put("type", 1); + params.put("logOperatorId",sysUserId); + return checkoutMapper.selectByParams(params); + } + }else{ + params.put("type", 0); + params.put("logOperatorId",sysUserId); + return checkoutMapper.selectByParams(params); + } } @Override diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java index 82d8c8c6..73947e12 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java @@ -10,6 +10,10 @@ import com.xhpc.activity.service.XhpcClearingHistoryOrderService; import com.xhpc.activity.vo.ClearingOrderVo; import com.xhpc.common.core.exception.CustomException; import com.xhpc.common.core.utils.StringUtils; +import com.xhpc.common.security.service.TokenService; +import com.xhpc.common.util.UserTypeUtil; +import com.xhpc.system.api.domain.SysUser; +import com.xhpc.system.api.model.LoginUser; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,10 +45,34 @@ public class XhpcClearingHistoryOrderServiceImpl implements XhpcClearingHistoryO @Resource XhpcOperatorMapper operatorMapper; + @Resource + TokenService tokenService; + @Override public List getPage(Map params) { - return historyOrderMapper.getListPage(params); + LoginUser loginUser = tokenService.getLoginUser(); + SysUser sysUser = loginUser.getSysUser(); + Long sysUserId = sysUser.getUserId(); + if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ + + if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ + Long logOperatorId = sysUser.getOperatorId(); + //运营商看自己的场站 + params.put("type", 1); + params.put("logOperatorId",logOperatorId); + return historyOrderMapper.getListPage(params); + }else{ + //查询赋值的场站 + params.put("type", 1); + params.put("logOperatorId",sysUserId); + return historyOrderMapper.getListPage(params); + } + }else{ + params.put("type", 0); + params.put("logOperatorId",sysUserId); + return historyOrderMapper.getListPage(params); + } } diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml index 8aa9a9e8..83d31054 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml @@ -59,6 +59,12 @@ and cc.create_time #{params.endTime} + + and cc.operator_id= in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId})) + + + and cc.operator_id= in (select operator_id from xhpc_charging_station where charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId})) + diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml index 66f79b31..c76720a1 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml @@ -213,6 +213,22 @@ and find_in_set(ho.clearing_order_id, #{params.orderIds}) + + + and ho.operator_id =#{operatorId} + + + and ho.charging_station_id =#{chargingStationId} + + + and ho.terminal_id in (select terminal_id from xhpc_terminal where charging_pile_id=#{chargingPileId} and del_flag =0) + + + and ho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId}) + + + and ho.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId}) + diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml index 9ff01629..11ec3646 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml @@ -79,6 +79,7 @@ from xhpc_tradebill_internet_check_record p left join sys_user cu on cu.user_id=p.create_by left join sys_user uu on uu.user_id=p.update_by + left join xhpc_history_order xho on xho.history_order_id =p.history_order_no and p.upload_id = #{params.uploadId} @@ -95,6 +96,18 @@ and p.status = #{params.status} + + and p.tenant_id = #{params.tenantId} + + + and xho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) + + + and xho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId}) + + + and xho.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId}) + order by p.upload_id desc, status asc @@ -119,6 +132,18 @@ and status = #{params.status} + + and p.tenant_id = #{params.tenantId} + + + and xho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) + + + and xho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId}) + + + and xho.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId}) + group by status diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java index 3057b9ec..9c5b94ba 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java @@ -57,7 +57,7 @@ public interface XhpcAppUserMapper { * @date 2022/3/4 10:37 * @since version-1.0 */ - Long selectTotalCountByTenantIdAndCurrentTime(@Param("tenantIdList") List tenantIdList, @Param("currentTime") String currentTime); + Long selectTotalCountByTenantIdAndCurrentTime(@Param("tenantIdsStr") String tenantIdsStr, @Param("currentTime") String currentTime); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java index b7fd6561..c016ba9e 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java @@ -25,14 +25,16 @@ public interface XhpcChargingStationMapper { * @date 2022/2/28 17:50 * @since version-1.0 */ - List> selectByTenantIdAndChargingStationId(@Param("tenantIdList") List tenantIdList, @Param("chargingStationId") Long chargingStationId); + List> selectByTenantIdAndChargingStationId(@Param("tenantIdsStr") String tenantIdsStr, @Param("chargingStationId") Long chargingStationId); /** * @author WH * @date 2022/3/3 15:20 * @since version-1.0 */ - List> selectByTenantIdAndAreaCode(@Param("tenantIdList") List tenantIdList, @Param("areaCode") Integer areaCode); + List> selectByTenantIdAndAreaCode(@Param("tenantIdsStr") String tenantIdsStr, @Param("areaCode") Integer areaCode,@Param("number") Integer number); + + int getXhpcAreaLevel(@Param("areaCode")Integer areaCode); /** * query id of charging station by list of tenant id diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java index ea67ea29..513681d8 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java @@ -41,7 +41,7 @@ public interface XhpcHistoryOrderMapper { * @since version-1.0 */ Long selectTotalElectricQuantity( - @Param("tenantIdList") List tenantIdList, + @Param("tenantIdsStr") String tenantIdsStr, @Param("chargingStationIdList") List chargingStationIdList); Long selectCountByTenantIdsAndChargingStationIds( diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcRateTimeMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcRateTimeMapper.java index 17c94662..812fa03c 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcRateTimeMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcRateTimeMapper.java @@ -28,6 +28,6 @@ public interface XhpcRateTimeMapper { * @date 2022/3/17 14:46 * @since version-1.0 */ - List> selectByTenantIdsAndCharingStationIds(@Param("tenantIdList") List tenantIdList, @Param("xhpcChargingStationList") ArrayList xhpcChargingStationList); + List> selectByTenantIdsAndCharingStationIds(@Param("tenantIdsStr") String tenantIdsStr, @Param("xhpcChargingStationList") ArrayList xhpcChargingStationList); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java index 42c5a4ca..e5e292ec 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java @@ -216,14 +216,19 @@ public class XhpcCardServiceImpl implements IXhpcCardService { dataDTO.setCardStatus((Integer) data.get("status")); dataDTO.setUserAccount((String) data.get("user_account")); dataDTO.setCashPledge((Integer) data.get("cashPledge")); + dataDTO.setClassification((Integer) data.get("cardType")); //3.判断是否是离线卡，离线卡处理逻辑 if (dataDTO.getClassification() == 0) { //离线用户类型为10 dataDTO.setUserType(10L); - int userIndex = (int) data.get("userIndex"); - TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(userIndex); - String phone = tIccardUser.getPhone(); - dataDTO.setUserAccount(phone); + if(data.get("userIndex")!=null){ + int userIndex = (int) data.get("userIndex"); + TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(userIndex); + if(tIccardUser !=null){ + String phone = tIccardUser.getPhone(); + dataDTO.setUserAccount(phone); + } + } } else { dataDTO.setUserType((Long) data.get("user_type")); if (data.get("user_id") != null) { diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java index ca528b52..3e515418 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java @@ -55,9 +55,7 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 0: tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, null); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, null); return R.ok(xhpcChargingStationList); } else { xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(null, null); @@ -67,24 +65,24 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { //query charging station infos of whole area Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); return R.ok(xhpcChargingStationList); } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(null, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(null, areaCode,number); return R.ok(xhpcChargingStationList); } case 2: //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); return R.ok(xhpcChargingStationList); } else { return R.fail("传入的参数有误"); @@ -107,10 +105,8 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 0: tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); //get user count of c client - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); List chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList); //（0 C端用户 1 流量方用户 2社区用户 3B端用户） Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); @@ -118,7 +114,7 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { return R.ok(appUserCount + communityUserCount + customerUserCount); } else { //get user count of c client - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); List chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList); //（0 C端用户 1 流量方用户 2社区用户 3B端用户） Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); @@ -129,25 +125,27 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 1: Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); return R.ok(appUserCount + communityUserCount + customerUserCount); } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); return R.ok(appUserCount + communityUserCount + customerUserCount); @@ -156,16 +154,14 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); return R.ok(appUserCount + communityUserCount + customerUserCount); @@ -193,10 +189,8 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 0: tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); //get user count of c client - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, currentTime); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, currentTime); List chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList); //（0 C端用户 1 流量方用户 2社区用户 3B端用户） Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, currentTime); @@ -204,7 +198,7 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { return R.ok(appUserCount + communityUserCount + customerUserCount); } else { //get user count of c client - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, currentTime); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, currentTime); List chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList); //（0 C端用户 1 流量方用户 2社区用户 3B端用户） Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, currentTime); @@ -215,25 +209,27 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 1: Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); return R.ok(appUserCount + communityUserCount + customerUserCount); } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); return R.ok(appUserCount + communityUserCount + customerUserCount); @@ -242,16 +238,14 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); + Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); return R.ok(appUserCount + communityUserCount + customerUserCount); @@ -278,9 +272,7 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 0: tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdList, null); + Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdsStr, null); return R.ok(totalElectricQuantity); } else { Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(null, null); @@ -290,39 +282,39 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 1: Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdList, chargingStationIdList); + Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdsStr, chargingStationIdList); return R.ok(totalElectricQuantity); } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdList, chargingStationIdList); + Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdsStr, chargingStationIdList); return R.ok(totalElectricQuantity); } case 2: //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdList, chargingStationIdList); + Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdsStr, chargingStationIdList); return R.ok(totalElectricQuantity); } else { return R.fail("传入的参数有误"); @@ -358,10 +350,12 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 1: Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); @@ -369,7 +363,7 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { OrderRatio orderRatio = getOrderRatio(tenantIdList, chargingStationIdList); return R.ok(orderRatio); } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); @@ -381,11 +375,9 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); @@ -429,16 +421,17 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 1://省市区 Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); - + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } @@ -448,11 +441,9 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } @@ -522,51 +513,49 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 0: tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, null); + List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, null); return getRealtimeOrders(realtimeOrderList); } else { - List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, null); + List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, null); return getRealtimeOrders(realtimeOrderList); } //query charging station infos of whole area case 1: Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, chargingStationIdList); + List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, chargingStationIdList); return getRealtimeOrders(realtimeOrderList); } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, chargingStationIdList); + List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, chargingStationIdList); return getRealtimeOrders(realtimeOrderList); } case 2: //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } - List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, chargingStationIdList); + List> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, chargingStationIdList); return getRealtimeOrders(realtimeOrderList); } else { return R.fail("传入的参数有误"); @@ -595,17 +584,19 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 1: Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } return getOrderTrend(tenantIdList, chargingStationIdList); } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); @@ -616,11 +607,9 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); @@ -653,17 +642,19 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { case 1: Integer areaCode = coreParam.getAreaCode(); tenantIdsStr = coreParam.getTenantIds(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); } return R.ok(xhpcChargingStationMapper.getWorkOrderTerminal(chargingStationIdList,tenantIdList)); } else { - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); @@ -674,11 +665,9 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { //query location info of special charging station of special tenant tenantIdsStr = coreParam.getTenantIds(); if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { - tenantIdArray = tenantIdsStr.split(","); - tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList()); String chargingStationIdStr = coreParam.getChargingStationIds(); long chargingStationId = Long.parseLong(chargingStationIdStr); - xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); + xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId); ArrayList chargingStationIdList = new ArrayList<>(); for (Map chargingStation : xhpcChargingStationList) { chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml index c88b194b..36431e95 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml @@ -329,11 +329,8 @@ FROM xhpc_app_user - - and tenant_id IN - - #{tenantId} - + + and find_in_set(tenant_id, #{tenantIdsStr}) and create_time =]]> DATE_ADD(#{currentTime},INTERVAL -3 MONTH) diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml index f3c03f25..6936cd77 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -64,11 +64,8 @@ WHERE xhpc_charging_station.del_flag = 0 AND xhpc_charging_station.`status` = 0 - - AND xhpc_charging_station.tenant_id in - - #{tenantId} - + + and find_in_set(tenant_id, #{tenantIdsStr}) AND xhpc_charging_station.charging_station_id = #{chargingStationId} @@ -86,16 +83,27 @@ xhpc_charging_station WHERE del_flag = 0 - - AND tenant_id in - - #{tenantId} - + + and find_in_set(tenant_id, #{tenantIdsStr}) - AND area_code = #{areaCode} + + AND area_code in (select code from xhpc_area where pcode in(select code from xhpc_area where pcode =#{areaCode})) + + + AND area_code in (select code from xhpc_area where pcode =#{areaCode}) + + + AND area_code =#{areaCode} + + + + +