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/TRepairServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
index d348ebb..f2669a2 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
@@ -1,18 +1,33 @@
package com.ruoyi.chargingPile.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
+import com.ruoyi.account.api.dto.SendMessageDTO;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.model.Site;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.model.TRepair;
+import com.ruoyi.chargingPile.api.domain.SiteMenu;
import com.ruoyi.chargingPile.mapper.TRepairMapper;
-import com.ruoyi.chargingPile.service.TRepairService;
-import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.other.api.feignClient.RoleSiteClient;
+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 jdk.nashorn.internal.parser.Token;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Arrays;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
/**
* <p>
@@ -22,9 +37,36 @@
* @author xiaochen
* @since 2024-08-08
*/
+@Slf4j
@Service
public class TRepairServiceImpl extends ServiceImpl<TRepairMapper, TRepair> implements TRepairService {
+ @Autowired
+ private ISiteService siteService;
+ @Autowired
+ private TChargingPileService chargingPileService;
+ @Autowired
+ private TChargingPileNotificationService chargingPileNotificationService;
+ @Resource
+ private SysUserClient sysUserClient;
+
+ @Resource
+ private IPartnerService partnerService;
+
+ @Resource
+ private UserSiteClient userSiteClient;
+
+ @Resource
+ private RoleSiteClient roleSiteClient;
+
+ @Resource
+ private SysUserRoleClient sysUserRoleClient;
+ @Resource
+ private AppUserClient appUserClient;
+
+
+ @Autowired
+ private TokenService tokenService;
/**
* 获取报修记录列表
@@ -33,7 +75,57 @@
* @return
*/
@Override
- public List<TRepair> getRepairList(PageInfo<TRepair> pageInfo, String name, String siteId) {
- return this.baseMapper.getRepairList(pageInfo, name, siteId);
+ public List<TRepair> getRepairList(PageInfo<TRepair> pageInfo, String name, Integer siteId) {
+ //校验合作商权限
+ List<Integer> siteIds = new ArrayList<>();
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ if(null == siteId || 0 == siteId){
+ //合作商
+ if(roleType == 2){
+ Set<Integer> data = partnerService.authSite(objectId, SiteMenu.REPAIR_RECORD);
+ siteIds = new ArrayList<>(data);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ 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();
+ data.addAll(data1);
+ siteIds = data;
+ }
+ }
+ }else{
+ siteIds.add(siteId);
+ }
+ List<TRepair> repairList = this.baseMapper.getRepairList(pageInfo, name, siteIds);
+ for (TRepair repair : repairList) {
+ repair.setAuthDelete(roleType == 1 ? true : partnerService.authMenu(objectId, repair.getSiteId(), SiteMenu.REPAIR_RECORD_DEL));
+ }
+ return repairList;
+ }
+
+ @Override
+ public void add(TRepair dto) {
+ // 故障短信提醒
+ Site site = siteService.getById(dto.getSiteId());
+ TChargingPile chargingPile = chargingPileService.getById(dto.getChargingPileId());
+ String siteName = site.getName();
+// String reqStr = MsgUtil.faultMsg(site.getPhone(), site.getName(), chargingPile.getNumber() + "");
+// String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(site.getPhone());
+ sendMessageDTO.setCode(site.getName());
+ sendMessageDTO.setChargeGun(chargingPile.getNumber() + "");
+ sendMessageDTO.setType(3);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
+ log.info("故障短信提醒：{}",result);
+ if(siteName.length()>10){
+ siteName = siteName.substring(0,10);
+ }
+ chargingPileNotificationService.saveData(4,dto.getSiteId(),dto.getChargingPileId(),site.getPhone(),"检测到"+siteName+"..."+chargingPile.getNumber()+"号桩设备离线，请及时查看处理！");
+ dto.setRepairTime(LocalDateTime.now());
+ this.save(dto);
}
}
--
Gitblit v1.7.1