diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 521a5209..cf1358f1 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -114,7 +114,7 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetAStandSearchCenter"); addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetBLawsSearchCenter"); addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetCBussStandSearchCenter"); - + addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/syncSearchCenterData"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java b/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java index 6790a6c6..76c49725 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java @@ -11,6 +11,9 @@ import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,6 +25,8 @@ import java.util.Map; @Api(description = "搜索中心重置索引及数据+实施预警触发") public class ResetSearchCenterController extends BaseController> { + private static final Logger logger = LoggerFactory.getLogger(ResetSearchCenterController.class); + @Autowired private ResetSearchCenterService resetSearchCenterService; @ApiOperation(value = "|SearchCenter|重新创建ALL标准数据索引") @@ -77,4 +82,35 @@ public class ResetSearchCenterController extends BaseController indexstate = elasticsearchService.searchDataById("stand","stand",standId,null); + if(!indexstate.isEmpty()){ + createStandMQService.sendStandMQ(sarStandardsInfo,"update"); + }else{ + createStandMQService.sendStandMQ(sarStandardsInfo,"add"); + } + } + } + + } + + /** + * 同步添加企业标准搜索中心数据内容 + * @param standId + */ + public void syncBussStandSearchCenterData(String standId) throws Exception { + if(StringUtils.isNotBlank(standId)){ + SarBussionessStand sarBussionessStand = iSarBussionessStandService.selectStandardsInfoByKey(standId); + logger.debug("本次处理的标准信息:"+JSONObject.toJSONString(sarBussionessStand)); + if(sarBussionessStand!=null){ + if (sarBussionessStand.getAttrInfoMap() != null) { + sarBussionessStand.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStand.getAttrInfoMap())); + } + Map indexstate = elasticsearchService.searchDataById("bussstand","bussstand",standId,null); + if(!indexstate.isEmpty()){ + createStandMQService.sendBussStandMQ(sarBussionessStand,"update"); + }else{ + createStandMQService.sendBussStandMQ(sarBussionessStand,"add"); + } + } + } + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 76d1de95..8645ff6f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -70,7 +70,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl standUnqualifiedPage=new Page<>(); //判断前端是否提供页码和每页条数 sarStandUnqualifiedPage.setCloseState(1); - List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); + List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage); standUnqualifiedPage.setRecords(sarStandUnqualifieds); standUnqualifiedPage.setTotal(total); @@ -113,7 +113,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); // } sarStandUnqualifiedPage.setCloseState(2); - List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); + List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage); Page page=new Page(); page.setSize(sarStandUnqualifiedPage.getSize()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java index 3f7f4d93..1049e123 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java @@ -202,7 +202,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl i switch (field) { case "textStatus":return "文本状态"; case "country": return "适用区域"; - case "isRelateAccess": return "重要度"; + case "isRelateAccess": return "是否纳入认证清单"; case "issueTime": return "发布日期"; case "standYear": return "标准年份"; case "standNature": return "标准性质"; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index c6dba835..bb7e0858 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -41,9 +41,9 @@ left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID WHERE sar_public_idea_all.idea_id = #{ideaId} - LIMIT ${(page-1)*size},${size} )c ORDER BY CONVERT(SUBSTRING(c.part_code,1,(SELECT LOCATE('.',CONCAT(c.part_code,'.')))),SIGNED) ,c.rows + LIMIT ${(page-1)*size},${size}