From a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Jun 2023 14:06:46 +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 | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 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 b0490de..fdfa217 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
@@ -5,11 +5,15 @@
import cn.gistack.sm.sjztmd.mapper.AttResManagePersonMapper;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
import cn.gistack.sm.sjztmd.vo.PersonVO;
+import cn.gistack.sm.sjztmd.vo.UserPersonVO;
+import cn.gistack.system.user.entity.User;
+import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +29,10 @@
@Service
@DS("zt")
public class AttResManagePersonServiceImpl extends ServiceImpl<AttResManagePersonMapper, AttResManagePerson> implements IAttResManagePersonService {
+
+ @Autowired
+ private IUserClient userClient;
+
@Override
public Boolean saveOrUpdateResManagePerson(AttResManagePerson attResManagePerson) {
if (StringUtil.isBlank(attResManagePerson.getResGuid()))
@@ -75,8 +83,49 @@
* @return
*/
@Override
- @DS("zt")
public List<PersonVO> getPersonListByResGuid(String res_cd, List<String> personList) {
return baseMapper.getPersonListByResGuid(res_cd,personList);
}
+
+ @Override
+ public int synchronizationAddUser() {
+ // 同步没有责任人表中没有的用户
+ List<UserPersonVO> userPersonVOS = baseMapper.getPersonByUserNotExists();
+ int i = 0;
+ for (UserPersonVO vo:userPersonVOS) {
+ User user = new User();
+ user.setId(Long.parseLong(vo.getUserPhone()));
+ user.setAccount(vo.getUserPhone());
+ user.setPassword("383977f7a48c4600a6cadff28f4340cee30f3011");
+ user.setRoleId(vo.getRoleId());
+ // 如果是巡查责任人，设置为默认部门
+ if (user.getRoleId().equals("1642713427301355522")) {
+ user.setDeptId(String.valueOf(Integer.parseInt(vo.getAdCode()) + 1));
+ } else {
+ user.setDeptId(vo.getAdCode());
+ }
+ user.setDeptId(vo.getAdCode());
+ user.setName(vo.getUserName().trim());
+ user.setRealName(vo.getUserName().trim());
+ user.setPhone(vo.getUserPhone());
+ try {
+ R<Boolean> ret = userClient.saveUser(user);
+ if (ret.getData()) {
+ i++;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ return i;
+ }
+
+ @Override
+ public int synchronizationUpdateUser() {
+ // 同步没有责任人表中没有的用户
+ int ret = baseMapper.updateUserByPerson();
+ return ret;
+ }
+
}
--
Gitblit v1.9.3