添加初始化数据库脚本

base-manager/src/main/java/com/mortals/xhx/base/system/resource/service/ResourceService.java

@@ -65,5 +65,5 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
     List<ResourceEntity> findAll(int userType);
 
 
-    void updateUserList();
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/UserService.java

@@ -14,6 +14,7 @@ import com.mortals.framework.service.ICRUDService;
 import com.mortals.framework.service.IUser;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
 import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.common.pdu.user.UserPdu;
 
 import java.util.List;
 import java.util.Set;
@@ -116,4 +117,6 @@ public interface UserService extends ICRUDService<UserEntity,Long> {
 
 
       void updateWidthDao(UserEntity userEntity);
+
+    void updateUserList(List<UserPdu> list);
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -66,6 +66,9 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
     @Autowired
     private ResourceService resourceService;
 
+    @Autowired
+    private SiteService siteService;
+
 
     private void doHandlerUser(UserEntity entity) throws AppException {
         if (StringUtils.isNotEmpty(entity.getLoginPwd())) {
@@ -294,6 +297,33 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
         dao.update(userEntity);
     }
 
+    @Override
+    public void updateUserList(List<UserPdu> list) {
+        //更新本地用户信息，并且更新用户站点树
+        list.forEach(user -> {
+            UserEntity tempUserEntity = this.selectOne(new UserQuery().loginName(user.getLoginName()));
+            if (ObjectUtils.isEmpty(tempUserEntity)) {
+                //新增
+                UserEntity entity = new UserEntity();
+                entity.initAttrValue();
+                BeanUtils.copyProperties(user, entity, BeanUtil.getNullPropertyNames(user));
+                this.save(entity);
+                Context context = new Context();
+                context.setUser(entity);
+
+                ThreadPool.getInstance().execute(new SyncTreeSiteThread(siteService, context));
+            } else {
+                //更新
+                UserEntity userEntity = new UserEntity();
+                BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd", "userType", "status", "lastLoginTime", "lastLoginAddress"});
+                this.updateWidthDao(userEntity);
+                Context context = new Context();
+                context.setUser(userEntity);
+                ThreadPool.getInstance().execute(new SyncTreeSiteThread(siteService, context));
+            }
+        });
+    }
+
 
     @Override
     protected void findAfter(UserEntity params, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException {

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

 package com.mortals.xhx.daemon.task;
 
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.framework.util.ThreadPool;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
+import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.common.utils.SyncTreeSiteThread;
+import com.mortals.xhx.feign.user.IUserFeign;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
 
 /**
  * 同步用户
@@ -18,10 +33,24 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
     @Autowired
     private ResourceService resourceService;
 
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private IUserFeign userFeign;
+
+
 
     @Override
     public void excuteTask(ITask task) throws AppException {
-        resourceService.updateUserList();
+
+        UserPdu userPdu = new UserPdu();
+        userPdu.setPage(1);
+        userPdu.setSize(-1);
+        Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
+
+        userService.updateUserList(list.getData().getData());
+        //resourceService.updateUserList();
 
      /*   UserPdu userPdu = new UserPdu();
         userPdu.setPage(1);

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -17,6 +17,8 @@ import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.common.utils.SyncTreeSiteThread;
 import com.mortals.xhx.feign.user.IUserFeign;
 import com.mortals.xhx.module.area.model.AreaEntity;
@@ -197,8 +199,12 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         //刷新站点树
         Rest<String> rest = userFeign.synchSiteAuth();
         if(rest.getCode().equals(YesNoEnum.YES.getValue())){
-            //更新用户站点id,并更新站点树
-            resourceService.updateUserList();
+            UserPdu userPdu = new UserPdu();
+            userPdu.setPage(1);
+            userPdu.setSize(-1);
+            Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
+
+            userService.updateUserList(list.getData().getData());
         }
         super.updateAfter(entity, context);
     }
@@ -210,8 +216,12 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
         Rest<String> rest = userFeign.synchSiteAuth();
         if(rest.getCode().equals(YesNoEnum.YES.getValue())){
-            //更新用户站点id,并更新站点树
-            resourceService.updateUserList();
+            UserPdu userPdu = new UserPdu();
+            userPdu.setPage(1);
+            userPdu.setSize(-1);
+            Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
+
+            userService.updateUserList(list.getData().getData());
         }
 
         super.saveAfter(entity, context);
@@ -223,8 +233,13 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
         Rest<String> rest = userFeign.synchSiteAuth();
         if(rest.getCode().equals(YesNoEnum.YES.getValue())){
-            //更新用户站点id,并更新站点树
-            resourceService.updateUserList();
+
+            UserPdu userPdu = new UserPdu();
+            userPdu.setPage(1);
+            userPdu.setSize(-1);
+            Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
+
+            userService.updateUserList(list.getData().getData());
         }
         super.removeAfter(ids, context, result);
     }