| ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/dto/TAppUserDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -3,11 +3,13 @@ import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.AuditUserDto; import com.ruoyi.system.dto.TAppUserDTO; import com.ruoyi.system.dto.UpAndDownDTO; import com.ruoyi.system.dto.UserIdDto; import com.ruoyi.system.model.TAppUser; @@ -19,6 +21,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -63,14 +67,30 @@ * 添加人员 */ // @PreAuthorize("@ss.hasPermi('system:user:addUser')") @ApiOperation(value = "添加人员") @ApiOperation(value = "添加人员",notes = "请求参数：TAppUserDTO对象",response = TAppUserDTO.class) @PostMapping(value = "/api/t-app-user/addUser") public R<?> addUser(@RequestBody String param) { TAppUser tAppUser = JSON.parseObject(param, TAppUser.class); String pwd = SecurityUtils.encryptPassword(tAppUser.getPassword()); tAppUser.setPassword(pwd); tAppUser.setState(1); appUserService.save(tAppUser); TAppUserDTO dto = JSON.parseObject(param, TAppUserDTO.class); if(!StringUtils.hasLength(dto.getAccount())){ return R.fail("请输入账号"); } if (appUserService.isExit(dto)) { return R.fail("该账号已存在"); } List<TUserMajor> userMajors = dto.getUserMajors(); if(CollectionUtils.isEmpty(userMajors)){ return R.fail("请选择专业"); } String pwd = SecurityUtils.encryptPassword(dto.getPassword()); dto.setPassword(pwd); dto.setState(1); appUserService.save(dto); for (TUserMajor userMajor : userMajors) { userMajor.setAppUserId(dto.getId()); } userMajorService.saveBatch(userMajors); return R.ok(); } @@ -81,13 +101,22 @@ @ApiOperation(value = "编辑人员", response = TAppUser.class) @PostMapping(value = "/api/t-app-user/updateUser") public R<?> updateUser(@RequestBody String param) { TAppUser tAppUser = JSON.parseObject(param, TAppUser.class); if(tAppUser.getPassword()!=null && !tAppUser.getPassword().isEmpty()){ String pwd = SecurityUtils.encryptPassword(tAppUser.getPassword()); tAppUser.setPassword(pwd); TAppUserDTO dto = JSON.parseObject(param, TAppUserDTO.class); if (appUserService.isExit(dto)) { return R.fail("该账号已存在"); } tAppUser.setState(1); appUserService.updateById(tAppUser); List<TUserMajor> userMajors = dto.getUserMajors(); if(dto.getPassword()!=null && !dto.getPassword().isEmpty()){ String pwd = SecurityUtils.encryptPassword(dto.getPassword()); dto.setPassword(pwd); } dto.setState(1); appUserService.updateById(dto); userMajorService.remove(Wrappers.lambdaQuery(TUserMajor.class).eq(TUserMajor::getAppUserId,dto.getId())); for (TUserMajor userMajor : userMajors) { userMajor.setAppUserId(dto.getId()); } userMajorService.saveBatch(userMajors); return R.ok(); }
New file @@ -0,0 +1,18 @@ package com.ruoyi.system.dto; import com.ruoyi.system.model.TAppUser; import com.ruoyi.system.model.TUserMajor; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel(value="TAppUserDTO对象", description="人员管理") public class TAppUserDTO extends TAppUser { @ApiModelProperty(value = "专业id集合") private List<TUserMajor> userMajors; } ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
@@ -71,9 +71,9 @@ @TableField("state") private Integer state; @ApiModelProperty(value = "职业技能") @ApiModelProperty(value = "职业技能 1=无 2=初级 3=中级 4=高级") @TableField("level") private String level; private Integer level; @ApiModelProperty(value = "经度") @TableField(exist = false) ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.dto.TAppUserDTO; import com.ruoyi.system.model.TAppUser; import com.ruoyi.system.query.TAppUserQuery; import com.ruoyi.system.vo.TAppUserPageVo; @@ -23,4 +24,9 @@ TAppUserPageVo pageAuditDetail(String id); /** * 判断账号是否已存在 */ boolean isExit(TAppUserDTO dto); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
@@ -1,7 +1,10 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.dto.TAppUserDTO; import com.ruoyi.system.mapper.TAppUserMapper; import com.ruoyi.system.model.TAppUser; import com.ruoyi.system.query.TAppUserQuery; @@ -46,4 +49,15 @@ BeanUtils.copyProperties(tAppUser, tAppUserPageVo); return tAppUserPageVo; } @Override public boolean isExit(TAppUserDTO dto) { if(StringUtils.isNotEmpty(dto.getId())){ // 修改 return this.count(Wrappers.lambdaQuery(TAppUser.class).ne(TAppUser::getId, dto.getId()).eq(TAppUser::getAccount, dto.getAccount())) > 0; }else { // 新增 return this.count(Wrappers.lambdaQuery(TAppUser.class).eq(TAppUser::getAccount, dto.getAccount())) > 0; } } }
