FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-06-13 20:54:45 +08:00
parent 94e01ee4ee 3379ac54ca
commit 36c9a0ccd0
4 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java
+1 -1
View File
@@ -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
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+33 -3
View File
@@ -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<Map<String, Object>> 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<Map<String, Object>> 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<Map<String, Object>> 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);
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java
+14
View File
@@ -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<AskQuestions> {
@Autowired
private AskUserServiceImpl askUserService;
@GetMapping("/getAskQuestionsPage")
public ResponseMessage<IPage<AskQuestions>> getAskQuestionsPage(AskQuestionsPage askQuestions){
IPage<AskQuestions> iPage = new Page<>();
iPage.setSize(askQuestions.getPageSize());
iPage.setPages(askQuestions.getPage());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.orderByDesc("QUESTION_TIME");
IPage<AskQuestions> page = askQuestionsService.page(iPage,queryWrapper);
return Result.success(page);
}
/**
* 查询问题列表
* @return
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsPage.java
+16
View File
@@ -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;
}