From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
index 99d4e24..d2d6a95 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
@@ -12,12 +12,14 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Set;
/**
* @ClassName SM服务Feign实现类
@@ -75,10 +77,43 @@
/**
*
* @param res_cd
+ * @param areaList
* @return
*/
@Override
- public List<PersonVO> getUserListByResGuid(String res_cd) {
- return adBaseService.getPersonListByResGuid(res_cd);
+ public List<PersonVO> getUserListByResGuid(String res_cd, String areaList) {
+ return adBaseService.getPersonListByResGuid(res_cd,areaList);
+ }
+
+ @Override
+ public int syncharonization_add_user() {
+ return attResManagePersonService.synchronizationAddUser();
+ }
+
+ @Override
+ public int syncharonization_update_user() {
+ return attResManagePersonService.synchronizationUpdateUser();
+ }
+
+ /**
+ * 通过水库代码获取巡查责任人及技术责任人手机号
+ * @param list
+ * @return
+ */
+ @Override
+ @PostMapping(GET_PERSON_LIST_BY_WATER_CODE_LIST)
+ public Set<String> getPersonListByWaterCodeList(List<String> list) {
+ return attResManagePersonService.getPersonListByWaterCodeList(list);
+ }
+
+ /**
+ * 根据水库编号查询市县水利部人员姓名及联系方式
+ * @param res_cd 水库编号
+ * @return
+ */
+ @Override
+ @GetMapping(GET_CITY_COUNTY_PERSONG_LIST_BY_RES_GUID)
+ public List<PersonVO> getCityCountyPersonListByResGuid(String res_cd) {
+ return attResManagePersonService.getCityCountyPersonListByResGuid(res_cd);
}
}
--
Gitblit v1.9.3