From 71d23d994445025d9eaf18c86bbdcf82f632bf83 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 16 六月 2025 09:49:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 103 ++++++++++++++++++++++++++-------------------------
1 files changed, 52 insertions(+), 51 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 7d58d32..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
@@ -196,7 +196,6 @@
}
site.setMark(0);
this.save(site);
- // 推送充电站数据给监管平台
return AjaxResult.success();
}
@@ -227,6 +226,8 @@
}
this.updateById(site);
+ tcecClient.superviseNotificationStationInfo(site.getId());
+
return AjaxResult.success();
}
@@ -280,56 +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("供电局用户编号不能为空");
- }
- }
+// 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();
}
--
Gitblit v1.7.1