init

2024-03-12 18:38:33 +08:00
parent 7bc31dc69e
commit cbf8192a73
14 changed files with 148 additions and 82 deletions
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AgreementSettingController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AgreementSettingController.java
@@ -1,15 +1,10 @@
 package com.ruoyi.xq.controller;

 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-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.xq.domain.AgreementSetting;
@@ -18,10 +13,6 @@ 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.util.Arrays;
-
 /**
 * 协议设置
 *
@@ -36,37 +27,13 @@ public class AgreementSettingController extends BaseController {

    private final AgreementSettingService agreementSettingService;

-    /**
-     * 查询协议设置列表
-     */
-    @SaCheckPermission("xq:agreementSetting:list")
-    @GetMapping("/list")
-    public TableDataInfo<AgreementSetting> list(AgreementSetting bo, PageQuery pageQuery) {
-        Page<AgreementSetting> page = agreementSettingService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
-        return TableDataInfo.build(page);
-    }
-
    /**
     * 获取协议设置详细信息
-     *
-     * @param id 主键
     */
    @SaCheckPermission("xq:agreementSetting:query")
-    @GetMapping("/{id}")
-    public R<AgreementSetting> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(agreementSettingService.getById(id));
-    }
-
-    /**
-     * 新增协议设置
-     */
-    @SaCheckPermission("xq:agreementSetting:add")
-    @Log(title = "协议设置", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody AgreementSetting bo) {
-        return toAjax(agreementSettingService.save(bo));
+    @GetMapping("/info")
+    public R<AgreementSetting> getInfo() {
+        return R.ok(agreementSettingService.getAgreementSetting());
    }

    /**
@@ -80,16 +47,4 @@ public class AgreementSettingController extends BaseController {
        return toAjax(agreementSettingService.updateById(bo));
    }

-    /**
-     * 删除协议设置
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("xq:agreementSetting:remove")
-    @Log(title = "协议设置", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(agreementSettingService.removeBatchByIds(Arrays.asList(ids)));
-    }
 }
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/BannerController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/BannerController.java
@@ -42,7 +42,7 @@ public class BannerController extends BaseController {
    @SaCheckPermission("xq:banner:list")
    @GetMapping("/list")
    public TableDataInfo<Banner> list(Banner bo, PageQuery pageQuery) {
-        Page<Banner> page = bannerService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Banner> page = bannerService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByAsc(Banner::getSort));
        return TableDataInfo.build(page);
    }

--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
@@ -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();
    }

    /**
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WithdrawSettingController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/WithdrawSettingController.java
@@ -42,7 +42,7 @@ public class WithdrawSettingController extends BaseController {
    @SaCheckPermission("xq:withdrawSetting:list")
    @GetMapping("/list")
    public TableDataInfo<WithdrawSetting> list(WithdrawSetting bo, PageQuery pageQuery) {
-        Page<WithdrawSetting> page = withdrawSettingService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<WithdrawSetting> page = withdrawSettingService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(WithdrawSetting::getCreateTime));
        return TableDataInfo.build(page);
    }

--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java
@@ -39,7 +39,8 @@ public class HomeAppController {
    @Log(title = "轮播图", businessType = BusinessType.OTHER, isSaveDb = false)
    public R<List<Banner>> banner(){
        List<Banner> list = bannerService.list(Wrappers.lambdaQuery(Banner.class)
-                .eq(Banner::getEnableStatus, 1));
+                .eq(Banner::getEnableStatus, 1)
+                .orderByAsc(Banner::getSort));
        return R.ok(list);
    }
 }