From a96c5eddcd63fa6f09e4cdce9e28c7b846068f0c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 18 九月 2024 16:45:51 +0800
Subject: [PATCH] 9.18
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
index b38a11d..6eae9d5 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java
@@ -15,6 +15,8 @@
import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.ruoyi.system.api.feignClient.SysUserRoleClient;
+import com.ruoyi.system.api.model.SysUserRoleVo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -44,6 +46,9 @@
@Resource
private RoleSiteClient roleSiteClient;
+
+ @Resource
+ private SysUserRoleClient sysUserRoleClient;
@@ -71,7 +76,8 @@
//非管理员需要根据角色和用户配置查询允许的站点数据
if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
- List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
siteIds = new HashSet<>(data);
}
@@ -84,4 +90,24 @@
pageInfo.setRecords(list);
return pageInfo;
}
+
+ @Override
+ public void saveData(Integer type,Integer siteId,Integer chargingPileId, String phone, String data) {
+ TChargingPileNotification notification = new TChargingPileNotification();
+ switch (type){
+ case 1:
+ // 验证码
+ notification.setPhone(phone);
+ notification.setContent(data);
+ break;
+ default:
+ // 停车占位
+ notification.setSiteId(siteId);
+ notification.setChargingPileId(chargingPileId);
+ notification.setPhone(phone);
+ notification.setContent(data);
+ break;
+ }
+ }
+
}
--
Gitblit v1.7.1