From 6cd67e6ee4057a74d0b1f97cebc6b07564158c8e Mon Sep 17 00:00:00 2001 From: liuzongren <15011502566@163.com> Date: Sun, 29 Sep 2024 17:10:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=89=94=E9=99=A4nacos=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=202.=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?,=E9=98=B2=E6=AD=A2=E5=85=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 36 ++++++------- .../ComposeAnalysisApplication.java | 4 -- .../service/impl/AnalysisTaskServiceImpl.java | 11 ++-- .../task/PorjectAnalysisTask.java | 7 ++- src/main/resources/application-dev.yaml | 42 +++++++++++++++ src/main/resources/application.yaml | 52 +++++++++++++++---- 6 files changed, 114 insertions(+), 38 deletions(-) create mode 100644 src/main/resources/application-dev.yaml diff --git a/pom.xml b/pom.xml index f56cef2..c039ca5 100644 --- a/pom.xml +++ b/pom.xml @@ -20,24 +20,24 @@ spring-boot-starter-web - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/keyware/composeanalysis/ComposeAnalysisApplication.java b/src/main/java/com/keyware/composeanalysis/ComposeAnalysisApplication.java index 9c24d65..e634f83 100644 --- a/src/main/java/com/keyware/composeanalysis/ComposeAnalysisApplication.java +++ b/src/main/java/com/keyware/composeanalysis/ComposeAnalysisApplication.java @@ -3,14 +3,10 @@ package com.keyware.composeanalysis; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.scheduling.annotation.EnableAsync; @MapperScan("com.keyware.composeanalysis.mapper") @SpringBootApplication -@EnableDiscoveryClient -@RefreshScope @EnableAsync public class ComposeAnalysisApplication { diff --git a/src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java b/src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java index 9fde7bb..c7877af 100644 --- a/src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java +++ b/src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.keyware.composeanalysis.service.impl; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.keyware.common.constant.RedisConst; import com.keyware.common.constant.enums.AnalysisStatusEnum; @@ -70,7 +71,10 @@ public class AnalysisTaskServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(AnalysisTask::getId, analysisTask.getId()) + .set(AnalysisTask::getComposeFlag, AnalysisStatusEnum.ANALYSISING.getCode()); + this.update(null,updateWrapper); MongoTemplate mongoTemplate = new MongoTemplate(mongoClient, MongoDBConst.DB_NAME_PREFIX + analysisTask.getId()); AnalysisLogUtil.insert(mongoTemplate, "【成分分析】开始:" + analysisTask.getFileName()); @@ -85,8 +89,9 @@ public class AnalysisTaskServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(AnalysisTask::getId, analysisTask.getId()) + .set(AnalysisTask::getAnalysisStatus, AnalysisStatusEnum.FAIL_ANALYSIS.getCode()); + analysisService.update(null,updateWrapper); } } diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml new file mode 100644 index 0000000..2fde845 --- /dev/null +++ b/src/main/resources/application-dev.yaml @@ -0,0 +1,42 @@ +server: + port: 8001 + +spring: + application: + name: compose-analysis + data: + mongodb: + uri: mongodb://127.0.0.1:27017/KEYSWAN + redis: + host: 127.0.0.1 + port: 6379 + password: 123456 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/keyswan?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: 123456 + hikari: + #最小连接数 + minimum-idle: 5 + #最大连接数 + maximum-pool-size: 30 + #最大空闲时间 + idle-timeout: 30000 + #连接超时时间 + connection-timeout: 30000 + #自动提交 + auto-commit: true + +#solr检索库地址 +solr: + solrUrl: http://172.16.36.7:8993/solr/ + #批量匹配时,返回的匹配数量 + row: 5 + +#被测件上传存储路径 +codeResourcePath: D:\codeResourcePath + +logging: + level: + com.txlc.dwh.job.common.interceptor.PerformanceInterceptor: debug diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index e9f435a..84db728 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,15 +1,45 @@ +server: + port: 8001 + spring: application: name: compose-analysis - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 - namespace: 4ce70f33-8b88-4931-a88c-2b68e7259bd7 - config: - server-addr: 127.0.0.1:8848 - namespace: 4ce70f33-8b88-4931-a88c-2b68e7259bd7 - file-extension: yaml - config: - import: nacos:compose-analysis-dev.yaml + data: + mongodb: + uri: mongodb://127.0.0.1:27017/KEYSWAN + redis: + host: 127.0.0.1 + port: 6379 + password: 123456 + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/keyswan?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: 123456 + hikari: + #最小连接数 + minimum-idle: 5 + #最大连接数 + maximum-pool-size: 30 + #最大空闲时间 + idle-timeout: 30000 + #连接超时时间 + connection-timeout: 30000 + #自动提交 + auto-commit: true + + +#solr检索库地址 +solr: + solrUrl: http://172.16.36.7:8993/solr/ + #批量匹配时,返回的匹配数量 + row: 5 + +#被测件上传存储路径 +codeResourcePath: D:\codeResourcePath + +logging: + level: + com.txlc.dwh.job.common.interceptor.PerformanceInterceptor: debug