Compare commits

..

No commits in common. "52ca9b3295969a7ea7b4d722e7e272ffa8ec7d2c" and "3e7a30d786497bc20aa9380789d0721b0cd5764d" have entirely different histories.

3 changed files with 2 additions and 41 deletions

View File

@ -10,7 +10,6 @@ import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.request.RequestModel; import com.mcwl.resource.domain.request.RequestModel;
import com.mcwl.resource.domain.request.RequestWorkFlow; import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.domain.vo.MallProductVo; import com.mcwl.resource.domain.vo.MallProductVo;
import com.mcwl.resource.service.ModelImageService;
import com.mcwl.resource.service.ModelService; import com.mcwl.resource.service.ModelService;
import com.mcwl.system.service.ISysUserService; import com.mcwl.system.service.ISysUserService;
import com.mcwl.web.controller.common.OssUtil; import com.mcwl.web.controller.common.OssUtil;
@ -39,9 +38,6 @@ public class MallProductController extends BaseController {
@Autowired @Autowired
private ModelService modelService; private ModelService modelService;
@Autowired
private ModelImageService modelImageService;
/*** /***
* *
@ -149,31 +145,4 @@ public class MallProductController extends BaseController {
return AjaxResult.success(mallProductList); 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);
}
} }

View File

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

View File

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