diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java index 1ecad00..68d8527 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java @@ -6,9 +6,7 @@ import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; import com.bnyer.img.domain.Banner; import com.bnyer.img.domain.Feedback; -import com.bnyer.img.dto.BannerDto; -import com.bnyer.img.dto.BannerPageDto; -import com.bnyer.img.dto.FeedBackDto; +import com.bnyer.img.dto.*; import com.bnyer.img.service.FeedBackService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,10 +29,10 @@ public class FeedBackController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="查询feedback分页") - @GetMapping("/page") - public TableDataInfo listFeedBack(){ + @PostMapping("/page") + public TableDataInfo listFeedBack(@RequestBody @ApiParam("feedback分页对象") FeedBackPageDto dto){ startPage(); - List feedback = feedBackService.queryPage("0"); + List feedback = feedBackService.queryPage(dto.getSource()); return getDataTable(feedback); } @@ -46,6 +44,14 @@ public class FeedBackController extends BaseController { return AjaxResult.success(feedBackService.update(dto.extractParam())); } + //@RequiresPermissions("system:config:list") + @ApiOperation(value="变更feedback显示状态") + @PostMapping(value = "/changeStatus") + public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("feedback状态对象") FeedBackStatusDto dto){ + log.debug("变更feedback参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(feedBackService.changeStatus(dto.getId(),dto.getStatus())); + } + //@RequiresPermissions("system:config:list") @ApiOperation(value="删除feedback") @DeleteMapping(value = "/delete/{ids}") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java new file mode 100644 index 0000000..18c3d43 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java @@ -0,0 +1,19 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("feedback分页接收类") +public class FeedBackPageDto implements Serializable { + + @ApiModelProperty(value="平台渠道") + private String source; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackStatusDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackStatusDto.java new file mode 100644 index 0000000..a7d229a --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackStatusDto.java @@ -0,0 +1,25 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("feedback状态接收类") +public class FeedBackStatusDto implements Serializable { + + @ApiModelProperty(value="主键Id") + private Long id; + + @NotNull(message = "状态不能为空!") + @ApiModelProperty(value="状态") + private String status; + + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java index ad2c6f9..ea9de39 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java @@ -40,4 +40,12 @@ public interface FeedBackService { * @return - */ Feedback queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id,String status); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java index 135201d..5f0a4a9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java @@ -1,6 +1,9 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.bnyer.common.core.utils.StringUtils; import com.bnyer.img.domain.Feedback; import com.bnyer.img.mapper.FeedbackMapper; import com.bnyer.img.service.FeedBackService; @@ -39,7 +42,7 @@ public class FeedBackServiceImpl implements FeedBackService { @Override public List queryPage(String source) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Feedback::getSource,source); + wrapper.eq(StringUtils.isNotNull(source),Feedback::getSource,source); return feedbackMapper.selectList(wrapper); } @@ -47,4 +50,13 @@ public class FeedBackServiceImpl implements FeedBackService { public Feedback queryDetails(Long id) { return feedbackMapper.selectById(id); } + + @Override + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Feedback::getId, id); + Feedback feedback = new Feedback(); + feedback.setIsShow(status); + return feedbackMapper.update(feedback,wrapper); + } }