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/service/impl/AttResManagePersonServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
index 6e42fc9..727eb67 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
@@ -1,6 +1,6 @@
package cn.gistack.sm.sjztmd.service.impl;
-import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.intelligentCall.entity.Scene;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
import cn.gistack.sm.sjztmd.mapper.AttResManagePersonMapper;
@@ -104,11 +104,11 @@
User user = new User();
user.setId(Long.parseLong(vo.getUserPhone()));
user.setAccount(vo.getUserPhone());
- user.setPassword("383977f7a48c4600a6cadff28f4340cee30f3011");
+ user.setPassword("Zhsk@123456");
user.setRoleId(vo.getRoleId());
// 如果是巡查责任人，设置为默认部门
if (user.getRoleId().equals("1642713427301355522")) {
- user.setDeptId(String.valueOf(Integer.parseInt(vo.getAdCode()) + 1));
+ user.setDeptId(String.valueOf(Long.valueOf(vo.getAdCode()) + 1));
} else {
user.setDeptId(vo.getAdCode());
}
@@ -117,6 +117,11 @@
user.setRealName(vo.getUserName().trim());
user.setPhone(vo.getUserPhone());
try {
+ R<List<User>> listR = userClient.userInfoByPhoneOrAccount("000000",user.getPhone());
+ // 存在不保存
+ if (listR.getData().size() > 0) {
+ continue;
+ }
R<Boolean> ret = userClient.saveUser(user);
if (ret.getData()) {
i++;
@@ -167,4 +172,20 @@
// 返回
return personVOList;
}
+
+ @DS("master")
+ @Override
+ public List<PatrolResponsiblePerson> getPatrolResponsiblePersonByResCdList(List<String> reservoirList) {
+ return baseMapper.getPatrolResponsiblePersonByResCdList(reservoirList);
+ }
+
+ /**
+ * 通过水库代码获取水库及巡查责任人信息
+ * @param stringList
+ * @return
+ */
+ @Override
+ public Set<Scene> getPatrolPersonListByWaterCodeList(List<String> stringList) {
+ return baseMapper.getPatrolPersonListByWaterCodeList(stringList);
+ }
}
--
Gitblit v1.9.3