组织机构同步接口

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/DepartmentAndPersonnelServiceImpl.java

@@ -75,9 +75,10 @@ public class DepartmentAndPersonnelServiceImpl implements DepartmentAndPersonnel
                     //TODO:补充平台构造部门字段
                     insertSysOrganization.setIsleaf("n");
                     //如果名字中带有“有限公司”
-                    if(departmentVo.getDepartmentname().contains("有限公司")){
+                    if (departmentVo.getDepartmentname().contains("有限公司")) {
                         insertSysOrganization.setOrgtype("Branch-Office");
                     }
+                    insertSysOrganization.setEnabled("y");
 
                     insertDepartList.add(insertSysOrganization);
                 } else {
@@ -87,6 +88,20 @@ public class DepartmentAndPersonnelServiceImpl implements DepartmentAndPersonnel
                     } else {
                         sysOrganizationDo.setCode(departmentVo.getDepartmentcode());
                         sysOrganizationDo.setPid(departmentVo.getSupdepid());
+                        sysOrganizationDo.setFullname(departmentVo.getDepartmentname());
+                        sysOrganizationDo.setShortname(departmentVo.getDepartmentname());
+                        if (ObjectUtil.isNotEmpty(departmentVo.getSupdepid())) {
+                            sysOrganizationDo.setPid(departmentVo.getSupdepid());
+                        } else {
+                            sysOrganizationDo.setPid("-1");
+                        }
+                        //TODO:补充平台构造部门字段
+                        sysOrganizationDo.setIsleaf("n");
+                        //如果名字中带有“有限公司”
+                        if (departmentVo.getDepartmentname().contains("有限公司")) {
+                            sysOrganizationDo.setOrgtype("Branch-Office");
+                        }
+                        sysOrganizationDo.setEnabled("y");
 
                         updateDepartList.add(sysOrganizationDo);
                     }
@@ -107,34 +122,39 @@ public class DepartmentAndPersonnelServiceImpl implements DepartmentAndPersonnel
             //查询本系统中已有的员工数据
             List<SysUserDo> sysUserDoList = sysUserService.list();
             for (PersonnelVo personnelVo : personnelList) {
-                SysUserDo sysUserDo = sysUserDoList.stream().filter(item -> item.getId().equals(personnelVo.getWorkcode())).findFirst().orElse(null);
+                SysUserDo sysUserDo = sysUserDoList.stream().filter(item -> item.getAccount().equals(personnelVo.getWorkcode())).findFirst().orElse(null);
                 //不存在 并且在职，则新增
                 if (ObjectUtil.isEmpty(sysUserDo) && personnelVo.getStatus() == 1) {
                     SysUserDo insertUser = new SysUserDo();
-                    insertUser.setId(personnelVo.getWorkcode());
+                    insertUser.setId(SecurityUtil.getUUID());
                     insertUser.setAccount(personnelVo.getWorkcode());
                     insertUser.setName(personnelVo.getLastname());
                     //TODO:待完善平台用户其他字段
+                    insertUser.setCode(personnelVo.getWorkcode());
+                    insertUser.setPassword(SecurityUtil.getSaltMd5AndSha("000000", insertUser.getId()));//新增用户初始化密码为“000000”
                     insertUserList.add(insertUser);
 
                     SysUserOrgDo insertUserOrg = new SysUserOrgDo();
                     insertUserOrg.setId(SecurityUtil.getUUID());
-                    insertUserOrg.setUserid(personnelVo.getWorkcode());
+                    insertUserOrg.setUserid(insertUser.getId());
                     insertUserOrg.setOrgid(personnelVo.getDepartmentid());
                     insertUserOrgList.add(insertUserOrg);
 
                     //新增用户给予默认角色
                     SysUserRoleDo insertUserRole = new SysUserRoleDo();
                     insertUserRole.setId(SecurityUtil.getUUID());
-                    insertUserRole.setUserid(personnelVo.getWorkcode());
+                    insertUserRole.setUserid(insertUser.getId());
                     insertUserRole.setRoleid("58fb8df3bebb48d58e8a2be261c32774");//普通员工 角色
+                    insertUserRoleList.add(insertUserRole);
                 } else {
                     //不是在职，则删除
                     if (personnelVo.getStatus() != 1) {
-                        deleteUserIdList.add(personnelVo.getWorkcode());
-                        deleteUserOrgByUserIdList.add(personnelVo.getWorkcode());
+                        deleteUserIdList.add(sysUserDo.getId());
+                        deleteUserOrgByUserIdList.add(sysUserDo.getId());
                     } else {
+                        sysUserDo.setAccount(personnelVo.getWorkcode());
                         sysUserDo.setName(personnelVo.getLastname());
+                        sysUserDo.setCode(personnelVo.getWorkcode());
                         updateUserList.add(sysUserDo);
 
                         deleteUserOrgByUserIdList.add(personnelVo.getWorkcode());
@@ -164,8 +184,8 @@ public class DepartmentAndPersonnelServiceImpl implements DepartmentAndPersonnel
 
         //批量导入/修改用户
         if (ObjectUtil.isNotEmpty(deleteUserIdList)) {
-//            sysUserService.removeByIds(deleteUserIdList);
-            departmentAndPersonnelDao.deleteUserById(deleteUserIdList);
+            sysUserService.removeByIds(deleteUserIdList);
+//            departmentAndPersonnelDao.deleteUserById(deleteUserIdList);
         }
         if (ObjectUtil.isNotEmpty(updateUserList)) {
             sysUserService.updateBatchById(updateUserList);
@@ -175,19 +195,19 @@ public class DepartmentAndPersonnelServiceImpl implements DepartmentAndPersonnel
         }
 
         //批量导入/修改 用户-部门
-        if(ObjectUtil.isNotEmpty(deleteUserOrgByUserIdList)){
+        if (ObjectUtil.isNotEmpty(deleteUserOrgByUserIdList)) {
             sysUserOrgService.remove(new QueryWrapper<SysUserOrgDo>().lambda().in(SysUserOrgDo::getUserid, deleteUserOrgByUserIdList));
         }
-        if(ObjectUtil.isNotEmpty(insertUserOrgList)){
+        if (ObjectUtil.isNotEmpty(insertUserOrgList)) {
             sysUserOrgService.saveBatch(insertUserOrgList);
         }
 
         //初始化批量导入/修改 用户-角色
-        if(ObjectUtil.isNotEmpty(insertUserRoleList)){
+        if (ObjectUtil.isNotEmpty(insertUserRoleList)) {
             sysUserRoleService.saveBatch(insertUserRoleList);
         }
 
-        String res = "成功，部门新增"+insertDepartList.size()+"个，更新"+updateDepartList.size()+"个，删除"+deleteDepartIdList.size()+"个，员工新增"+insertUserList.size()+"个，更新"+updateUserList.size()+"个，删除"+deleteUserIdList.size()+"个";
+        String res = "成功，部门新增" + insertDepartList.size() + "个，更新" + updateDepartList.size() + "个，删除" + deleteDepartIdList.size() + "个，员工新增" + insertUserList.size() + "个，更新" + updateUserList.size() + "个，删除" + deleteUserIdList.size() + "个";
         return R.ok(res);
     }
 }

js-security/security-server/src/main/java/com/rongwei/savecheck/controller/DepartmentAndPersonnelController.java

@@ -26,7 +26,7 @@ public class DepartmentAndPersonnelController {
      */
     @PostMapping("/departmentAndPersonnel")
     public R departmentAndPersonnel(@RequestBody DepartmentAndPersonnelReq req){
-        log.info("开始同步部门和用户信息");
+        log.info("开始同步部门和用户信息，入参：{}",req);
         return departmentAndPersonnelService.departmentAndPersonnel(req);
     }
 }

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/dao/DangerousDao.java

@@ -1,26 +0,0 @@
-package com.rongwei.trainingcommon.sys.dao;
-
-import com.rongwei.training.vo.DemandUserVo;
-import com.rongwei.training.vo.WordEmpInfoVo;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * CommonDao class
- *
- * @author XH
- * @date 2020/12/18
- */
-public interface DangerousDao {
-    @Select("SELECT a.*, b.JOBTYPE, b.ASSIGNMENTTIMESTART, b.ASSIGNMENTTIMEEND FROM asp_inspectrecords a LEFT JOIN asp_job_management b ON a.JOBID = b.ID WHERE a.deleted = 0 AND a.PUNISHPERSONNELID IS NOT NULL AND a.STATUS = '1' AND a.GENERATEPENALTYORNOT = 'y'")
-    List<Map<String, Object>> getDangerousDailyNotify();
-
-    @Select("SELECT a.*, b.JOBTYPE, b.ASSIGNMENTTIMESTART, b.ASSIGNMENTTIMEEND FROM asp_inspectrecords a LEFT JOIN asp_job_management b ON a.JOBID = b.ID WHERE a.deleted = 0 AND a.ID = #{id}")
-    Map<String, Object> getDangerousNotify(@Param("id") String id);
-
-
-}