blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zxl
2 小时以前 3b0516a2959e25576e4f3fda697a3b025d06c8c9 
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java


@@ -10,12 +10,22 @@


import com.ycl.platform.domain.form.YwPeopleForm;


import com.ycl.platform.domain.vo.YwPeopleVO;


import com.ycl.platform.domain.query.YwPeopleQuery;




import java.util.Collections;


import java.util.Date;


import java.util.List;




import com.baomidou.mybatisplus.core.metadata.IPage;


import com.ycl.system.domain.SysUserRole;


import com.ycl.system.entity.SysRole;


import com.ycl.system.entity.SysUser;


import com.ycl.system.mapper.SysConfigMapper;


import com.ycl.system.mapper.SysRoleMapper;


import com.ycl.system.mapper.SysUserMapper;


import com.ycl.system.mapper.SysUserRoleMapper;


import com.ycl.system.page.PageUtil;


import com.ycl.utils.SecurityUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.security.crypto.password.PasswordEncoder;


import org.springframework.stereotype.Service;


import org.springframework.beans.BeanUtils;


@@ -41,9 +51,10 @@




    private final YwPeopleMapper ywPeopleMapper;


    private final YwUnitMapper ywUnitMapper;


    private final PasswordEncoder passwordEncoder;


    private final SysUserMapper sysUserMapper;




    private final SysUserRoleMapper sysUserRoleMapper;


    private final SysRoleMapper sysRoleMapper;


    private final SysConfigMapper sysConfigMapper;


    /**


     * 添加


     * @param form


@@ -56,10 +67,21 @@


        SysUser sysUser = new SysUser();


        fullUser(sysUser, form);


        sysUserMapper.insertUser(sysUser);


        // 获取运维人员角色


        SysRole sysRole = sysRoleMapper.selectRoleByKey("yw_user");


        if (Objects.isNull(sysRole)) { return Result.error("运维角色不存在"); }


        // 绑定账号角色关系


        SysUserRole sysUserRole = new SysUserRole();


        sysUserRole.setRoleId(sysRole.getRoleId());


        sysUserRole.setUserId(sysUser.getUserId());


        sysUserRoleMapper.batchUserRole(Collections.singletonList(sysUserRole));




        YwPeople entity = YwPeopleForm.getEntityByForm(form, null);


        entity.setUserId(sysUser.getUserId());


        entity.setAddWay("manual");


        Date now = new Date();


        entity.setCreateTime(now);


        entity.setUpdateTime(now);


        if(baseMapper.insert(entity) > 0) {


            return Result.ok("添加成功");


        }


@@ -73,11 +95,12 @@


     */


    public void fullUser(SysUser sysUser, YwPeopleForm form) {


        sysUser.setUserName(form.getYwPersonAccount());


        sysUser.setPassword(passwordEncoder.encode("123456"));


        String password = sysConfigMapper.checkConfigKeyUnique("sys.user.initPassword").getConfigValue();


        sysUser.setPassword(SecurityUtils.encryptPassword(password));


        sysUser.setStatus("0");


        sysUser.setDelFlag("0");


        sysUser.setFirstLogin((short) 0);


        sysUser.setNickName(form.getYwPersonName());


        sysUser.setUnitId(form.getBelongUnit());


    }




    /**


@@ -99,6 +122,8 @@


        sysUserMapper.updateUser(sysUser);




        BeanUtils.copyProperties(form, entity);


        Date now = new Date();


        entity.setUpdateTime(now);


        if (baseMapper.updateById(entity) > 0) {


            return Result.ok("修改成功");


        }


@@ -119,7 +144,10 @@


                .list();


        List<Long> userIds = list.stream().map(YwPeople::getUserId).collect(Collectors.toList());


        baseMapper.deleteBatchIds(ids);


        sysUserMapper.deleteUserByIds((Long[]) userIds.toArray());


        if (!userIds.isEmpty()) {


            sysUserRoleMapper.deleteUserRoleByUserIds(userIds);


            sysUserMapper.deleteUserByIds(userIds.toArray(new Long[0]));


        }


        return Result.ok("删除成功");


    }