修改定时任务

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -230,6 +230,7 @@ public class ZkDataSyncTask {
                 role.setId("2");//普通用户
                 roles.add(role);
                 user.setRoles(roles);
+                user.setUserType("00");
                 dmUser = new DmUser();
                 dmUser.setDept(dept);
                 dmUser.setId(user.getId());

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java

@@ -144,6 +144,10 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "根用户组名称", hidden = true)
     private String userRootGroupName;
 
+    @Column(name = "user_type")
+    @ApiModelProperty(value = "人员种类(00-正式人员、01-外协单位、02-租户)", hidden = true)
+    private String userType;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java

@@ -121,4 +121,11 @@ public class DeptController {
         deptService.delete(deptDtos);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @ApiOperation("查询所有部门")
+    @GetMapping(value = "/getAllDept")
+    public ResponseEntity<Object> getAllDept() throws Exception {
+        List<DeptDto> deptDtos = deptService.getAllDept();
+        return new ResponseEntity<>(PageUtil.toPage(deptDtos, deptDtos.size()),HttpStatus.OK);
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java

@@ -110,8 +110,6 @@ public class UserController {
     @PreAuthorize("@el.check('user:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody User resources){
         checkLevel(resources);
-        // 默认密码 123456
-        /*resources.setPassword(passwordEncoder.encode("123456"));*/
         resources.setPassword(passwordEncoder.encode(resources.getOrgPassword()));
         userService.create(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java

@@ -150,4 +150,10 @@ public interface DeptService {
      * @param deptDtos /
      */
     void verification(Set<DeptDto> deptDtos);
+
+    /**
+     * 查询所有数据
+     * @return /
+     */
+    List<DeptDto> getAllDept() throws Exception;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java

@@ -85,4 +85,6 @@ public class UserDto extends BaseDTO implements Serializable {
     private String userRootGroupId;
 
     private String userRootGroupName;
+
+    private String userType;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java

@@ -168,6 +168,7 @@ public class DeptServiceImpl implements DeptService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(Dept resources) {
+        resources.setId(UUID.randomUUID().toString());
         deptRepository.save(resources);
         // 计算子节点数目
         resources.setSubCount(0);
@@ -304,6 +305,12 @@ public class DeptServiceImpl implements DeptService {
         }
     }
 
+    @Override
+    public List<DeptDto> getAllDept() throws Exception {
+        List<Dept> dept = deptRepository.findAll();
+        return deptMapper.toDto(dept);
+    }
+
     private void updateSubCnt(String deptId){
         if(deptId != null){
             int count = deptRepository.countByPid(deptId);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -18,7 +18,11 @@ package me.zhengjie.modules.system.service.impl;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.config.FileProperties;
 import me.zhengjie.exception.BadRequestException;
+import me.zhengjie.modules.dm.card.domain.DmCard;
+import me.zhengjie.modules.dm.card.service.DmCardService;
+import me.zhengjie.modules.dm.card.service.dto.DmCardDto;
 import me.zhengjie.modules.dm.user.domain.DmUser;
+import me.zhengjie.modules.dm.user.repository.DmUserRepository;
 import me.zhengjie.modules.dm.user.service.DmUserService;
 import me.zhengjie.modules.dm.user.service.dto.DmUserDto;
 import me.zhengjie.modules.dm.user.service.mapstruct.DmUserMapper;
@@ -69,6 +73,8 @@ public class UserServiceImpl implements UserService {
     private final OnlineUserService onlineUserService;
     private final DmUserService dmUserService;
     private final DmUserMapper dmUserMapper;
+    private final DmUserRepository dmUserRepository;
+    private final DmCardService dmCardService;
 
     @Override
     public Object queryAll(UserQueryCriteria criteria, Pageable pageable) {
@@ -99,16 +105,29 @@ public class UserServiceImpl implements UserService {
     @Transactional(rollbackFor = Exception.class)
     public void create(User resources) {
         //设置用户信息
-        resources = setDmUserInfoToSysUser(resources);
+        //resources = setDmUserInfoToSysUser(resources);
         if (userRepository.findByUsername(resources.getUsername()) != null) {
             throw new EntityExistException(User.class, "username", resources.getUsername());
         }
-        /*if (userRepository.findByEmail(resources.getEmail()) != null) {
-            throw new EntityExistException(User.class, "email", resources.getEmail());
-        }*/
-//        if (userRepository.findByPhone(resources.getPhone()) != null) {
-//            throw new EntityExistException(User.class, "phone", resources.getPhone());
-//        }
+        resources.setId(UUID.randomUUID().toString());
+
+        DmUser dmUser = new DmUser();
+        dmUser.setId(resources.getId());
+        dmUser.setName(resources.getNickName());
+        dmUser.setSex(resources.getGender());
+        dmUser.setContacts(resources.getPhone());
+        dmUser.setEmail(resources.getEmail());
+        dmUser.setDept(resources.getDept());
+        dmUser.setUserNumber(resources.getUserCode());
+        dmUser.setUserCode(resources.getUserCode());
+        dmUser.setStatus(resources.getEnabled());
+        dmUser.setType("01");
+        DmCardDto dmCardDto = dmCardService.create(new DmCard());
+        dmUser.setCardid(String.valueOf(dmCardDto.getId()));
+        DmUser dmUser1 = dmUserRepository.save(dmUser);
+
+        resources.setDmCompany(null);
+        resources.setDmUser(dmUser1);
         userRepository.save(resources);
     }