人员部门同步

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/MySysOrganizationMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.SysOrganization;
+import com.rongwei.rwcommon.base.BaseDao;
+
+/**
+ * @Entity generator.domain.SysOrganization
+ */
+public interface MySysOrganizationMapper extends BaseMapper<SysOrganization> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/MySysRoleMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.SysRole;
+import com.rongwei.rwcommon.base.BaseDao;
+
+/**
+ * @Entity generator.domain.SysRole
+ */
+public interface MySysRoleMapper extends BaseMapper<SysRole> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/MySysUserMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.SysUser;
+import com.rongwei.rwcommon.base.BaseDao;
+
+/**
+ * @Entity generator.domain.SysUser
+ */
+public interface MySysUserMapper extends BaseMapper<SysUser> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/MySysUserOrgMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.SysUserOrg;
+import com.rongwei.rwcommon.base.BaseDao;
+
+/**
+ * @Entity generator.domain.SysUserOrg
+ */
+public interface MySysUserOrgMapper extends BaseMapper<SysUserOrg> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/MySysUserRoleMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.SysUserRole;
+import com.rongwei.rwcommon.base.BaseDao;
+
+/**
+ * @Entity generator.domain.SysUserRole
+ */
+public interface MySysUserRoleMapper extends BaseMapper<SysUserRole> {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/SqlServerMapper.java

@@ -4,8 +4,10 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.rongwei.bsentity.domain.PmProject;
 import com.rongwei.bsentity.domain.ZProject;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -16,8 +18,21 @@ import java.util.List;
 public interface SqlServerMapper {
     @DS("slave")
     List<PmProject> getPmProjectList();
+
     @DS("slave")
     List<ZProject> getZProjectList();
+
+    @DS("slave")
+    @Select("select a.EMPID,a.USERID,a.EMPNAME,b.EMPID AS 'USERID4A' from OM_EMPLOYEE a LEFT JOIN AC_OPERATOR b ON a.USERID = b.USERID ")
+    List<Map<String, Object>> getUsers();
+
+    @DS("slave")
+    @Select("select a.*,b.AORGID AS 'ORGID4A' from OM_ORGANIZATION a LEFT JOIN Z_BS_ORG b ON a.ORGID = b.ORGID;")
+    List<Map<String, Object>> getOrgs();
+
+    @DS("slave")
+    @Select("select * from OM_EMPORG where ISMAIN = 'y'")
+    List<Map<String, Object>> getUserOrgs();
 }
 
 

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/MySysOrganizationService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.SysOrganization;
+
+/**
+ *
+ */
+public interface MySysOrganizationService extends IService<SysOrganization> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/MySysRoleService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.SysRole;
+
+/**
+ *
+ */
+public interface MySysRoleService extends IService<SysRole> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/MySysUserOrgService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.SysUserOrg;
+
+/**
+ *
+ */
+public interface MySysUserOrgService extends IService<SysUserOrg> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/MySysUserRoleService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.SysUserRole;
+
+/**
+ *
+ */
+public interface MySysUserRoleService extends IService<SysUserRole> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/MySysUserService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.SysUser;
+
+/**
+ *
+ */
+public interface MySysUserService extends IService<SysUser> {
+
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ScheduledTasksServiceBySqlServerServiceImpl.java

@@ -1,15 +1,20 @@
 package com.rongwei.bscommon.sys.service.impl;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.rongwei.bscommon.sys.dao.MySysUserOrgMapper;
 import com.rongwei.bscommon.sys.dao.SqlServerMapper;
-import com.rongwei.bscommon.sys.service.ScheduledTasksServiceBySqlServerService;
-import com.rongwei.bsentity.domain.PmProject;
-import com.rongwei.bsentity.domain.ZProject;
+import com.rongwei.bscommon.sys.service.*;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.rwcommon.utils.SecurityUtil;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -26,6 +31,16 @@ public class ScheduledTasksServiceBySqlServerServiceImpl implements ScheduledTas
     private PmProjectServiceImpl pmProjectService;
     @Autowired
     private ZProjectServiceImpl zProjectService;
+    @Resource
+    private MySysUserService sysUserService;
+    @Resource
+    private MySysUserOrgService sysUserOrgService;
+    @Resource
+    private MySysOrganizationService sysOrganizationService;
+    @Resource
+    private MySysUserRoleService sysUserRoleService;
+    @Resource
+    private MySysRoleService sysRoleService;
 
     @Override
     public void projectAboutSync() {
@@ -37,12 +52,12 @@ public class ScheduledTasksServiceBySqlServerServiceImpl implements ScheduledTas
             data.setDeleted("0");
         });
         List<ZProject> collect = zProjectList.stream().filter(info -> info.getId() == 14237).collect(Collectors.toList());
-        List<List<ZProject>>partition1  = ListUtils.partition(collect, 3);
+        List<List<ZProject>> partition1 = ListUtils.partition(collect, 3);
         try {
-            partition1.parallelStream().forEach(data->{
-                zProjectService.saveBatch(data,3);
+            partition1.parallelStream().forEach(data -> {
+                zProjectService.saveBatch(data, 3);
             });
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
@@ -52,15 +67,146 @@ public class ScheduledTasksServiceBySqlServerServiceImpl implements ScheduledTas
             data.setDeleted("0");
         });
         List<List<PmProject>> partition = ListUtils.partition(pmProjectList, 20);
-        partition.parallelStream().forEach(data->{
-            pmProjectService.saveBatch(data,20);
+        partition.parallelStream().forEach(data -> {
+            pmProjectService.saveBatch(data, 20);
         });
 
     }
 
     @Override
     public void userAndOrgSync() {
+        //查询所有sql server的用户信息
+        List<Map<String, Object>> userList = sqlServerMapper.getUsers();
+        //查询所有sql server的部门信息
+        List<Map<String, Object>> orgList = sqlServerMapper.getOrgs();
+        //查询所有sql server的用户部门关系信息
+        List<Map<String, Object>> userOrgList = sqlServerMapper.getUserOrgs();
 
+        //查询当前系统已有的用户信息
+        List<SysUser> sysUserList = sysUserService.list();
+        //查询当前系统已有的部门信息
+        List<SysOrganization> sysOrganizationList = sysOrganizationService.list();
+        //查询当前系统已有的用户部门关系信息
+        List<SysUserOrg> sysUserOrgList = sysUserOrgService.list();
+
+        //==================处理用户信息==============
+        List<SysUser> needUserInsert = new LinkedList<>();
+        List<SysUser> needUserUpdate = new LinkedList<>();
+//        List<String> needDelUserId = new LinkedList<>();
+
+        List<String> sysUserIdList = sysUserList.stream().map(SysUser::getId).collect(Collectors.toList());
+        for (Map<String, Object> userMap : userList) {
+            String id = userMap.getOrDefault("EMPID", "").toString();
+            String account = userMap.getOrDefault("USERID", "").toString();
+            String name = userMap.getOrDefault("EMPNAME", "").toString();
+            String userid4A = userMap.getOrDefault("USERID4A", "").toString();
+
+            SysUser sysUser2 = sysUserList.stream().filter(sysUser -> sysUser.getId().equals(id)).findFirst().orElse(null);
+
+
+            if (ObjectUtil.isEmpty(sysUser2)) {
+                SysUser sysUser = new SysUser();
+                sysUser.setId(id);
+                sysUser.setAccount(account);
+                sysUser.setName(name);
+                sysUser.setCode(userid4A);
+                sysUser.setPassword("861896bc3fa76282c65f3b575d74b2cbaca7b435778f0f7c");
+                needUserInsert.add(sysUser);
+            }else {
+                if (!userid4A.equals(sysUser2.getCode())){//4AID不同，更新
+                    sysUser2.setCode(userid4A);
+                    needUserUpdate.add(sysUser2);
+                }
+            }
+        }
+
+        //===============处理部门信息==============
+        List<SysOrganization> needOrgInsert = new LinkedList<>();
+
+        List<String> sysOrgIdList = sysOrganizationList.stream().map(SysOrganization::getId).collect(Collectors.toList());
+        for (Map<String, Object> orgMap : orgList) {
+            String orgid = orgMap.getOrDefault("ORGID", "").toString();
+            String orgcode = orgMap.getOrDefault("ORGCODE", "").toString();
+            String orgname = orgMap.getOrDefault("ORGNAME", "").toString();
+            String level = orgMap.getOrDefault("ORGLEVEL", "").toString();
+            String pid = orgMap.getOrDefault("PARENTORGID", "").toString();
+            String fullpid = orgMap.getOrDefault("ORGSEQ", "").toString();
+            String sort = orgMap.getOrDefault("SORTNO", "").toString();
+            String isleaf = orgMap.getOrDefault("ISLEAF", "").toString();
+            String orgid4A = orgMap.getOrDefault("ORGID4A", "").toString();
+
+            if (!sysOrgIdList.contains(orgid)) {
+                SysOrganization sysOrganization = new SysOrganization();
+                sysOrganization.setId(orgid);
+                sysOrganization.setCode(orgid4A);
+                sysOrganization.setFullname(orgname);
+                sysOrganization.setShortname(orgname);
+                sysOrganization.setLevel(Integer.parseInt(level));
+                sysOrganization.setPid(pid);
+                sysOrganization.setSort(Integer.parseInt(sort));
+                sysOrganization.setIsleaf(isleaf);
+                sysOrganization.setFullpid(fullpid);
+                needOrgInsert.add(sysOrganization);
+            }
+        }
+
+        //=============处理用户部门关系============
+        List<SysUserOrg> needUserOrgInsert = new LinkedList<>();
+        List<SysUserOrg> needUserOrgUpdate = new LinkedList<>();
+//        List<String> needDelUserOrgId = new LinkedList<>();
+
+        for (Map<String, Object> userOrgMap : userOrgList) {
+            String userid = userOrgMap.getOrDefault("EMPID", "").toString();
+            String orgid = userOrgMap.getOrDefault("ORGID", "").toString();
+            SysUserOrg sysUserOrg = sysUserOrgList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getUserid()) && item.getUserid().equals(userid)).findFirst().orElse(null);
+            if (ObjectUtil.isEmpty(sysUserOrg)) {
+                SysUserOrg newSysUserOrg = new SysUserOrg();
+                newSysUserOrg.setId(SecurityUtil.getUUID());
+                newSysUserOrg.setUserid(userid);
+                newSysUserOrg.setOrgid(orgid);
+                needUserOrgInsert.add(newSysUserOrg);
+                continue;
+            }
+            if (!sysUserOrg.getOrgid().equals(orgid)) {
+                sysUserOrg.setOrgid(orgid);
+                needUserOrgUpdate.add(sysUserOrg);
+            }
+        }
+
+        //=============新增用户赋值默认角色==============
+        List<SysUserRole> needUserRoleInsert = new LinkedList<>();
+
+        List<String> needInsertUserIdList = needUserInsert.stream().map(SysUser::getId).collect(Collectors.toList());
+        for (String userId : needInsertUserIdList) {
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setId(SecurityUtil.getUUID());
+            sysUserRole.setUserid(userId);
+            sysUserRole.setRoleid("C570E284-632E-47DA-A94F-156D9B69C5F2");
+            needUserRoleInsert.add(sysUserRole);
+        }
+
+        if (ObjectUtil.isNotEmpty(needUserInsert)) {
+            sysUserService.saveBatch(needUserInsert);
+        }
+
+        if (ObjectUtil.isNotEmpty(needUserUpdate)){
+            sysUserService.updateBatchById(needUserUpdate);
+        }
+//        if (ObjectUtil.isNotEmpty(needDelUserId)){
+//            sysUserService.removeByIds(needDelUserId);
+//        }
+        if (ObjectUtil.isNotEmpty(needOrgInsert)) {
+            sysOrganizationService.saveBatch(needOrgInsert);
+        }
+        if (ObjectUtil.isNotEmpty(needUserOrgInsert)) {
+            sysUserOrgService.saveBatch(needUserOrgInsert);
+        }
+        if (ObjectUtil.isNotEmpty(needUserOrgUpdate)) {
+            sysUserOrgService.updateBatchById(needUserOrgUpdate);
+        }
+        if (ObjectUtil.isNotEmpty(needUserRoleInsert)) {
+            sysUserRoleService.saveBatch(needUserRoleInsert);
+        }
     }
 }
 

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysOrganizationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.service.MySysOrganizationService;
+import com.rongwei.bscommon.sys.dao.MySysOrganizationMapper;
+import com.rongwei.bsentity.domain.SysOrganization;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class SysOrganizationServiceImpl extends ServiceImpl<MySysOrganizationMapper, SysOrganization>
+    implements MySysOrganizationService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.MySysRoleMapper;
+import com.rongwei.bscommon.sys.service.MySysRoleService;
+import com.rongwei.bsentity.domain.SysRole;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<MySysRoleMapper, SysRole>
+    implements MySysRoleService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysUserOrgServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.MySysUserOrgMapper;
+import com.rongwei.bscommon.sys.service.MySysUserOrgService;
+import com.rongwei.bsentity.domain.SysUserOrg;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class SysUserOrgServiceImpl extends ServiceImpl<MySysUserOrgMapper, SysUserOrg>
+    implements MySysUserOrgService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysUserRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.MySysUserRoleMapper;
+import com.rongwei.bscommon.sys.service.MySysUserRoleService;
+import com.rongwei.bsentity.domain.SysUserRole;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class SysUserRoleServiceImpl extends ServiceImpl<MySysUserRoleMapper, SysUserRole>
+    implements MySysUserRoleService {
+
+}
+
+
+
+

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.MySysUserMapper;
+import com.rongwei.bscommon.sys.service.MySysUserService;
+import com.rongwei.bsentity.domain.SysUser;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class SysUserServiceImpl extends ServiceImpl<MySysUserMapper, SysUser>
+    implements MySysUserService {
+
+}
+
+
+
+

jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/SysOrganization.java

@@ -0,0 +1,118 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 组织机构表
+ * @TableName SYS_ORGANIZATION
+ */
+@TableName(value ="SYS_ORGANIZATION")
+@Data
+public class SysOrganization extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 父主键ID
+     */
+    @TableField(value = "PID")
+    private String pid;
+
+    /**
+     * 父级全路径
+     */
+    @TableField(value = "FULLPID")
+    private String fullpid;
+
+    /**
+     * 
+     */
+    @TableField(value = "TREECODE")
+    private String treecode;
+
+    /**
+     * 等级
+     */
+    @TableField(value = "LEVEL")
+    private Integer level;
+
+    /**
+     * 是否叶子节点
+     */
+    @TableField(value = "ISLEAF")
+    private String isleaf;
+
+    /**
+     * 代码
+     */
+    @TableField(value = "CODE")
+    private String code;
+
+    /**
+     * 全称
+     */
+    @TableField(value = "FULLNAME")
+    private String fullname;
+
+    /**
+     * 简称
+     */
+    @TableField(value = "SHORTNAME")
+    private String shortname;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "SORT")
+    private Integer sort;
+
+    /**
+     * 组织类型
+     */
+    @TableField(value = "ORGTYPE")
+    private String orgtype;
+
+    /**
+     * 负责人ID
+     */
+    @TableField(value = "CHARGEID")
+    private String chargeid;
+
+    /**
+     * 负责人名称
+     */
+    @TableField(value = "CHARGER")
+    private String charger;
+
+    /**
+     * 是否启用Y/N
+     */
+    @TableField(value = "ENABLED")
+    private String enabled;
+
+    /**
+     * 租户ID
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/SysRole.java

@@ -0,0 +1,100 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 角色表
+ * @TableName SYS_ROLE
+ */
+@TableName(value ="SYS_ROLE")
+@Data
+public class SysRole extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 父ID
+     */
+    @TableField(value = "PID")
+    private String pid;
+
+    /**
+     * 父级全路径
+     */
+    @TableField(value = "FULLPID")
+    private String fullpid;
+
+    /**
+     * 树表结构编号
+     */
+    @TableField(value = "TREECODE")
+    private String treecode;
+
+    /**
+     * 等级
+     */
+    @TableField(value = "LEVEL")
+    private Integer level;
+
+    /**
+     * 是否叶子节点
+     */
+    @TableField(value = "ISLEAF")
+    private String isleaf;
+
+    /**
+     * 编码
+     */
+    @TableField(value = "CODE")
+    private String code;
+
+    /**
+     * 角色名称
+     */
+    @TableField(value = "NAME")
+    private String name;
+
+    /**
+     * 多语言角色名称
+     */
+    @TableField(value = "ENNAME")
+    private String enname;
+
+    /**
+     * 角色类型
+     */
+    @TableField(value = "ROLETYPE")
+    private String roletype;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "SORT")
+    private Integer sort;
+
+    /**
+     * 租户ID
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/SysUser.java

@@ -0,0 +1,129 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 用户表
+ * @TableName SYS_USER
+ */
+@TableName(value ="SYS_USER")
+@Data
+public class SysUser extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 账号
+     */
+    @TableField(value = "ACCOUNT")
+    private String account;
+
+    /**
+     * 密码
+     */
+    @TableField(value = "PASSWORD")
+    private String password;
+
+    /**
+     * 姓名
+     */
+    @TableField(value = "NAME")
+    private String name;
+
+    /**
+     * 工号
+     */
+    @TableField(value = "CODE")
+    private String code;
+
+    /**
+     * 头像
+     */
+    @TableField(value = "PORTRAIT")
+    private String portrait;
+
+    /**
+     * 手机号
+     */
+    @TableField(value = "MOBILE")
+    private String mobile;
+
+    /**
+     * 电话
+     */
+    @TableField(value = "PHONE")
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    @TableField(value = "EMAIL")
+    private String email;
+
+    /**
+     * 性别
+     */
+    @TableField(value = "GENDER")
+    private String gender;
+
+    /**
+     * 直属领导
+     */
+    @TableField(value = "DIRECTLYLEADER")
+    private String directlyleader;
+
+    /**
+     * 用户属性
+     */
+    @TableField(value = "USERATTRIBUTE")
+    private String userattribute;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "SORT")
+    private Integer sort;
+
+    /**
+     * 是否启用Y/N
+     */
+    @TableField(value = "ENABLED")
+    private String enabled;
+
+    /**
+     * 租户ID
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 企业微信userid
+     */
+    @TableField(value = "QYWXUSERID")
+    private String qywxuserid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 签名
+     */
+    @TableField(value = "SIGNATURE")
+    private String signature;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/SysUserOrg.java

@@ -0,0 +1,58 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 用户部门表
+ * @TableName SYS_USER_ORG
+ */
+@TableName(value ="SYS_USER_ORG")
+@Data
+public class SysUserOrg extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    @TableField(value = "USERID")
+    private String userid;
+
+    /**
+     * 组织ID
+     */
+    @TableField(value = "ORGID")
+    private String orgid;
+
+    /**
+     * 是否主部门Y/N
+     */
+    @TableField(value = "ISMAIN")
+    private String ismain;
+
+    /**
+     * 租户ID
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/SysUserRole.java

@@ -0,0 +1,51 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 用户角色表
+ * @TableName SYS_USER_ROLE
+ */
+@TableName(value ="SYS_USER_ROLE")
+@Data
+public class SysUserRole extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    @TableField(value = "USERID")
+    private String userid;
+
+    /**
+     * 角色ID
+     */
+    @TableField(value = "ROLEID")
+    private String roleid;
+
+    /**
+     * 租户ID
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}