From fd887d10fdecdfa7a2ba9ccabf5846f389ce41b0 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Mon, 26 Sep 2022 17:37:12 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 4 ++ .../search/service/ElasticsearchService.java | 2 + .../impl/ElasticsearchServiceImpl.java | 31 +++++++++++ .../search/ResetSearchCenterController.java | 11 ++++ .../server/ResetSearchCenterService.java | 52 +++++++++++++++++++ 5 files changed, 100 insertions(+) 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 85a82ac0..8304ea9d 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 @@ -153,6 +153,10 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/sysLog/sys-log/exportSysLogExcelVOExcelData"); + + addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetALLSearchCenterForExits"); + + //// //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/ElasticsearchService.java b/adc-da-search/src/main/java/com/adc/da/search/service/ElasticsearchService.java index 3ee60980..861693dc 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/ElasticsearchService.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/ElasticsearchService.java @@ -124,6 +124,8 @@ public interface ElasticsearchService { List> searchAll(String index,String search); + List> searchAllForExists(String index,String search); + /** * 使用分词查询 * diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java index f49aae44..f2a1780a 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java @@ -310,6 +310,37 @@ public class ElasticsearchServiceImpl implements ElasticsearchService { } + /** + * 使用索引查询所有 + */ + @Override + public List> searchAllForExists(String index,String search) { + List> sourceList = new ArrayList>(); + + //1、指定es集群 cluster.name 是固定的key值，my-application是ES集群的名称 +// Settings settings = Settings.builder().put("cluster.name", "my-application").build(); + BoolQueryBuilder boolQueryMustNot = QueryBuilders.boolQuery(); + QueryBuilder qBuilder = boolQueryMustNot.mustNot(QueryBuilders.existsQuery("titleBig")); + SearchResponse sResponse = client.prepareSearch(index) + .setQuery(qBuilder).setTrackTotalHits(true) + .get(); + SearchHits hits = sResponse.getHits(); + if(hits.getTotalHits().value > 0){ +// QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery(""); +// if(StringUtils.isNotBlank(search) && "fulltextserch".equals(index)){ +// queryBuilder1 = QueryBuilders.multiMatchQuery(search, +// "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" +// ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); +// } + SearchResponse scrollResp = search(index,qBuilder, 1,(int) hits.getTotalHits().value); + for (SearchHit hit : scrollResp.getHits()) { + sourceList.add(hit.getSourceAsMap()); + } + } + return sourceList; + } + + public SearchResponse search(String index, QueryBuilder query,int page, int size) { updateIndex(index, page,size); 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 07a0e863..32d90d5b 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 @@ -61,6 +61,17 @@ public class ResetSearchCenterController extends BaseController r = new ArrayList<>(); + if(stand.isOk() && StringUtils.isNotBlank(stand.getData().toString())){ + r.add(stand.getData().toString()); + } + String res = String.join(", ", r); + logger.info(res); + + return Result.success(res); + } + @Async public ResponseMessage syncResetALLSearchCenter(SearchCenter searchCenter) throws Exception{ Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch"); @@ -622,6 +646,34 @@ public class ResetSearchCenterService { } + //重建国内外标准 + @Async + public ResponseMessage resetfulltextForExists(SarStandardsInfoEOPage page,SearchCenter searchCenter) throws Exception{ + + int countUpdateSuccess = 0; + int countAddSuccess = 0; + + Boolean getStandIndex = elasticsearchService.isIndexExist("stand"); + + if(!getStandIndex){ + logger.info("ES 不存在索引:stand"); + return Result.error("ES 不存在索引:stand"); + } + + String search = getSearch(searchCenter); + String result = "error"; + List> searchListData = elasticsearchService.searchAllForExists("fulltextserch",search); + for (Map map : searchListData) { + String title = String.valueOf(map.get("title")); + if (!"".equals(title) && !"null".equals(title)) { + map.put("titleBig",title.toUpperCase()); + } + result = elasticsearchService.updateDataByIdForMap(map, "fulltextserch", "fulltextserch", String.valueOf(map.get("id"))); + } + return Result.success(result); + + } + //重建国内外标准 @Async public ResponseMessage resetStandSearchCenterId(SarStandardsInfoEOPage page,SearchCenter searchCenter) throws Exception{ From 11eee9ec03c72326deebe4b71bfb21db30b37190 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 27 Sep 2022 10:59:57 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 2cec40fa..f287302c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -291,7 +291,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl srcxList = new ArrayList<>(); - if (!srcx.contains("[")){ + if (null != srcx && !srcx.contains("[")){ String[] srcxArray = srcx.split(","); for (String srcxString : srcxArray){ String ss = dicTypeMap.get(srcxString); From 556166090cab5d5e6f846f80e7b95d695bda900d Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 27 Sep 2022 14:27:33 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 14f076a5..dfcf4f39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -126,7 +126,8 @@ public class ScheduledJob { logger.info("========================================================================================================"); logger.info("========================================================================================================"); //删除不在预警范围的标准 - int remove = sarStandardWarningDao.autoCancelWarning(); +// int remove = sarStandardWarningDao.autoCancelWarning(); + int remove = sarStandardWarningDao.delete(null); log.info("开始修整"+new Date()+"!"); try { Thread.sleep(20000); @@ -209,6 +210,11 @@ public class ScheduledJob { //清空标准的日期子表 iWarningDateService.remove(null); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } // 保存进入标准的日期子表 保存标准的实施日期 新车型实施日期 在产车实施日期 多个 iWarningDateService.saveBatch(data); //联接标准的日期子表 和分解单表 查询符合预警期限的标准和分解项 From a26274ac9c5dc44a1c9786a81bc2da55992366e0 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 27 Sep 2022 14:54:31 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E9=80=82=E7=94=A8=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index f287302c..26eb926a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -304,6 +304,13 @@ public class SarStandItemsServiceImpl extends ServiceImpl Date: Tue, 27 Sep 2022 15:53:27 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/util/InitStandAttrSearchUtil.java | 2 + .../adc/da/scheduled/ScheduledJobRunner.java | 27 ++++++ .../com/adc/da/search/conf/SchedulerConf.java | 88 +++++++++++++++++++ .../tsTask/controller/TbTaskController.java | 11 +++ .../com/adc/da/slrs/tsTask/entity/TbTask.java | 3 + 5 files changed, 131 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJobRunner.java diff --git a/adc-da-search/src/main/java/com/adc/da/search/util/InitStandAttrSearchUtil.java b/adc-da-search/src/main/java/com/adc/da/search/util/InitStandAttrSearchUtil.java index 3caafc2e..c0ee1a8d 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/util/InitStandAttrSearchUtil.java +++ b/adc-da-search/src/main/java/com/adc/da/search/util/InitStandAttrSearchUtil.java @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; +import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import java.math.BigDecimal; @@ -24,6 +25,7 @@ import java.util.Map; */ @Component +@Order(value = 1) public class InitStandAttrSearchUtil implements ApplicationRunner { private static final Logger logger = LoggerFactory.getLogger(InitStandAttrSearchUtil.class); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJobRunner.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJobRunner.java new file mode 100644 index 00000000..b707764b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJobRunner.java @@ -0,0 +1,27 @@ +package com.adc.da.scheduled; + + +import com.adc.da.search.conf.SchedulerConf; +import com.adc.da.search.util.InitStandAttrSearchUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +@Component +@Order(value = 2) +public class ScheduledJobRunner implements ApplicationRunner { + + private static final Logger logger = LoggerFactory.getLogger(ScheduledJobRunner.class); + + @Autowired + private SchedulerConf schedulerConf; + + @Override + public void run(ApplicationArguments args) throws Exception { + schedulerConf.startByIp(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java index 6b161dcf..6fac8108 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java @@ -15,7 +15,12 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Component; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; import java.util.Date; +import java.util.Enumeration; import java.util.List; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; @@ -107,6 +112,89 @@ public class SchedulerConf { log.info("{}，任务停止...",taskId); } + /** + * 根据ip开启定时任务 + */ + public void startByIp() throws Exception{ +// InetAddress addr = InetAddress.getLocalHost(); +// log.info("Local HostAddress: "+addr.getHostAddress()); +// String hostname = addr.getHostName(); +// log.info("Local host name: "+hostname); + String addr = getIpAddress(); + log.info("本机ip地址：" + addr); + //查询 + List tbTaskList = tbTaskDao.selectList(null); + for (TbTask tbTask : tbTaskList) { + if (addr.equals(tbTask.getIp())) { + this.start(tbTask.getId()); + log.info("执行了:"+tbTask.getTaskDesc()); + } + } + } + + private static String getIpAddress(){ + try{ + Enumeration allNetInterfaces = NetworkInterface.getNetworkInterfaces(); + while (allNetInterfaces.hasMoreElements()){ + NetworkInterface netInterface = (NetworkInterface) allNetInterfaces.nextElement(); + Enumeration addresses = netInterface.getInetAddresses(); + while (addresses.hasMoreElements()){ + InetAddress ip = (InetAddress) addresses.nextElement(); + if (ip != null + && ip instanceof Inet4Address + && !ip.isLoopbackAddress() //loopback地址即本机地址，IPv4的loopback范围是127.0.0.0 ~ 127.255.255.255 + && ip.getHostAddress().indexOf(":")==-1){ + System.out.println("本机的IP = " + ip.getHostAddress()); + return ip.getHostAddress(); + } + } + } + }catch(Exception e){ + e.printStackTrace(); + } + return null; + } + /** 获取主机地址 */ + public static String getHostIp(){ + + String realIp = null; + + try { + InetAddress address = InetAddress.getLocalHost(); + + // 如果是回环网卡地址, 则获取ipv4 地址 + if (address.isLoopbackAddress()) { + address = getInet4Address(); + } + + realIp = address.getHostAddress(); + + log.info("获取主机ip地址成功, 主机ip地址:{}", address); + return address.getHostAddress(); + } catch (Exception e) { + log.error("获取主机ip地址异常", e); + } + + return realIp; + } + + /** 获取IPV4网络配置 */ + private static InetAddress getInet4Address() throws SocketException { + // 获取所有网卡信息 + Enumeration networkInterfaces = NetworkInterface.getNetworkInterfaces(); + while (networkInterfaces.hasMoreElements()) { + NetworkInterface netInterface = (NetworkInterface) networkInterfaces.nextElement(); + Enumeration addresses = netInterface.getInetAddresses(); + while (addresses.hasMoreElements()) { + InetAddress ip = (InetAddress) addresses.nextElement(); + if (ip instanceof Inet4Address) { + return ip; + } + } + } + return null; + } + /** * 更新数据库动态定时任务状态 */ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java index ac5138bc..cd31f36c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import java.lang.reflect.Field; +import java.net.InetAddress; import java.util.ArrayList; import java.util.List; @@ -54,6 +55,16 @@ public class TbTaskController extends BaseController { return "操作成功"; } + /** + * 根据ip开启定时任务 + * http://localhost:10085/tbTask + */ + @GetMapping("startByIp/{taskId}") + public String startByIp() throws Exception{ + schedulerConf.startByIp(); + return "操作成功"; + } + /** * 更新一个动态定时任务 * http://localhost:10085/tbTask/save?taskId=2&taskExp=0/2 * * * * ?&taskClass=cn.huanzi.qch.springboottimer.task.MyRunnable3 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/entity/TbTask.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/entity/TbTask.java index fcd393de..5da780f7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/entity/TbTask.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/entity/TbTask.java @@ -45,6 +45,9 @@ public class TbTask extends BaseEntity { @ApiModelProperty(value = "定时任务状态，0停用 1启用") private Integer taskStatus; + @ApiModelProperty(value = "ip地址") + private String ip; + @ApiModelProperty(value = "定时任务的Runnable任务类完整路径") private String taskClass; From 950c78575b6a5b6084be6fe0ebdfa4b37f2ab55f Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 27 Sep 2022 16:16:22 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/search/conf/SchedulerConf.java | 110 ++++++------------ 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java index 6fac8108..7e4b0cae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java @@ -18,16 +18,12 @@ import org.springframework.stereotype.Component; import java.net.Inet4Address; import java.net.InetAddress; import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Date; -import java.util.Enumeration; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; /** - * 动态定时器 + * 动态定时器 */ @Slf4j @Component @@ -52,7 +48,7 @@ public class SchedulerConf { * 初始化线程池任务调度 */ @Autowired - public SchedulerConf(){ + public SchedulerConf() { this.threadPoolTaskScheduler.setPoolSize(50); this.threadPoolTaskScheduler.setThreadNamePrefix("task-thread-"); this.threadPoolTaskScheduler.setWaitForTasksToCompleteOnShutdown(true); @@ -62,17 +58,17 @@ public class SchedulerConf { /** * 获取所有数据库里的定时任务 */ - private void getAllTbTask(){ + private void getAllTbTask() { //查询所有，并put到tasks SchedulerConf.tasks.clear(); List list = iTbTaskService.list(); - list.forEach((task)-> SchedulerConf.tasks.put(task.getId(),task)); + list.forEach((task) -> SchedulerConf.tasks.put(task.getId(), task)); } /** * 根据定时任务id，启动定时任务 */ - public void start(String taskId){ + public void start(String taskId) { try { //重新获取最新执行任务周期 this.getAllTbTask(); @@ -81,7 +77,7 @@ public class SchedulerConf { //获取并实例化Runnable任务类 Class clazz = Class.forName(tbTask.getTaskClass()); - Runnable runnable = (Runnable)clazz.newInstance(); + Runnable runnable = (Runnable) clazz.newInstance(); //Cron表达式 CronTrigger cron = new CronTrigger(tbTask.getTaskExp()); @@ -89,11 +85,11 @@ public class SchedulerConf { //执行，并put到runTasks SchedulerConf.runTasks.put(taskId, Objects.requireNonNull(this.threadPoolTaskScheduler.schedule(runnable, cron))); - this.updateTaskStatus(taskId,1); + this.updateTaskStatus(taskId, 1); - log.info("{}，任务启动！",taskId); + log.info("{}，任务启动！", taskId); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { - log.error("{}，任务启动失败...",taskId); + log.error("{}，任务启动失败...", taskId); e.printStackTrace(); } @@ -102,95 +98,65 @@ public class SchedulerConf { /** * 根据定时任务id，停止定时任务 */ - public void stop(String taskId){ + public void stop(String taskId) { SchedulerConf.runTasks.get(taskId).cancel(true); SchedulerConf.runTasks.remove(taskId); - this.updateTaskStatus(taskId,0); + this.updateTaskStatus(taskId, 0); - log.info("{}，任务停止...",taskId); + log.info("{}，任务停止...", taskId); } /** * 根据ip开启定时任务 */ - public void startByIp() throws Exception{ + public void startByIp() throws Exception { // InetAddress addr = InetAddress.getLocalHost(); // log.info("Local HostAddress: "+addr.getHostAddress()); // String hostname = addr.getHostName(); // log.info("Local host name: "+hostname); - String addr = getIpAddress(); - log.info("本机ip地址：" + addr); + List addr = getIpAddress(); //查询 List tbTaskList = tbTaskDao.selectList(null); for (TbTask tbTask : tbTaskList) { - if (addr.equals(tbTask.getIp())) { - this.start(tbTask.getId()); - log.info("执行了:"+tbTask.getTaskDesc()); + if (addr == null){ + log.error("本机地址未获取到！！"); + break; + } + String ips = tbTask.getIp(); + String[] ipArray = ips.split(","); + for (String realIp : ipArray) { + if (addr.contains(realIp)) { + log.info("本机ip地址：" + addr); + this.start(tbTask.getId()); + log.info("执行了:" + tbTask.getTaskDesc()); + } } } } - private static String getIpAddress(){ - try{ + private static List getIpAddress() { + try { + List ips = new ArrayList<>(); Enumeration allNetInterfaces = NetworkInterface.getNetworkInterfaces(); - while (allNetInterfaces.hasMoreElements()){ + while (allNetInterfaces.hasMoreElements()) { NetworkInterface netInterface = (NetworkInterface) allNetInterfaces.nextElement(); Enumeration addresses = netInterface.getInetAddresses(); - while (addresses.hasMoreElements()){ + while (addresses.hasMoreElements()) { InetAddress ip = (InetAddress) addresses.nextElement(); if (ip != null && ip instanceof Inet4Address && !ip.isLoopbackAddress() //loopback地址即本机地址，IPv4的loopback范围是127.0.0.0 ~ 127.255.255.255 - && ip.getHostAddress().indexOf(":")==-1){ - System.out.println("本机的IP = " + ip.getHostAddress()); - return ip.getHostAddress(); + && ip.getHostAddress().indexOf(":") == -1) { + log.info("本机的IP = " + ip.getHostAddress()); + ips.add(ip.getHostAddress()); } } } - }catch(Exception e){ - e.printStackTrace(); - } - return null; - } - /** 获取主机地址 */ - public static String getHostIp(){ - - String realIp = null; - - try { - InetAddress address = InetAddress.getLocalHost(); - - // 如果是回环网卡地址, 则获取ipv4 地址 - if (address.isLoopbackAddress()) { - address = getInet4Address(); - } - - realIp = address.getHostAddress(); - - log.info("获取主机ip地址成功, 主机ip地址:{}", address); - return address.getHostAddress(); + return ips; } catch (Exception e) { - log.error("获取主机ip地址异常", e); - } - - return realIp; - } - - /** 获取IPV4网络配置 */ - private static InetAddress getInet4Address() throws SocketException { - // 获取所有网卡信息 - Enumeration networkInterfaces = NetworkInterface.getNetworkInterfaces(); - while (networkInterfaces.hasMoreElements()) { - NetworkInterface netInterface = (NetworkInterface) networkInterfaces.nextElement(); - Enumeration addresses = netInterface.getInetAddresses(); - while (addresses.hasMoreElements()) { - InetAddress ip = (InetAddress) addresses.nextElement(); - if (ip instanceof Inet4Address) { - return ip; - } - } + e.printStackTrace(); } return null; } @@ -198,7 +164,7 @@ public class SchedulerConf { /** * 更新数据库动态定时任务状态 */ - private void updateTaskStatus(String taskId,int status){ + private void updateTaskStatus(String taskId, int status) { TbTask task = iTbTaskService.getById(taskId); task.setTaskStatus(status); task.setUpdateTime(new Date()); From 9722851ada64e19a921d78201b516400fdcc2f71 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 28 Sep 2022 09:21:36 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=8A=82=E7=82=B9=E6=B7=BB=E5=8A=A0=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 2 + .../SarPublicIdeaAllController.java | 66 +++++++++++++++++++ .../service/ISarPublicIdeaAllService.java | 3 + .../Impl/SarPublicIdeaAllServiceImpl.java | 25 +++++++ 4 files changed, 96 insertions(+) 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 8304ea9d..0ade319e 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 @@ -75,6 +75,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //标准征求意见导出 addInterceptor.excludePathPatterns("/api/slrs/sar-public-idea-all/tuallStand"); + // 标准征求意见流程意见导出 + addInterceptor.excludePathPatterns("/api/slrs/sar-public-idea-all/tuallStandYJCL"); //标准法规清单导出 addInterceptor.excludePathPatterns("/api/sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById"); //标准法规清单车型导出 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index d48e99c5..10b03d84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -9,6 +9,7 @@ import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl; import com.adc.da.utils.removeHtml.RemoveHtml; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Lists; @@ -211,4 +212,69 @@ public class SarPublicIdeaAllController extends BaseController } } + + @ApiOperation(value = "导出全部意见-标准意见征求流程-意见处理节点") + @PostMapping("/tuallStandYJCL") + public void getAllStandYJCL(HttpServletResponse response, @RequestBody Map params){ + try { + JSONArray jsonArray = JSON.parseArray(params.get("json")); + List data = sarPublicIdeaAllImpl.getPublicAllIdeaYJCL(jsonArray); + + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + String textName="流程意见详情"; + + Map map=new HashMap<>(); + map.put("1","上报"); + map.put("2","处理后上报"); + map.put("3","不上报"); + String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + + List standExcel=new ArrayList<>(); + int i=0; + for (SarPublicIdeaAll sarPublicIdeaAll:data){ + i++; + GetExcelDto getExcelDto = GetExcelDto.builder() + .partCode(sarPublicIdeaAll.getPartCode()) + .oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText())) + .newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText())) + .reason(sarPublicIdeaAll.getReason()) + .userName(sarPublicIdeaAll.getUserName()) + .deptName(sarPublicIdeaAll.getDeptName()) + .state(map.get(sarPublicIdeaAll.getState())) + .cause(sarPublicIdeaAll.getCause()) + .sourceType(sarPublicIdeaAll.getSourceType()) + .partName(sarPublicIdeaAll.getChapterName()) + .num(String.valueOf(i)) + .build(); + standExcel.add(getExcelDto); + } + + List> headList=new ArrayList>(); + headList.add(Lists.newArrayList("序号")); + headList.add(Lists.newArrayList("章节编号")); + headList.add(Lists.newArrayList("章节名称")); + headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改前")); + headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改后")); + headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); + headList.add(Lists.newArrayList("提出部门")); + headList.add(Lists.newArrayList("提出人")); + headList.add(Lists.newArrayList("处理意见")); + headList.add(Lists.newArrayList("原因")); + headList.add(Lists.newArrayList("来源")); + EasyExcel.write(response.getOutputStream(), GetExcelDto.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(standExcel); + + } catch (Exception e) { + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + try { + response.getWriter().println(JSON.toJSONString(Result.error())); + } catch (IOException ioException) { + ioException.printStackTrace(); + } + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java index dfdb027e..f46b571f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java @@ -5,10 +5,12 @@ import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAllSUD; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** *

@@ -27,4 +29,5 @@ public interface ISarPublicIdeaAllService extends IService { String delete(DelStandDto delStandDto); String del(String id); String checkIsShow(DetAllStandDto detAllStandDto); + List getPublicAllIdeaYJCL(JSONArray info); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 7f77d294..b837c7e3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -8,6 +8,9 @@ import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaAllService; import com.adc.da.sys.entity.LoginInfoEO; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -162,4 +165,26 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl getPublicAllIdeaYJCL(JSONArray info) { + List publicList = new ArrayList<>(); + + for (Object object : info) { + JSONObject jsonObject = (JSONObject) object; + SarPublicIdeaAll sarPublicIdeaAll = new SarPublicIdeaAll(); + sarPublicIdeaAll.setPartCode(jsonObject.getString("chapterNumber")); + sarPublicIdeaAll.setOldText(jsonObject.getString("oldText")); + sarPublicIdeaAll.setNewText(jsonObject.getString("newText")); + sarPublicIdeaAll.setReason(jsonObject.getString("reason")); // 修改理由 + sarPublicIdeaAll.setUserName(jsonObject.getString("responUserName")); + sarPublicIdeaAll.setDeptName(jsonObject.getString("department")); + sarPublicIdeaAll.setState(jsonObject.getString("state")); // 处理意见 + sarPublicIdeaAll.setCause(jsonObject.getString("cause")); // 原因 + sarPublicIdeaAll.setSourceType(jsonObject.getString("sourceType")); + sarPublicIdeaAll.setChapterName(jsonObject.getString("chapterName")); + + publicList.add(sarPublicIdeaAll); + } + return publicList; + } } From 80c7602e11d644e609d7e8e5de262eeddc2296fa Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Wed, 28 Sep 2022 10:04:35 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=8D=95=E5=85=83=E5=8F=98=E5=9E=8B=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index 3ccd1ab0..d2539f51 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -276,8 +276,8 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append(" "); - contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" "); - contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" "); +// contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" "); +// contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" "); contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append(" "); contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append(" "); From 3ef12b62bf50e6e4fe1e059013fcc1f047fcfc6b Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 28 Sep 2022 12:12:20 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E5=A1=AB=E5=86=99=E8=AF=84=E4=BC=B0=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/controller/SarStandItemsController.java | 7 ++++++- .../adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java | 2 ++ .../service/impl/SarStandItemsServiceImpl.java | 8 ++++++++ .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 7 +++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index a870eb5f..1446b057 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -145,5 +145,10 @@ public class SarStandItemsController extends BaseController { return Result.success(fileType); } - + @ApiOperation(value = "项目合规评估流程-项目-分解单条款内容查询") + @PostMapping("/findTermsConditions") + public ResponseMessage findTermsConditions( @RequestParam("idList") List idList){ + List ItemDto = ServiceImpl.findTermsConditions(idList); + return Result.success("200",ItemDto); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 4f66254b..7cec98f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -82,4 +82,6 @@ public interface SarStandItemsDao extends BaseMapper { List getFileType(@Param("standId") String standId); List getFileTypeHG(@Param("standId") String standId); + + List findTermsConditions(@Param("idList") List idsList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 26eb926a..2204a86d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -343,4 +343,12 @@ public class SarStandItemsServiceImpl extends ServiceImpl findTermsConditions(List idsList) { + List sarStandItemsDtos = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(idsList)) { + sarStandItemsDtos = sarStandItemsDao.findTermsConditions(idsList); + } + return sarStandItemsDtos; + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index a333b0fc..ae17f0f1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -811,4 +811,11 @@ + + From 12c93f4a21cb3e0d6809ab9ed5e59c8df5ca83ea Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 28 Sep 2022 14:27:57 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E5=A1=AB=E5=86=99=E8=AF=84=E4=BC=B0=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandItems/controller/SarStandItemsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 1446b057..6b6847e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -147,7 +147,7 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "项目合规评估流程-项目-分解单条款内容查询") @PostMapping("/findTermsConditions") - public ResponseMessage findTermsConditions( @RequestParam("idList") List idList){ + public ResponseMessage findTermsConditions( @RequestParam(name = "idList", required = false) List idList){ List ItemDto = ServiceImpl.findTermsConditions(idList); return Result.success("200",ItemDto); } From 107a58b857b54a9e38251308b02ca7bc09d214be Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Wed, 28 Sep 2022 15:38:55 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=A0=91=E7=BB=93=E6=9E=84=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E8=BF=99=E5=9D=97=E9=80=BB=E8=BE=91=E4=B8=8D=E6=98=8E?= =?UTF-8?q?=E7=99=BD=EF=BC=8C=E6=9A=82=E6=97=B6=E4=B8=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=BC=95=E8=B5=B7=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java | 4 ++++ .../sarResource/service/impl/TsResourceServiceImpl.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java index c1337157..a5d69489 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java @@ -2,8 +2,10 @@ package com.adc.da.slrs.sarBussStandMenu.dao; import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import javax.validation.constraints.Past; import java.util.List; /** @@ -33,4 +35,6 @@ public interface SarBussStandMenuDao extends BaseMapper { int insertSelective (SarBussStandMenu sarStandMenuEO); + int updateMenuidByMenuid (@Param("oldMenuid") String oldMenuid ,@Param("newMenuid") String newMenuid); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index fc441c2d..0815fd38 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; +import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao; import com.adc.da.slrs.sarResource.dao.TsResourceDao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; @@ -45,6 +46,9 @@ public class TsResourceServiceImpl extends ServiceImpl selectMenuByRole(TsResource sarMenu) { List list = dao.selectMenuByRole(sarMenu); if (list == null) { @@ -389,6 +393,8 @@ public class TsResourceServiceImpl extends ServiceImpl Date: Wed, 28 Sep 2022 22:35:37 +0800 Subject: [PATCH 12/21] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E6=A0=87=E5=87=86=E4=B8=ADGB=E5=92=8C=E9=9D=9EGB=E7=B1=BB?= =?UTF-8?q?=E5=9C=A8=E8=87=AA=E5=8A=A8=E5=8F=98=E6=9B=B4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/UpdateStateStandSyncFz.java | 81 ++++--------------- 1 file changed, 15 insertions(+), 66 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index 535df843..4c5f2372 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -110,45 +110,28 @@ public class UpdateStateStandSyncFz implements Runnable { List invalidStandToGBList = new ArrayList<>(); List bdtStandToGBList = new ArrayList<>(); - + List bdtStandToNotGBList = new ArrayList<>(); // 当前标准的标准类别是否是GB类 GB集合逻辑 getStateStandScheduledList.forEach(info -> { if(StringUtils.isNotBlank(info.getBDTBZH())){ List bdtList = Arrays.stream(info.getBDTBZH().split(",")).map( s -> s.replace(" ","").trim()).collect(Collectors.toList()); - // 查询等于GB的国内标准 + int bdtStandNumCount = bdtList.size(); QueryWrapper wrapperGB = new QueryWrapper(); wrapperGB.eq("SAR_STANDARDS_INFO.VALID_FLAG","0"); - wrapperGB.eq("SAR_STANDARDS_INFO.STAND_SORT","GB"); +// wrapperGB.eq("SAR_STANDARDS_INFO.STAND_SORT","GB"); wrapperGB.in("trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-'," + "SAR_STANDARDS_INFO.STAND_YEAR),' ',''))",bdtList); List queryGBList = sarStandardsInfoDao.selectList(wrapperGB); - - if(!queryGBList.isEmpty()){ - int queryGbCount = queryGBList.size(); - - //被代替标准号中所有有效标准的状态都是现行有效状态 - List fzList = queryGBList.stream().filter(info1 -> - "vsaga7nwub".equals(info1.getTextStatus()) || "qke0ckro2p".equals(info1.getTextStatus()) - || "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); - - List fzList2 = queryGBList.stream().filter(info1 -> - !"vsaga7nwub".equals(info1.getTextStatus()) && !"qke0ckro2p".equals(info1.getTextStatus()) - && !"chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); - -// //被代替标准号中所有有效标准的状态都是被代替状态 -// List bdtStateList = queryGBList.stream().filter(info1 -> -// "qke0ckro2p".equals(info1.getTextStatus())).collect(Collectors.toList()); -// -// //被代替标准号中所有有效标准的状态都是废止状态 -// List fzList = queryGBList.stream().filter(info1 -> -// "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); - - // 满足其上存入更新废止逻辑 如果只有一个被代替标准 优先更新废止状态 - if(!fzList.isEmpty() && fzList2.isEmpty()){ + //被代替标准号中所有有效标准的状态都是现行有效状态 + List fzList = queryGBList.stream().filter(info1 -> + "vsaga7nwub".equals(info1.getTextStatus()) || "qke0ckro2p".equals(info1.getTextStatus()) + || "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); + // 检查当前标准是否为GB类 + if(StringUtils.equals(info.getStandSort(),"GB")){ + if(fzList.size() == bdtStandNumCount){//当所有标准都是现行有效状态时 invalidStandToGBList.add(info); - }else { - // 被代替标准号中的有效标准的标准状态中有一个是发布、即将实施、现行有效、被代替状态的 + }else{//其中被代替标准号中存在 List singleList = queryGBList.stream().filter(info1 -> { if("hc99551723c".equals(info1.getTextStatus()) || "hb0iy9z23c".equals(info1.getTextStatus()) || "vsaga7nwub".equals(info1.getTextStatus()) || "qke0ckro2p".equals(info1.getTextStatus())){ @@ -156,50 +139,19 @@ public class UpdateStateStandSyncFz implements Runnable { } return false; }).collect(Collectors.toList()); - // 满足其上存入更新被代替逻辑 if(!singleList.isEmpty()){ bdtStandToGBList.add(info); } } + }else{//非GB类 + if(fzList.size()>0){ + bdtStandToNotGBList.add(info); + } } } }); - - // 当前标准的标准类别是否是GB类 NOT GB集合逻辑 - List bdtStandToNotGBList = getStateStandScheduledList.stream().filter(info -> { - if(StringUtils.isNotBlank(info.getBDTBZH())){ - List bdtList = Arrays.stream(info.getBDTBZH().split(",")).map( - s -> s.replace(" ","").trim()).collect(Collectors.toList()); - - //发布、即将实施、现行有效、被代替 - List bdtStateList = new ArrayList<>(); - // 发布 - bdtStateList.add("hc99551723c"); - // 作废 - bdtStateList.add("hb0iy9z23c"); - // 即将实施 - bdtStateList.add("vsaga7nwub"); - // 被代替 - bdtStateList.add("qke0ckro2p"); - - // 查询不等于GB的国内标准 且 有效的被代替标准 - QueryWrapper wrapperNotGB = new QueryWrapper(); - wrapperNotGB.eq("VALID_FLAG","0"); - wrapperNotGB.ne("STAND_SORT","GB"); - wrapperNotGB.in("TEXT_STATUS",bdtStateList); - wrapperNotGB.in("trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-'," + - "SAR_STANDARDS_INFO.STAND_YEAR),' ',''))",bdtList); - List queryNotGBList = sarStandardsInfoDao.selectList(wrapperNotGB); - - // 被代替标准号中的有效标准的标准状态中有一个是发布、即将实施、现行有效、被代替状态的 - // 满足其上过滤更新被代替数据 - return !queryNotGBList.isEmpty(); - } - return false; - }).collect(Collectors.toList()); - if(!invalidStandToGBList.isEmpty()){ logger.info("=============被代替标准号中所有有效标准的状态都是现行有效、被代替、废止状态 执行============"); // 文本状态更为废止状态 @@ -217,9 +169,6 @@ public class UpdateStateStandSyncFz implements Runnable { // 文本状态更为被代替 execStandDate(bdtStandToNotGBList,"qke0ckro2p"); } - - - } logger.info("每天0点1分执行 国内标准文本状态被代替逻辑 标准自动变更废止:"+Thread.currentThread().getName() + " cron=0 1 0 * * ? --- " + new Date()+"---End-01"); From 42c8e7e1002e640410878bef0955c4015e7f6a18 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 29 Sep 2022 09:17:06 +0800 Subject: [PATCH 13/21] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=AD=E7=9A=84=E5=BA=9F=E5=BC=83=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=90=8D=E7=A7=B0=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/DataSync/DataSyncController.java | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java index 31d7d7b2..3920a3bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java @@ -1,28 +1,8 @@ package com.adc.da.slrs.DataSync; import com.adc.da.slrs.DataSync.service.IDataSyncService; -import com.adc.da.slrs.sarInstitution.entity.TsInstitution; -import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; -import com.adc.da.slrs.sarInstitution.service.impl.TsInstitutionServiceImpl; -import com.adc.da.slrs.sarPosition.entity.TsPosition; -import com.adc.da.slrs.sarPosition.service.ITsPositionService; -import com.adc.da.slrs.sarPosition.service.impl.TsPositionServiceImpl; -import com.adc.da.slrs.sarUser.entity.TsUser; -import com.adc.da.slrs.sarUser.service.ITsUserService; -import com.adc.da.slrs.sarUser.service.impl.TsUserServiceImpl; -import com.adc.da.sync.service.SyncUserService; -import com.adc.da.sys.dao.OrgEODao; -import com.adc.da.sys.entity.OrgEO; -import com.adc.da.sys.entity.UserOrgEO; -import com.adc.da.sys.service.IOrgEOService; -import com.adc.da.sys.service.impl.OrgEOServiceImpl; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -32,7 +12,7 @@ import java.sql.Timestamp; import java.util.*; @RestController -@Api(description = "|SarStandPutTime|") +@Api(description = "|数据同步及处理逻辑代码|") @RequestMapping("/${restPath}/DataSync") public class DataSyncController { From 6bc2bfadb09b6ec1f53deef68e398d33f8fcb525 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 13:09:41 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=87=8D=E6=9E=84=E5=90=8E=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/mq/SendStandMQService.java | 31 ++++++++++ .../server/ResetSearchCenterService.java | 62 +++++++++++-------- 2 files changed, 66 insertions(+), 27 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 80f7c1ec..8c881c6c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -7,6 +7,7 @@ import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.rabbitmq.client.Channel; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -82,8 +83,10 @@ public class SendStandMQService { } String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr(); Map attrInfoMap = new TreeMap<>(); + Map attrInfoMapForAuth = new TreeMap<>(); if(StringUtils.isNotBlank(sarStandAttrEOStr)){ attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr); + attrInfoMapForAuth.putAll(attrInfoMap); } Map infoMap = infoEO.getAttrInfoMap(); Map infoEOMapItems = infoEO.getMapItems(); @@ -274,6 +277,34 @@ public class SendStandMQService { if (!"null".equals(standEnName) && StringUtils.isNotBlank(standEnName)) { saveMap.put("standEnNameBig", standEnName.toUpperCase()); } + if ("1".equals(attrInfoMapForAuth.get("updateAuth"))) { + Map getAttrMap = new TreeMap<>(attrInfoMapForAuth); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + List valArr = new ArrayList<>(); + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + if (StringUtils.isNotBlank(entry.getValue().toString())) { + Object json = null; + if (Utils.isJson(entry.getValue().toString())) { + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } + if (json instanceof org.json.JSONArray) { + valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); + } else { + value = entry.getValue().toString(); + valArr = Arrays.asList(value.split(",")); + } + if (!valArr.isEmpty()) { + value = dicTypeEODao.getDicNamesByCodes(valArr, ""); + } + } + saveMap.put(name + "Name",value); + } + } + } + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { 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 2e1755e0..6913cfc7 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 @@ -27,6 +27,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.slrs.standardSplit.service.SarStandardsInfoEOService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.util.http.ResponseMessage; @@ -37,6 +38,7 @@ import com.adc.da.utils.util.InitStandAttrUtil; import com.adc.da.utils.util.Utils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.elasticsearch.client.transport.TransportClient; @@ -107,6 +109,9 @@ public class ResetSearchCenterService { @Autowired private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + @Autowired + private ISarStandardsInfoService sarStandardsInfoEOService; + @PostConstruct public void init() { @@ -854,36 +859,39 @@ public class ResetSearchCenterService { getAttrMap.put(clobField, fieldValue); } } - + getAttrMap.put("updateAuth","1"); row.setAttrInfoMap(getAttrMap); } - Map getAttrMap = row.getAttrInfoMap(); - if (getAttrMap != null && getAttrMap.size() > 0) { - for (Map.Entry entry : getAttrMap.entrySet()) { - String name = entry.getKey(); - String value = ""; - List valArr = new ArrayList<>(); - if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { - if (StringUtils.isNotBlank(entry.getValue().toString())) { - Object json = null; - if(Utils.isJson(entry.getValue().toString())){ - json = new JSONTokener(entry.getValue().toString()).nextValue(); - } - if (json instanceof org.json.JSONArray) { - valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); - } else { - value = entry.getValue().toString(); - valArr = Arrays.asList(value.split(",")); - } - if (!valArr.isEmpty()) { - value = dicTypeEODao.getDicNamesByCodes(valArr, ""); - } - } - entry.setValue(value); - } - } - } +// Map getAttrMap = row.getAttrInfoMap(); +// if (getAttrMap != null && getAttrMap.size() > 0) { +// for (Map.Entry entry : getAttrMap.entrySet()) { +// String name = entry.getKey(); +// String value = ""; +// List valArr = new ArrayList<>(); +// if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { +// if (StringUtils.isNotBlank(entry.getValue().toString())) { +// Object json = null; +// if(Utils.isJson(entry.getValue().toString())){ +// json = new JSONTokener(entry.getValue().toString()).nextValue(); +// } +// if (json instanceof org.json.JSONArray) { +// valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); +// } else { +// value = entry.getValue().toString(); +// valArr = Arrays.asList(value.split(",")); +// } +// if (!valArr.isEmpty()) { +// value = dicTypeEODao.getDicNamesByCodes(valArr, ""); +// } +// } +// entry.setValue(value); +// } +// } +// } +// if (getAttrMap != null) { +// row.setSarStandAttrEOStr(JSONObject.toJSONString(getAttrMap)); +// } } } From bc0d3a878a16404f94e91bd3ba44e5ddf6e70d94 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 14:13:32 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=B9=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=E3=80=81=E8=83=BD=E6=BA=90?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/service/impl/SearchCenterServiceImpl.java | 10 ++++++---- .../service/impl/StandLawsSearchServiceImpl.java | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index aad97d2d..7afd8604 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1495,14 +1495,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){ if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){ queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(), - "textContent" - ).minimumShouldMatch("100%").field("title",10f)); + "NYLXName" + ).minimumShouldMatch("100%")); +// .field("title",10f)); } if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){ queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(), - "textContent" - ).minimumShouldMatch("100%").field("title",10f)); + "CLLXName" + ).minimumShouldMatch("100%")); +// .field("title",10f)); } boolQueryBuilder.must(queryBuilder); diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index d2539f51..ce74e0bb 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -466,6 +466,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { } String title = String.valueOf(fullTextSearchEO.getOrDefault("title","")); fullTextSearchEO.put("titleBig",title.toUpperCase()); + fullTextSearchEO.put("CLLXName",attrInfoMap.get("CLLXName")); + fullTextSearchEO.put("NYLXName",attrInfoMap.get("NYLXName")); + fullTextSearchEO.put("CLLX",attrInfoMap.get("CLLX")); + fullTextSearchEO.put("NYLX",attrInfoMap.get("NYLX")); return fullTextSearchEO; } From 97f12bdef17d44461b9b1c22a8637ff14f002114 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 14:40:03 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7=E8=B6=85=E9=93=BE=E6=8E=A5=E6=89=93=E4=B8=8D=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardsInfoController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index df295625..945da70f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -768,15 +768,15 @@ public class SarStandardsInfoController extends BaseController //@RequiresPermissions("lawss:sarStandardsInfo:list") public ResponseMessage queryInfoByStandNum(SarStandardsInfoEOPage page) throws Exception { if (org.apache.commons.lang.StringUtils.isNotBlank(page.getStandNumber())){ - String sort = ""; - if (page.getStandNumber().length()>3) { - sort = page.getStandNumber().substring(0, 3); - } - if ("ECE".equals(sort)) { - int length = page.getStandNumber().length(); - String number = page.getStandNumber().substring(3,length); - page.setStandNumber("UN(ECE)" + number); - } +// String sort = ""; +// if (page.getStandNumber().length()>3) { +// sort = page.getStandNumber().substring(0, 3); +// } +// if ("ECE".equals(sort)) { +// int length = page.getStandNumber().length(); +// String number = page.getStandNumber().substring(3,length); +// page.setStandNumber("UN(ECE)" + number); +// } } List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(page.getStandNumber(),page.getStandType()); SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage(); From d105dce3a5f3dcdf613158a437c20848640366a8 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 15:00:09 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=87=BAexcel=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 8 +++++++- .../da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 8 +++++++- .../da/slrs/sarStandWarning/entity/WarningExportVO.java | 8 ++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 987beea9..f66ba43d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -150,7 +150,13 @@ public class EarlyWarningEOController extends BaseController { // List exportExcel = earlyWarningEOService.getExportExcel(excelVO); List exportExcel = earlyWarningEOService.getExportExcel(excelVO); - + for (WarningExportVO warningExportVO : exportExcel){ + String condition = warningExportVO.getTermsConditions(); + if (condition != null && condition.length() > 32001){ + condition = condition.substring(0,32000); + warningExportVO.setTermsConditions(condition); + } + } // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 65e8ae2e..152c60d9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -60,7 +60,7 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String standName; - @ExcelProperty(value = "发布日期",index = 5) + @ExcelProperty(value = "发布日期",index = 6) @ColumnWidth(20) @ApiModelProperty("发布日期") @TableField(exist = false) @@ -98,6 +98,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String itemsName; + @ExcelProperty(value = "条款内容",index = 5) + @ColumnWidth(60) + @ApiModelProperty("条款内容") + @TableField(exist = false) + private String termsConditions; + @ExcelIgnore @TableField("POLICY_ID") private String policyId; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java index db2f7b95..e3041f7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java @@ -11,18 +11,18 @@ public class WarningExportVO extends EarlyWarningEO { - @ExcelProperty(value = "实施日期",index = 6) + @ExcelProperty(value = "实施日期",index = 7) @ColumnWidth(20) @ApiModelProperty("实施日期") private String SSRQ; - @ExcelProperty(value = "新车型实施日期",index = 7) + @ExcelProperty(value = "新车型实施日期",index = 8) @ColumnWidth(20) @ApiModelProperty("新车型实施日期") private String XCXSSRQ; - @ExcelProperty(value = "在产车实施日期",index = 8) + @ExcelProperty(value = "在产车实施日期",index = 9) @ColumnWidth(20) @ApiModelProperty("在产车实施日期") private String ZCCSSRQ; @@ -31,7 +31,7 @@ public class WarningExportVO extends EarlyWarningEO { @ApiModelProperty("标准类别显示") private String standTypeShow; - @ExcelProperty(value = "适用车型",index = 9) + @ExcelProperty(value = "适用车型",index = 10) @ColumnWidth(20) @ApiModelProperty("适用车型展示") private String applyTypeShow; From 822437e3646c1c4c30b7e427c9cf1c16507bcf31 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 29 Sep 2022 17:13:53 +0800 Subject: [PATCH 18/21] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=B8=AD=E5=BF=83=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/service/impl/SearchCenterServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index aad97d2d..b40aa95b 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1540,9 +1540,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { String textStatusColor = ""; if(StringUtils.isNotBlank(sourceAsMap.getOrDefault("textStatusFull","").toString())){ String textStatus = sourceAsMap.getOrDefault("textStatusFull","").toString(); - if("废止".equals(textStatus) || "被代替".equals(textStatus) || "作废".equals(textStatus) ){ + if("废止".equals(textStatus) || "作废".equals(textStatus) ){ textStatusColor = "redClass"; - }else if("参考".equals(textStatus)){ + }else if("参考".equals(textStatus) || "被代替".equals(textStatus)){ textStatusColor = "greenClass"; } } @@ -1717,9 +1717,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(StringUtils.isNotBlank(sourceAsMap.getOrDefault("textStatusFull","").toString())){ String textStatus = sourceAsMap.getOrDefault("textStatusFull","").toString(); - if("废止".equals(textStatus) || "被代替".equals(textStatus) || "作废".equals(textStatus) ){ + if("废止".equals(textStatus) || "作废".equals(textStatus) ){ textStatusColor = "redClass"; - }else if("参考".equals(textStatus)){ + }else if("参考".equals(textStatus) || "被代替".equals(textStatus)){ textStatusColor = "greenClass"; } } @@ -2057,9 +2057,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { String textStatusColor = ""; if(StringUtils.isNotBlank(sourceAsMap.getOrDefault("textStatusFull","").toString())){ String textStatus = sourceAsMap.getOrDefault("textStatusFull","").toString(); - if("废止".equals(textStatus) || "被代替".equals(textStatus) || "作废".equals(textStatus) ){ + if("废止".equals(textStatus) || "作废".equals(textStatus) ){ textStatusColor = "redClass"; - }else if("参考".equals(textStatus)){ + }else if("参考".equals(textStatus) || "被代替".equals(textStatus)){ textStatusColor = "greenClass"; } } From 42274fb6b0532540326fa8504c8fff8ead762171 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 17:00:42 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=B9=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=E3=80=81=E8=83=BD=E6=BA=90?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index ce74e0bb..1c450a90 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -446,6 +446,11 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append(" "); contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append(" "); + attrInfoMap.put("CLLXName",attrInfoMap.get("SYCXCLASSName")); + attrInfoMap.put("NYLXName",attrInfoMap.get("NYLXCLASSName")); + attrInfoMap.put("CLLX",attrInfoMap.get("SYCXCLASS")); + attrInfoMap.put("NYLX",attrInfoMap.get("NYLXCLASS")); + if (attrInfoMap.containsKey("content")){ if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ String con = String.valueOf(attrInfoMap.get("content")); From 8ff7b4b8ac50066a44cdd73105a9ea955849ca31 Mon Sep 17 00:00:00 2001 From: zyd Date: Fri, 30 Sep 2022 02:08:40 +0800 Subject: [PATCH 20/21] =?UTF-8?q?fix:=20=E9=94=99=E8=AF=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=85=A8=E9=83=A8=E8=BE=93=E5=87=BA=E5=88=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/scheduledState/server/UpdateStateStandSyncFz.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index 4c5f2372..34370397 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -173,7 +173,7 @@ public class UpdateStateStandSyncFz implements Runnable { logger.info("每天0点1分执行 国内标准文本状态被代替逻辑 标准自动变更废止:"+Thread.currentThread().getName() + " cron=0 1 0 * * ? --- " + new Date()+"---End-01"); }catch(Exception e){ - logger.info(e.getMessage()); + logger.error(e.getMessage(),e); } } From d4e592e21f90341a79e78cba09a0097747ac8a6c Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 16:56:13 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20ip=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/20220930_定时任务添加IP地址.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/sql/20220930_定时任务添加IP地址.sql diff --git a/doc/sql/20220930_定时任务添加IP地址.sql b/doc/sql/20220930_定时任务添加IP地址.sql new file mode 100644 index 00000000..182e0a22 --- /dev/null +++ b/doc/sql/20220930_定时任务添加IP地址.sql @@ -0,0 +1,2 @@ +ALTER TABLE tb_task +ADD COLUMN ip varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'ip地址' AFTER `create_time`; \ No newline at end of file