mdm

easydo-chengfa/src/main/java/easydo/technology/controller/ApiController.java

@@ -219,7 +219,6 @@ public class ApiController {
             connection.setAutoCommit(false);
             for (MDMDept model : mdmDeptList) {
                 SysDept dept = new SysDept();
-                dept.setDeptId(Long.valueOf(model.get_ID()));
                 dept.setCode(model.getC_INTERNAL_UNIT_CODE());
                 dept.setName(model.getC_FULLNAME());
                 dept.setFirmAddress(model.getC_ADDRESS());
@@ -230,6 +229,8 @@ public class ApiController {
                 } else {
                     dept.setEnabled(false);
                 }
+                dept.setCreateTime(LocalDateUtil.localDateTimeFormatyMdHms(LocalDateTimeUtil.of(Long.valueOf(model.get_CREATE_TIME()))));
+                dept.setUpdateTime(dept.getCreateTime());
 
                 SysDept pDept = new SysDept();
                 pDept.setCode(model.getC_HR_MANAGEMENT_UNIT());
@@ -240,17 +241,17 @@ public class ApiController {
                 pDept.setSubCount(pDept.getSubCount() + 1);
                 jdbcClient.jdbcUpdateById(pDept, connection);
 
-                dept.setCreateTime(LocalDateUtil.localDateTimeFormatyMdHms(LocalDateTimeUtil.of(Long.valueOf(model.get_CREATE_TIME()))));
-                dept.setUpdateTime(dept.getCreateTime());
-
                 SysDept exist = new SysDept();
-                exist.setDeptId(Long.valueOf(model.get_ID()));
-                int count = jdbcClient.getJdbcCount(exist, connection);
-                if (count == 0) {
+                exist.setCode(model.getC_INTERNAL_UNIT_CODE());
+                exist = jdbcClient.getJdbcModel(exist, connection);
+                if (StringUtil.isEmpty(exist.getDeptId())) {
+                    dept.setDeptId((long) 0);
                     jdbcClient.jdbcInsert(dept, connection);
-                } else {
+                }else {
+                    dept.setDeptId(exist.getDeptId());
                     jdbcClient.jdbcUpdateById(dept, connection);
                 }
+
                 connection.commit();
             }
             result.put("code", 200);
@@ -282,7 +283,6 @@ public class ApiController {
             for (MDMUser model : mdmUserList) {
                 SysUser user = new SysUser();
                 user.setCode(model.getC_USER_CODE());
-                user.setUserId(Long.valueOf(model.get_ID()));
                 user.setNickName(model.getC_USER_NAME());
                 user.setPhone(model.getC_MOBILEPHONE_NUMBER());
                 user.setCreateTime(LocalDateUtil
@@ -306,11 +306,13 @@ public class ApiController {
                 }
 
                 SysUser exist = new SysUser();
-                exist.setUserId(Long.valueOf(model.get_ID()));
-                int count = jdbcClient.getJdbcCount(exist, connection);
-                if (count == 0) {
+                exist.setUsername(model.getC_USER_CODE());
+                jdbcClient.getJdbcModel(exist,connection);
+                if (StringUtil.isEmpty(exist.getUserId())) {
+                    user.setUserId((long) 0);
                     jdbcClient.jdbcInsert(user, connection);
                 } else {
+                    user.setUserId(exist.getUserId());
                     jdbcClient.jdbcUpdateById(user, connection);
                 }
             }

easydo-system/src/main/java/easydo/technology/system/domain/User.java

@@ -59,6 +59,8 @@ public class User extends CommonEntity {
     private String projectUserType;
 
     private String features;
+
+    private String originPassword;
     /**
      * sys-user用户表的id
      */

easydo-system/src/main/java/easydo/technology/system/rest/UserController.java

@@ -106,8 +106,8 @@ public class UserController {
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody UserDto resources) {
         checkLevel(resources);
-        // 默认密码 123456
-        resources.setPassword(passwordEncoder.encode("123456"));
+        // 默认密码 yonghuming
+        resources.setPassword(passwordEncoder.encode(resources.getUsername()));
         userService.save(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
@@ -162,7 +162,7 @@ public class UserController {
         if (passwordEncoder.matches(newPass, user.getPassword())) {
             throw new BadRequestException("新密码不能与旧密码相同");
         }
-        userService.updatePass(user.getUsername(), passwordEncoder.encode(newPass));
+        userService.updatePass(user.getUsername(), newPass);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 

easydo-system/src/main/java/easydo/technology/system/service/impl/UserServiceImpl.java

@@ -27,6 +27,7 @@ import easydo.technology.system.service.UsersRolesService;
 import easydo.technology.utils.*;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Pageable;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,7 +57,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private final RedisUtils redisUtils;
     private final UserCacheClean userCacheClean;
     private final OnlineUserService onlineUserService;
-
+    private final PasswordEncoder passwordEncoder;
     private final UserMapper userMapper;
     private final DeptService deptService;
     private final UsersRolesService usersRolesService;
@@ -187,6 +188,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (resources.getDept() != null) {
             user.setDeptId(resources.getDept().getId());
         }
+        user.setOriginPassword(user.getUsername());
         int ret = userMapper.insert(user);
         final Long userId = user.getId();
         if (CollectionUtils.isNotEmpty(resources.getRoles())) {
@@ -300,11 +302,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updatePass(String username, String encryptPassword) {
+    public void updatePass(String username, String password) {
         UpdateWrapper<User> updater = new UpdateWrapper<>();
         updater.lambda().eq(User::getUsername, username);
         User user = new User();
-        user.setPassword(encryptPassword);
+        user.setPassword(passwordEncoder.encode(password));
+        user.setOriginPassword(password);
         user.setPwdResetTime(new Date());
         userMapper.update(user, updater);
         redisUtils.del("user::username:" + username);