autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-10 18:30:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Lemon
2026-01-04 14:28:00 +08:00
parent b8a7569f3d
commit c2e5e900b0
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -20,6 +20,7 @@ import com.jsowell.common.enums.ykc.PileStatusEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.spring.SpringUtils; import com.jsowell.common.util.spring.SpringUtils;
import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderBasicInfo;
@@ -82,7 +83,7 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
private OrderBasicInfoService orderBasicInfoService; private OrderBasicInfoService orderBasicInfoService;
@Autowired @Autowired
private ThirdPartyStationRelationService thirdPartyStationRelationService; private PileMerchantInfoService pileMerchantInfoService;
@Autowired @Autowired
private PileMsgRecordService pileMsgRecordService; private PileMsgRecordService pileMsgRecordService;
@@ -1057,28 +1058,15 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
*/ */
@Override @Override
public BusinessConnectorInfoVO getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto) { public BusinessConnectorInfoVO getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto) {
// String stationId = dto.getStationId(); // 获取登录账号信息
String merchantId = dto.getMerchantId(); Long deptId = SecurityUtils.getDeptId();
// List<String> stationIds = dto.getStationIds(); List<String> stationIds = pileMerchantInfoService.queryByMerchantDeptIds(Lists.newArrayList(String.valueOf(deptId)));
String connectorStatus = dto.getConnectorStatus(); String connectorStatus = dto.getConnectorStatus();
int pageNum = dto.getPageNum(); int pageNum = dto.getPageNum();
int pageSize = dto.getPageSize(); int pageSize = dto.getPageSize();
BusinessConnectorInfoVO vo = new BusinessConnectorInfoVO(); BusinessConnectorInfoVO vo = new BusinessConnectorInfoVO();
// 通过merchantId查询站点ids
List<PileStationInfo> pileStationInfos = pileStationInfoService.selectStationListByMerchantIdWithAuth(Long.parseLong(merchantId));
// 收集站点ids
List<Long> longStationIds = pileStationInfos.stream()
.map(PileStationInfo::getId)
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(longStationIds)) {
return vo;
}
List<String> StationIds = longStationIds.stream()
.map(String::valueOf) // 或 s -> Long.parseLong(s)
.collect(Collectors.toList());
// 根据站点ids查询枪口列表(有缓存) // 根据站点ids查询枪口列表(有缓存)
// List<ConnectorInfoVO> uniAppConnectorList = getUniAppConnectorList(Long.parseLong(stationId)); List<ConnectorInfoVO> connectorInfoVOS = batchSelectConnectorList(stationIds);
List<ConnectorInfoVO> connectorInfoVOS = batchSelectConnectorList(StationIds);
// 筛选出枪口编号 // 筛选出枪口编号
List<String> pileConnectorCodeList = connectorInfoVOS.stream() List<String> pileConnectorCodeList = connectorInfoVOS.stream()
.map(ConnectorInfoVO::getPileConnectorCode) .map(ConnectorInfoVO::getPileConnectorCode)
@@ -1098,6 +1086,10 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
vo.setChargingConnectorNum(chargingNum); vo.setChargingConnectorNum(chargingNum);
vo.setFaultConnectorNum(faultNum); vo.setFaultConnectorNum(faultNum);
List<Long> longStationIds = stationIds.stream()
.map(Long::parseLong) // 或 s -> Long.parseLong(s)
.collect(Collectors.toList());
// 根据站点id和枪口状态查询枪口列表 // 根据站点id和枪口状态查询枪口列表
QueryConnectorListDTO queryConnectorListDTO = QueryConnectorListDTO.builder() QueryConnectorListDTO queryConnectorListDTO = QueryConnectorListDTO.builder()
.pageNum(pageNum) .pageNum(pageNum)