yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加租户、运营商搜索，修改数据大屏

Browse Source
This commit is contained in:
yuyang 2022-05-09 17:14:58 +08:00
parent d175cc15fe
commit 198c22192a
36 changed files with 544 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java
View File

@ -36,7 +36,7 @@ public class XhpcClearingCheckoutController extends BaseController {
@GetMapping("/getPage") @GetMapping("/getPage")
public TableDataInfo getPage(HttpServletRequest request, public TableDataInfo getPage(HttpServletRequest request,
String status, String status,
String operatorId, Long operatorId,
String startTime, String startTime,
String endTime, String endTime,
String tenantId) { String tenantId) {
@ -60,7 +60,7 @@ public class XhpcClearingCheckoutController extends BaseController {
@GetMapping("/getCheckoutPage") @GetMapping("/getCheckoutPage")
public TableDataInfo getCheckoutPage(String operatorId, public TableDataInfo getCheckoutPage(Long operatorId,
String tenantId) { String tenantId) {
startPage(); startPage();

12
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
View File

@ -34,25 +34,31 @@ public class XhpcClearingHistoryOrderController extends BaseController {
@GetMapping("/getPage") @GetMapping("/getPage")
public TableDataInfo getUnclearingPage(HttpServletRequest request, public TableDataInfo getUnclearingPage(HttpServletRequest request,
String tenantId,
Long operatorId,
Long chargingStationId,
Long chargingPileId,
Long terminalId,
String startTime, String startTime,
String endTime, String endTime,
String orderNo, String orderNo,
String userType, String userType,
String internetName, String internetName,
String operatorId,
String stationId) { String stationId) {
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
startPage(); startPage();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", loginUser.getTenantId());
params.put("startTime", startTime); params.put("startTime", startTime);
params.put("endTime", endTime); params.put("endTime", endTime);
params.put("orderNo", orderNo); params.put("orderNo", orderNo);
params.put("userType", userType); params.put("userType", userType);
params.put("internetName", internetName); params.put("internetName", internetName);
params.put("tenantId", tenantId);
params.put("operatorId", operatorId); 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)); return getDataTable(orderService.getPage(params));
} }

18
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcTradebillInternetBillController.java
View File

@ -42,13 +42,20 @@ public class XhpcTradebillInternetBillController extends BaseController {
@GetMapping("/checkPage") @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 orderNumber,
@RequestParam(required = false) String station, @RequestParam(required = false) String station,
@RequestParam(required = false) String internetName, @RequestParam(required = false) String internetName,
@RequestParam(required = false) Integer status){ @RequestParam(required = false) Integer status){
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", tenantId);
params.put("operatorId", operatorId);
params.put("chargingStationId", chargingStationId);
params.put("uploadId", uploadId); params.put("uploadId", uploadId);
params.put("orderNumber",orderNumber); params.put("orderNumber",orderNumber);
params.put("stationName", station); params.put("stationName", station);
@ -61,13 +68,20 @@ public class XhpcTradebillInternetBillController extends BaseController {
@GetMapping("/statusTotal") @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 orderNumber,
@RequestParam(required = false) String stationName, @RequestParam(required = false) String stationName,
@RequestParam(required = false) String internetName, @RequestParam(required = false) String internetName,
@RequestParam(required = false) Integer status){ @RequestParam(required = false) Integer status){
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", tenantId);
params.put("operatorId", operatorId);
params.put("chargingStationId", chargingStationId);
params.put("uploadId", uploadId); params.put("uploadId", uploadId);
params.put("orderNumber",orderNumber); params.put("orderNumber",orderNumber);
params.put("stationName", stationName); params.put("stationName", stationName);

53
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java
View File

@ -20,6 +20,10 @@ import com.xhpc.activity.vo.HDTradebillVo;
import com.xhpc.activity.vo.KDTradebillVo; import com.xhpc.activity.vo.KDTradebillVo;
import com.xhpc.activity.vo.XDTTradebillVo; import com.xhpc.activity.vo.XDTTradebillVo;
import com.xhpc.activity.vo.XJTradeBillVo; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -43,6 +47,9 @@ public class InternetBillServiceImpl implements InternetBillService {
@Resource @Resource
XhpcHistoryOrderMapper historyOrderMapper; XhpcHistoryOrderMapper historyOrderMapper;
@Resource
TokenService tokenService;
@Override @Override
public XhpcTradebillInternetCheckRecordDomain getInfoByPk(int pk) { public XhpcTradebillInternetCheckRecordDomain getInfoByPk(int pk) {
@ -73,14 +80,56 @@ public class InternetBillServiceImpl implements InternetBillService {
@Override @Override
public List<XhpcTradebillInternetCheckRecordDomain> getInternetCheckList(Map<String, Object> params) { public List<XhpcTradebillInternetCheckRecordDomain> getInternetCheckList(Map<String, Object> 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 internetCheckRecordMapper.selectListByParams(params); 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 @Override
public Map<String, Object> getStatusTotal(Map<String, Object> params) { public Map<String, Object> getStatusTotal(Map<String, Object> params) {
LoginUser loginUser = tokenService.getLoginUser();
List<Map<String, Object>> resultList = internetCheckRecordMapper.selectTotalGroupbyStatus(params); SysUser sysUser = loginUser.getSysUser();
Long sysUserId = sysUser.getUserId();
//获取登陆用户
List<Map<String, Object>> 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 successCount = 0;
int failCount = 0; int failCount = 0;
int uncheckCount = 0; int uncheckCount = 0;

23
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java
View File

@ -23,6 +23,7 @@ import com.xhpc.common.core.web.service.BaseService;
import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.redis.service.RedisService;
import com.xhpc.common.security.service.TokenService; import com.xhpc.common.security.service.TokenService;
import com.xhpc.common.util.UserTypeUtil; import com.xhpc.common.util.UserTypeUtil;
import com.xhpc.system.api.domain.SysUser;
import com.xhpc.system.api.model.LoginUser; import com.xhpc.system.api.model.LoginUser;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -70,7 +71,29 @@ public class XhpcClearingCheckoutServiceImpl extends BaseService implements Xhpc
@Override @Override
public List<XhpcClearingCheckoutDomain> getPage(Map<String, Object> params) { public List<XhpcClearingCheckoutDomain> getPage(Map<String, Object> 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); 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 @Override

28
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java
View File

@ -10,6 +10,10 @@ import com.xhpc.activity.service.XhpcClearingHistoryOrderService;
import com.xhpc.activity.vo.ClearingOrderVo; import com.xhpc.activity.vo.ClearingOrderVo;
import com.xhpc.common.core.exception.CustomException; import com.xhpc.common.core.exception.CustomException;
import com.xhpc.common.core.utils.StringUtils; 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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -41,10 +45,34 @@ public class XhpcClearingHistoryOrderServiceImpl implements XhpcClearingHistoryO
@Resource @Resource
XhpcOperatorMapper operatorMapper; XhpcOperatorMapper operatorMapper;
@Resource
TokenService tokenService;
@Override @Override
public List<XhpcClearingHistoryOrderDomain> getPage(Map<String, Object> params) { public List<XhpcClearingHistoryOrderDomain> getPage(Map<String, Object> 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); 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);
}
} }

6
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
View File

@ -59,6 +59,12 @@
<if test="params.endTime!=null and params.endTime!=''"> <if test="params.endTime!=null and params.endTime!=''">
and cc.create_time <![CDATA[ <= ]]> #{params.endTime} and cc.create_time <![CDATA[ <= ]]> #{params.endTime}
</if> </if>
<if test="params.type==1">
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}))
</if>
<if test="params.type==2">
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}))
</if>
</select> </select>

16
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
View File

@ -213,6 +213,22 @@
<if test="params.orderIds!=null and params.orderIds!=''"> <if test="params.orderIds!=null and params.orderIds!=''">
and find_in_set(ho.clearing_order_id, #{params.orderIds}) and find_in_set(ho.clearing_order_id, #{params.orderIds})
</if> </if>
<if test="params.operatorId !=null">
and ho.operator_id =#{operatorId}
</if>
<if test="params.chargingStationId !=null">
and ho.charging_station_id =#{chargingStationId}
</if>
<if test="params.chargingPileId !=null">
and ho.terminal_id in (select terminal_id from xhpc_terminal where charging_pile_id=#{chargingPileId} and del_flag =0)
</if>
<if test="params.type==1">
and ho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId})
</if>
<if test="params.type==2">
and ho.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId})
</if>
</select> </select>

25
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml
View File

@ -79,6 +79,7 @@
from xhpc_tradebill_internet_check_record p from xhpc_tradebill_internet_check_record p
left join sys_user cu on cu.user_id=p.create_by 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 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
<where> <where>
<if test="params.uploadId != null and params.upload!='' and params.uploadId !=0"> <if test="params.uploadId != null and params.upload!='' and params.uploadId !=0">
and p.upload_id = #{params.uploadId} and p.upload_id = #{params.uploadId}
@ -95,6 +96,18 @@
<if test="params.status != null and params.status!=''"> <if test="params.status != null and params.status!=''">
and p.status = #{params.status} and p.status = #{params.status}
</if> </if>
<if test="params.tenantId != null and params.tenantId!=''">
and p.tenant_id = #{params.tenantId}
</if>
<if test="params.operatorId != null ">
and xho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
</if>
<if test="params.type==1">
and xho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId})
</if>
<if test="params.type==2">
and xho.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId})
</if>
</where> </where>
order by p.upload_id desc, status asc order by p.upload_id desc, status asc
</select> </select>
@ -119,6 +132,18 @@
<if test="params.status != null and params.status!=''"> <if test="params.status != null and params.status!=''">
and status = #{params.status} and status = #{params.status}
</if> </if>
<if test="params.tenantId != null and params.tenantId!=''">
and p.tenant_id = #{params.tenantId}
</if>
<if test="params.operatorId != null ">
and xho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
</if>
<if test="params.type==1">
and xho.charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{params.logOperatorId})
</if>
<if test="params.type==2">
and xho.charging_station_id in (select charging_station_id from xhpc_user_privilege where user_id=#{params.logOperatorId})
</if>
</where> </where>
group by status group by status
</select> </select>

2
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java
View File

@ -57,7 +57,7 @@ public interface XhpcAppUserMapper {
* @date 2022/3/4 10:37 * @date 2022/3/4 10:37
* @since version-1.0 * @since version-1.0
*/ */
Long selectTotalCountByTenantIdAndCurrentTime(@Param("tenantIdList") List<String> tenantIdList, @Param("currentTime") String currentTime); Long selectTotalCountByTenantIdAndCurrentTime(@Param("tenantIdsStr") String tenantIdsStr, @Param("currentTime") String currentTime);
} }

6
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java
View File

@ -25,14 +25,16 @@ public interface XhpcChargingStationMapper {
* @date 2022/2/28 17:50 * @date 2022/2/28 17:50
* @since version-1.0 * @since version-1.0
*/ */
List<Map<String, Object>> selectByTenantIdAndChargingStationId(@Param("tenantIdList") List<String> tenantIdList, @Param("chargingStationId") Long chargingStationId); List<Map<String, Object>> selectByTenantIdAndChargingStationId(@Param("tenantIdsStr") String tenantIdsStr, @Param("chargingStationId") Long chargingStationId);
/** /**
* @author WH * @author WH
* @date 2022/3/3 15:20 * @date 2022/3/3 15:20
* @since version-1.0 * @since version-1.0
*/ */
List<Map<String, Object>> selectByTenantIdAndAreaCode(@Param("tenantIdList") List<String> tenantIdList, @Param("areaCode") Integer areaCode); List<Map<String, Object>> 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 * query id of charging station by list of tenant id

2
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java
View File

@ -41,7 +41,7 @@ public interface XhpcHistoryOrderMapper {
* @since version-1.0 * @since version-1.0
*/ */
Long selectTotalElectricQuantity( Long selectTotalElectricQuantity(
@Param("tenantIdList") List<String> tenantIdList, @Param("tenantIdsStr") String tenantIdsStr,
@Param("chargingStationIdList") List<Long> chargingStationIdList); @Param("chargingStationIdList") List<Long> chargingStationIdList);
Long selectCountByTenantIdsAndChargingStationIds( Long selectCountByTenantIdsAndChargingStationIds(

2
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcRateTimeMapper.java
View File

@ -28,6 +28,6 @@ public interface XhpcRateTimeMapper {
* @date 2022/3/17 14:46 * @date 2022/3/17 14:46
* @since version-1.0 * @since version-1.0
*/ */
List<Map<String, Object>> selectByTenantIdsAndCharingStationIds(@Param("tenantIdList") List<String> tenantIdList, @Param("xhpcChargingStationList") ArrayList<Long> xhpcChargingStationList); List<Map<String, Object>> selectByTenantIdsAndCharingStationIds(@Param("tenantIdsStr") String tenantIdsStr, @Param("xhpcChargingStationList") ArrayList<Long> xhpcChargingStationList);
} }

5
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
View File

@ -216,14 +216,19 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
dataDTO.setCardStatus((Integer) data.get("status")); dataDTO.setCardStatus((Integer) data.get("status"));
dataDTO.setUserAccount((String) data.get("user_account")); dataDTO.setUserAccount((String) data.get("user_account"));
dataDTO.setCashPledge((Integer) data.get("cashPledge")); dataDTO.setCashPledge((Integer) data.get("cashPledge"));
dataDTO.setClassification((Integer) data.get("cardType"));
//3.判断是否是离线卡，离线卡处理逻辑 //3.判断是否是离线卡，离线卡处理逻辑
if (dataDTO.getClassification() == 0) { if (dataDTO.getClassification() == 0) {
//离线用户类型为10 //离线用户类型为10
dataDTO.setUserType(10L); dataDTO.setUserType(10L);
if(data.get("userIndex")!=null){
int userIndex = (int) data.get("userIndex"); int userIndex = (int) data.get("userIndex");
TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(userIndex); TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(userIndex);
if(tIccardUser !=null){
String phone = tIccardUser.getPhone(); String phone = tIccardUser.getPhone();
dataDTO.setUserAccount(phone); dataDTO.setUserAccount(phone);
}
}
} else { } else {
dataDTO.setUserType((Long) data.get("user_type")); dataDTO.setUserType((Long) data.get("user_type"));
if (data.get("user_id") != null) { if (data.get("user_id") != null) {

177
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java
View File

@ -55,9 +55,7 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 0: case 0:
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, null);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, null);
return R.ok(xhpcChargingStationList); return R.ok(xhpcChargingStationList);
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(null, null); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(null, null);
@ -67,24 +65,24 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
//query charging station infos of whole area //query charging station infos of whole area
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
return R.ok(xhpcChargingStationList); return R.ok(xhpcChargingStationList);
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(null, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(null, areaCode,number);
return R.ok(xhpcChargingStationList); return R.ok(xhpcChargingStationList);
} }
case 2: case 2:
//query location info of special charging station of special tenant //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
return R.ok(xhpcChargingStationList); return R.ok(xhpcChargingStationList);
} else { } else {
return R.fail("传入的参数有误"); return R.fail("传入的参数有误");
@ -107,10 +105,8 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 0: case 0:
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
//get user count of c client //get user count of c client
Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null);
List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList); List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList);
//（0 C端用户 1 流量方用户 2社区用户 3B端用户） //（0 C端用户 1 流量方用户 2社区用户 3B端用户）
Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); 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); return R.ok(appUserCount + communityUserCount + customerUserCount);
} else { } else {
//get user count of c client //get user count of c client
Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, null); Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null);
List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList); List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList);
//（0 C端用户 1 流量方用户 2社区用户 3B端用户） //（0 C端用户 1 流量方用户 2社区用户 3B端用户）
Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null);
@ -129,25 +125,27 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 1: case 1:
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null);
Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null);
return R.ok(appUserCount + communityUserCount + customerUserCount); return R.ok(appUserCount + communityUserCount + customerUserCount);
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null);
Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null);
return R.ok(appUserCount + communityUserCount + customerUserCount); 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 //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null);
Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null);
return R.ok(appUserCount + communityUserCount + customerUserCount); return R.ok(appUserCount + communityUserCount + customerUserCount);
@ -193,10 +189,8 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 0: case 0:
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
//get user count of c client //get user count of c client
Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, currentTime); Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, currentTime);
List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList); List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList);
//（0 C端用户 1 流量方用户 2社区用户 3B端用户） //（0 C端用户 1 流量方用户 2社区用户 3B端用户）
Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, currentTime); 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); return R.ok(appUserCount + communityUserCount + customerUserCount);
} else { } else {
//get user count of c client //get user count of c client
Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdList, currentTime); Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, currentTime);
List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList); List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdList);
//（0 C端用户 1 流量方用户 2社区用户 3B端用户） //（0 C端用户 1 流量方用户 2社区用户 3B端用户）
Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, currentTime); Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, currentTime);
@ -215,25 +209,27 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 1: case 1:
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null);
Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null);
return R.ok(appUserCount + communityUserCount + customerUserCount); return R.ok(appUserCount + communityUserCount + customerUserCount);
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null);
Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null);
return R.ok(appUserCount + communityUserCount + customerUserCount); 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 //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null);
Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdList, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null);
return R.ok(appUserCount + communityUserCount + customerUserCount); return R.ok(appUserCount + communityUserCount + customerUserCount);
@ -278,9 +272,7 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 0: case 0:
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdsStr, null);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(tenantIdList, null);
return R.ok(totalElectricQuantity); return R.ok(totalElectricQuantity);
} else { } else {
Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(null, null); Long totalElectricQuantity = xhpcHistoryOrderMapper.selectTotalElectricQuantity(null, null);
@ -290,39 +282,39 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 1: case 1:
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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); return R.ok(totalElectricQuantity);
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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); return R.ok(totalElectricQuantity);
} }
case 2: case 2:
//query location info of special charging station of special tenant //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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); return R.ok(totalElectricQuantity);
} else { } else {
return R.fail("传入的参数有误"); return R.fail("传入的参数有误");
@ -358,10 +350,12 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 1: case 1:
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
@ -369,7 +363,7 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
OrderRatio orderRatio = getOrderRatio(tenantIdList, chargingStationIdList); OrderRatio orderRatio = getOrderRatio(tenantIdList, chargingStationIdList);
return R.ok(orderRatio); return R.ok(orderRatio);
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
@ -429,16 +421,17 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 1://省市区 case 1://省市区
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
} }
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
} }
@ -522,51 +513,49 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 0: case 0:
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, null);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, null);
return getRealtimeOrders(realtimeOrderList); return getRealtimeOrders(realtimeOrderList);
} else { } else {
List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, null); List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, null);
return getRealtimeOrders(realtimeOrderList); return getRealtimeOrders(realtimeOrderList);
} }
//query charging station infos of whole area //query charging station infos of whole area
case 1: case 1:
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
} }
List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, chargingStationIdList); List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, chargingStationIdList);
return getRealtimeOrders(realtimeOrderList); return getRealtimeOrders(realtimeOrderList);
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
} }
List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, chargingStationIdList); List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, chargingStationIdList);
return getRealtimeOrders(realtimeOrderList); return getRealtimeOrders(realtimeOrderList);
} }
case 2: case 2:
//query location info of special charging station of special tenant //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
} }
List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdList, chargingStationIdList); List<Map<String, Object>> realtimeOrderList = xhpcRateTimeMapper.selectByTenantIdsAndCharingStationIds(tenantIdsStr, chargingStationIdList);
return getRealtimeOrders(realtimeOrderList); return getRealtimeOrders(realtimeOrderList);
} else { } else {
return R.fail("传入的参数有误"); return R.fail("传入的参数有误");
@ -595,17 +584,19 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 1: case 1:
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
} }
return getOrderTrend(tenantIdList, chargingStationIdList); return getOrderTrend(tenantIdList, chargingStationIdList);
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
@ -653,17 +642,19 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
case 1: case 1:
Integer areaCode = coreParam.getAreaCode(); Integer areaCode = coreParam.getAreaCode();
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
int number =0;
if(areaCode !=null){
number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode);
}
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(","); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));
} }
return R.ok(xhpcChargingStationMapper.getWorkOrderTerminal(chargingStationIdList,tenantIdList)); return R.ok(xhpcChargingStationMapper.getWorkOrderTerminal(chargingStationIdList,tenantIdList));
} else { } else {
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdList, areaCode); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndAreaCode(tenantIdsStr, areaCode,number);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); 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 //query location info of special charging station of special tenant
tenantIdsStr = coreParam.getTenantIds(); tenantIdsStr = coreParam.getTenantIds();
if (!"".equals(tenantIdsStr) && tenantIdsStr != null) { if (!"".equals(tenantIdsStr) && tenantIdsStr != null) {
tenantIdArray = tenantIdsStr.split(",");
tenantIdList = Arrays.stream(tenantIdArray).collect(Collectors.toList());
String chargingStationIdStr = coreParam.getChargingStationIds(); String chargingStationIdStr = coreParam.getChargingStationIds();
long chargingStationId = Long.parseLong(chargingStationIdStr); long chargingStationId = Long.parseLong(chargingStationIdStr);
xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdList, chargingStationId); xhpcChargingStationList = xhpcChargingStationMapper.selectByTenantIdAndChargingStationId(tenantIdsStr, chargingStationId);
ArrayList<Long> chargingStationIdList = new ArrayList<>(); ArrayList<Long> chargingStationIdList = new ArrayList<>();
for (Map<String, Object> chargingStation : xhpcChargingStationList) { for (Map<String, Object> chargingStation : xhpcChargingStationList) {
chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID)); chargingStationIdList.add((Long) chargingStation.get(ConstantClass.CHARGING_STATION_ID));

7
xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml
View File

@ -329,11 +329,8 @@
FROM FROM
xhpc_app_user xhpc_app_user
<where> <where>
<if test="tenantIdList!=null and tenantIdList.size()!=0 "> <if test="tenantIdsStr!=null and tenantIdsStr!='' ">
and tenant_id IN and find_in_set(tenant_id, #{tenantIdsStr})
<foreach collection="tenantIdList" separator="," open="(" close=")" item="tenantId">
#{tenantId}
</foreach>
</if> </if>
<if test="currentTime!=null and currentTime!='' "> <if test="currentTime!=null and currentTime!='' ">
and create_time <![CDATA[>=]]> DATE_ADD(#{currentTime},INTERVAL -3 MONTH) and create_time <![CDATA[>=]]> DATE_ADD(#{currentTime},INTERVAL -3 MONTH)

28
xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml
View File

@ -64,11 +64,8 @@
WHERE WHERE
xhpc_charging_station.del_flag = 0 xhpc_charging_station.del_flag = 0
AND xhpc_charging_station.`status` = 0 AND xhpc_charging_station.`status` = 0
<if test="tenantIdList!=null and tenantIdList.size()!=0"> <if test="tenantIdsStr!=null and tenantIdsStr!='' ">
AND xhpc_charging_station.tenant_id in and find_in_set(tenant_id, #{tenantIdsStr})
<foreach collection="tenantIdList" separator="," open="(" close=")" item="tenantId">
#{tenantId}
</foreach>
</if> </if>
<if test="chargingStationId!=null"> <if test="chargingStationId!=null">
AND xhpc_charging_station.charging_station_id = #{chargingStationId} AND xhpc_charging_station.charging_station_id = #{chargingStationId}
@ -86,16 +83,27 @@
xhpc_charging_station xhpc_charging_station
WHERE WHERE
del_flag = 0 del_flag = 0
<if test="tenantIdList!=null and tenantIdList.size()!=0 "> <if test="tenantIdsStr!=null and tenantIdsStr!='' ">
AND tenant_id in and find_in_set(tenant_id, #{tenantIdsStr})
<foreach collection="tenantIdList" item="tenantId" open="(" close=")" separator=",">
#{tenantId}
</foreach>
</if> </if>
<if test="areaCode != null and areaCode != '' "> <if test="areaCode != null and areaCode != '' ">
<if test="number !=0 and number ==1">
AND area_code in (select code from xhpc_area where pcode in(select code from xhpc_area where pcode =#{areaCode}))
</if>
<if test="number !=0 and number ==2">
AND area_code in (select code from xhpc_area where pcode =#{areaCode})
</if>
<if test="number !=0 and number ==3">
AND area_code =#{areaCode} AND area_code =#{areaCode}
</if> </if>
</if>
</select> </select>
<select id="getXhpcAreaLevel" resultType="int">
select level from xhpc_area where code =#{areaCode}
</select>
<select id="selectChargingStationIds" resultType="java.lang.Long"> <select id="selectChargingStationIds" resultType="java.lang.Long">
SELECT SELECT
charging_station_id charging_station_id

7
xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -116,11 +116,8 @@
xhpc_history_order xhpc_history_order
WHERE WHERE
del_flag = 0 del_flag = 0
<if test="tenantIdList!=null and tenantIdList.size()!=0 "> <if test="tenantIdsStr!=null and tenantIdsStr!='' ">
and tenant_id in and find_in_set(tenant_id, #{tenantIdsStr})
<foreach collection="tenantIdList" separator="," open="(" close=")" item="tenantId">
#{tenantId}
</foreach>
</if> </if>
<if test="chargingStationIdList!=null and chargingStationIdList.size()!=0 "> <if test="chargingStationIdList!=null and chargingStationIdList.size()!=0 ">
and charging_station_id in and charging_station_id in

7
xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcRateTimeMapper.xml
View File

@ -75,11 +75,8 @@
WHERE WHERE
charging_order_id IN charging_order_id IN
(SELECT charge_order_id FROM xhpc_charge_order WHERE STATUS = 0 and del_flag = 0 (SELECT charge_order_id FROM xhpc_charge_order WHERE STATUS = 0 and del_flag = 0
<if test="tenantIdList!=null and tenantIdList.size()!=0"> <if test="tenantIdsStr!=null and tenantIdsStr!='' ">
and tenant_id in and find_in_set(tenant_id, #{tenantIdsStr})
<foreach collection="tenantIdList" open="(" close=")" separator="," item="tenantId">
#{tenantId}
</foreach>
</if> </if>
<if test="xhpcChargingStationList!=null and xhpcChargingStationList.size()!=0"> <if test="xhpcChargingStationList!=null and xhpcChargingStationList.size()!=0">
and charging_station_id in and charging_station_id in

58
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java
View File

@ -43,9 +43,9 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getTimeIntervalPage") @GetMapping("/getTimeIntervalPage")
public TableDataInfo getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) public TableDataInfo getTimeIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime,Long userId,Integer type)
{ {
List<Map<String, Object>> list = xhpcStatisticsService.getTimeIntervalPage(request,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); List<Map<String, Object>> list = xhpcStatisticsService.getTimeIntervalPage(request,tenantId,chargingStationId,chargingPileId,terminalId,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type);
return getDataTable(list); return getDataTable(list);
} }
@ -61,9 +61,9 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getDateIntervalPage") @GetMapping("/getDateIntervalPage")
public TableDataInfo getDateIntervalPage(HttpServletRequest request,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) public TableDataInfo getDateIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime,Long userId, Integer type)
{ {
List<Map<String, Object>> list = xhpcStatisticsService.getDateIntervalPage(request,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); List<Map<String, Object>> list = xhpcStatisticsService.getDateIntervalPage(request,tenantId,chargingStationId,chargingPileId,terminalId,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type);
return getDataTable(list); return getDataTable(list);
} }
/** /**
@ -79,9 +79,9 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getStationIntervalPage") @GetMapping("/getStationIntervalPage")
public TableDataInfo getStationIntervalPage(HttpServletRequest request,String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) public TableDataInfo getStationIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, Long userId, Integer type)
{ {
List<Map<String, Object>> list = xhpcStatisticsService.getStationIntervalPage(request,chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); List<Map<String, Object>> list = xhpcStatisticsService.getStationIntervalPage(request,tenantId,chargingStationId,chargingPileId,terminalId,chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type);
return getDataTable(list); return getDataTable(list);
} }
@ -96,9 +96,9 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getOperatorIntervalPage") @GetMapping("/getOperatorIntervalPage")
public TableDataInfo getOperatorIntervalPage(HttpServletRequest request,String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) public TableDataInfo getOperatorIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String operatorIds, Long operatorId,String startTime, String endTime, Long userId,Integer type)
{ {
List<Map<String, Object>> list = xhpcStatisticsService.getOperatorIntervalPage(request,operatorIds,operatorId,startTime,endTime,userId,type); List<Map<String, Object>> list = xhpcStatisticsService.getOperatorIntervalPage(request,tenantId,chargingStationId,chargingPileId,terminalId,operatorIds,operatorId,startTime,endTime,userId,type);
return getDataTable(list); return getDataTable(list);
} }
@ -113,7 +113,7 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getInternetUserIntervalPage") @GetMapping("/getInternetUserIntervalPage")
public TableDataInfo getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds,Long internetUserId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) public TableDataInfo getInternetUserIntervalPage(HttpServletRequest request,String internetUserIds,Long internetUserId,String startTime, String endTime, Long userId,Integer type)
{ {
startPage(); startPage();
List<Map<String, Object>> list = xhpcStatisticsService.getInternetUserIntervalPage(request,internetUserIds,internetUserId,startTime,endTime,userId,type); List<Map<String, Object>> list = xhpcStatisticsService.getInternetUserIntervalPage(request,internetUserIds,internetUserId,startTime,endTime,userId,type);
@ -133,9 +133,9 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getTerminalIntervalPage") @GetMapping("/getTerminalIntervalPage")
public TableDataInfo getTerminalIntervalPage(HttpServletRequest request,String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) public TableDataInfo getTerminalIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,String terminalId,Long operatorId,String startTime, String endTime,Long userId,Integer type)
{ {
List<Map<String, Object>> list = xhpcStatisticsService.getTerminalIntervalPage(request,chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); List<Map<String, Object>> list = xhpcStatisticsService.getTerminalIntervalPage(request,tenantId,chargingStationId,terminalId,operatorId,startTime,endTime,userId,type);
return getDataTable(list); return getDataTable(list);
} }
@ -228,9 +228,9 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getSumSourceList") @GetMapping("/getSumSourceList")
public TableDataInfo getSumSourceList(HttpServletRequest request,String startTime, String endTime, String internetUserIds, String chargingStationIds) { public TableDataInfo getSumSourceList(HttpServletRequest request,String tenantId,Long operatorId,Long chargingStationId,Long chargingPileId,Long terminalId,String startTime, String endTime, String internetUserIds, String chargingStationIds) {
startPage(); startPage();
List<Map<String, Object>> list = xhpcStatisticsService.getSumSourceList(request,startTime,endTime,internetUserIds,chargingStationIds); List<Map<String, Object>> list = xhpcStatisticsService.getSumSourceList(request,tenantId,operatorId,chargingStationId,chargingPileId,terminalId,startTime,endTime,internetUserIds,chargingStationIds);
return getDataTable(list); return getDataTable(list);
} }
@ -247,9 +247,9 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getMechanismPage") @GetMapping("/getMechanismPage")
public TableDataInfo getMechanismPage(HttpServletRequest request,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type,Integer source) public TableDataInfo getMechanismPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, Long userId,Integer type,Integer source)
{ {
List<Map<String, Object>> list = xhpcStatisticsService.getMechanismPage(request,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type,source); List<Map<String, Object>> list = xhpcStatisticsService.getMechanismPage(request,tenantId,chargingStationId,chargingPileId,terminalId,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type,source);
return getDataTable(list); return getDataTable(list);
} }
@ -268,8 +268,8 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@PostMapping("/timeInterval/export") @PostMapping("/timeInterval/export")
public void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { public void timeIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime,Long userId,Integer type) throws IOException {
xhpcStatisticsService.timeIntervalExport(request,response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); xhpcStatisticsService.timeIntervalExport(request,response,tenantId,chargingStationId,chargingPileId,terminalId, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type);
} }
/** /**
@ -284,8 +284,8 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@PostMapping("/dateInterval/export") @PostMapping("/dateInterval/export")
public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime,Long userId,Integer type) throws IOException {
xhpcStatisticsService.dateIntervalExport(request,response, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type); xhpcStatisticsService.dateIntervalExport(request,response,tenantId,chargingStationId,chargingPileId,terminalId, chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type);
} }
/** /**
* 电站统计导出 * 电站统计导出
@ -300,8 +300,8 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@PostMapping("/stationInterval/export") @PostMapping("/stationInterval/export")
public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds,String operatorIds,Long internetUserId, Long operatorId,String startTime, String endTime,Long userId,Integer type) throws IOException {
xhpcStatisticsService.stationIntervalExport(request,response, chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type); xhpcStatisticsService.stationIntervalExport(request,response,tenantId,chargingStationId,chargingPileId,terminalId, chargingStationIds,operatorIds,internetUserId,operatorId,startTime,endTime,userId,type);
} }
/** /**
@ -315,8 +315,8 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@PostMapping("/operatorInterval/export") @PostMapping("/operatorInterval/export")
public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String operatorIds, Long operatorId,String startTime, String endTime,Long userId,Integer type) throws IOException {
xhpcStatisticsService.operatorIntervalExport(request,response, operatorIds,operatorId,startTime,endTime,userId,type); xhpcStatisticsService.operatorIntervalExport(request,response,tenantId,chargingStationId,chargingPileId,terminalId, operatorIds,operatorId,startTime,endTime,userId,type);
} }
/** /**
@ -324,8 +324,8 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@PostMapping("/internetUserInterval/export") @PostMapping("/internetUserInterval/export")
public void internetUserIntervalExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime,String internetUserIds, String chargingStationIds) throws IOException { public void internetUserIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long operatorId,Long chargingStationId,Long chargingPileId,Long terminalId, String startTime, String endTime,String internetUserIds, String chargingStationIds) throws IOException {
xhpcStatisticsService.getSumSourceListExport(request,response, startTime,endTime,internetUserIds,chargingStationIds); xhpcStatisticsService.getSumSourceListExport(request,response,tenantId,operatorId,chargingStationId,chargingPileId,terminalId, startTime,endTime,internetUserIds,chargingStationIds);
} }
@ -341,8 +341,8 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@PostMapping("/terminalInterval/export") @PostMapping("/terminalInterval/export")
public void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId,String terminalId,Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type) throws IOException { public void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId, Long chargingStationId,String terminalId,Long operatorId,String startTime, String endTime,Long userId,Integer type) throws IOException {
xhpcStatisticsService.terminalIntervalExport(request,response, chargingStationId,terminalId,operatorId,startTime,endTime,userId,type); xhpcStatisticsService.terminalIntervalExport(request,response,tenantId, chargingStationId,terminalId,operatorId,startTime,endTime,userId,type);
} }
/** /**
@ -358,9 +358,9 @@ public class XhpcStatisticsController extends BaseController {
* @return * @return
*/ */
@PostMapping("/getMechanismPage/export") @PostMapping("/getMechanismPage/export")
public void getMechanismExport(HttpServletRequest request,HttpServletResponse response,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type,@RequestParam("source")Integer source)throws IOException public void getMechanismExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime,Long userId,Integer type,@RequestParam("source")Integer source)throws IOException
{ {
xhpcStatisticsService.getMechanismExport(request,response,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type,source); xhpcStatisticsService.getMechanismExport(request,response,tenantId,chargingStationId,chargingPileId,terminalId,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type,source);
} }

14
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java
View File

@ -26,7 +26,7 @@ public interface XhpcStatisticsServiceMapper {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getTimeIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); List<Map<String, Object>> getTimeIntervalPage(@Param("chargingStationId")Long chargingStationId,@Param("chargingPileId")Long chargingPileId,@Param("terminalId")Long terminalId,@Param("chargingStationIds") List<String> chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId);
/** /**
@ -39,7 +39,7 @@ public interface XhpcStatisticsServiceMapper {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getDateIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId")Long userId,@Param("tenantId")String tenantId); List<Map<String, Object>> getDateIntervalPage(@Param("chargingStationId") Long chargingStationId,@Param("chargingPileId") Long chargingPileId,@Param("terminalId") Long terminalId,@Param("chargingStationIds") List<String> chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId")Long userId,@Param("tenantId")String tenantId);
/** /**
* 电站统计 * 电站统计
@ -52,7 +52,7 @@ public interface XhpcStatisticsServiceMapper {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getStationIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("operatorUserId") List<String> operatorUserId,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); List<Map<String, Object>> getStationIntervalPage(@Param("chargingStationId")Long chargingStationId,@Param("chargingPileId")Long chargingPileId,@Param("terminalId")Long terminalId,@Param("chargingStationIds") List<String> chargingStationIds,@Param("operatorUserId") List<String> operatorUserId,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId);
/** /**
* 运营商统计 * 运营商统计
@ -63,7 +63,7 @@ public interface XhpcStatisticsServiceMapper {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getOperatorIntervalPage(@Param("operatorUserId") List<String> operatorUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); List<Map<String, Object>> getOperatorIntervalPage(@Param("chargingStationId")Long chargingStationId,@Param("chargingPileId")Long chargingPileId,@Param("terminalId")Long terminalId,@Param("operatorUserId") List<String> operatorUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId);
/** /**
* 流量方统计 * 流量方统计
@ -87,7 +87,7 @@ public interface XhpcStatisticsServiceMapper {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getTerminalIntervalPage(@Param("chargingStationId") String chargingStationId,@Param("terminalId") String terminalId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId); List<Map<String, Object>> getTerminalIntervalPage(@Param("chargingStationId") Long chargingStationId,@Param("terminalId") String terminalId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId,@Param("tenantId")String tenantId);
/** /**
@ -146,7 +146,7 @@ public interface XhpcStatisticsServiceMapper {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getMechanismPage(@Param("chargingStationIds") List<String> chargingStationIds, @Param("internetUserId") Long internetUserId, @Param("operatorId") Long operatorId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") Integer type, @Param("userId")Long userId, @Param("tenantId")String tenantId,@Param("source")Integer source); List<Map<String, Object>> getMechanismPage(@Param("chargingStationId")Long chargingStationId,@Param("chargingPileId")Long chargingPileId,@Param("terminalId")Long terminalId,@Param("chargingStationIds") List<String> chargingStationIds, @Param("internetUserId") Long internetUserId, @Param("operatorId") Long operatorId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") Integer type, @Param("userId")Long userId, @Param("tenantId")String tenantId,@Param("source")Integer source);
@ -179,7 +179,7 @@ public interface XhpcStatisticsServiceMapper {
* 订单来源列表 * 订单来源列表
* @return * @return
*/ */
List<Map<String,Object>> getSumSourceList(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceIds")List<String> sourceIds,@Param("chargingStationIdList")List<String> chargingStationIdList,@Param("tenantId")String tenantId,@Param("sysUserId")Long sysUserId,@Param("number")Integer number); List<Map<String,Object>> getSumSourceList(@Param("operatorId")Long operatorId,@Param("chargingStationId")Long chargingStationId,@Param("chargingPileId")Long chargingPileId,@Param("terminalId")Long terminalId,@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceIds")List<String> sourceIds,@Param("chargingStationIdList")List<String> chargingStationIdList,@Param("tenantId")String tenantId,@Param("sysUserId")Long sysUserId,@Param("number")Integer number);
/** /**
* 获取登陆用户信息 * 获取登陆用户信息

28
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcStatisticsService.java
View File

@ -30,7 +30,7 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); List<Map<String, Object>> getTimeIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type);
/** /**
@ -44,7 +44,7 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getDateIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); List<Map<String, Object>> getDateIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type);
/** /**
* 电站统计 * 电站统计
@ -58,7 +58,7 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getStationIntervalPage(HttpServletRequest request,String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type); List<Map<String, Object>> getStationIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type);
/** /**
* 运营商统计 * 运营商统计
@ -70,7 +70,7 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getOperatorIntervalPage(HttpServletRequest request,String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type); List<Map<String, Object>> getOperatorIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type);
/** /**
@ -97,7 +97,7 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
List<Map<String, Object>> getTerminalIntervalPage(HttpServletRequest request,String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type); List<Map<String, Object>> getTerminalIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type);
/** /**
* 电站列表 * 电站列表
@ -160,7 +160,7 @@ public interface IXhpcStatisticsService {
* 订单来源列表 * 订单来源列表
* @return * @return
*/ */
List<Map<String, Object>> getSumSourceList(HttpServletRequest request,String startTime, String endTime, String sourceIds, String chargingStationIds); List<Map<String, Object>> getSumSourceList(HttpServletRequest request,String tenantId,Long operatorId,Long chargingStationId,Long chargingPileId,Long terminalId,String startTime, String endTime, String sourceIds, String chargingStationIds);
/** /**
@ -175,7 +175,7 @@ public interface IXhpcStatisticsService {
* @param source 订单来源（0 C端用户 1 流量方用户 2社区用户 3B端用户） * @param source 订单来源（0 C端用户 1 流量方用户 2社区用户 3B端用户）
* @return * @return
*/ */
List<Map<String, Object>> getMechanismPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type,Integer source); List<Map<String, Object>> getMechanismPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type,Integer source);
@ -220,7 +220,7 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; void timeIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException;
/** /**
@ -234,7 +234,7 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; void dateIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException;
/** /**
* 电站统计导出 * 电站统计导出
@ -248,7 +248,7 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; void stationIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException;
/** /**
* 运营商统计导出 * 运营商统计导出
@ -260,14 +260,14 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException;
/** /**
* 订单来源统计导出 * 订单来源统计导出
* @return * @return
*/ */
void getSumSourceListExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime, String sourceIds,String chargingStationIds) throws IOException; void getSumSourceListExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long operatorId,Long chargingStationId,Long chargingPileId,Long terminalId, String startTime, String endTime, String sourceIds,String chargingStationIds) throws IOException;
/** /**
@ -281,9 +281,9 @@ public interface IXhpcStatisticsService {
* @param type 1 平台 2 运营商 3流量方 * @param type 1 平台 2 运营商 3流量方
* @return * @return
*/ */
void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException; void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId, Long chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException;
void getMechanismExport(HttpServletRequest request,HttpServletResponse response,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type,Integer source) throws IOException ; void getMechanismExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type,Integer source) throws IOException ;
/** /**
* 今日订单量、今日订电量、今日营收、今日充电枪状态 * 今日订单量、今日订电量、今日营收、今日充电枪状态

9
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java
View File

@ -370,10 +370,11 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
if(byId.get("stopReasonRvcsName") !=null){ if(byId.get("stopReasonRvcsName") !=null){
byId.put("stopReasonRvcsName",translate(byId.get("stopReasonRvcsName").toString())); byId.put("stopReasonRvcsName",translate(byId.get("stopReasonRvcsName").toString()));
} }
byId.putAll(getRateTime(byId.get("serialNumber").toString(), byId.get("totalPrice").toString())); byId.putAll(getRateTime(byId.get("serialNumber").toString(), byId.get("totalPrice").toString(),byId.get("totalPower").toString()));
} }
return AjaxResult.success(byId); return AjaxResult.success(byId);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return AjaxResult.error(e.getMessage()); return AjaxResult.error(e.getMessage());
} }
} }
@ -422,7 +423,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
/** /**
* 历史信息费率时段 * 历史信息费率时段
*/ */
private Map<String, Object> getRateTime(String serialNumber, String totalPrice) { private Map<String, Object> getRateTime(String serialNumber, String totalPrice,String totalPower) {
BigDecimal powerPriceTotal = new BigDecimal(0); BigDecimal powerPriceTotal = new BigDecimal(0);
BigDecimal servicePriceTotal = new BigDecimal(0); BigDecimal servicePriceTotal = new BigDecimal(0);
@ -432,7 +433,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
Date startTime2 = chargeOrder.getStartTime(); Date startTime2 = chargeOrder.getStartTime();
Date updateTime2 = chargeOrder.getEndTime(); Date updateTime2 = chargeOrder.getEndTime();
//充电度数 //充电度数
BigDecimal chargingDegree = chargeOrder.getChargingDegree(); BigDecimal chargingDegree = new BigDecimal(totalPower);
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
//1时间没有跨天 //1时间没有跨天
long betweenDay = DateUtil.between(startTime2, updateTime2, DateUnit.DAY); long betweenDay = DateUtil.between(startTime2, updateTime2, DateUnit.DAY);
@ -456,7 +457,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
private Map<String, Object> getBigDecimal(String totalPrice, BigDecimal powerPriceTotal, BigDecimal servicePriceTotal, XhpcChargeOrder chargeOrder, Long rateModelId, Date startTime2, Date updateTime2, BigDecimal chargingDegree, List<Map<String, Object>> list) { private Map<String, Object> getBigDecimal(String totalPrice, BigDecimal powerPriceTotal, BigDecimal servicePriceTotal, XhpcChargeOrder chargeOrder, Long rateModelId, Date startTime2, Date updateTime2, BigDecimal chargingDegree, List<Map<String, Object>> list) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
if(chargingDegree.compareTo(new BigDecimal(0))==0){ if(chargingDegree==null || chargingDegree.compareTo(new BigDecimal(0))==0){
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
map1.put("time", 0); map1.put("time", 0);
map1.put("powerPrice", totalPrice); map1.put("powerPrice", totalPrice);

133
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
View File

@ -43,33 +43,32 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
RedisService redisService; RedisService redisService;
@Override @Override
public List<Map<String, Object>> getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { public List<Map<String, Object>> getTimeIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) {
if (getJudge(internetUserId, operatorId, type)){ if (getJudge(internetUserId, operatorId, type)){
return new ArrayList<>(); return new ArrayList<>();
} }
List<String> chargingStationId =new ArrayList<>(); List<String> chargingStationIdList =new ArrayList<>();
if(!"".equals(chargingStationIds) && chargingStationIds !=null){ if(!"".equals(chargingStationIds) && chargingStationIds !=null){
chargingStationId= Arrays.asList(chargingStationIds.split(",")); chargingStationIdList= Arrays.asList(chargingStationIds.split(","));
} }
//获取登陆用户 //获取登陆用户
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
startPage(); startPage();
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId);
} }
}else{ }else{
startPage(); startPage();
list =xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); list =xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId);
} }
List<Map<String, Object>> page =new ArrayList<>(); List<Map<String, Object>> page =new ArrayList<>();
if(list !=null && list.size()>0){ if(list !=null && list.size()>0){
@ -164,18 +163,17 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
return page; return page;
} }
@Override @Override
public List<Map<String, Object>> getDateIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { public List<Map<String, Object>> getDateIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) {
if (getJudge(internetUserId, operatorId, type)){ if (getJudge(internetUserId, operatorId, type)){
return new ArrayList<>(); return new ArrayList<>();
} }
List<String> chargingStationId =new ArrayList<>(); List<String> chargingStationIdList =new ArrayList<>();
if(!"".equals(chargingStationIds) && chargingStationIds !=null){ if(!"".equals(chargingStationIds) && chargingStationIds !=null){
chargingStationId= Arrays.asList(chargingStationIds.split(",")); chargingStationIdList= Arrays.asList(chargingStationIds.split(","));
} }
//获取登陆用户 //获取登陆用户
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
//获取登陆用户 //获取登陆用户
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
@ -184,27 +182,27 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId, chargingStationIdList,internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId);
} }
}else{ }else{
startPage(); startPage();
list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId);
} }
return list; return list;
} }
@Override @Override
public List<Map<String, Object>> getStationIntervalPage(HttpServletRequest request,String chargingStationIds, String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { public List<Map<String, Object>> getStationIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) {
if (getJudge(internetUserId, operatorId, type)){ if (getJudge(internetUserId, operatorId, type)){
return new ArrayList<>(); return new ArrayList<>();
} }
List<String> chargingStationId =new ArrayList<>(); List<String> chargingStationIdList =new ArrayList<>();
if(!"".equals(chargingStationIds) && chargingStationIds !=null){ if(!"".equals(chargingStationIds) && chargingStationIds !=null){
chargingStationId= Arrays.asList(chargingStationIds.split(",")); chargingStationIdList= Arrays.asList(chargingStationIds.split(","));
} }
List<String> operatorUserId =new ArrayList<>(); List<String> operatorUserId =new ArrayList<>();
if(!"".equals(operatorIds) && operatorIds !=null){ if(!"".equals(operatorIds) && operatorIds !=null){
@ -212,7 +210,6 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
@ -220,14 +217,14 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId,tenantId); list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,2,sysUserId,tenantId); list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,2,sysUserId,tenantId);
} }
}else{ }else{
startPage(); startPage();
list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,0,sysUserId,tenantId); list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,0,sysUserId,tenantId);
} }
@ -235,7 +232,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
@Override @Override
public List<Map<String, Object>> getOperatorIntervalPage(HttpServletRequest request,String operatorIds, Long operatorId, String startTime, String endTime, Long userId, Integer type) { public List<Map<String, Object>> getOperatorIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String operatorIds, Long operatorId, String startTime, String endTime, Long userId, Integer type) {
if(getJudge(null,operatorId,type)){ if(getJudge(null,operatorId,type)){
return new ArrayList<>(); return new ArrayList<>();
} }
@ -245,7 +242,6 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
@ -253,14 +249,14 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId);
} }
}else{ }else{
startPage(); startPage();
list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId);
} }
return list; return list;
@ -300,13 +296,12 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
* @return * @return
*/ */
@Override @Override
public List<Map<String, Object>> getTerminalIntervalPage(HttpServletRequest request, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { public List<Map<String, Object>> getTerminalIntervalPage(HttpServletRequest request,String tenantId,Long chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) {
//获取登陆用户 //获取登陆用户
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
String tenantId = loginUser.getTenantId();
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
startPage(); startPage();
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
@ -484,7 +479,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
@Override @Override
public List<Map<String, Object>> getSumSourceList(HttpServletRequest request,String startTime, String endTime, String sourceIds,String chargingStationIds) { public List<Map<String, Object>> getSumSourceList(HttpServletRequest request,String tenantId,Long operatorId,Long chargingStationId,Long chargingPileId,Long terminalId,String startTime, String endTime, String sourceIds,String chargingStationIds) {
List<String> sourceList =new ArrayList<>(); List<String> sourceList =new ArrayList<>();
if(!"".equals(sourceIds) && sourceIds !=null){ if(!"".equals(sourceIds) && sourceIds !=null){
sourceList= Arrays.asList(sourceIds.split(",")); sourceList= Arrays.asList(sourceIds.split(","));
@ -495,7 +490,6 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
@ -504,33 +498,32 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getSumSourceList(startTime, endTime, sourceList,chargingStationIdList,tenantId,logOperatorId,1); list = xhpcStatisticsServiceMapper.getSumSourceList(operatorId,chargingStationId,chargingPileId,terminalId,startTime, endTime, sourceList,chargingStationIdList,tenantId,logOperatorId,1);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getSumSourceList(startTime, endTime, sourceList, chargingStationIdList,tenantId,sysUserId,2); list = xhpcStatisticsServiceMapper.getSumSourceList(operatorId,chargingStationId,chargingPileId,terminalId,startTime, endTime, sourceList, chargingStationIdList,tenantId,sysUserId,2);
} }
}else{ }else{
startPage(); startPage();
list = xhpcStatisticsServiceMapper.getSumSourceList(startTime, endTime, sourceList, chargingStationIdList,tenantId,sysUserId,0); list = xhpcStatisticsServiceMapper.getSumSourceList(operatorId,chargingStationId,chargingPileId,terminalId,startTime, endTime, sourceList, chargingStationIdList,tenantId,sysUserId,0);
} }
return list; return list;
} }
@Override @Override
public List<Map<String, Object>> getMechanismPage(HttpServletRequest request, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type,Integer source) { public List<Map<String, Object>> getMechanismPage(HttpServletRequest request,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type,Integer source) {
if (getJudge(internetUserId, operatorId, type)){ if (getJudge(internetUserId, operatorId, type)){
return new ArrayList<>(); return new ArrayList<>();
} }
List<String> chargingStationId =new ArrayList<>(); List<String> chargingStationIdList =new ArrayList<>();
if(!"".equals(chargingStationIds) && chargingStationIds !=null){ if(!"".equals(chargingStationIds) && chargingStationIds !=null){
chargingStationId= Arrays.asList(chargingStationIds.split(",")); chargingStationIdList= Arrays.asList(chargingStationIds.split(","));
} }
//获取登陆用户 //获取登陆用户
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
//获取登陆用户 //获取登陆用户
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
@ -539,14 +532,14 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId,source); list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId,source);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId,source); list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId,source);
} }
}else{ }else{
startPage(); startPage();
list =xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId,source); list =xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId,source);
} }
return list; return list;
@ -636,8 +629,8 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
@Override @Override
public void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { public void timeIntervalExport(HttpServletRequest request,HttpServletResponse response, String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException {
List<Map<String, Object>> list = getTimeIntervalPage(request,chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type); List<Map<String, Object>> list = getTimeIntervalPage(request,tenantId,chargingStationId,chargingPileId,terminalId,chargingStationIds, internetUserId, operatorId, startTime, endTime, userId, type);
// 通过工具类创建writer，默认创建xls格式 // 通过工具类创建writer，默认创建xls格式
BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx");
@ -679,19 +672,18 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
@Override @Override
public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { public void dateIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException {
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
if (getJudge(internetUserId, operatorId, type)){ if (getJudge(internetUserId, operatorId, type)){
}else{ }else{
List<String> chargingStationId =new ArrayList<>(); List<String> chargingStationIdList =new ArrayList<>();
if(!"".equals(chargingStationIds) && chargingStationIds !=null){ if(!"".equals(chargingStationIds) && chargingStationIds !=null){
chargingStationId= Arrays.asList(chargingStationIds.split(",")); chargingStationIdList= Arrays.asList(chargingStationIds.split(","));
} }
//获取登陆用户 //获取登陆用户
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
//获取登陆用户 //获取登陆用户
@ -699,13 +691,13 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId);
} }
}else{ }else{
list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); list =xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId);
} }
} }
// 通过工具类创建writer，默认创建xls格式 // 通过工具类创建writer，默认创建xls格式
@ -750,14 +742,14 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
@Override @Override
public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { public void stationIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds,String operatorIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException {
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
if (getJudge(internetUserId, operatorId, type)){ if (getJudge(internetUserId, operatorId, type)){
}else{ }else{
List<String> chargingStationId =new ArrayList<>(); List<String> chargingStationIdList =new ArrayList<>();
if(!"".equals(chargingStationIds) && chargingStationIds !=null){ if(!"".equals(chargingStationIds) && chargingStationIds !=null){
chargingStationId= Arrays.asList(chargingStationIds.split(",")); chargingStationIdList= Arrays.asList(chargingStationIds.split(","));
} }
List<String> operatorUserId =new ArrayList<>(); List<String> operatorUserId =new ArrayList<>();
if(!"".equals(operatorIds) && operatorIds !=null){ if(!"".equals(operatorIds) && operatorIds !=null){
@ -765,20 +757,19 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId,tenantId); list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,2,sysUserId,tenantId); list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,2,sysUserId,tenantId);
} }
}else{ }else{
list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,0,sysUserId,tenantId); list =xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList,operatorUserId,internetUserId,operatorId,startTime,endTime,0,sysUserId,tenantId);
} }
} }
@ -826,7 +817,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
@Override @Override
public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { public void operatorIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String operatorIds,Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException {
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
if(getJudge(null,operatorId,type)){ if(getJudge(null,operatorId,type)){
@ -837,20 +828,19 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId); list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId); list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId);
} }
}else{ }else{
list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId); list =xhpcStatisticsServiceMapper.getOperatorIntervalPage(chargingStationId,chargingPileId,terminalId,operatorUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId);
} }
} }
// 通过工具类创建writer，默认创建xls格式 // 通过工具类创建writer，默认创建xls格式
@ -899,9 +889,9 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
@Override @Override
public void getSumSourceListExport(HttpServletRequest request,HttpServletResponse response, String startTime, String endTime, String sourceIds, String chargingStationIds) throws IOException { public void getSumSourceListExport(HttpServletRequest request,HttpServletResponse response,String tenantId,Long operatorId,Long chargingStationId,Long chargingPileId,Long terminalId, String startTime, String endTime, String sourceIds, String chargingStationIds) throws IOException {
List<Map<String, Object>> list = getSumSourceList(request,startTime, endTime, sourceIds,chargingStationIds); List<Map<String, Object>> list = getSumSourceList(request,tenantId,operatorId,chargingStationId,chargingPileId,terminalId,startTime, endTime, sourceIds,chargingStationIds);
// 通过工具类创建writer，默认创建xls格式 // 通过工具类创建writer，默认创建xls格式
BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx");
@ -948,11 +938,11 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
@Override @Override
public void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response, String chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException { public void terminalIntervalExport(HttpServletRequest request,HttpServletResponse response,String tenantId, Long chargingStationId, String terminalId, Long operatorId, String startTime, String endTime, Long userId, Integer type) throws IOException {
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
@ -1012,32 +1002,31 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
} }
@Override @Override
public void getMechanismExport(HttpServletRequest request, HttpServletResponse response, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type, Integer source) throws IOException { public void getMechanismExport(HttpServletRequest request, HttpServletResponse response,String tenantId,Long chargingStationId,Long chargingPileId,Long terminalId, String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type, Integer source) throws IOException {
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
if (getJudge(internetUserId, operatorId, type)){ if (getJudge(internetUserId, operatorId, type)){
}else{ }else{
List<String> chargingStationId =new ArrayList<>(); List<String> chargingStationIdList =new ArrayList<>();
if(!"".equals(chargingStationIds) && chargingStationIds !=null){ if(!"".equals(chargingStationIds) && chargingStationIds !=null){
chargingStationId= Arrays.asList(chargingStationIds.split(",")); chargingStationIdList= Arrays.asList(chargingStationIds.split(","));
} }
//获取登陆用户 //获取登陆用户
LoginUser loginUser = tokenService.getLoginUser(request); LoginUser loginUser = tokenService.getLoginUser(request);
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
//获取登陆用户 //获取登陆用户
if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){ if(!UserTypeUtil.SYS_USER_TYPE_ADMIN.equals(sysUser.getUserId())){
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId,source); list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 1,logOperatorId,tenantId,source);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId,source); list = xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 2,sysUserId,tenantId,source);
} }
}else{ }else{
list =xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId,source); list =xhpcStatisticsServiceMapper.getMechanismPage(chargingStationId,chargingPileId,terminalId,chargingStationIdList, internetUserId, operatorId, startTime, endTime, 0,sysUserId,tenantId,source);
} }
} }
// 通过工具类创建writer，默认创建xls格式 // 通过工具类创建writer，默认创建xls格式

1
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -875,6 +875,7 @@
ho.operation_svc_commission as operationSvcCommission, ho.operation_svc_commission as operationSvcCommission,
ho.act_power_price as actPowerPrice, ho.act_power_price as actPowerPrice,
ho.act_service_price as actServicePrice, ho.act_service_price as actServicePrice,
ho.total_power as totalPower,
ed.total_power as sanTotalPower, ed.total_power as sanTotalPower,
ed.total_money as sanTotalMoney, ed.total_money as sanTotalMoney,
case when ed.dispute_reason=1 then "交易不存在" case when ed.dispute_reason=1 then "交易不存在"

60
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml
View File

@ -93,6 +93,15 @@
#{chargingStationId} #{chargingStationId}
</foreach> </foreach>
</if> </if>
<if test="chargingStationId !=null">
and charging_station_id =#{chargingStationId}
</if>
<if test="chargingPileId !=null">
and terminal_id in (select terminal_id from xhpc_terminal where charging_pile_id=#{chargingPileId} and del_flag =0)
</if>
<if test="terminalId !=null">
and terminal_id =#{terminalId}
</if>
<if test="startTime !=null and startTime !=''"> <if test="startTime !=null and startTime !=''">
and create_time &gt;= #{startTime} and create_time &gt;= #{startTime}
</if> </if>
@ -144,6 +153,15 @@
#{chargingStationId} #{chargingStationId}
</foreach> </foreach>
</if> </if>
<if test="chargingStationId !=null">
and charging_station_id =#{chargingStationId}
</if>
<if test="chargingPileId !=null">
and terminal_id in (select terminal_id from xhpc_terminal where charging_pile_id=#{chargingPileId} and del_flag =0)
</if>
<if test="terminalId !=null">
and terminal_id =#{terminalId}
</if>
<if test="startTime !=null and startTime !=''"> <if test="startTime !=null and startTime !=''">
and create_time &gt;= #{startTime} and create_time &gt;= #{startTime}
</if> </if>
@ -196,6 +214,15 @@
<if test="startTime !=null and startTime !=''"> <if test="startTime !=null and startTime !=''">
and ss.create_time &gt;= #{startTime} and ss.create_time &gt;= #{startTime}
</if> </if>
<if test="chargingStationId !=null">
and ss.charging_station_id =#{chargingStationId}
</if>
<if test="chargingPileId !=null">
and ss.terminal_id in (select terminal_id from xhpc_terminal where charging_pile_id=#{chargingPileId} and del_flag =0)
</if>
<if test="terminalId !=null">
and ss.terminal_id =#{terminalId}
</if>
<if test="endTime !=null and endTime !=''"> <if test="endTime !=null and endTime !=''">
and ss.create_time &lt;= #{endTime} and ss.create_time &lt;= #{endTime}
</if> </if>
@ -254,6 +281,15 @@
<if test="startTime !=null and startTime !=''"> <if test="startTime !=null and startTime !=''">
and ss.create_time &gt;= #{startTime} and ss.create_time &gt;= #{startTime}
</if> </if>
<if test="chargingStationId !=null">
and ss.charging_station_id =#{chargingStationId}
</if>
<if test="chargingPileId !=null">
and ss.terminal_id in (select terminal_id from xhpc_terminal where charging_pile_id=#{chargingPileId} and del_flag =0)
</if>
<if test="terminalId !=null">
and ss.terminal_id =#{terminalId}
</if>
<if test="endTime !=null and endTime !=''"> <if test="endTime !=null and endTime !=''">
and ss.create_time &lt;= #{endTime} and ss.create_time &lt;= #{endTime}
</if> </if>
@ -535,6 +571,18 @@
<if test="source ==null"> <if test="source ==null">
and source in (2,3) and source in (2,3)
</if> </if>
<if test="operatorId !=null">
and operator_id =#{operatorId}
</if>
<if test="chargingStationId !=null">
and charging_station_id =#{chargingStationId}
</if>
<if test="chargingPileId !=null">
and terminal_id in (select terminal_id from xhpc_terminal where charging_pile_id=#{chargingPileId} and del_flag =0)
</if>
<if test="terminalId !=null">
and terminal_id =#{terminalId}
</if>
<if test="chargingStationIds !=null and chargingStationIds.size()>0"> <if test="chargingStationIds !=null and chargingStationIds.size()>0">
and charging_station_id in and charging_station_id in
<foreach collection="chargingStationIds" open="(" item="chargingStationId" separator="," close=")" > <foreach collection="chargingStationIds" open="(" item="chargingStationId" separator="," close=")" >
@ -1018,6 +1066,18 @@
<if test="endTime !=null and endTime !=''"> <if test="endTime !=null and endTime !=''">
and ss.create_time &lt;= #{endTime} and ss.create_time &lt;= #{endTime}
</if> </if>
<if test="operatorId !=null">
and ss.operator_id =#{operatorId}
</if>
<if test="chargingStationId !=null">
and ss.charging_station_id =#{chargingStationId}
</if>
<if test="chargingPileId !=null">
and ss.terminal_id in (select terminal_id from xhpc_terminal where charging_pile_id=#{chargingPileId} and del_flag =0)
</if>
<if test="terminalId !=null">
and ss.terminal_id =#{terminalId}
</if>
<if test="sourceIds !=null and sourceIds.size()>0"> <if test="sourceIds !=null and sourceIds.size()>0">
and ss.charging_mode in and ss.charging_mode in
<foreach collection="sourceIds" open="(" item="sourceId" separator="," close=")" > <foreach collection="sourceIds" open="(" item="sourceId" separator="," close=")" >

8
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcCommonController.java
View File

@ -94,8 +94,8 @@ public class XhpcCommonController extends BaseController {
* 机构人员统计 * 机构人员统计
*/ */
@GetMapping(value = "/getPersonnelStatistics") @GetMapping(value = "/getPersonnelStatistics")
public TableDataInfo getPersonnelStatistics(Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name , String phone, String account) { public TableDataInfo getPersonnelStatistics(String tenantId,Long terminalId,Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name , String phone, String account) {
List<Map<String, Object>> list = xhpcCommonService.getPersonnelStatistics(operatorId,chargingStationId,chargingPileId,type,name,phone,account); List<Map<String, Object>> list = xhpcCommonService.getPersonnelStatistics(tenantId,terminalId,operatorId,chargingStationId,chargingPileId,type,name,phone,account);
return getDataTable(list); return getDataTable(list);
} }
@ -103,8 +103,8 @@ public class XhpcCommonController extends BaseController {
* 机构人员统计 * 机构人员统计
*/ */
@PostMapping(value = "/getPersonnelStatisticsExport") @PostMapping(value = "/getPersonnelStatisticsExport")
public void getPersonnelStatisticsExport(HttpServletResponse response, Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name , String phone, String account)throws IOException { public void getPersonnelStatisticsExport(HttpServletResponse response,String tenantId,Long terminalId, Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name , String phone, String account)throws IOException {
xhpcCommonService.getPersonnelStatisticsExport(response,operatorId,chargingStationId,chargingPileId,type,name,phone,account); xhpcCommonService.getPersonnelStatisticsExport(response,tenantId,terminalId,operatorId,chargingStationId,chargingPileId,type,name,phone,account);
} }

8
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java
View File

@ -182,9 +182,9 @@ public class XhpcOperatorController extends BaseController {
*/ */
//@PreAuthorize(hasPermi = "system:operator:page") //@PreAuthorize(hasPermi = "system:operator:page")
@GetMapping("/page") @GetMapping("/page")
public TableDataInfo page(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) { public TableDataInfo page(String tenantId,Long operatorId,String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) {
startPage(); startPage();
List<Map<String, Object>> list = iXhpcOperatorService.selectOperatorList(name, contactName, contactPhone, createTimeStart, createTimeEnd); List<Map<String, Object>> list = iXhpcOperatorService.selectOperatorList(tenantId,operatorId,name,contactName, contactPhone, createTimeStart, createTimeEnd);
return getDataTable(list); return getDataTable(list);
} }
@ -209,8 +209,8 @@ public class XhpcOperatorController extends BaseController {
*/ */
//@PreAuthorize(hasPermi = "system:operator:page") //@PreAuthorize(hasPermi = "system:operator:page")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) { public AjaxResult list(String tenantId,Long operatorId,String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) {
List<Map<String, Object>> list = iXhpcOperatorService.selectOperatorList(name, contactName, contactPhone, createTimeStart, createTimeEnd); List<Map<String, Object>> list = iXhpcOperatorService.selectOperatorList(tenantId,operatorId,name, contactName, contactPhone, createTimeStart, createTimeEnd);
return AjaxResult.success(list); return AjaxResult.success(list);
} }

2
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcCommonMapper.java
View File

@ -28,5 +28,5 @@ public interface XhpcCommonMapper {
Map<String, Object> getCustomersUser(@Param("phone") String phone,@Param("userId")Long userId,@Param("serialNumber")String serialNumber,@Param("tenantId") String tenantId); Map<String, Object> getCustomersUser(@Param("phone") String phone,@Param("userId")Long userId,@Param("serialNumber")String serialNumber,@Param("tenantId") String tenantId);
List<Map<String, Object>> getPersonnelStatistics(@Param("operatorId")Long operatorId,@Param("chargingStationId") Long chargingStationId, @Param("chargingPileId")Long chargingPileId, @Param("type")Integer type, @Param("name")String name , @Param("phone")String phone, @Param("account")String account,@Param("number") Integer number,@Param("userId") Long userId,@Param("tenantId")String tenantId); List<Map<String, Object>> getPersonnelStatistics(@Param("terminalId")Long terminalId,@Param("operatorId")Long operatorId,@Param("chargingStationId") Long chargingStationId, @Param("chargingPileId")Long chargingPileId, @Param("type")Integer type, @Param("name")String name , @Param("phone")String phone, @Param("account")String account,@Param("number") Integer number,@Param("userId") Long userId,@Param("tenantId")String tenantId);
} }

2
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcOperatorMapper.java
View File

@ -62,7 +62,7 @@ public interface XhpcOperatorMapper {
* @param contactPhone 联系人电话 * @param contactPhone 联系人电话
* @return 结果 * @return 结果
*/ */
public List<Map<String, Object>> selectOperatorList(@Param("name") String name, @Param("contactName") String contactName, @Param("contactPhone") String contactPhone, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd,@Param("tenantId")String tenantId); public List<Map<String, Object>> selectOperatorList(@Param("operatorId") Long operatorId, @Param("name") String name, @Param("contactName") String contactName, @Param("contactPhone") String contactPhone, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd,@Param("tenantId")String tenantId,@Param("type")Integer type,@Param("logOperatorId")Long logOperatorId);
/** /**
* 通过用户ID删除用户和角色关联 * 通过用户ID删除用户和角色关联

4
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcCommonService.java
View File

@ -46,8 +46,8 @@ public interface IXhpcCommonService {
/** /**
* 根据用户手机号获取用户信息 * 根据用户手机号获取用户信息
*/ */
List<Map<String, Object>> getPersonnelStatistics(Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name , String phone, String account); List<Map<String, Object>> getPersonnelStatistics(String tenantId,Long terminalId,Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name , String phone, String account);
void getPersonnelStatisticsExport(HttpServletResponse response, Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name , String phone, String account)throws IOException; void getPersonnelStatisticsExport(HttpServletResponse response,String tenantId,Long terminalId, Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name , String phone, String account)throws IOException;
} }

2
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcOperatorService.java
View File

@ -61,7 +61,7 @@ public interface IXhpcOperatorService {
* @param contactPhone 联系人电话 * @param contactPhone 联系人电话
* @return 结果 * @return 结果
*/ */
public List<Map<String, Object>> selectOperatorList(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd); public List<Map<String, Object>> selectOperatorList(String tenantId,Long operatorId,String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd);
/** /**
* 删除用户 * 删除用户

18
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommonServiceImpl.java
View File

@ -125,12 +125,11 @@ public class XhpcCommonServiceImpl extends BaseService implements IXhpcCommonSer
* @param account * @param account
*/ */
@Override @Override
public List<Map<String, Object>> getPersonnelStatistics(Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name, String phone, String account) { public List<Map<String, Object>> getPersonnelStatistics(String tenantId,Long terminalId,Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name, String phone, String account) {
//获取登陆用户 //获取登陆用户
LoginUser loginUser = tokenService.getLoginUser(); LoginUser loginUser = tokenService.getLoginUser();
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
//获取登陆用户 //获取登陆用户
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
@ -140,23 +139,22 @@ public class XhpcCommonServiceImpl extends BaseService implements IXhpcCommonSer
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcCommonMapper.getPersonnelStatistics(operatorId, chargingStationId, chargingPileId, type, name,phone,account, 1,logOperatorId,tenantId); list = xhpcCommonMapper.getPersonnelStatistics(terminalId,operatorId, chargingStationId, chargingPileId, type, name,phone,account, 1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcCommonMapper.getPersonnelStatistics(operatorId, chargingStationId, chargingPileId, type, name,phone,account, 2,sysUserId,tenantId); list = xhpcCommonMapper.getPersonnelStatistics(terminalId,operatorId, chargingStationId, chargingPileId, type, name,phone,account, 2,sysUserId,tenantId);
} }
}else{ }else{
startPage(); startPage();
list =xhpcCommonMapper.getPersonnelStatistics(operatorId, chargingStationId, chargingPileId, type, name,phone,account, 0,sysUserId,tenantId); list =xhpcCommonMapper.getPersonnelStatistics(terminalId,operatorId, chargingStationId, chargingPileId, type, name,phone,account, 0,sysUserId,tenantId);
} }
return list; return list;
} }
@Override @Override
public void getPersonnelStatisticsExport(HttpServletResponse response, Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name, String phone, String account) throws IOException { public void getPersonnelStatisticsExport(HttpServletResponse response, String tenantId,Long terminalId,Long operatorId, Long chargingStationId, Long chargingPileId, Integer type, String name, String phone, String account) throws IOException {
LoginUser loginUser = tokenService.getLoginUser(); LoginUser loginUser = tokenService.getLoginUser();
SysUser sysUser = loginUser.getSysUser(); SysUser sysUser = loginUser.getSysUser();
String tenantId = loginUser.getTenantId();
Long sysUserId = sysUser.getUserId(); Long sysUserId = sysUser.getUserId();
//获取登陆用户 //获取登陆用户
List<Map<String, Object>> list =new ArrayList<>(); List<Map<String, Object>> list =new ArrayList<>();
@ -164,14 +162,14 @@ public class XhpcCommonServiceImpl extends BaseService implements IXhpcCommonSer
if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){ if(UserTypeUtil.SYS_USER_TYPE_ONE.equals(sysUser.getUserType())){
Long logOperatorId = sysUser.getOperatorId(); Long logOperatorId = sysUser.getOperatorId();
//运营商看自己的场站 //运营商看自己的场站
list = xhpcCommonMapper.getPersonnelStatistics(operatorId, chargingStationId, chargingPileId, type, name,phone,account, 1,logOperatorId,tenantId); list = xhpcCommonMapper.getPersonnelStatistics(terminalId,operatorId, chargingStationId, chargingPileId, type, name,phone,account, 1,logOperatorId,tenantId);
}else{ }else{
//查询赋值的场站 //查询赋值的场站
list = xhpcCommonMapper.getPersonnelStatistics(operatorId, chargingStationId, chargingPileId, type, name,phone,account, 2,sysUserId,tenantId); list = xhpcCommonMapper.getPersonnelStatistics(terminalId,operatorId, chargingStationId, chargingPileId, type, name,phone,account, 2,sysUserId,tenantId);
} }
}else{ }else{
list =xhpcCommonMapper.getPersonnelStatistics(operatorId, chargingStationId, chargingPileId, type, name,phone,account, 0,sysUserId,tenantId); list =xhpcCommonMapper.getPersonnelStatistics(terminalId,operatorId, chargingStationId, chargingPileId, type, name,phone,account, 0,sysUserId,tenantId);
} }
// 通过工具类创建writer，默认创建xls格式 // 通过工具类创建writer，默认创建xls格式
BigExcelWriter writer = ExcelUtil.getBigWriter("机构人员统计.xlsx"); BigExcelWriter writer = ExcelUtil.getBigWriter("机构人员统计.xlsx");

24
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcOperatorServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.xhpc.user.service.impl;
import com.xhpc.common.core.constant.UserConstants; import com.xhpc.common.core.constant.UserConstants;
import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.utils.StringUtils;
import com.xhpc.common.security.service.TokenService; 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.domain.SysUser;
import com.xhpc.system.api.model.LoginUser; import com.xhpc.system.api.model.LoginUser;
import com.xhpc.user.domain.XhpcOperator; import com.xhpc.user.domain.XhpcOperator;
@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -109,9 +111,27 @@ public class XhpcOperatorServiceImpl implements IXhpcOperatorService {
* @return 结果 * @return 结果
*/ */
@Override @Override
public List<Map<String, Object>> selectOperatorList(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) { public List<Map<String, Object>> selectOperatorList(String tenantId,Long operatorId,String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) {
//获取登陆用户
LoginUser loginUser = tokenService.getLoginUser(); LoginUser loginUser = tokenService.getLoginUser();
return xhpcOperatorMapper.selectOperatorList(name, contactName, contactPhone, createTimeStart, createTimeEnd,loginUser.getTenantId()); 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();
return xhpcOperatorMapper.selectOperatorList(operatorId,name, contactName, contactPhone, createTimeStart, createTimeEnd,tenantId,1,logOperatorId);
//运营商看自己的场站
}else{
//查询赋值的场站
return xhpcOperatorMapper.selectOperatorList(operatorId,name, contactName, contactPhone, createTimeStart, createTimeEnd,tenantId,2,sysUserId);
}
}else{
return xhpcOperatorMapper.selectOperatorList(operatorId,name, contactName, contactPhone, createTimeStart, createTimeEnd,tenantId,0,sysUserId);
}
} }
/** /**

12
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml
View File

@ -146,6 +146,9 @@
<if test="operatorId !=null"> <if test="operatorId !=null">
and xcp.create_id=#{operatorId} and xcp.create_id=#{operatorId}
</if> </if>
<if test="terminalId !=null">
and xho.terminal_id=#{terminalId}
</if>
<if test="chargingPileId !=null"> <if test="chargingPileId !=null">
and xcp.create_id=(select operator_id from xhpc_charging_station where charging_station_id=(select terminal_id from xhpc_charging_pile where charging_pile_id=#{chargingPileId})) and xcp.create_id=(select operator_id from xhpc_charging_station where charging_station_id=(select terminal_id from xhpc_charging_pile where charging_pile_id=#{chargingPileId}))
</if> </if>
@ -186,6 +189,9 @@
<if test="operatorId !=null"> <if test="operatorId !=null">
and xcup.create_id=#{operatorId} and xcup.create_id=#{operatorId}
</if> </if>
<if test="terminalId !=null">
and xho.terminal_id=#{terminalId}
</if>
<if test="chargingPileId !=null"> <if test="chargingPileId !=null">
and xcup.create_id=(select operator_id from xhpc_charging_station where charging_station_id=(select terminal_id from xhpc_charging_pile where charging_pile_id=#{chargingPileId})) and xcup.create_id=(select operator_id from xhpc_charging_station where charging_station_id=(select terminal_id from xhpc_charging_pile where charging_pile_id=#{chargingPileId}))
</if> </if>
@ -220,6 +226,9 @@
<if test="type==1"> <if test="type==1">
and xcp.create_type=2 and xcp.create_id=#{userId} and xcp.create_type=2 and xcp.create_id=#{userId}
</if> </if>
<if test="terminalId !=null">
and xho.terminal_id=#{terminalId}
</if>
<if test="chargingStationId !=null"> <if test="chargingStationId !=null">
and xcp.create_id=(select operator_id from xhpc_charging_station where charging_station_id=#{chargingStationId}) and xcp.create_id=(select operator_id from xhpc_charging_station where charging_station_id=#{chargingStationId})
</if> </if>
@ -259,6 +268,9 @@
<if test="type==1"> <if test="type==1">
and xcup.create_type=2 and xcup.create_id=#{userId} and xcup.create_type=2 and xcup.create_id=#{userId}
</if> </if>
<if test="terminalId !=null">
and xho.terminal_id=#{terminalId}
</if>
<if test="chargingStationId !=null"> <if test="chargingStationId !=null">
and xcup.create_id=(select operator_id from xhpc_charging_station where charging_station_id=#{chargingStationId}) and xcup.create_id=(select operator_id from xhpc_charging_station where charging_station_id=#{chargingStationId})
</if> </if>

9
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml
View File

@ -321,6 +321,15 @@
<if test="tenantId != null and tenantId != ''"><!-- 结束时间检索 --> <if test="tenantId != null and tenantId != ''"><!-- 结束时间检索 -->
AND xo.tenant_id= #{tenantId} AND xo.tenant_id= #{tenantId}
</if> </if>
<if test="operatorId !=null">
and xo.operator_id =#{operatorId}
</if>
<if test="type==1">
and xo.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=#{userId}))
</if>
<if test="type==2">
and xo.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=#{userId}))
</if>
group by xo.operator_id group by xo.operator_id
ORDER BY xo.update_time DESC ORDER BY xo.update_time DESC
</select> </select>