修改了增加，修改用户代码

feige

2024-06-10 f34203dacf5485b06d9d80618e5e14cf4463c2d7

修改了增加，修改用户代码

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -50,8 +50,10 @@
        // 生成令牌
        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                loginBody.getUuid());

        HashMap<String, String> tokenMap = new HashMap<>();
        tokenMap.put("token",token);
       // tokenMap.put("roid",roid)
        return AjaxResult.success(tokenMap);
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -12,6 +12,7 @@
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.sysUserAndUserInfo;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
import org.apache.commons.lang3.ArrayUtils;
@@ -132,6 +133,42 @@
    }

    /**
     * 修改用户
     *
     */
    @PreAuthorize("@ss.hasPermi('system:user:edit')")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PostMapping("/updateUserInfo")
    public AjaxResult editUser(@Validated @RequestBody sysUserAndUserInfo user)
    {
        SysUser us = new SysUser();
        us.setUserId(user.getSysId());
        us.setNickName(user.getNickName());
        us.setRoleId(user.getRoleId());
        us.setSex(user.getSex());
        us.setStatus(user.getStatus());
        userService.updateUser(us);

        System.out.println(user.getFamilyId());
     //   System.out.println("[[[[]]]]]]");
                ZInfoUser infoUser = new ZInfoUser();
        infoUser.setUserId(user.getUserId());
        infoUser.setIsMyFamily(user.getIsMyFamily());
        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setSysId(user.getSysId());
        if(user.getSpouseId()!=null)
            infoUser.setSpouseId(user.getSpouseId());
        ZfFamily zfFamily = zfFamilyService.getByFamId(user.getFamilyId());
        if(zfFamily!=null&&zfFamily.getFid()!=null)
            infoUser.setFatherId(zfFamily.getFid());
        if(zfFamily!=null&&zfFamily.getMid()!=null)
            infoUser.setMomId(zfFamily.getMid());
        zInfoUserService.saveOrUpdate(infoUser);
      //  zInfoUserService.update(infoUser);
             //   .saveOrUpdate(infoUser);
        return AjaxResult.success();
    }
    /**
     * 新增用户
     */
    @PreAuthorize("@ss.hasPermi('system:user:add')")
@@ -168,21 +205,28 @@
        }
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        userService.insertUser(user);
        //写入到 新建立的信息表里面

        ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setUserId(user.getUserId());
        infoUser.setSysId(user.getUserId());
     //   infoUser.setUserId(user.getUserId());
        infoUser.setNickName(user.getNickName());
        infoUser.setPhoneNumber(user.getPhonenumber());
        infoUser.setSex(user.getSex()=="男"?1:0);
        infoUser.setFamilyId(userAll.getFamilyId());
        if(zfFamily!=null) {
        if(zfFamily!=null&&zfFamily.getFid()!=null) {
            infoUser.setFatherId(zfFamily.getFid());
         //   infoUser.setMomId(zfFamily.getMid());
        }
        if(zfFamily!=null&&zfFamily.getMid()!=null) {
            infoUser.setFatherId(zfFamily.getMid());
       //     infoUser.setMomId(zfFamily.getMid());
        }
        System.out.println("-----");
        System.out.println(userAll.getIsMyFamily());
        System.out.println(userAll.getFamilyId());
        infoUser.setIsMyFamily(userAll.getIsMyFamily());
        if(userAll.getSpouseId()==0)
            infoUser.setSpouseId(null);
@@ -194,8 +238,10 @@
        if(user.getRoleIds()[0]==102)
            infoUser.setRoleId(3L);
        // infoUser.setRoleName(user.g);

        if(userAll.getFamilyId()!=-1) {
            zInfoUserService.saveOrUpdate(infoUser);
            zInfoUserService.save(infoUser);
        //    zInfoUserService.saveOrUpdate(infoUser);
            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
            lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId());
            List<ZInfoUser> lis = zInfoUserService.list(lqw);
@@ -211,7 +257,7 @@
                        .update();
            }
        }
        return toAjax(userService.insertUser(user));
        return AjaxResult.success();
    }

    /**
@@ -252,6 +298,9 @@
        {
            return error("当前用户不能删除");
        }
//        for(Long uid: userIds) {
//            zInfoUserService.getInfoBysysId();
//        }
        zInfoUserService.removeByUserName( userService.findUserNames(userIds));
        return toAjax(userService.deleteUserByIds(userIds));
    }

 ruoyi-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@
# 开发环境配置
server:
  # 服务器的HTTP端口，默认为8080
  port: 8080
  port: 8089
  ssl: #ssl配置
    # resources根目录的”证书源文件.pfx“
    key-store: classpath:www.bendudu.com.pfx

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -215,12 +215,28 @@
         update sys_user set password = #{password} where user_name = #{userName}
    </update>
    
    <delete id="deleteUserByUserName" parameterType="String">
        update sys_user set status = '1' where user_name= #{userName}
    </delete>
    <delete id="deleteUserByName" parameterType="String">
        delete from sys_user where user_name= #{userName}
    </delete>

    <delete id="deleteUserById" parameterType="Long">
         update sys_user set del_flag = '2' where user_id = #{userId}
        update sys_user set status = '1' where user_id = #{userId}
    </delete>



    <delete id="deleteById" parameterType="Long">
        delete from sys_user where user_id in
        <foreach collection="array" item="userId" open="(" separator="," close=")">
            #{userId}
        </foreach>
     </delete>
     
     <delete id="deleteUserByIds" parameterType="Long">
         update sys_user set del_flag = '2' where user_id in
        update sys_user set status = '1' where user_id in
         <foreach collection="array" item="userId" open="(" separator="," close=")">
             #{userId}
        </foreach> 

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -218,6 +218,9 @@
     */
    private String secondFamilyId;



    private Long sysId;
    /**
     * 代数
     */

 zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java

@@ -39,6 +39,9 @@

    private Long fid;

    @Excel(name="母亲id")
    private Long mid;



}

 zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java

New file
@@ -0,0 +1,58 @@
package com.ruoyi.domain;

import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
public class sysUserAndUserInfo {
    private static final long serialVersionUID = 1L;


    private Long userId;



    /** 用户昵称 */
    @Excel(name = "用户名称")
    private String nickName;



    /** 用户性别 */
    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
    private String sex;



    /** 帐号状态（0正常 1停用） */
    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
    private String status;



    /** 角色对象 */
    private List<SysRole> roles;

    /** 角色组 */
    private Long[] roleIds;


    /** 角色ID */
    private Long roleId;


    private Integer isMyFamily;


    private Long spouseId;

    private Long familyId;

    private Long sysId;
}

 zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java

@@ -22,7 +22,12 @@

    AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);



 public ZInfoUser getInfoBysysId(Long sysid);
    AjaxResult getInfoByfid(Long fid);

   // AjaxResult updateBySysId()
    List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);

    AjaxResult removeByUserName(List userName);

 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java

@@ -71,6 +71,14 @@
    }

    @Override
    public ZInfoUser getInfoBysysId(Long sysid) {
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZInfoUser::getSysId, sysid);
        List<ZInfoUser> list = list(lqw);
        return list.get(0);
    }

    @Override
    public AjaxResult getInfoByfid(Long fid) {
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZInfoUser::getFamilyId, fid);
@@ -615,7 +623,7 @@

    @Override
    public ZInfoUser getInfoById(Long userId) {
        ZInfoUser user = getById(userId);
        ZInfoUser user = getInfoBysysId(userId);


        if(user!=null)
@@ -793,6 +801,9 @@
                        Long spouseId = one.getSpouseId();
                        if (spouseId != null) {
                            ZInfoUser spouse = zInfoUserService.getById(spouseId);
                          //  System.out.println(spouseId);
                          //  System.out.println(spouse);
                          //  System.out.println("0000))))))))))))))))");
                            spouse.setIdentity(people.getIdentity() + 1);
                            one.setSpouse(spouse);
                        }