From 4f285b71bb1b35476fe6222136f86e8260203a39 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 11 Jun 2022 19:58:36 +0800 Subject: [PATCH 1/2] feat: There is no way the, Es --- .../com/adc/da/search/bean/SearchCenter.java | 2 +- .../server/ResetSearchCenterService.java | 36 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java index f6451a54..72bb9e1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java @@ -24,7 +24,7 @@ public class SearchCenter { @NotNull @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准," + " DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）," + - "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）") + "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）, UPDNONEXISTENT_TEXTSTATUS (只支持文本查询接口,文本状态高亮字段不同步重置)") private String execType; @NotNull diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index ce54fe20..a63a9fbe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -275,6 +275,15 @@ public class ResetSearchCenterService { } }).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); + }else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){ + List> filterList = searchListData.stream().filter(stringObjectMap -> { + if(stringObjectMap.get("textStatusFull") == null){ + return true; + }else { + return false; + } + }).collect(Collectors.toList()); + esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); }else { esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); } @@ -317,7 +326,8 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()) + || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){ for(SarStandardsInfo sarStandardsInfoEO : updList){ countUpdateSuccess++; standFunc(sarStandardsInfoEO); @@ -550,6 +560,15 @@ public class ResetSearchCenterService { } }).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); + }else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){ + List> filterList = searchListData.stream().filter(stringObjectMap -> { + if(stringObjectMap.get("textStatusFull") == null){ + return true; + }else { + return false; + } + }).collect(Collectors.toList()); + esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); }else { esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); } @@ -592,7 +611,8 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()) + || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){ for(SarLawsStandInfo sarLawsInfoEO : updList){ countUpdateSuccess++; lawsAttrInfoShowSearchDetails(sarLawsInfoEO); @@ -885,6 +905,15 @@ public class ResetSearchCenterService { } }).collect(Collectors.toList()); esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); + }else if("UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())){ + List> filterList = searchListData.stream().filter(stringObjectMap -> { + if(stringObjectMap.get("textStatusFull") == null){ + return true; + }else { + return false; + } + }).collect(Collectors.toList()); + esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); }else { esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); } @@ -931,7 +960,8 @@ public class ResetSearchCenterService { } if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase()) - || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()))){ + || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase()) + || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){ for(SarBussionessStand sarBussionessStandEO : updList){ countUpdateSuccess++; bussAttrInfoShowSearchDetails(sarBussionessStandEO); From 3379ac54ca25ba88853a03dbf8998b42ffdbe0e8 Mon Sep 17 00:00:00 2001 From: qk <1005180704@qq。com> Date: Mon, 13 Jun 2022 08:56:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?insert=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=97=AE=E7=AD=94=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3/getAskQuestionsPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskQuestionsController.java | 14 ++++++++++++++ .../slrs/StandardQA/entity/AskQuestionsPage.java | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsPage.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 6bef0f92..ca29ecb4 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 @@ -4,6 +4,7 @@ import com.adc.da.base.web.BaseController; import com.adc.da.slrs.NewsFeed.entity.NewsFeed; 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.AskUser; import com.adc.da.slrs.StandardQA.entity.Reply; import com.adc.da.slrs.StandardQA.entity.Subscription; @@ -13,6 +14,8 @@ import com.adc.da.util.UUIDUtils; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -43,6 +46,17 @@ public class AskQuestionsController extends BaseController { @Autowired private AskUserServiceImpl askUserService; + @GetMapping("/getAskQuestionsPage") + public ResponseMessage> getAskQuestionsPage(AskQuestionsPage askQuestions){ + IPage iPage = new Page<>(); + iPage.setSize(askQuestions.getPageSize()); + iPage.setPages(askQuestions.getPage()); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByDesc("QUESTION_TIME"); + IPage page = askQuestionsService.page(iPage,queryWrapper); + return Result.success(page); + } + /** * 查询问题列表 * @return 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 new file mode 100644 index 00000000..5c7a974e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsPage.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.StandardQA.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +/** + * @Author: qk + * @Date: 2022/6/10 0010 14:48 + * @Version 1.0 + */ +@Data +public class AskQuestionsPage { + + private Long page; + private Long pageSize; +}