From f3592b4751f6ec88c2dfae39c006a8ceeaa67180 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 May 2023 15:12:02 +0800
Subject: [PATCH] 险情上报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 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 c1f9098..782e372 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
@@ -34,21 +39,70 @@
public class AttResManagePersonController extends BladeController {
private final IAttResManagePersonService attResManagePersonService;
+ private final IUserClient userClient;
+
@ApiOperation(value = "中台责任人水库列表-分页列表查询", notes = "中台责任人水库列表-分页列表查询")
@GetMapping(value = "/list")
public R queryPageList(AttResManagePerson attResManagePerson, Query query) {
IPage<AttResManagePerson> pageList = attResManagePersonService.page(Condition.getPage(query), Condition.getQueryWrapper(attResManagePerson));
return R.data(pageList);
}
- @ApiOperation(value = "根据手机号码获取中台责任人水库列表", notes = "根据手机号码获取中台责任人水库列表")
+
+ @ApiOperation(value = "根据水库id获取中台责任人列表", notes = "根据水库id获取中台责任人列表")
+ @GetMapping(value = "/findResManagePersonByResId")
+ public R findResManagePersonByResId(AttResManagePerson attResManagePerson) {
+
+ if (StringUtil.isEmpty(attResManagePerson.getResGuid()))
+ return R.fail("resGuid不能为空");
+
+ List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson));
+ return R.data(list);
+
+ }
+
+ @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().toString());
+ 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) {
+
+ if (StringUtil.isEmpty(resIds))
+ return R.fail("resGuid不能为空");
+
+ List<AttResManagePerson> list = attResManagePersonService.attResManagePersonListByResIds(resIds);
+ return R.data(list);
+
+ }
+
+ @ApiOperation(value = "根据手机号码获取中台责任人水库id组合字符串", notes = "根据手机号码获取中台责任人水库id组合字符串")
@GetMapping(value = "/queryListByPhone")
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