Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-admin/src/main/resources/application.yml

@@ -129,7 +129,7 @@ wulian:
 
 #高德地图相关配置
 aMap:
-  merchantPrivateKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArNnwPdM2CCN7SlgMRFI5rTyoW+olOpASMVUulFs4dD96BOkOjrmLXW1IBZs8V1pcR0F8NXT/9o5XHPjsME2FqDDyqFcDaQXJFw6knQD+V5PhSE+nNzKpW5UFTEKulY0KS/VW6sE21O7h5gpmXBsa5OFVzvuFaKTasoP9NcsAuLjgEC6B7sHyny6E6/qCVXx4HMWFNJsnTpX+KEZ1AjXlUFUGZS0dxNS2mxAnJoOP+ey/gsxF8NeH8EYXuWrOnoJvt1/veVv2OW3TvLBatgWh17Xyoj+zyIPnouZHe8KyMQL8BL8U1y9/wsK7p2VqXX2Pqbt6nh1lstlcXP2UOBXwLwIDAQAB
+  merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC10OGVHfh4manoO2DE7xA8TipooKDt5WDpazYAKYKs3Rx5auWPoGEdERe1wyOQAJ34DmEULacTv2/mdjarLptL/sj3ba7XVDdAphNzrrIzLsNuzTqK9gxF5EeAAeo06H26rLrXmIvOL0KEsUuwxzuyFB0k3HZc8xM9yl3MXtv2Z0PpiYbvd32sd7HFZiM+H2ldzBZlXp2vC7ca0aj/BckIeWY/vJo5k400glTrcu8FSZbLRaMEzmJEyssVZzh2gPwvPVHoYvRIXpkiqNghyRWmKywC+h07fz21t94yhj+f/rGiK3YY3gv5S2xJ1NgmDfjmJvFMB3o00QH/GlJaiLcNAgMBAAECggEAL25ruyQTcxrbWWtMJnQbbzARHjRxZz6E1sASWV566a/RQtehRaPYUeXoopFi0KlojJLrvoDeamdxwNSsFGJXPy8brHjfuOsOcv4gavhzIqkbcOd3U1M3BnC0Om/FcsIIMs/m+mGgb0yi9Mzv6xE+wIlAxSICeuMq7N7DM5K3nYMIWhbE8kIrurMUpalH+s1FDL3FMOdRgM8L7yAjGoXZUtal6aDwTOsDkjlRmt+IuvqTjREtdBUZRLjKSU2b/3+Z42OOrkongYF74KPuQ1LmQ6Qa1D0O2b37A5ne8VbFjHai8E59Ol2PYwggajqj00G5x3KBUFJYiIhUApq6lXxywQKBgQDjgLExqhi6Op1G1Q0W5W/bKMrHshtcJawsO8C+PBxxPV9Da+5ZkguW4a1ErGCCPI0SVVW1QCTrPyrbJHyw9LteX98cnY6PGy1XVXWL+mKOK0jwL+yV299dMpk4R6u5+oO5ZX9WfoNsF3rEvfMiQxFSaH9HMR7q9GySno3NSzLW0QKBgQDMlyfqhnkDEY/rgRTo42FpX1KVf9JOP0L9+B2Q7Rec7iARuT6/qSxoV6PwNyYixyjbXx8xJQHoUDTRSgY5v543Nmh+bLOyR5NfNRqEmYpKtb0T4qB57jBMiVXcoIPXwcb7yVscAvI/rycDqEkOVgTqRdR0FW7q/svF9EuTzjNjfQKBgQDXtP7NY0U81jSno3xcuECdoQjb3WEZttKPwjwXY7FoIVPA/oYpQVNhxSrfUT3UXos31deFGoOm1ebRj7/2nKVHb0mBvVYdFByikPH6PfbSa/IlYptE4AviNwaWGUaW+ROKZtUc8qmzhHOwNZZhZwv2ggQkQUvaZNTJFDLJc0KJ8QKBgQDD/wr+YlUL24dE1iRx92Maz3cOQaX30CMdqtSoQnqcnIOcdxrmAevJCizDtBGUv7ckcbwwGIP7SttOpNvR9wBbZIQ2mWyNHoTQcM82uOEDMZgxtKqIJOegavEWq6+iwsEd9YiTDT+GQwXdOxrB4SZUSRF/JAlelzogKik9MA2LAQKBgG5cjf9V+6Ka2QjxkIV73/h5P5f08fUNAkLGiUjnH+eozsC3PGnifSwLVlfun8iHDXLwOtUK9xzGJ3yd/a8e9BBhZ8Xyd3Fqz2+q4cxorAz0UhZUnwDPUuLdEABntansYMhkrsOcXAiIQmFmMlgoHmbVHpFmWBy7VL3w2xDn1UM1
   aMapPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArqmh0JZrIhk+tMbF+VE63WaqqLRs+OHZkX3HGyr4cokujgdZb0kAq4jBJa/VjWK2qDXHr2KpoY2/ppmA73oJvNPcuVxR6nwYddcASg6uFCK/vfH5PKVV0W/xKTeOIQ6NTd0wRFZs9zNo1endqgQDvn1d1Rvl1r+18MJ3BXLMjkzCUUurgeO84AIlksYV5Z46hoScyXjSc8lsmwX5r7cwHLajFXdjKo1yOCbzClMqLM29THYuegwHFcT/zp64Nd7+nawWWuPOgfkr0MTGrNCkV8ywpbyG0XVewMkdN6pTaZNvhMnLH00VkXASPB51vUjhs4WBiFZth9q3rZBkaEYSMQIDAQAB
   appId: 202306150188103814
   devUrl: https://restapi.amap.com/rest/openmp/devgw?key=7967738241f0a580b5a1342f43793a61

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -43,6 +43,7 @@ import com.jsowell.service.MemberService;
 import com.jsowell.service.OrderService;
 import com.jsowell.service.PileRemoteService;
 import com.jsowell.service.PileService;
+import com.jsowell.thirdparty.amap.service.AMapService;
 import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.service.LianLianService;
 import com.jsowell.thirdparty.lianlian.util.Cryptos;
@@ -165,6 +166,9 @@ public class SpringBootTestController {
 	@Autowired
 	private AdapayMemberService adapayMemberService;
 
+	@Autowired
+	private AMapService aMapService;
+
 	@Test
 	public void testQueryAdapayMemberInfo() {
 		String adapayMemberId = "AM25703321";
@@ -249,6 +253,13 @@ public class SpringBootTestController {
 
 	}
 
+	@Test
+	public void testAMap() throws Exception {
+		String pileConnectorCode = "8800000000012601";
+		String s = aMapService.pushChargingDeviceDynamics(pileConnectorCode);
+		System.out.println(s);
+	}
+
 	@Test
 	public void testVinCode() {
 		String msg = "880000000000210203000000000000000000000000000000000000000000000000004C5257594743454B584D43303437313434";

jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java

@@ -299,12 +299,12 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
 			if (StringUtils.isBlank(orderInfo.getStationId())) {
 				return null;
 			}
-			log.info("推送联联平台实时数据 params: orderBasicInfo:{}", JSON.toJSONString(orderInfo));
 			relation.setStationId(Long.parseLong(orderInfo.getStationId()));
 			StationSettingRelationVO relationInfo = stationSettingRelationService.selectRelationInfo(relation);
 			// ThirdPartySettingInfo thirdPartySettingInfo = thirdPartySettingInfoService.getInfoByStationId(pileBasicInfo.getStationId());
 			if (Objects.nonNull(relationInfo)) {
 				String pileConnectorCode = pileSn + connectorCode;
+				log.info("推送联联平台实时数据 params: orderBasicInfo:{}", JSON.toJSONString(orderInfo));
 				// 设备状态变化推送  notification_stationStatus
 				lianLianService.pushConnectorStatus(pileConnectorCode, connectorStatus);
 				if (StringUtils.equals(connectorStatus, "03")) {

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java

@@ -35,7 +35,7 @@ public class AMapEquipmentInfo {
 
     // 充电设备接口列表
     @JSONField(name = "ConnectorInfos")
-    private List<AMapConnectorInfo> AMapConnectorInfos;
+    private List<AMapConnectorInfo> ConnectorInfos;
 
     // 充电设备总功率 单位：kW
     @JSONField(name = "Power")

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java

@@ -132,7 +132,7 @@ public class AMapStationInfo {
 
     // 充电收费信息
     @JSONField(name = "PriceChargingInfo")
-    private List<AMapPriceChargingInfo> AMapPriceChargingInfo;
+    private List<AMapPriceChargingInfo> PriceChargingInfo;
 
     // 快充总桩数
     @JSONField(name = "FastEquipmentNum")
@@ -144,5 +144,5 @@ public class AMapStationInfo {
 
     // 充电设备信息列表
     @JSONField(name = "EquipmentInfos")
-    private List<AMapEquipmentInfo> AMapEquipmentInfos;
+    private List<AMapEquipmentInfo> EquipmentInfos;
 }

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java

@@ -1,17 +1,14 @@
 package com.jsowell.thirdparty.amap.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.jsowell.common.constant.Constants;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.PileBasicInfo;
 import com.jsowell.pile.domain.PileStationInfo;
-import com.jsowell.pile.dto.amap.ChargeDeviceDynamicsDTO;
 import com.jsowell.pile.dto.amap.GetStationInfoDTO;
 import com.jsowell.pile.service.*;
-import com.jsowell.pile.service.impl.PileStationInfoServiceImpl;
 import com.jsowell.pile.vo.base.ConnectorInfoVO;
 import com.jsowell.pile.vo.uniapp.BillingPriceVO;
 import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO;
@@ -25,7 +22,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -106,14 +102,14 @@ public class AMapServiceImpl implements AMapService {
             aMapInfo.setBusineHours(stationInfo.getBusinessHours());
 
             List<AMapPriceChargingInfo> priceList = getPriceInfoByStationId(String.valueOf(stationInfo.getId()));
-            aMapInfo.setAMapPriceChargingInfo(priceList);
+            aMapInfo.setPriceChargingInfo(priceList);
 
             Map<String, Integer> pileNumMap = pileConnectorInfoService.getPileTypeNum(stationInfo.getId());
             aMapInfo.setFastEquipmentNum(pileNumMap.get("fastTotal"));
             aMapInfo.setSlowEquipmentNum(pileNumMap.get("slowTotal"));
 
             List<AMapEquipmentInfo> aMapEquipmentInfos = getPileListByStationId(String.valueOf(stationInfo.getId()));
-            aMapInfo.setAMapEquipmentInfos(aMapEquipmentInfos);
+            aMapInfo.setEquipmentInfos(aMapEquipmentInfos);
 
             resultList.add(aMapInfo);
         }
@@ -225,7 +221,7 @@ public class AMapServiceImpl implements AMapService {
 
             List<AMapConnectorInfo> aMapConnectorInfos = getConnectorListBySN(pileBasicInfo.getSn());
 
-            info.setAMapConnectorInfos(aMapConnectorInfos);
+            info.setConnectorInfos(aMapConnectorInfos);
 
             pileList.add(info);
         }

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java

@@ -29,7 +29,7 @@ public class AMapUtils {
     private static String PRD_URL;
 
     @Value("${aMap.merchantPrivateKey}")
-    public static void setMerchantPrivateKey(String merchantPrivateKey) {
+    public void setMerchantPrivateKey(String merchantPrivateKey) {
         AMapUtils.MERCHANT_PRIVATE_KEY = merchantPrivateKey;
     }