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 | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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 c1f07c9..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,19 +1,16 @@
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.domain.SiteMenu;
+import com.ruoyi.chargingPile.api.domain.SiteMenu;
import com.ruoyi.chargingPile.mapper.TRepairMapper;
import com.ruoyi.chargingPile.service.*;
-import com.ruoyi.common.core.constant.MsgConstants;
-import com.ruoyi.common.core.utils.HttpUtils;
-import com.ruoyi.common.core.utils.MsgUtil;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.page.BasePage;
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;
@@ -21,6 +18,7 @@
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;
@@ -28,7 +26,6 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Set;
@@ -64,9 +61,12 @@
@Resource
private SysUserRoleClient sysUserRoleClient;
+ @Resource
+ private AppUserClient appUserClient;
+
-
-
+ @Autowired
+ private TokenService tokenService;
/**
* 获取报修记录列表
@@ -78,17 +78,17 @@
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){
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
- Integer roleType = sysUser.getRoleType();
- Integer objectId = sysUser.getObjectId();
//合作商
if(roleType == 2){
- Set<Integer> data = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ Set<Integer> data = partnerService.authSite(objectId, SiteMenu.REPAIR_RECORD);
siteIds = new ArrayList<>(data);
}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();
@@ -99,7 +99,11 @@
}else{
siteIds.add(siteId);
}
- return this.baseMapper.getRepairList(pageInfo, name, siteIds);
+ 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
@@ -108,8 +112,14 @@
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);
+// 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);
--
Gitblit v1.7.1