autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 查询首页数据

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-13 17:41:05 +08:00
parent 3f8405d3d2
commit 42d206e446
11 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/dto/IndexQueryDTO.java
View File

@@ -3,6 +3,8 @@ package com.jsowell.pile.dto;
import com.jsowell.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.List;
/**
* 首页数据展示DTO
*
@@ -15,4 +17,6 @@ public class IndexQueryDTO extends BaseEntity {
* 站点id
*/
private String stationId;
private List<String> stationIdList;
}

3
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
View File

@@ -1,6 +1,7 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.PileMerchantInfo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -67,4 +68,6 @@ public interface PileMerchantInfoMapper {
* @return 结果
*/
public int deletePileMerchantInfoByIds(Long[] ids);
List<String> queryByMerchantDeptIds(@Param("merchantDeptIds") List<String> merchantDeptIds);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
View File

@@ -77,4 +77,6 @@ public interface PileStationInfoMapper {
* @return
*/
List<PileStationInfo> getStationInfoForLianLian();
List<String> queryByStationDeptIds(@Param("stationDeptIds") List<String> stationDeptIds);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java
View File

@@ -63,4 +63,11 @@ public interface IPileMerchantInfoService {
String getMerchantIdByAppId(String appId);
MerchantInfoVO getMerchantInfo(String merchantId);
/**
* 根据运营商部门ids 查询所有站点id
* @param merchantDeptIds
* @return
*/
List<String> queryByMerchantDeptIds(List<String> merchantDeptIds);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java
View File

@@ -92,4 +92,6 @@ public interface IPileStationInfoService {
PileStationVO getStationInfoByPileSn(String pileSn);
List<PileStationInfo> getStationInfoForLianLian();
List<String> queryByStationDeptIds(List<String> stationIds);
}

26
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -27,6 +27,7 @@ import com.jsowell.pile.service.IPileConnectorInfoService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.service.IPileModelInfoService;
import com.jsowell.pile.service.IPileSimInfoService;
import com.jsowell.pile.service.IPileStationInfoService;
import com.jsowell.pile.service.SimCardService;
import com.jsowell.pile.vo.base.MerchantInfoVO;
import com.jsowell.pile.vo.base.PileInfoVO;
@@ -71,6 +72,9 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
@Autowired
private IPileMerchantInfoService pileMerchantInfoService;
@Autowired
private IPileStationInfoService pileStationInfoService;
@Autowired
private IPileSimInfoService pileSimInfoService;
@@ -565,9 +569,27 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
if (authorizedMap == null) {
return new IndexGeneralSituationVO();
}
dto.setStationDeptIds(authorizedMap.getStationDeptIds());
dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
// dto.setStationDeptIds(authorizedMap.getStationDeptIds());
// dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
List<String> stationIdList = Lists.newArrayList();
List<String> stationDeptIds = authorizedMap.getStationDeptIds();
if (CollectionUtils.isNotEmpty(stationDeptIds)) {
// 根据部门id查询站点id
List<String> list = pileStationInfoService.queryByStationDeptIds(stationDeptIds);
if (CollectionUtils.isNotEmpty(list)) {
stationIdList.addAll(list);
}
}
List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
// 根据运营商部门id查询下面所有站点id
List<String> list = pileMerchantInfoService.queryByMerchantDeptIds(merchantDeptIds);
if (CollectionUtils.isNotEmpty(list)) {
stationIdList.addAll(list);
}
}
log.info("后管首页基本信息查询 authorizedMap:{}, dto:{}", JSONObject.toJSONString(authorizedMap), JSONObject.toJSONString(dto));
dto.setStationIdList(stationIdList);
return pileBasicInfoMapper.getGeneralSituation(dto);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
View File

@@ -175,4 +175,9 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
.build();
return vo;
}
@Override
public List<String> queryByMerchantDeptIds(List<String> merchantDeptIds) {
return pileMerchantInfoMapper.queryByMerchantDeptIds(merchantDeptIds);
}
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -163,6 +163,11 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
return pileStationInfoMapper.getStationInfoForLianLian();
}
@Override
public List<String> queryByStationDeptIds(List<String> stationIds) {
return pileStationInfoMapper.queryByStationDeptIds(stationIds);
}
/**
* 查询充电站信息列表
*