From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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 504004c..058511c 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
@@ -4,7 +4,6 @@
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;
@@ -15,9 +14,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -73,8 +70,9 @@
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("value", userList.get(0).getId().toString());
map.put("name", userList.get(0).getName());
+ map.put("type",person.getType());
resList.add(map);
}
}
@@ -97,7 +95,7 @@
@ApiOperation(value = "根据手机号码获取中台责任人水库id组合字符串", notes = "根据手机号码获取中台责任人水库id组合字符串")
@GetMapping(value = "/queryListByPhone")
public R queryListByPhone(AttResManagePerson attResManagePerson) {
- List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson));
+ final List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson));
List<String> reslist = new ArrayList<>();
list.forEach(item -> {
reslist.add(item.getResGuid());
@@ -105,4 +103,32 @@
return R.data(StringUtil.join(reslist, ","));
}
+ @ApiOperation(value="责任人-添加/修改", notes="责任人-添加/修改")
+ @PostMapping(value = "/editZrr")
+ public R editZrr(@RequestBody AttResManagePerson attResManagePerson) {
+ if (StringUtil.isEmpty(attResManagePerson.getResGuid()))
+ return R.fail("resGuid不能为空");
+ if (StringUtil.isEmpty(attResManagePerson.getType()))
+ return R.fail("type不能为空");
+ if (StringUtil.isEmpty(attResManagePerson.getSysResource()))
+ return R.fail("sysResource不能为空");
+ if (StringUtil.isEmpty(attResManagePerson.getUserPhone()))
+ return R.fail("userPhone不能为空");
+ if (StringUtil.isEmpty(attResManagePerson.getUserName()))
+ return R.fail("userName不能为空");
+ return R.data(attResManagePersonService.saveOrUpdateResManagePerson(attResManagePerson));
+ }
+
+ @ApiOperation(value="多个责任人-添加/修改", notes="多个责任人-添加/修改")
+ @PostMapping(value = "/editListZrr")
+ public R editListZrr(@RequestBody List<AttResManagePerson> attResManagePersons) {
+ return attResManagePersonService.saveOrUpdateResManagePerson(attResManagePersons);
+ }
+
+ @ApiOperation(value="同步责任人用户", notes="同步责任人用户")
+ @GetMapping(value = "/synchronizationUser")
+ public R synchronizationUser() {
+ return R.data(attResManagePersonService.synchronizationAddUser());
+ }
+
}
--
Gitblit v1.9.3