From d56e45a6bf3ad11809fbf51dff0dfbe853860d43 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 三月 2025 20:56:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 6 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 f39014b..7d58d32 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;
/**
@@ -111,7 +113,6 @@
//非管理员需要根据角色和用户配置查询允许的站点数据
//改用roleId=1来判断
if(admin.getData()!=1){
-// if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
if(data2.size() > 0){
@@ -195,6 +196,7 @@
}
site.setMark(0);
this.save(site);
+ // 推送充电站数据给监管平台
return AjaxResult.success();
}
@@ -266,9 +268,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 +279,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();
}
@@ -463,5 +515,8 @@
for (TChargingPile tChargingPile : list1) {
integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
}
+
+ //推送三方平台
+ tcecClient.notificationStationChange(Arrays.asList(id));
}
}
--
Gitblit v1.7.1