init

2024-03-05 18:57:21 +08:00
parent 779de6cbc1
commit 7e1f31ed2f
65 changed files with 1976 additions and 751 deletions
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/DynamicImageController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/DynamicImageController.java
@@ -1,29 +1,26 @@
 package com.ruoyi.xq.controller;

-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
+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.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.xq.domain.vo.DynamicImageVo;
-import com.ruoyi.xq.domain.bo.DynamicImageBo;
-import com.ruoyi.xq.service.IDynamicImageService;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.xq.domain.DynamicImage;
+import com.ruoyi.xq.service.DynamicImageService;
+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;

 /**
 * 动态图片
@@ -37,27 +34,18 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequestMapping("/xq/dynamicImage")
 public class DynamicImageController extends BaseController {

-    private final IDynamicImageService iDynamicImageService;
+    private final DynamicImageService dynamicImageService;

    /**
     * 查询动态图片列表
     */
    @SaCheckPermission("xq:dynamicImage:list")
    @GetMapping("/list")
-    public TableDataInfo<DynamicImageVo> list(DynamicImageBo bo, PageQuery pageQuery) {
-        return iDynamicImageService.queryPageList(bo, pageQuery);
+    public TableDataInfo<DynamicImage> list(DynamicImage bo, PageQuery pageQuery) {
+        Page<DynamicImage> page = dynamicImageService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
    }

-    /**
-     * 导出动态图片列表
-     */
-    @SaCheckPermission("xq:dynamicImage:export")
-    @Log(title = "动态图片", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(DynamicImageBo bo, HttpServletResponse response) {
-        List<DynamicImageVo> list = iDynamicImageService.queryList(bo);
-        ExcelUtil.exportExcel(list, "动态图片", DynamicImageVo.class, response);
-    }

    /**
     * 获取动态图片详细信息
@@ -66,9 +54,9 @@ public class DynamicImageController extends BaseController {
     */
    @SaCheckPermission("xq:dynamicImage:query")
    @GetMapping("/{id}")
-    public R<DynamicImageVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<DynamicImage> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long id) {
-        return R.ok(iDynamicImageService.queryById(id));
+        return R.ok(dynamicImageService.getById(id));
    }

    /**
@@ -78,8 +66,8 @@ public class DynamicImageController extends BaseController {
    @Log(title = "动态图片", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody DynamicImageBo bo) {
-        return toAjax(iDynamicImageService.insertByBo(bo));
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DynamicImage bo) {
+        return toAjax(dynamicImageService.save(bo));
    }

    /**
@@ -89,8 +77,8 @@ public class DynamicImageController extends BaseController {
    @Log(title = "动态图片", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DynamicImageBo bo) {
-        return toAjax(iDynamicImageService.updateByBo(bo));
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DynamicImage bo) {
+        return toAjax(dynamicImageService.updateById(bo));
    }

    /**
@@ -103,6 +91,6 @@ public class DynamicImageController extends BaseController {
    @DeleteMapping("/{ids}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
                          @PathVariable Long[] ids) {
-        return toAjax(iDynamicImageService.deleteWithValidByIds(Arrays.asList(ids), true));
+        return toAjax(dynamicImageService.removeBatchByIds(Arrays.asList(ids)));
    }
 }
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserExtendController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserExtendController.java
@@ -1,29 +1,26 @@
 package com.ruoyi.xq.controller;

-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
+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.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.xq.domain.vo.UserExtendVo;
-import com.ruoyi.xq.domain.bo.UserExtendBo;
-import com.ruoyi.xq.service.IUserExtendService;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.xq.domain.UserExtend;
+import com.ruoyi.xq.service.UserExtendService;
+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;

 /**
 * 用户邀请
@@ -37,27 +34,18 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequestMapping("/xq/userExtend")
 public class UserExtendController extends BaseController {

-    private final IUserExtendService iUserExtendService;
+    private final UserExtendService userExtendService;

    /**
     * 查询用户邀请列表
     */
    @SaCheckPermission("xq:userExtend:list")
    @GetMapping("/list")
-    public TableDataInfo<UserExtendVo> list(UserExtendBo bo, PageQuery pageQuery) {
-        return iUserExtendService.queryPageList(bo, pageQuery);
+    public TableDataInfo<UserExtend> list(UserExtend bo, PageQuery pageQuery) {
+        Page<UserExtend> page = userExtendService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
    }

-    /**
-     * 导出用户邀请列表
-     */
-    @SaCheckPermission("xq:userExtend:export")
-    @Log(title = "用户邀请", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(UserExtendBo bo, HttpServletResponse response) {
-        List<UserExtendVo> list = iUserExtendService.queryList(bo);
-        ExcelUtil.exportExcel(list, "用户邀请", UserExtendVo.class, response);
-    }

    /**
     * 获取用户邀请详细信息
@@ -66,9 +54,9 @@ public class UserExtendController extends BaseController {
     */
    @SaCheckPermission("xq:userExtend:query")
    @GetMapping("/{id}")
-    public R<UserExtendVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserExtend> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long id) {
-        return R.ok(iUserExtendService.queryById(id));
+        return R.ok(userExtendService.getById(id));
    }

    /**
@@ -78,8 +66,8 @@ public class UserExtendController extends BaseController {
    @Log(title = "用户邀请", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserExtendBo bo) {
-        return toAjax(iUserExtendService.insertByBo(bo));
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserExtend bo) {
+        return toAjax(userExtendService.save(bo));
    }

    /**
@@ -89,8 +77,8 @@ public class UserExtendController extends BaseController {
    @Log(title = "用户邀请", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserExtendBo bo) {
-        return toAjax(iUserExtendService.updateByBo(bo));
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserExtend bo) {
+        return toAjax(userExtendService.updateById(bo));
    }

    /**
@@ -103,6 +91,6 @@ public class UserExtendController extends BaseController {
    @DeleteMapping("/{ids}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
                          @PathVariable Long[] ids) {
-        return toAjax(iUserExtendService.deleteWithValidByIds(Arrays.asList(ids), true));
+        return toAjax(userExtendService.removeBatchByIds(Arrays.asList(ids)));
    }
 }
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/DynamicAppController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/DynamicAppController.java
@@ -0,0 +1,45 @@
+package com.ruoyi.xq.controller.app;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.xq.domain.Dynamic;
+import com.ruoyi.xq.dto.app.dynamic.AddDynamicReq;
+import com.ruoyi.xq.dto.app.dynamic.DynamicListVo;
+import com.ruoyi.xq.dto.app.dynamic.DynamicQuery;
+import com.ruoyi.xq.service.DynamicService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.Registration;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/dynamic")
+@Tag(name = "动态相关接口")
+public class DynamicAppController {
+    @Autowired
+    private DynamicService dynamicService;
+
+    @PostMapping("/add")
+    @Operation(summary = "新增动态")
+    @Log(title = "新增动态", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Void> addDynamic(@RequestBody AddDynamicReq req){
+        req.setUserId(LoginHelper.getUserId());
+        dynamicService.push(req);
+        return R.ok();
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "动态列表-分页")
+    @Log(title = "动态列表-分页", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<List<DynamicListVo>> page(PageQuery pageQuery, DynamicQuery dynamicQuery){
+        Page<DynamicListVo> page = dynamicService.pageApp(pageQuery, dynamicQuery);
+        return R.ok(page.getRecords());
+    }
+}
--- 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
@@ -0,0 +1,28 @@
+package com.ruoyi.xq.controller.app;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.xq.dto.app.user.vo.HomeUserVo;
+import com.ruoyi.xq.service.UserService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/home")
+@Tag(name = "首页相关接口")
+public class HomeAppController {
+    @Autowired
+    private UserService userService;
+    @GetMapping("/user/info")
+    @Operation(summary = "查询用户主页信息")
+    @Log(title = "查询用户主页信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<HomeUserVo> homeUser(Long userId){
+        HomeUserVo vo = userService.homeUser(userId);
+        return R.ok(vo);
+    }
+}
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java
@@ -0,0 +1,111 @@
+package com.ruoyi.xq.controller.app;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.xq.dto.app.common.IdsReq;
+import com.ruoyi.xq.dto.app.user.*;
+import com.ruoyi.xq.dto.app.user.vo.CurrentUserFullInfoVo;
+import com.ruoyi.xq.dto.app.user.vo.CurrentUserInfoVo;
+import com.ruoyi.xq.dto.app.user.vo.UserAuthInfoVo;
+import com.ruoyi.xq.manager.CurrentUserManager;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/current")
+@Tag(name = "当前用户相关接口")
+public class UserAppController {
+    @Autowired
+    private CurrentUserManager currentUserManager;
+
+    @GetMapping("/user/query/homeInfo")
+    @Operation(summary = "当前用户信息")
+    @Log(title = "当前用户信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<CurrentUserInfoVo> homeInfo(){
+        CurrentUserInfoVo vo = currentUserManager.currentBaseInfo();
+        return R.ok(vo);
+    }
+
+    @GetMapping("/user/query/fullInfo")
+    @Operation(summary = "当前用户的详细信息")
+    @Log(title = "当前用户的详细信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<CurrentUserFullInfoVo> fullInfo(){
+        CurrentUserFullInfoVo vo = currentUserManager.currentFullInfo();
+        return R.ok(vo);
+    }
+
+    @GetMapping("/user/query/authInfo")
+    @Operation(summary = "当前用户的认证信息")
+    @Log(title = "当前用户的认证信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<UserAuthInfoVo> authInfo(){
+        UserAuthInfoVo vo = currentUserManager.currentAuthInfo();
+        return R.ok(vo);
+    }
+
+    @PostMapping("/user/update/base")
+    @Operation(summary = "更新用户基本信息")
+    @Log(title = "更新用户基本信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Void> updateBaseInfo(@RequestBody UpdateBaseInfoReq req){
+        currentUserManager.updateBaseInfo(req);
+        return R.ok();
+    }
+
+    @PostMapping("/user/update/auth")
+    @Operation(summary = "更新用户认证信息")
+    @Log(title = "更新用户认证信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Void> updateAuth(@RequestBody UpdateUserAuthInfoReq req){
+        currentUserManager.updateInfoAuth(req);
+        return R.ok();
+    }
+
+    @PostMapping("/user/update/info")
+    @Operation(summary = "更新用户信息")
+    @Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Void> updateInfo(@RequestBody UpdateUserFullInfoReq req){
+        currentUserManager.updateInfo(req);
+        return R.ok();
+    }
+
+    @PostMapping("/user/update/avatar")
+    @Operation(summary = "更新用户头像信息")
+    @Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Void> updateAvatarInfo(@RequestBody UpdateAvatarReq req){
+        currentUserManager.updateAvatar(req.getAvatar());
+        return R.ok();
+    }
+
+    @PostMapping("/user/update/remark")
+    @Operation(summary = "更新用户备注信息")
+    @Log(title = "更新用户备注信息", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Void> updateRemarkInfo(@RequestBody UpdateRemarkReq req){
+        currentUserManager.updateRemark(req.getRemark());
+        return R.ok();
+    }
+
+    @PostMapping("/user/add/picture")
+    @Operation(summary = "新增用户照片")
+    @Log(title = "新增用户照片", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Void> addUserPicture(@RequestBody AddPicturesReq req){
+        currentUserManager.addUserPicture(req);
+        return R.ok();
+    }
+
+    @PostMapping("/user/remove/picture")
+    @Operation(summary = "删除用户照片")
+    @Log(title = "删除用户照片", businessType = BusinessType.OTHER, isSaveDb = false)
+    public R<Void> removeUserPicture(@RequestBody IdsReq req){
+        List<Long> ids = Arrays.stream(req.getIds().split(","))
+                .map(Long::valueOf)
+                .collect(Collectors.toList());
+        currentUserManager.removeUserPictures(ids);
+        return R.ok();
+    }
+
+}