update 对接内蒙古平台

jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java

@@ -63,6 +63,9 @@ public class Constants {
 
 	public static final String partnerId = "1632405339"; // 商户号Id
 
+	// 对接第三方平台，我方OPERATORID
+	public static final String JSOWELL_OPERATORID = "MA1JLFUU8";
+
 	public static final String OPERATORID_LIANLIAN = "MA1JLFUU8";
 
 	public static final String OPERATORID_JIANG_SU = "MA1X78KH5";

jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileConnectorDataBaseStatusEnum.java

@@ -43,6 +43,6 @@ public enum PileConnectorDataBaseStatusEnum {
 				return statusEnum.getLabel();
 			}
 		}
-		return "";
+		return "未知";
 	}
 }

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/domain/SupConnectorStatusInfo.java

@@ -53,7 +53,7 @@ public class SupConnectorStatusInfo {
      * 2：换电站内的电池箱充电设备接口
      */
     @JSONField(name = "EquipmentClassification")
-    private String equipmentClassification = "1";
+    private String equipmentClassification;
 
     /**
      * 名称: 接口状态
@@ -74,7 +74,7 @@ public class SupConnectorStatusInfo {
      * 描述: 0：未知10：空闲50：占用
      */
     @JSONField(name = "ParkStatus")
-    private String parkStatus = "0";
+    private String parkStatus;
 
     /**
      * 名称: 地锁状态

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java

@@ -13,6 +13,8 @@ import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
 import com.jsowell.common.enums.ykc.BillingTimeTypeEnum;
 import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
+import com.jsowell.common.enums.ykc.ReturnCodeEnum;
+import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.JWTUtils;
 import com.jsowell.common.util.PageUtils;
@@ -35,6 +37,7 @@ import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.uniapp.BillingPriceVO;
+import com.jsowell.pile.vo.web.PileConnectorInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.thirdparty.lianlian.domain.ConnectorChargeStatusInfo;
 import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
@@ -55,10 +58,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -396,23 +396,43 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
 
     @Override
     public String notificationStationStatus(String stationId, String pileConnectorCode, String status, ThirdPartySecretInfoVO secretInfoVO) {
+        // 查询充电枪口状态
+        PileConnectorInfoVO connectorInfo = pileConnectorInfoService.getPileConnectorInfoByConnectorCode(pileConnectorCode);
+        if (Objects.isNull(connectorInfo)) {
+            throw new BusinessException(ReturnCodeEnum.CODE_CONNECTOR_INFO_NULL_ERROR);
+        }
+
+        String merchantId = connectorInfo.getMerchantId();
+        MerchantInfoVO merchantInfoVO = pileMerchantInfoService.getMerchantInfoVO(merchantId);
+        if (Objects.isNull(merchantInfoVO)) {
+            throw new BusinessException(ReturnCodeEnum.CODE_CONNECTOR_INFO_NULL_ERROR);
+        }
+
+        SupConnectorStatusInfo info = SupConnectorStatusInfo.builder()
+                .operatorID(Constants.JSOWELL_OPERATORID)
+                .equipmentOwnerID(MerchantUtils.getOperatorID(merchantInfoVO.getOrganizationCode()))
+                .stationID(connectorInfo.getStationId())
+                .equipmentID(connectorInfo.getPileSn())
+                .connectorID(pileConnectorCode)
+                .equipmentClassification(Constants.ONE)
+                .status(Integer.parseInt(status))
+                .statusDesc(PileConnectorDataBaseStatusEnum.getStatusDescription(status))
+                .parkStatus(Constants.ZERO)
+                .lockStatus(Constants.ZERO)
+                .batteryStatus(Constants.ZERO)
+                .batteryPackID("")
+                .lastChangeTime(DateUtils.getDateTime())
+                .build();
+
+        // 调用联联平台接口
         String operatorId = secretInfoVO.getTheirOperatorId();
         String operatorSecret = secretInfoVO.getTheirOperatorSecret();
         String signSecret = secretInfoVO.getTheirSigSecret();
         String dataSecret = secretInfoVO.getTheirDataSecret();
         String dataSecretIv = secretInfoVO.getTheirDataSecretIv();
         String urlAddress = secretInfoVO.getTheirUrlPrefix();
-
         String url = urlAddress + "supervise_notification_station_status";
 
-        // 查询充电枪口状态
-
-
-        SupConnectorStatusInfo info = SupConnectorStatusInfo.builder()
-                .connectorID(pileConnectorCode)
-                .status(Integer.parseInt(status))
-                .build();
-        // 调用联联平台接口
         JSONObject json = new JSONObject();
         json.put("ConnectorStatusInfo", info);
         String jsonString = JSON.toJSONString(json);