This commit is contained in:
张良(004796)
2024-03-12 18:38:33 +08:00
parent 7bc31dc69e
commit cbf8192a73
14 changed files with 148 additions and 82 deletions

View File

@@ -12,14 +12,24 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.dto.admin.common.AuditFailReq;
import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
import com.ruoyi.xq.dto.app.common.IdsReq;
import com.ruoyi.xq.enums.common.AuditEnum;
import com.ruoyi.xq.service.UserPicturesService;
import com.ruoyi.xq.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.Arrays;
/**
@@ -35,14 +45,15 @@ import java.util.Arrays;
public class UserPicturesController extends BaseController {
private final UserPicturesService userPicturesService;
private final UserService userService;
/**
* 查询用户相册管理列表
*/
@SaCheckPermission("xq:userPictures:list")
@GetMapping("/list")
public TableDataInfo<UserPictures> list(UserPictures bo, PageQuery pageQuery) {
Page<UserPictures> page = userPicturesService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<UserPicturesAdminVo> list(UserPicturesAdminVo bo, PageQuery pageQuery) {
Page<UserPicturesAdminVo> page = userPicturesService.pageApp(pageQuery, bo);
return TableDataInfo.build(page);
}
@@ -66,18 +77,43 @@ public class UserPicturesController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserPictures bo) {
return toAjax(userPicturesService.save(bo));
User user = userService.getByUsercode(bo.getUsercode());
if(user == null){
return R.fail("用户不存在");
}
String[] split = bo.getPicture().split(",");
for (String picture : split) {
UserPictures pictures = new UserPictures();
pictures.setUserId(user.getId());
pictures.setUsercode(user.getUsercode());
pictures.setPicture(picture);
pictures.setAuditStatus(AuditEnum.SUCCESS.getCode());
pictures.setAuditRemark("后台新增免审核");
pictures.setAuditTime(LocalDateTime.now());
pictures.setAuditOpId(LoginHelper.getUserId());
pictures.setAuditOpName(LoginHelper.getUsername());
pictures.setAuditIp(ServletUtils.getClientIP());
userPicturesService.save(pictures);
}
return R.ok();
}
/**
* 修改用户相册管理
*/
@SaCheckPermission("xq:userPictures:edit")
@Log(title = "用户相册管理", businessType = BusinessType.UPDATE)
@Log(title = "用户相册审核成功", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserPictures bo) {
return toAjax(userPicturesService.updateById(bo));
@PostMapping("/audit/success")
public R<Void> auditSuccess(@RequestBody IdsReq bo) {
userPicturesService.auditSuccess(bo.getIds());
return R.ok();
}
@SaCheckPermission("xq:userPictures:edit")
@Log(title = "用户相册审核失败", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PostMapping("/audit/fail")
public R<Void> auditFail(@RequestBody AuditFailReq bo) {
userPicturesService.auditFail(bo.getId(),bo.getAuditRemark());
return R.ok();
}
/**