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

jsowell-admin/src/main/java/com/jsowell/amap/AMapController.java

@@ -1,6 +1,7 @@
 package com.jsowell.amap;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.jsowell.common.annotation.Anonymous;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.pile.dto.QueryPileDTO;
@@ -62,9 +63,9 @@ public class AMapController extends BaseController {
     @PostMapping("/pushStationStatus")
     public AMapCommonResult pushStationStatus(@RequestBody QueryPileDTO dto) {
         AMapCommonResult result = new AMapCommonResult();
-        logger.info("商家推送充电设备动态数据");
+        logger.info("商家推送充电设备动态数据 params:{}", JSONObject.toJSONString(dto));
         try {
-            String pushResult = aMapService.pushChargingDeviceDynamics(dto.getPileConnectorCode());
+            String pushResult = aMapService.pushChargingDeviceDynamics(dto.getStationId());
             return result.successResponse(pushResult);
         } catch (Exception e) {
             logger.error("商家推送充电设备动态数据 error", e);

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java

@@ -48,7 +48,7 @@ public class AdapayMemberController extends BaseController {
             logger.warn("创建结算账户接口warn", e);
             result = AjaxResult.error(e.getMessage());
         } catch (Exception e) {
-            logger.warn("创建结算账户接口error", e);
+            logger.error("创建结算账户接口error", e);
             result = AjaxResult.error("创建结算账户接口异常:" + e.getMessage());
         }
         logger.info("创建结算账户接口 result:{}", JSON.toJSONString(result));

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPileDTO.java

@@ -34,4 +34,6 @@ public class QueryPileDTO extends BasicPileDTO{
      * 桩编码List
      */
     private List<String> pileSns;
+
+    private String stationId;
 }