From ea4e6cf0a63fa8470846fd5188da9e912faf661e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 10:01:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
index 7fb53ff..fd964e2 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
@@ -1,6 +1,8 @@
package com.ruoyi.chargingPile.controller;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.model.TRepair;
import com.ruoyi.chargingPile.service.TRepairService;
@@ -38,8 +40,8 @@
private TRepairService repairService;
@Resource
private TokenService tokenService;
- @Autowired
- private SysUserClient userClient;
+ @Resource
+ private AppUserClient appUserClient;
/**
* 添加故障报修管理
@@ -50,9 +52,9 @@
public AjaxResult<String> add(@Validated @RequestBody TRepair dto) {
Long userId = tokenService.getLoginUserApplet().getUserId();
// 查询报修人员信息
- SysUser user = userClient.getSysUser(userId).getData();
- if(Objects.nonNull(user)){
- dto.setRepairman(user.getUserName());
+ TAppUser user = appUserClient.getUserById(userId).getData();
+ if(Objects.nonNull(user)){
+ dto.setRepairman(user.getName());
}
repairService.add(dto);
return AjaxResult.success();
@@ -61,7 +63,7 @@
@ResponseBody
@GetMapping("/getRepairList")
@ApiOperation(value = "获取报修记录列表数据", tags = {"管理后台-设备监控"})
- public AjaxResult<PageInfo<TRepair>> getRepairList(String name, String siteId, BasePage basePage){
+ public AjaxResult<PageInfo<TRepair>> getRepairList(String name, Integer siteId, BasePage basePage){
PageInfo<TRepair> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
List<TRepair> repairList = repairService.getRepairList(pageInfo, name, siteId);
pageInfo.setRecords(repairList);
--
Gitblit v1.7.1