diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java index 913afd58c..453e8a9ae 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/WeiWangKuaiDianController.java @@ -86,7 +86,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryStationsInfo(queryStationInfoDTO); - + logger.info("{}-查询充电站信息 result:{}", platformName, JSON.toJSONString(map)); return CommonResult.success(0, "查询充电站信息成功！", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("{}-查询充电站信息 error:", platformName, e); @@ -122,7 +122,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { PushRealTimeInfoDTO pushRealTimeInfoDTO = parseParamsDTO(dto, PushRealTimeInfoDTO.class); // 执行逻辑 String result = platformLogic.notificationStationStatus(pushRealTimeInfoDTO); - + logger.info("{}-设备状态推送 result:{}", platformName, result); return CommonResult.success(Integer.parseInt(result.split(",")[0]), result.split(",")[1], result.split(",")[2], result.split(",")[3]); } catch (Exception e) { logger.info("{}-设备状态推送 error:", platformName, e); @@ -157,7 +157,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryStationStatus(queryStationInfoDTO); - + logger.info("{}-设备接口状态查询 result:{}", platformName, map); return CommonResult.success(0, "设备接口状态查询成功！", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("{}-设备接口状态查询 error:", platformName, e); @@ -191,7 +191,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto, QueryStationInfoDTO.class); // 执行逻辑 Map map = platformLogic.queryStationStats(queryStationInfoDTO); - + logger.info("{}-查询统计信息 result:{}", platformName, map); return CommonResult.success(0, "查询统计信息成功！", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("{}-查询统计信息 error:", platformName, e); @@ -227,7 +227,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryEquipAuth(queryEquipmentDTO); - + logger.info("{}-请求设备认证 result:{}", platformName, map); return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.error("{}-请求设备认证 error:", platformName, e); @@ -260,7 +260,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryEquipBusinessPolicy(queryStartChargeDTO); - + logger.info("{}-查询业务策略信息 result:{}", platformName, map); return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("{}-查询业务策略信息 error:", platformName, e); @@ -297,7 +297,6 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryStartCharge(queryStartChargeDTO); logger.info("{}-请求启动充电 result:{}", platformName, map); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.error("{}-请求启动充电 error:", platformName, e); @@ -316,6 +315,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { RestApiResponse response = null; try { String result = platformLogic.notificationStartChargeResult(orderCode); + logger.info("【{}】推送启动充电结果 result:{}", this.getClass().getSimpleName(), result); response = new RestApiResponse<>(result); }catch (BusinessException e) { logger.error("【{}】推送启动充电结果 error",this.getClass().getSimpleName(), e); @@ -356,7 +356,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryEquipChargeStatus(queryEquipChargeStatusDTO); - + logger.info("{}-查询充电状态 result:{}", platformName, map); return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.error("{}-查询充电状态 error:", platformName, e); @@ -378,6 +378,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { RestApiResponse response = null; try { String result = platformLogic.notificationEquipChargeStatus(orderCode); + logger.info("推送充电状态 result:{}", result); response = new RestApiResponse<>(result); }catch (BusinessException e) { logger.error("推送充电状态 error",e); @@ -416,7 +417,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { // 解析入参 QueryStartChargeDTO queryStartChargeDTO = parseParamsDTO(dto, QueryStartChargeDTO.class); - + logger.info("{}-请求停止充电 params :{}", platformName, JSON.toJSONString(queryStartChargeDTO)); // 执行逻辑 Map map = platformLogic.queryStopCharge(queryStartChargeDTO); @@ -440,6 +441,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { RestApiResponse response = null; try { String result = platformLogic.notificationStopChargeResult(orderCode); + logger.info("推送停止充电结果 result:{}", result); response = new RestApiResponse<>(result); }catch (BusinessException e) { logger.error("推送停止充电结果 error",e); @@ -460,6 +462,7 @@ public class WeiWangKuaiDianController extends ThirdPartyBaseController { AjaxResult result; try { notificationService.notificationChargeOrderInfo(dto); + logger.info("充电订单信息推送成功"); result = AjaxResult.success(); } catch (BusinessException e) { logger.error("充电订单信息推送失败", e); diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 36ee01732..0b9b64796 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -38,12 +38,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell - password: js@160829 -# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell_pre -# password: Js@160829 +# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell +# password: js@160829 + url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_pre + password: Js@160829 # 从库数据源 slave: # 从数据源开关/默认关闭