From 88c727412039458c5564995aa4da83df4c280935 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 19 May 2023 09:37:46 +0800
Subject: [PATCH] 监测上报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
index 68ac727..504004c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
@@ -2,6 +2,9 @@
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
+import cn.gistack.system.user.entity.User;
+import cn.gistack.system.user.feign.IUserClient;
+import com.alibaba.nacos.client.utils.TenantUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,7 +20,9 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @ClassName AttResManagePersonController
@@ -33,6 +38,8 @@
@AllArgsConstructor
public class AttResManagePersonController extends BladeController {
private final IAttResManagePersonService attResManagePersonService;
+
+ private final IUserClient userClient;
@ApiOperation(value = "中台责任人水库列表-分页列表查询", notes = "中台责任人水库列表-分页列表查询")
@GetMapping(value = "/list")
@@ -53,6 +60,28 @@
}
+ @ApiOperation(value = "根据水库id获取中台责任人数据返回系统存在的用户列表", notes = "根据水库id获取中台责任人列表")
+ @GetMapping(value = "/findResManagePersonByResIdReturnSys")
+ public R findResManagePersonByResIdReturnSys(AttResManagePerson attResManagePerson) {
+
+ if (StringUtil.isEmpty(attResManagePerson.getResGuid()))
+ return R.fail("resGuid不能为空");
+
+ List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson));
+ List<Object> resList = new ArrayList<>();
+ for (AttResManagePerson person : list) {
+ List<User> userList = userClient.userInfoByPhone("000000", person.getUserPhone()).getData();
+ if (userList.size() > 0) {
+ Map<Object, Object> map = new HashMap<>();
+ map.put("value", userList.get(0).getId());
+ map.put("name", userList.get(0).getName());
+ resList.add(map);
+ }
+ }
+ return R.data(resList);
+
+ }
+
@ApiOperation(value = "根据水库id获取中台责任人列表", notes = "根据水库id获取中台责任人列表")
@GetMapping(value = "/findResManagePersonByResIds")
public R findResManagePersonByResId(String resIds) {
@@ -70,10 +99,10 @@
public R queryListByPhone(AttResManagePerson attResManagePerson) {
List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson));
List<String> reslist = new ArrayList<>();
- list.forEach(item->{
+ list.forEach(item -> {
reslist.add(item.getResGuid());
});
- return R.data(StringUtil.join(reslist,","));
+ return R.data(StringUtil.join(reslist, ","));
}
}
--
Gitblit v1.9.3