From dd3692dd92b0e404bf31c95642eaf93148d726a1 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 12 Jun 2023 14:04:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=BE=85=E5=8A=9E=E9=80=9A=E7=9F=A5=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 3 +++ .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++++ .../com/adc/da/workFlow/controller/WorkFlowController.java | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 156970c4..734d8932 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -506,4 +506,7 @@ public interface workFlowFeignClient { void recieveFile(@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId); @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/endPrcName",method = RequestMethod.GET) String endPrcName(@RequestParam("prcName")String prcName,@RequestParam("esId") String esId); + + @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/fushen",method = RequestMethod.GET) + String fushen(); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 2814d8a7..6f12193a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -475,4 +475,8 @@ public class workFlowFeignClientImpl { List mapWrapper = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery); return mapWrapper; } + + public String fushen() { + return workFlowFeignClient.fushen(); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index ce74e290..a6769c8e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1511,4 +1511,9 @@ public class WorkFlowController extends BaseController { return Result.success(); } + @ApiOperation(value = "|复审定时任务测试接口") + @PostMapping("/fushen") + public String fushen(){ + return workFlowFeignClient.fushen(); + } } From efb8e69f026484e5d5783ee0982855c4dc4ddf4d Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 12 Jun 2023 14:35:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=88=A0=E9=99=A4es=E4=B8=AD=E7=9A=84=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E5=92=8C=E4=BC=81=E6=A0=87=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E6=85=8E=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/ResetSearchCenterController.java | 10 ++ .../server/ResetSearchCenterServiceTemp.java | 124 ++++++++++++++++++ .../src/main/resources/mysql/interfaceLog.sql | 7 + 3 files changed, 141 insertions(+) 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 93ea333b..e4fb0d71 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 @@ -175,4 +175,14 @@ public class ResetSearchCenterController extends BaseController r = new ArrayList<>(); + if(stand.isOk() && StringUtils.isNotBlank(stand.getData().toString())){ + r.add(stand.getData().toString()); + } + + SearchCenter bussSearch = new SearchCenter(); + bussSearch.setExecType(searchCenter.getExecType()); + ResponseMessage buss = bussStandSearchCenter(bussSearch); + if(buss.isOk() && StringUtils.isNotBlank(buss.getData().toString())){ + r.add(buss.getData().toString()); + } + + String res = String.join(", ", r); + logger.info(res); + + return Result.success(res); + } + + @Async + public ResponseMessage bussStandSearchCenter(SearchCenter searchCenter)throws Exception { + Boolean getbussstandIndex = elasticsearchService.isIndexExist("bussstand"); + + if(!getbussstandIndex){ + logger.info("ES 不存在索引:bussstand"); + return Result.error("ES 不存在索引:bussstand"); + } + + String search = getSearch(searchCenter); + + List> searchListData = elasticsearchService.searchAll("bussstand",search); + + List esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); + + //如果时自动触发，删除需要根据全部的结果进行数据处理 +// List delList = new ArrayList<>(); +// +// if(!esIdList.isEmpty()){ +// +// List finalStandIdList = null; +// List finalStandIdList1 = finalStandIdList; +// List delDataList = esIdList.stream().filter(num -> !finalStandIdList1.contains(num)) +// .collect(Collectors.toList()); +// // 可以更新IDLIST 删除 ES +// if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ +// delList.addAll(searchCenter.getIdList()); +// }else{ +// delList.addAll(delDataList); +// } +// } +// +// +// if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){ +// elasticsearchService.deleteBatchId(delList,"bussstand"); +// elasticsearchService.deleteBatchId(delList,"fulltextserch"); +// logger.info("重置企标：删除-共"+delList.size()+"条数据"); +// }else{ +// logger.info("重置企标：没有删除数据，但应该删除"+delList.size()+"条数据"); +// } + + if(!esIdList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){ + elasticsearchService.deleteBatchId(esIdList,"bussstand"); + elasticsearchService.deleteBatchId(esIdList,"fulltextserch"); + logger.info("重置企标：删除-共"+esIdList.size()+"条数据"); + }else{ + logger.info("重置企标：没有删除数据，但应该删除"+esIdList.size()+"条数据"); + } + return Result.success("重置企标：删除-共"+esIdList.size()+"条数据"); + + } + + @Async + public ResponseMessage standSearchCenter(SearchCenter searchCenter)throws Exception { + Boolean getStandIndex = elasticsearchService.isIndexExist("stand"); + + if(!getStandIndex){ + logger.info("ES 不存在索引:stand"); + return Result.error("ES 不存在索引:stand"); + } + + String search = getSearch(searchCenter); + + List> searchListData = elasticsearchService.searchAll("stand",search); + + List esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList()); +// +// //如果时自动触发，删除需要根据全部的结果进行数据处理 +// List delList = new ArrayList<>(); +// +// List finalStandIdList = null; +// +// List finalStandIdList1 = finalStandIdList; +// List delDataList = esIdList.stream().filter(num -> !finalStandIdList1.contains(num)) +// .collect(Collectors.toList()); +// // 可以更新IDLIST 删除 ES +// if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty() && "DEL".equals(searchCenter.getExecType().toUpperCase())){ +// delList.addAll(searchCenter.getIdList()); +// }else{ +// delList.addAll(delDataList); +// } +// +// if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){ +// elasticsearchService.deleteBatchId(delList,"stand"); +// elasticsearchService.deleteBatchId(delList,"fulltextserch"); +// logger.info("重置国内外标准：删除-共"+delList.size()+"条数据"); +// }else{ +// logger.info("重置国内外标准：没有删除数据，但应该删除"+delList.size()+"条数据"); +// } + + if(!esIdList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){ + elasticsearchService.deleteBatchId(esIdList,"stand"); + elasticsearchService.deleteBatchId(esIdList,"fulltextserch"); + logger.info("重置国内外标准：删除-共"+esIdList.size()+"条数据"); + }else{ + logger.info("重置国内外标准：没有删除数据，但应该删除"+esIdList.size()+"条数据"); + } + return Result.success("重置国内外标准：删除-共"+esIdList.size()+"条数据"); + } + } diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql index 930ef31a..7d091d5d 100644 --- a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql +++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql @@ -1,5 +1,12 @@ -- 福田 需要通过第三方调用的接口 +--2023-06-012 14:33 +--名称 手动全部删除es中的国内外和企标数据，慎用 +--详情 +--路径 http://39.98.140.126:4201/api/search/resetSearchCenter/deleteES +--参数 json格式 {"execType":"ALL"} +--类型 post + --2023-06-01 09:41 --名称 存在重新技术委员会评审、评审意见修改时将技术委员会评审、评审意见修改的评分更新成0 --详情