From c05a14bba4b86d83918d7cdc01635785bf5694c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 03 六月 2025 00:26:08 +0800
Subject: [PATCH] 拆分mongodb查询服务
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 12 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 802bacb..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;
@@ -33,6 +34,7 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.feignClient.SysUserRoleClient;
import com.ruoyi.system.api.model.SysUserRoleVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -71,8 +73,6 @@
@Resource
private AppUserClient appUserClient;
@Resource
- private VipClient vipClient;
- @Resource
private SysUserRoleClient sysUserRoleClient;
@Resource
private TParkingLotService parkingLotService;
@@ -88,6 +88,9 @@
@Resource
private TPartnerSiteService partnerSiteService;
+ @Resource
+ private TCECClient tcecClient;
+
/**
* 获取站点管理列表数据
@@ -99,10 +102,10 @@
public PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList) {
Set<Integer> ids = null;
//校验合作商权限
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
- R<Integer> admin = sysUserClient.isAdmin(SecurityUtils.getUserId());
+ R<Integer> admin = sysUserClient.isAdmin(tokenService.getLoginUser().getUserid());
//合作商
if(roleType == 2){
ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
@@ -133,6 +136,8 @@
}
+
+
@Override
public PageInfo<GetSiteListDTO> getSiteList1(Long userId) {
GetSiteList siteList = new GetSiteList();
@@ -143,7 +148,7 @@
SysUser sysUser = sysUserClient.getSysUser(userId).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
- R<Integer> admin = sysUserClient.isAdmin(SecurityUtils.getUserId());
+ R<Integer> admin = sysUserClient.isAdmin(tokenService.getLoginUser().getUserid());
//合作商
if(roleType == 2){
@@ -221,6 +226,8 @@
}
this.updateById(site);
+ tcecClient.superviseNotificationStationInfo(site.getId());
+
return AjaxResult.success();
}
@@ -262,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("服务电话不能为空");
}
@@ -274,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();
}
@@ -343,7 +400,7 @@
public List<Site> getSiteListParkLot() {
Set<Integer> ids = null;
//校验合作商权限
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
//合作商
@@ -351,7 +408,7 @@
ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
}else{
//非管理员需要根据角色和用户配置查询允许的站点数据
- if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
@@ -378,7 +435,7 @@
public List<Site> getSiteListGun() {
Set<Integer> ids = null;
//校验合作商权限
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
//合作商
@@ -386,7 +443,7 @@
ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
}else{
//非管理员需要根据角色和用户配置查询允许的站点数据
- if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
@@ -459,5 +516,8 @@
for (TChargingPile tChargingPile : list1) {
integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
}
+
+ //推送三方平台
+ tcecClient.notificationStationChange(Arrays.asList(id));
}
}
--
Gitblit v1.7.1