Merge branch 'feature/my-invitation' into preview

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java

@@ -10,6 +10,7 @@ import com.mcwl.resource.domain.dto.ModelImagePageRes;
 import com.mcwl.resource.domain.request.RequestModel;
 import com.mcwl.resource.domain.request.RequestWorkFlow;
 import com.mcwl.resource.domain.vo.MallProductVo;
+import com.mcwl.resource.service.ModelImageService;
 import com.mcwl.resource.service.ModelService;
 import com.mcwl.system.service.ISysUserService;
 import com.mcwl.web.controller.common.OssUtil;
@@ -38,6 +39,9 @@ public class MallProductController extends BaseController {
     @Autowired
     private ModelService modelService;
 
+    @Autowired
+    private ModelImageService modelImageService;
+
 
     /***
      *
@@ -145,4 +149,31 @@ public class MallProductController extends BaseController {
         return AjaxResult.success(mallProductList);
     }
 
+
+    /**
+     * 我的发布-模型
+     */
+    @PostMapping("/selectByUserIdModel")
+    public AjaxResult selectByUserIdModel(@RequestBody MallProductVo mallProductVo){
+
+        return AjaxResult.success();
+    }
+
+    /**
+     * 我的发布-工作流
+     */
+    @PostMapping("/selectByUserIdWorkFlow")
+    public AjaxResult selectByUserIdWorkFlow(@RequestBody MallProductVo mallProductVo){
+
+        return AjaxResult.success();
+    }
+
+    /**
+     * 我的发布-图片
+     */
+    @PostMapping("/selectByUserIdImage")
+    public TableDataInfo selectByUserIdImage(@RequestBody ModelImagePageRes imagePageRes){
+
+        return modelImageService.listByPage(imagePageRes);
+    }
 }

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelCommentController.java

@@ -1,5 +1,6 @@
 package com.mcwl.web.controller.resource;
 
+import com.mcwl.common.annotation.RepeatSubmit;
 import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.resource.domain.ModelComment;
 import com.mcwl.resource.domain.vo.ModelCommentVo;
@@ -36,6 +37,7 @@ public class ModelCommentController {
     /**
      * 模型点赞/取消
      */
+    @RepeatSubmit
     @GetMapping("/modelLike/{modelId}")
     public AjaxResult like(@PathVariable Long imageId) {
         modelLikeService.like(imageId);
@@ -55,6 +57,7 @@ public class ModelCommentController {
     /**
      * 模型评论点赞/取消
      */
+    @RepeatSubmit
     @GetMapping("/commentLike/{commentId}")
     public AjaxResult commentLike(@PathVariable Long commentId) {
         modelCommentLikeService.like(commentId);

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java

@@ -1,8 +1,10 @@
 package com.mcwl.web.controller.resource;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.mcwl.common.annotation.RepeatSubmit;
 import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.domain.entity.SysUser;
+import com.mcwl.common.core.page.PageDomain;
 import com.mcwl.common.core.page.TableDataInfo;
 import com.mcwl.common.utils.SecurityUtils;
 import com.mcwl.common.utils.oss.OssUtil;
@@ -48,8 +50,9 @@ public class ModelImageController {
      * 图片列表
      */
     @PostMapping("/list")
-    public TableDataInfo list(@RequestBody ModelImagePageRes imagePageRes) {
+    public TableDataInfo list(@RequestBody PageDomain pageDomain) {
-
+        ModelImagePageRes imagePageRes = new ModelImagePageRes();
+        BeanUtil.copyProperties(pageDomain, imagePageRes);
         return modelImageService.listByPage(imagePageRes);
     }
 
@@ -112,6 +115,7 @@ public class ModelImageController {
     /**
      * 图片点赞/取消
      */
+    @RepeatSubmit
     @GetMapping("/imageLike/{imageId}")
     public AjaxResult like(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) {
         modelImageLikeService.like(imageId);
@@ -131,6 +135,7 @@ public class ModelImageController {
     /**
      * 图片评论点赞/取消
      */
+    @RepeatSubmit
     @GetMapping("/commentLike/{commentId}")
     public AjaxResult commentLike(@PathVariable @NotNull(message = "评论id不能为空") Long commentId) {
         modelImageCommentLikeService.like(commentId);