From 99238f44017b8be8fe63ab4644285a1f56e23f94 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 8 Jul 2022 17:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskQuestionsController.java | 6 ++ .../controller/ReplyController.java | 7 ++ .../StandardQA/entity/AskQuestionsPage.java | 29 ++++++++ .../da/slrs/StandardQA/entity/ReplyPage.java | 71 +++++++++++++++++++ .../service/AskQuestionsService.java | 3 + .../slrs/StandardQA/service/ReplyService.java | 5 +- .../service/impl/AskQuestionsServiceImpl.java | 21 ++++++ 7 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/ReplyPage.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index 8d12c060..9a5ecd01 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; +import oracle.ucp.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -55,6 +56,11 @@ public class AskQuestionsController extends BaseController { return Result.success(page); } + @PostMapping("/list") + public ResponseMessage> getAskQuestionslistPage(@RequestBody AskQuestionsPage askQuestions){ + return Result.success(askQuestionsService.listPage(askQuestions)); + } + /** * 查询问题列表 * @return diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java index 0acbaaf4..2a5421d1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java @@ -4,6 +4,7 @@ import com.adc.da.base.web.BaseController; import com.adc.da.common.ConvertMqEO; import com.adc.da.slrs.StandardQA.entity.AskQuestions; import com.adc.da.slrs.StandardQA.entity.Reply; +import com.adc.da.slrs.StandardQA.entity.ReplyPage; import com.adc.da.slrs.StandardQA.service.Impl.ReplyServiceImpl; import com.adc.da.util.UUIDUtils; import com.adc.da.util.http.ResponseMessage; @@ -71,4 +72,10 @@ public class ReplyController extends BaseController { } return Result.success("200","归档成功",null); } + + + @PostMapping("/listByPage") + public ResponseMessage updateReply(@RequestBody ReplyPage reply){ + return Result.success(replyService.listByPage(reply)); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsPage.java index 5c7a974e..7c3ee0f8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsPage.java @@ -1,8 +1,12 @@ package com.adc.da.slrs.StandardQA.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author: qk * @Date: 2022/6/10 0010 14:48 @@ -13,4 +17,29 @@ public class AskQuestionsPage { private Long page; private Long pageSize; + + + @ApiModelProperty(value = "分类") + private String classification; + + @ApiModelProperty(value = "问题描述") + private String problemDescription; + + + @ApiModelProperty(value = "提问人") + private String questioner; + + + @ApiModelProperty(value = "标准编号") + private String standardEncdoing; + + + @ApiModelProperty(value = "标准名称") + private String standardName; + + @ApiModelProperty(value = "标准ID") + private String standardId; + + @ApiModelProperty(value = "标准ID") + private String appendixName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/ReplyPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/ReplyPage.java new file mode 100644 index 00000000..4c1c89bb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/ReplyPage.java @@ -0,0 +1,71 @@ +package com.adc.da.slrs.StandardQA.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.base.page.BasePage; +import com.adc.da.common.ConvertMqEO; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; +import java.util.List; + +/** + * @Author: qk + * @Date: 2022/5/31 0031 9:20 + * @Version 1.0 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="Reply对象", description="") +public class ReplyPage extends BasePage { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "主键") + private String id; + + @TableField("REPLY") + @ApiModelProperty(value = "回答") + private String reply; + + @TableField("STATE") + @ApiModelProperty(value = "状态（0：显示，1：不显示）") + private String state; + + @TableField("REPLY_TIME") + @ApiModelProperty(value = "回答时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date replyTime; + + @TableField("APPENDIX") + @ApiModelProperty(value = "附件") + private String appendix; + + @TableField("ANSWERER") + @ApiModelProperty(value = "回答人") + private String answerer; + + @TableField("ASK_ID") + @ApiModelProperty(value = "问题ID") + private String askId; + + @TableField("APPENDIX_ID") + @ApiModelProperty(value = "附件ID") + private String appendixId; + + @TableField("APPENDIX_NAME") + @ApiModelProperty(value = "附件名称") + private String appendixName; + + @TableField(exist = false) + private List fileList; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java index 6b56667e..36cf94ba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java @@ -2,7 +2,9 @@ package com.adc.da.slrs.StandardQA.service; import com.adc.da.slrs.NewsFeed.entity.NewsFeed; import com.adc.da.slrs.StandardQA.entity.AskQuestions; +import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage; import com.adc.da.slrs.StandardQA.entity.Reply; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -15,6 +17,7 @@ import java.util.List; public interface AskQuestionsService extends IService { List getAskQuestions(AskQuestions askQuestions); + IPage listPage(AskQuestionsPage askQuestions); List getAskQuestionsNew(AskQuestions askQuestions); List getReplyDetails(AskQuestions askQuestions); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/ReplyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/ReplyService.java index 9372a377..f3cad8f2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/ReplyService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/ReplyService.java @@ -1,7 +1,8 @@ package com.adc.da.slrs.StandardQA.service; -import com.adc.da.slrs.StandardQA.entity.AskQuestions; import com.adc.da.slrs.StandardQA.entity.Reply; +import com.adc.da.slrs.StandardQA.entity.ReplyPage; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -10,4 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Version 1.0 */ public interface ReplyService extends IService { + + IPage listByPage(ReplyPage reply); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java index 3c18aeb2..44d486ad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java @@ -3,8 +3,12 @@ package com.adc.da.slrs.StandardQA.service.Impl; import com.adc.da.slrs.StandardQA.dao.AskQuestionsDao; import com.adc.da.slrs.StandardQA.entity.AskQuestions; +import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage; import com.adc.da.slrs.StandardQA.entity.Reply; import com.adc.da.slrs.StandardQA.service.AskQuestionsService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +35,23 @@ public class AskQuestionsServiceImpl extends ServiceImpl listPage(AskQuestionsPage askQuestions) { + Page page=new Page(); + page.setCurrent(askQuestions.getPage()); + page.setSize(askQuestions.getPageSize()); + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(askQuestions.getClassification()),"CLASSIFICATION",askQuestions.getClassification()); + wrapper.like(StringUtils.isNotBlank(askQuestions.getAppendixName()),"APPENDIX_NAME",askQuestions.getAppendixName()); + wrapper.like(StringUtils.isNotBlank(askQuestions.getProblemDescription()),"PROBLEM_DESCRIPTION",askQuestions.getProblemDescription()); + wrapper.eq(StringUtils.isNotBlank(askQuestions.getQuestioner()),"QUESTIONER",askQuestions.getQuestioner()); + wrapper.like(StringUtils.isNotBlank(askQuestions.getStandardEncdoing()),"STANDARD_ENCDOING",askQuestions.getStandardEncdoing()); + wrapper.like(StringUtils.isNotBlank(askQuestions.getStandardName()),"STANDARD_NAME",askQuestions.getStandardName()); + wrapper.eq(StringUtils.isNotBlank(askQuestions.getStandardId()),"STANDARD_ID",askQuestions.getStandardId()); + wrapper.orderByDesc("QUESTION_TIME"); + return askQuestionsDao.selectPage(page,wrapper); + } + @Override public List getReplyDetails(AskQuestions askQuestions) { return askQuestionsDao.getReplyDetails(askQuestions);