From abaf72a337248943e037b02d069c094e2ee5d60b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 05 Jul 2023 14:46:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
index d937235..3ad4838 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
@@ -5,9 +5,12 @@
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
+import java.util.Set;
/**
* @ClassName AttResManagePersonClent
@@ -27,6 +30,10 @@
String GET_AD_BASE = API_PREFIX + "/getAdBaseById";
String GET_PERSONG_LIST_BY_RES_GUID = API_PREFIX + "/getPersonListByResGuid";
String GET_USER_LIST_BY_RES_GUID = API_PREFIX + "/getUserListByResGuid";
+ String SYNCHARONIZATION_ADD_USER = API_PREFIX + "/synchronizationAddUser";
+ String SYNCHARONIZATION_UPDATE_USER = API_PREFIX + "/synchronizationUpdateUser";
+ String GET_PERSON_LIST_BY_WATER_CODE_LIST = API_PREFIX + "/getPersonListByWaterCodeList";
+ String GET_CITY_COUNTY_PERSONG_LIST_BY_RES_GUID = API_PREFIX + "/getCityCountyPersonListByResGuid";
@GetMapping(QUERY_LIST_BY_PHONE)
R queryListByPhone(@RequestParam("userPhone") String userPhone);
@@ -46,8 +53,31 @@
/**
* 根据水库编号查询除责任人之外的人员信息
* @param res_cd
+ * @param areaList
* @return
*/
@GetMapping(GET_USER_LIST_BY_RES_GUID)
- List<PersonVO> getUserListByResGuid(@RequestParam("res_cd") String res_cd);
+ List<PersonVO> getUserListByResGuid(@RequestParam("res_cd") String res_cd, @RequestParam("areaList") String areaList);
+
+ @PostMapping(SYNCHARONIZATION_ADD_USER)
+ int syncharonization_add_user();
+
+ @PostMapping(SYNCHARONIZATION_UPDATE_USER)
+ int syncharonization_update_user();
+
+ /**
+ * 通过水库代码获取巡查责任人及技术责任人手机号
+ * @param list
+ * @return
+ */
+ @PostMapping(GET_PERSON_LIST_BY_WATER_CODE_LIST)
+ Set<String> getPersonListByWaterCodeList(@RequestBody List<String> list);
+
+ /**
+ * 根据水库编号查询市县水利部人员姓名及联系方式
+ * @param res_cd 水库编号
+ * @return
+ */
+ @GetMapping(GET_CITY_COUNTY_PERSONG_LIST_BY_RES_GUID)
+ List<PersonVO> getCityCountyPersonListByResGuid(@RequestParam("res_cd") String res_cd);
}
--
Gitblit v1.9.3