From ba4b255aaeafa48639eaef05c170e7e818d711aa Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 9 Sep 2024 21:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/service/PileService.java | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
index 65fb88c82..08dfd299c 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
@@ -265,6 +265,39 @@ public class PileService {
 		return resultVO;
 	}
 
+	public AppletPileDetailVO getConnectorDetailV2(String pileConnectorCode) throws Exception {
+		log.info("查询充电枪口详情, pileConnectorCode:{}", pileConnectorCode);
+		PileConnectorDetailVO pileConnectorDetailVO = queryPileConnectorDetail(pileConnectorCode);
+		log.info("查询充电枪口详情, pileConnectorDetailVO:{}", JSON.toJSONString(pileConnectorDetailVO));
+		if (pileConnectorDetailVO == null) {
+			return null;
+		}
+		// 不是电单车的桩, 需要判断插枪状态
+		if (!StringUtils.equals(Constants.THREE, pileConnectorDetailVO.getChargePortType())) {
+			// 枪口状态不为2：占用（未充电）
+			if (!StringUtils.equals(PileConnectorDataBaseStatusEnum.OCCUPIED_NOT_CHARGED.getValue(), pileConnectorDetailVO.getConnectorStatus())) {
+				throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR);
+			}
+		}
+		String pileSn = pileConnectorDetailVO.getPileSn();
+		AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn);
+		log.info("查询充电枪口详情getConnectorDetail, pileSn:{}, pileConnectorDetailVO:{}, resultVO:{}", pileSn, JSON.toJSONString(pileConnectorDetailVO), JSON.toJSONString(resultVO));
+		List<ConnectorInfoVO> connectorInfoList = resultVO.getConnectorInfoList();
+		if (connectorInfoList.size() > 1 && !StringUtils.equals(pileConnectorDetailVO.getChargePortType(), "3")) {
+			List<ConnectorInfoVO> list = Lists.newArrayList();
+			// 枪口大于1个，此充电桩非单枪设备，根据参数展示对应枪口的信息
+			for (ConnectorInfoVO connectorInfoVO : connectorInfoList) {
+				if (StringUtils.equals(pileConnectorCode, pileSn + connectorInfoVO.getConnectorCode())) {
+					list.add(connectorInfoVO);
+				}
+			}
+			resultVO.setConnectorInfoList(list);
+		} else {
+			resultVO.setConnectorInfoList(connectorInfoList);
+		}
+		return resultVO;
+	}
+
 	public PileInfoVO selectPileInfoBySn(String pileSn) {
 		return pileBasicInfoService.selectPileInfoBySn(pileSn);
 	}