update 内蒙古平台Service

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupEquipChargeStatusInfo.java

@@ -187,6 +187,18 @@ public class SupEquipChargeStatusInfo {
     @JSONField(name = "ServiceMoney")
     private String serviceMoney;
 
+    /**
+     * 电池编码
+     */
+    @JSONField(name = "BatteryPackID")
+    private String batteryPackId;
+
+    /**
+     * 当前电表读数
+     */
+    @JSONField(name = "CurrentMeter")
+    private String currentMeter;
+
     /**
      * 时段数
      * 参数范围：0～ 32

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

@@ -16,6 +16,7 @@ import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
 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.OrderStatusEnum;
 import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
@@ -758,6 +759,33 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
     public String notificationEquipChargeStatus(String orderCode) {
         // 根据订单号查询订单信息
         OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
+        // OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderInfo.getOrderCode());
+        // 根据站点id查询运营商id
+        PileStationVO stationVO = pileStationInfoService.getStationInfo(orderInfo.getStationId());
+
+        // 查询枪口实时状态
+        List<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderInfo.getTransactionCode());
+        RealTimeMonitorData realTimeMonitorData;
+        if (CollectionUtils.isEmpty(chargingRealTimeData)) {
+            realTimeMonitorData = RealTimeMonitorData.builder()
+                    .chargingDegree(Constants.ZERO)
+                    .connectorStatus("3")
+                    .build();
+            chargingRealTimeData.add(realTimeMonitorData);
+        } else {
+            realTimeMonitorData = chargingRealTimeData.get(0);
+        }
+        String orderStatus = orderInfo.getOrderStatus();
+        if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderStatus)) {
+            // 充电中
+            orderStatus = "2";
+        } else if (StringUtils.equals(OrderStatusEnum.ORDER_COMPLETE.getValue(), orderStatus)) {
+            // 充电完成
+            orderStatus = "4";
+        }
+        BigDecimal current = realTimeMonitorData.getOutputCurrent() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getOutputCurrent());
+        BigDecimal voltage = realTimeMonitorData.getOutputVoltage() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getOutputVoltage());
+        String soc = realTimeMonitorData.getSOC() == null ? Constants.ZERO : realTimeMonitorData.getSOC();
         // 查询相关配置信息
         ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo();
 
@@ -768,25 +796,31 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
         String dataSecretIv = thirdPartySecretInfoVO.getTheirDataSecretIv();
         String urlAddress = thirdPartySecretInfoVO.getTheirUrlPrefix();
 
-        // 调用 查询充电状态方法
+        SupEquipChargeStatusInfo equipChargeStatusInfo = SupEquipChargeStatusInfo.builder()
-        QueryEquipChargeStatusDTO dto = new QueryEquipChargeStatusDTO();
+                .operatorID(operatorId)
-        dto.setStartChargeSeq(orderCode);
+                .equipmentOwnerID(ThirdPartyPlatformUtils.extractEquipmentOwnerID(stationVO.getOrganizationCode()))
-        dto.setOperatorID(thirdPartySecretInfoVO.getTheirOperatorId());
+                .stationID(orderInfo.getStationId())
-        Map<String, String> map = queryEquipChargeStatus(dto);
+                .equipmentID(orderInfo.getPileSn())
-        if (map == null) {
+                .orderNo(orderInfo.getOrderCode())
-            return null;
+                .orderStatus(Integer.parseInt(orderStatus))
-        }
+                .connectorID(orderInfo.getPileConnectorCode())
-        String data = map.get("Data");
+                .equipmentClassification(1) // 车辆充电设备接口
-        // 解密data (此处解密需用 thirdparty_platform_config 的密钥配置)
+                .pushTimeStamp(DateUtils.dateTimeNow())
-        byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(data),
+                .connectorStatus(Integer.parseInt(realTimeMonitorData.getConnectorStatus()))
-                thirdPartySecretInfoVO.getOurDataSecret().getBytes(), thirdPartySecretInfoVO.getOurDataSecretIv().getBytes());
+                .currentA(current)
-        String dataStr = new String(plainText, StandardCharsets.UTF_8);
+                .voltageA(voltage)
-        // 转成对应的对象
+                .soc(new BigDecimal(soc))
-        QueryChargingStatusVO vo = JSONObject.parseObject(dataStr, QueryChargingStatusVO.class);
+                .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime()))
+                .endTime(DateUtils.getDateTime())
+                .totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree()))
+                .batteryPackId("")
+                .currentMeter("")
+
+                .build();
 
         String url = urlAddress + "supervise_notification_equip_charge_status";
         // 调用联联平台接口
-        String jsonString = JSON.toJSONString(vo);
+        String jsonString = JSON.toJSONString(equipChargeStatusInfo);
 
         // 获取令牌
         String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);