From bcc287b50ce7cde62f3417e7a74cc12827e17c7f Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 3 Apr 2024 14:32:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=9F=A5=E8=AF=A2=E6=9E=AA?= =?UTF-8?q?=E5=8F=A3=E7=8A=B6=E6=80=81=E4=B9=8B=E5=89=8D=E5=85=88=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AF=A5=E7=AB=99=E7=82=B9=E6=9C=89=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=EF=BC=88=E5=8D=8E=E4=B8=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/PileController.java | 49 +++++++++------ .../com/jsowell/service/OrderService.java | 2 +- .../pile/PileConnectorInfoController.java | 59 +++++++++++++------ .../mapper/ThirdpartySnRelationMapper.java | 2 +- .../service/IThirdpartySnRelationService.java | 2 +- .../impl/OrderBasicInfoServiceImpl.java | 2 +- .../impl/ThirdpartySnRelationServiceImpl.java | 6 +- .../pile/ThirdpartySnRelationMapper.xml | 7 +++ 8 files changed, 87 insertions(+), 42 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index b9ac19b85..a9e91036d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -143,10 +144,15 @@ public class PileController extends BaseController { public RestApiResponse selectStationConnectorList(HttpServletRequest request, @RequestBody QueryConnectorListDTO dto) { logger.info("查询充电枪口列表 params:{}", JSON.toJSONString(dto)); RestApiResponse response = null; + try { + // 修改对接第三方平台的枪口状态 + updateThirdPartyConnectorStatus(dto); + } catch (Exception e) { + logger.error("修改对接第三方平台的枪口状态 error"); + } + try { PageResponse pageResponse = pileConnectorInfoService.selectStationConnectorList(dto); - List list = (List) pageResponse.getList(); - updateThirdPartyConnectorStatus(list); response = new RestApiResponse<>(pageResponse); } catch (Exception e) { logger.error("查询充电枪口列表异常", e); @@ -186,26 +192,35 @@ public class PileController extends BaseController { /** * 修改第三方平台枪口状态 + * @see com.jsowell.web.controller.pile.PileConnectorInfoController#updateThirdPartyConnectorStatus(com.jsowell.pile.dto.QueryConnectorListDTO) + * 两个方法完全相同，如有修改需同步修改 */ - public void updateThirdPartyConnectorStatus(List connectorList) { - if (CollectionUtils.isEmpty(connectorList)) { + private void updateThirdPartyConnectorStatus(QueryConnectorListDTO dto) { + if (dto == null) { return; } - List stationIdList = connectorList.stream() - .map(PileConnectorInfoVO::getStationId) - .collect(Collectors.toList()); + List pileIds = dto.getPileIds(); + List stationIdList = dto.getStationIdList(); - for (String stationId : stationIdList) { - String stationIdStr = String.valueOf(stationId); - List list = snRelationService.selectSnRelationListByParams(stationIdStr, null); - if (CollectionUtils.isEmpty(list)) { - return; - } - for (ThirdPartySnRelationVO vo : list) { - String thirdPartyType = vo.getThirdPartyType(); - // 调用通用查询实时数据接口（需在接口中修改枪口状态） - commonService.commonQueryStationStatus(stationIdStr, thirdPartyType); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(pileIds)) { + list = snRelationService.selectSnRelationListByParams(null, null, pileIds); + } + if (CollectionUtils.isNotEmpty(stationIdList)) { + for (Long stationId : stationIdList) { + String stationIdStr = String.valueOf(stationId); + list = snRelationService.selectSnRelationListByParams(stationIdStr, null, null); } } + if (CollectionUtils.isEmpty(list)) { + return; + } + + for (ThirdPartySnRelationVO vo : list) { + String thirdPartyType = vo.getThirdPartyType(); + String stationId = vo.getStationId(); + // 调用通用查询实时数据接口（需在接口中修改枪口状态） + commonService.commonQueryStationStatus(stationId, thirdPartyType); + } } } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index e846e16e2..20cfa9c8e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1336,7 +1336,7 @@ public class OrderService { String pileSn = orderInfo.getPileSn(); // 根据 stationId 查询 pile_sn_relation 表 - List snRelations = snRelationService.selectSnRelationListByParams(stationId, pileSn); + List snRelations = snRelationService.selectSnRelationListByParams(stationId, pileSn, null); if (CollectionUtils.isEmpty(snRelations)) { return false; } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java index ed2e9be79..4697ecd4c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java @@ -1,6 +1,7 @@ package com.jsowell.web.controller.pile; import com.alibaba.fastjson2.JSON; +import com.jsowell.api.uniapp.PileController; import com.jsowell.common.annotation.Log; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.page.TableDataInfo; @@ -12,7 +13,9 @@ import com.jsowell.pile.dto.QueryConnectorDTO; import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.dto.UpdateConnectorParkNoDTO; import com.jsowell.pile.service.IThirdpartySnRelationService; +import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.PileConnectorInfoService; +import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.ThirdPartySnRelationVO; import com.jsowell.thirdparty.common.CommonService; @@ -22,6 +25,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -40,6 +44,12 @@ public class PileConnectorInfoController extends BaseController { @Autowired private IThirdpartySnRelationService snRelationService; + @Autowired + private PileStationInfoService pileStationInfoService; + + @Autowired + private PileBasicInfoService pileBasicInfoService; + @Autowired private CommonService commonService; @@ -74,9 +84,13 @@ public class PileConnectorInfoController extends BaseController { @PostMapping("/getConnectorInfoListByParams") public TableDataInfo getConnectorInfoListByParams(@RequestBody QueryConnectorListDTO dto) { logger.info("查询接口列表 param:{}", JSON.toJSONString(dto)); + try { + // 修改对接第三方平台的枪口状态 + updateThirdPartyConnectorStatus(dto); + } catch (Exception e) { + logger.error("修改对接第三方平台的枪口状态 error"); + } List list = pileConnectorInfoService.getConnectorInfoListByParams(dto); - // 修改对接第三方平台的枪口状态 - updateThirdPartyConnectorStatus(list); logger.info("查询接口列表 result:{}", JSON.toJSONString(list)); return getDataTable(list); } @@ -144,26 +158,35 @@ public class PileConnectorInfoController extends BaseController { /** * 修改第三方平台枪口状态 + * @see PileController#updateThirdPartyConnectorStatus(com.jsowell.pile.dto.QueryConnectorListDTO) + * 两个方法完全相同，如有修改需同步修改 */ - public void updateThirdPartyConnectorStatus(List connectorList) { - if (CollectionUtils.isEmpty(connectorList)) { + private void updateThirdPartyConnectorStatus(QueryConnectorListDTO dto) { + if (dto == null) { return; } - List stationIdList = connectorList.stream() - .map(PileConnectorInfoVO::getStationId) - .collect(Collectors.toList()); + List pileIds = dto.getPileIds(); + List stationIdList = dto.getStationIdList(); - for (String stationId : stationIdList) { - String stationIdStr = String.valueOf(stationId); - List list = snRelationService.selectSnRelationListByParams(stationIdStr, null); - if (CollectionUtils.isEmpty(list)) { - return; - } - for (ThirdPartySnRelationVO vo : list) { - String thirdPartyType = vo.getThirdPartyType(); - // 调用通用查询实时数据接口（需在接口中修改枪口状态） - commonService.commonQueryStationStatus(stationIdStr, thirdPartyType); - } + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(pileIds)) { + list = snRelationService.selectSnRelationListByParams(null, null, pileIds); + } + if (CollectionUtils.isNotEmpty(stationIdList)) { + for (Long stationId : stationIdList) { + String stationIdStr = String.valueOf(stationId); + list = snRelationService.selectSnRelationListByParams(stationIdStr, null, null); + } + } + if (CollectionUtils.isEmpty(list)) { + return; + } + + for (ThirdPartySnRelationVO vo : list) { + String thirdPartyType = vo.getThirdPartyType(); + String stationId = vo.getStationId(); + // 调用通用查询实时数据接口（需在接口中修改枪口状态） + commonService.commonQueryStationStatus(stationId, thirdPartyType); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ThirdpartySnRelationMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ThirdpartySnRelationMapper.java index 71fdfa120..4f209eadb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ThirdpartySnRelationMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ThirdpartySnRelationMapper.java @@ -84,5 +84,5 @@ public interface ThirdpartySnRelationMapper { * @param stationId * @return */ - List selectSnRelationListByParams(@Param("stationId") String stationId, @Param("pileSn") String pileSn); + List selectSnRelationListByParams(@Param("stationId") String stationId, @Param("pileSn") String pileSn, @Param("pileIds") List pileIds); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdpartySnRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdpartySnRelationService.java index 64882ae91..efaa160bd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdpartySnRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdpartySnRelationService.java @@ -30,7 +30,7 @@ public interface IThirdpartySnRelationService { */ public List selectThirdpartySnRelationList(ThirdpartySnRelation thirdpartySnRelation); - public List selectSnRelationListByParams(String stationId, String pileSn); + public List selectSnRelationListByParams(String stationId, String pileSn, List pileIds); /** * 新增万车充--第三方平台桩编号对应关系 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 1e8b160de..fcdbefccb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3056,7 +3056,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } // 判断该桩是否对接了类似华为平台的第三方站点 - List list = snRelationService.selectSnRelationListByParams(null, orderInfo.getPileSn()); + List list = snRelationService.selectSnRelationListByParams(null, orderInfo.getPileSn(), null); if (CollectionUtils.isNotEmpty(list)) { for (ThirdPartySnRelationVO vo : list) { String startMode = vo.getStartMode(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdpartySnRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdpartySnRelationServiceImpl.java index c6337a880..82a2e3c75 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdpartySnRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdpartySnRelationServiceImpl.java @@ -45,9 +45,9 @@ public class ThirdpartySnRelationServiceImpl implements IThirdpartySnRelationSer return thirdpartySnRelationMapper.selectThirdpartySnRelationList(thirdpartySnRelation); } - - public List selectSnRelationListByParams(String stationId, String pileSn) { - return thirdpartySnRelationMapper.selectSnRelationListByParams(stationId, pileSn); + @Override + public List selectSnRelationListByParams(String stationId, String pileSn, List pileIds) { + return thirdpartySnRelationMapper.selectSnRelationListByParams(stationId, pileSn, pileIds); } /** diff --git a/jsowell-pile/src/main/resources/mapper/pile/ThirdpartySnRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ThirdpartySnRelationMapper.xml index 1de38d798..41164a416 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ThirdpartySnRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ThirdpartySnRelationMapper.xml @@ -99,6 +99,7 @@ FROM thirdparty_sn_relation t1 JOIN thirdparty_station_relation t2 ON t1.thirdparty_type = t2.third_party_type + JOIN pile_basic_info t3 on t1.pile_sn = t3.sn WHERE t1.del_flag = '0' @@ -107,6 +108,12 @@ AND t1.pile_sn = #{pileSn,jdbcType=VARCHAR} + + AND t3.id in + + #{pileId,jdbcType=BIGINT} + +