Merge remote-tracking branch 'origin/dev' into dev

jsowell-pile/src/main/java/com/jsowell/pile/dto/business/QueryConnectorInfoDTO.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 运营端小程序查询枪口信息DTO
  *
@@ -40,4 +42,14 @@ public class QueryConnectorInfoDTO {
      * 枪口编号
      */
     private String pileConnectorCode;
+
+    /**
+     * 站点Id List
+     */
+    private List<String> stationIds;
+
+    /**
+     * 运营商id
+     */
+    private String merchantId;
 }

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

@@ -20,11 +20,13 @@ import com.jsowell.common.enums.ykc.PileStatusEnum;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
+import com.jsowell.common.util.SecurityUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.spring.SpringUtils;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.PileBasicInfo;
 import com.jsowell.pile.domain.PileConnectorInfo;
+import com.jsowell.pile.domain.PileStationInfo;
 import com.jsowell.pile.dto.QueryConnectorDTO;
 import com.jsowell.pile.dto.QueryConnectorListDTO;
 import com.jsowell.pile.dto.UpdateConnectorParkNoDTO;
@@ -81,7 +83,7 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
     private OrderBasicInfoService orderBasicInfoService;
 
     @Autowired
-    private ThirdPartyStationRelationService thirdPartyStationRelationService;
+    private PileMerchantInfoService pileMerchantInfoService;
 
     @Autowired
     private PileMsgRecordService pileMsgRecordService;
@@ -1056,15 +1058,17 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
      */
     @Override
     public BusinessConnectorInfoVO getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto) {
-        String stationId = dto.getStationId();
+        // 获取登录账号信息
+        Long deptId = SecurityUtils.getDeptId();
+        List<String> stationIds = pileMerchantInfoService.queryByMerchantDeptIds(Lists.newArrayList(String.valueOf(deptId)));
         String connectorStatus = dto.getConnectorStatus();
         int pageNum = dto.getPageNum();
         int pageSize = dto.getPageSize();
         BusinessConnectorInfoVO vo = new BusinessConnectorInfoVO();
-        // 根据站点id查询枪口列表(有缓存)
+        // 根据站点ids查询枪口列表(有缓存)
-        List<ConnectorInfoVO> uniAppConnectorList = getUniAppConnectorList(Long.parseLong(stationId));
+        List<ConnectorInfoVO> connectorInfoVOS = batchSelectConnectorList(stationIds);
         // 筛选出枪口编号
-        List<String> pileConnectorCodeList = uniAppConnectorList.stream()
+        List<String> pileConnectorCodeList = connectorInfoVOS.stream()
                 .map(ConnectorInfoVO::getPileConnectorCode)
                 .collect(Collectors.toList());
         // 批量获取某状态的枪口数量
@@ -1082,11 +1086,15 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
         vo.setChargingConnectorNum(chargingNum);
         vo.setFaultConnectorNum(faultNum);
 
+        List<Long> longStationIds = stationIds.stream()
+                .map(Long::parseLong)  // 或 s -> Long.parseLong(s)
+                .collect(Collectors.toList());
+
         // 根据站点id和枪口状态查询枪口列表
         QueryConnectorListDTO queryConnectorListDTO = QueryConnectorListDTO.builder()
                 .pageNum(pageNum)
                 .pageSize(pageSize)
-                .stationIdList(Lists.newArrayList(Long.parseLong(stationId)))
+                .stationIdList(longStationIds)
                 .build();
         List<PileConnectorInfoVO> pileConnectorInfoVOList = getConnectorInfoListByParams(queryConnectorListDTO);
         if (connectorStatus != null) {