From 2a5f6eceaef1483bb88157c61afc7a66705d88a0 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 20 六月 2025 15:25:28 +0800 Subject: [PATCH] 监管平台bug修改 --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 67 +++++++++++++++++++++++++++++++-- 1 files changed, 62 insertions(+), 5 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java index aa55790..ed2cadc 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java @@ -25,6 +25,7 @@ import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.integration.api.feignClient.IntegrationClient; +import com.ruoyi.integration.api.feignClient.TCECClient; import com.ruoyi.other.api.domain.TVip; import com.ruoyi.other.api.feignClient.RoleSiteClient; import com.ruoyi.other.api.feignClient.UserSiteClient; @@ -72,8 +73,6 @@ @Resource private AppUserClient appUserClient; @Resource - private VipClient vipClient; - @Resource private SysUserRoleClient sysUserRoleClient; @Resource private TParkingLotService parkingLotService; @@ -88,6 +87,9 @@ @Resource private TPartnerSiteService partnerSiteService; + + @Resource + private TCECClient tcecClient; /** @@ -224,6 +226,8 @@ } this.updateById(site); + tcecClient.superviseNotificationStationInfo(site.getId()); + return AjaxResult.success(); } @@ -265,9 +269,9 @@ // if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){ // return AjaxResult.error("地图位置不能为空"); // } - if(StringUtils.isEmpty(site.getPhone())){ - return AjaxResult.error("站点电话不能为空"); - } +// if(StringUtils.isEmpty(site.getPhone())){ +// return AjaxResult.error("站点电话不能为空"); +// } if(StringUtils.isEmpty(site.getServicePhone())){ return AjaxResult.error("服务电话不能为空"); } @@ -277,6 +281,56 @@ if(null == site.getSort()){ return AjaxResult.error("排序不能为空"); } +// if(StringUtils.isEmpty(site.getAreaCodeCountryside())){ +// return AjaxResult.error("充换电站所在县以下行政区划代码不能为空"); +// } +// if(null == site.getStationClassification()){ +// return AjaxResult.error("请选择站点分类"); +// } +// if(null == site.getGeneralApplicationType()){ +// return AjaxResult.error("请选择通用类型"); +// } +// if(null == site.getParkType()){ +// return AjaxResult.error("请选择停车费类型"); +// } +// if(null == site.getRoundTheClock()){ +// return AjaxResult.error("请选择是否7*24h营业"); +// } +// if (site.getStationClassification()!=1&& (!org.springframework.util.StringUtils.hasLength(site.getSwapMatchCars()))){ +// return AjaxResult.error("服务车型描述不能为空"); +// } +// if(null == site.getElectricityType()){ +// return AjaxResult.error("请选择电费类型"); +// } +// if(null == site.getBusinessExpandType()){ +// return AjaxResult.error("请选择报装类型"); +// } +// if(null == site.getCapacity()){ +// return AjaxResult.error("报装电源容量不能为空"); +// } +// if(null == site.getRatedPower()){ +// return AjaxResult.error("站点额定总功率不能为空"); +// } +// if(StringUtils.isEmpty(site.getOfficialRunTime())){ +// return AjaxResult.error("请选择正式投运时间"); +// } +// if(null == site.getPeriodFee()){ +// return AjaxResult.error("请选择峰谷时分"); +// } +// if(null == site.getVideoMonitor()){ +// return AjaxResult.error("请选择视频监控配套情况"); +// } +// if(StringUtils.isEmpty(site.getEquipmentOwnerName())){ +// return AjaxResult.error("设备所属方名称不能为空"); +// } +// if(null == site.getSupplyType()){ +// return AjaxResult.error("请选择供电类型"); +// } +// if(site.getSupplyType()==1){ +// if (StringUtils.isEmpty(site.getResidentNo())){ +// return AjaxResult.error("供电局用户编号不能为空"); +// } +// } return AjaxResult.success(); } @@ -462,5 +516,8 @@ for (TChargingPile tChargingPile : list1) { integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails)); } + + //推送三方平台 + tcecClient.notificationStationChange(Arrays.asList(id)); } } -- Gitblit v1.7.1