diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java b/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java index 281cec26e..6c36d01d6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java +++ b/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java @@ -14,6 +14,7 @@ import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.lianlian.util.Cryptos; import com.jsowell.thirdparty.lianlian.util.Encodes; +import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO; import com.jsowell.thirdparty.yongchengboche.service.YCBCService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -58,6 +59,24 @@ public class YCBCController extends BaseController { } } + /** + * 获取token接口 + * http://localhost:8080/ycbc/v1/query_token + */ + @PostMapping("/v1/ycbcQuery_token") + public String ycbcQueryToken(@RequestBody YCBCGetTokenDTO dto) { + logger.info("请求甬城泊车平台令牌 params:{}", JSONObject.toJSONString(dto)); + String token = ""; + try { + token = ycbcService.YCBCGetToken(dto); + logger.info("请求甬城泊车平台令牌 result:{}", token); + } catch (Exception e) { + logger.error("请求甬城泊车平台令牌接口 异常"); + return ""; + } + return token; + } + /** * 甬城泊车平台查询充电站信息 @@ -92,7 +111,7 @@ public class YCBCController extends BaseController { QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); queryStationInfoDTO.setOperatorId(dto.getOperatorID()); Map map = ycbcService.queryStationsInfo(queryStationInfoDTO); - + logger.info("甬城泊车平台查询充电站信息 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "查询充电站信息成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("甬城泊车平台查询充电站信息 error:", e); @@ -135,7 +154,7 @@ public class YCBCController extends BaseController { QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); queryStationInfoDTO.setOperatorId(dto.getOperatorID()); Map map = ycbcService.queryStationStatus(queryStationInfoDTO); - + logger.info("甬城泊车平台查询充电站状态信息 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "查询充电站状态信息成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("甬城泊车平台查询充电站状态信息 error:", e); @@ -230,7 +249,7 @@ public class YCBCController extends BaseController { QueryEquipmentDTO queryEquipmentDTO = JSONObject.parseObject(dataStr, QueryEquipmentDTO.class); queryEquipmentDTO.setOperatorID(dto.getOperatorID()); Map map = ycbcService.queryEquipAuth(queryEquipmentDTO); - + logger.info("甬城泊车平台请求设备认证 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "请求设备认证成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("甬城泊车平台请求设备认证 error:", e); @@ -272,7 +291,7 @@ public class YCBCController extends BaseController { QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class); queryStartChargeDTO.setOperatorId(dto.getOperatorID()); Map map = ycbcService.queryStartCharge(queryStartChargeDTO); - + logger.info("甬城泊车平台请求启动充电 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "请求启动充电成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.error("甬城泊车平台请求启动充电 error", e); @@ -313,7 +332,7 @@ public class YCBCController extends BaseController { QueryEquipChargeStatusDTO queryEquipChargeStatusDTO = JSONObject.parseObject(dataStr, QueryEquipChargeStatusDTO.class); queryEquipChargeStatusDTO.setOperatorID(dto.getOperatorID()); Map map = ycbcService.queryEquipChargeStatus(queryEquipChargeStatusDTO); - + logger.info("甬城泊车平台查询充电状态 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "查询充电状态成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.error("甬城泊车平台查询充电状态 error", e); @@ -378,7 +397,7 @@ public class YCBCController extends BaseController { QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class); queryStartChargeDTO.setOperatorId(dto.getOperatorID()); Map map = ycbcService.queryStopCharge(queryStartChargeDTO); - + logger.info("甬城泊车平台请求停止充电 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "请求停止充电成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.error("甬城泊车平台请求停止充电 error", e); diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/zhongdianlian/ZDLController.java b/jsowell-admin/src/main/java/com/jsowell/thirdparty/zhongdianlian/ZDLController.java index badee7ec1..1a57e46e5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/zhongdianlian/ZDLController.java +++ b/jsowell-admin/src/main/java/com/jsowell/thirdparty/zhongdianlian/ZDLController.java @@ -94,7 +94,7 @@ public class ZDLController extends BaseController { queryStationInfoDTO.setOperatorId(dto.getOperatorID()); queryStationInfoDTO.setAddress("宁波"); Map map = zdlService.queryStationsInfo(queryStationInfoDTO); - + logger.info("中电联平台查询充电站信息 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "查询充电站信息成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("中电联平台查询充电站信息 error:", e); @@ -137,7 +137,7 @@ public class ZDLController extends BaseController { QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); queryStationInfoDTO.setOperatorId(dto.getOperatorID()); Map map = zdlService.queryStationStats(queryStationInfoDTO); - + logger.info("中电联平台查询统计信息 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "查询统计信息成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("中电联平台查询统计信息 error:", e); @@ -184,7 +184,7 @@ public class ZDLController extends BaseController { QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); queryStationInfoDTO.setOperatorId(dto.getOperatorID()); Map map = zdlService.queryStationStatus(queryStationInfoDTO); - + logger.info("中电联平台设备接口状态查询 result:{}", JSONObject.toJSONString(map)); return CommonResult.success(0, "设备接口状态查询成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.info("中电联平台设备接口状态查询 error:", e); diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java index 008fbda90..11cb26f32 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java @@ -183,6 +183,11 @@ public class CacheConstants { */ public static final String LTYT_TOKEN_BY_APPID = "ltyt_token_by_appid:"; + /** + * 甬城泊车系统Token + */ + public static final String YCBC_TOKEN_BY_OPERATORID = "yong_cheng_bo_che_token_by_operatorId:"; + /** * 桩硬件故障 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml index ff743940e..4c9aea98b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml @@ -472,6 +472,12 @@ and t1.address like concat('%', #{dto.address}, '%') + + and t1.id in + + #{stationId,jdbcType=VARCHAR} + +