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

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-06-29 08:53:42 +08:00
parent 6199f40128 4380b2af06
commit a8e7a28de5
8 changed files with 165 additions and 14 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
+2 -1
View File
@@ -24,7 +24,8 @@ public class SearchCenter {
@NotNull
@ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准," +
" DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）," +
"UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）, UPDNONEXISTENT_TEXTSTATUS (只支持文本查询接口,文本状态高亮字段不同步重置)")
"UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）, UPDNONEXISTENT_TEXTSTATUS (只支持文本查询接口,文本状态高亮字段不同步重置)," +
"UPDNONEXISTENT_NAMEEN (只支持文本查询接口,维护ES 英文字段不存在的数据)")
private String execType;
@NotNull
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+11 -1
View File
@@ -1165,6 +1165,15 @@ public class ResetSearchCenterService {
}
}).collect(Collectors.toList());
esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
}else if("UPDNONEXISTENT_NAMEEN".equals(searchCenter.getExecType().toUpperCase())){
List<Map<String, Object>> filterList = searchListData.stream().filter(stringObjectMap -> {
if(stringObjectMap.get("nameEnTitle") == 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());
}
@@ -1212,7 +1221,8 @@ public class ResetSearchCenterService {
if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase())
|| "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase())
|| "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){
|| "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())
|| "UPDNONEXISTENT_NAMEEN".equals(searchCenter.getExecType().toUpperCase()))){
for(SarBussionessStand sarBussionessStandEO : updList){
countUpdateSuccess++;
bussAttrInfoShowSearchDetails(sarBussionessStandEO);
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
+9
View File
@@ -5,6 +5,7 @@ import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,14 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
}
//----------------回来改----------------------上面的------
@ApiOperation(value = "获取是否存在重复名企标名称接口")
@GetMapping("/getDataByNameAndSort")
public ResponseMessage<Integer> getDataByNameAndSort(EsRevisePlan esRevisePlan){
QueryWrapper qw = new QueryWrapper();
qw.eq("buss_sort",esRevisePlan.getBussSort());
qw.eq("es_name",esRevisePlan.getEsName());
return Result.success(iEsRevisePlanService.count(qw));
}
@ApiOperation(value = "获取是否存在重复名企标名称接口")
@GetMapping("/getDataByName")
public ResponseMessage<Object> getDataByName(EsRevisePlan esRevisePlan){
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+2 -2
View File
@@ -71,10 +71,10 @@ public class EsRevisePlan extends BasePage {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date releaseTime;
@ApiModelProperty(value = "起草责任单位")
@ApiModelProperty(value = "起草责任单位ID")
private String unit;
@ApiModelProperty(value = "起草责任单位ID")
@ApiModelProperty(value = "起草责任单位名称")
private String unitName;
@ApiModelProperty(value = "引入企业标准json(标准id)")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+9 -8
View File
@@ -1568,15 +1568,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
entry.setValue("");
}
if("TXLBBUSS".equals(name)){
String value = entry.getValue().toString();
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("REPLACE(MENU_NAME,' ','')",value.trim());
wrapper.like("PARENT_IDS","aaaaaaaaaaaaaaaaaaaaaa");
List<SarMenuStandard> list = iSarMenuStandardService.list(wrapper);
if(!list.isEmpty()){
newMap.put(name+"MenuId",list.get(0).getId());
if(value1 != null){
String value = entry.getValue().toString();
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("REPLACE(MENU_NAME,' ','')",value.trim());
wrapper.like("PARENT_IDS","aaaaaaaaaaaaaaaaaaaaaa");
List<SarMenuStandard> list = iSarMenuStandardService.list(wrapper);
if(!list.isEmpty()){
newMap.put(name+"MenuId",list.get(0).getId());
}
}
}
if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
String value = entry.getValue().toString();