From 31d3e646314759a65e15301e36caee9671434660 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 16 Mar 2021 13:47:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=9B=9E=E6=98=BE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=202=E3=80=81=E8=AF=A2=E4=BB=B7=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97=203=E3=80=81=E9=87=8D=E6=96=B0=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E6=A0=87=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BizServiceEbtpProjectApplication.java | 16 ++++++++++++++++ .../project/common/ProjectExceptionEnum.java | 2 ++ .../service/impl/ISeatatEntrustServiceImpl.java | 5 ++--- .../dao/mapper/ProjectReEvaluationMapper.xml | 1 + .../impl/ProjectReEvaluationServiceImpl.java | 4 ++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java index 76f05ab..53396ca 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java @@ -1,12 +1,16 @@ package com.chinaunicom.mall.ebtp.project; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; +import io.micrometer.core.instrument.MeterRegistry; import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; +import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication(exclude = { @@ -23,4 +27,16 @@ public class BizServiceEbtpProjectApplication { SpringApplication.run(BizServiceEbtpProjectApplication.class, args); } + /** + * Grafana 注册项 + * + * @param applicationName 应用名称， 用于grafana应用列表 + * @return + */ + @Bean + public MeterRegistryCustomizer configurer( + @Value("${spring.application.name}") String applicationName) { + return (registry) -> registry.config().commonTags("application", applicationName); + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java index f029b93..07df1a4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java @@ -163,6 +163,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { FRAME_EXCEPTION_INQUIRY_PROJECT_NOT_EMPTY(110072,"询价单已经初始化，请误重复提交"), FRAME_EXCEPTION_INQUIRY_DELEGATION_CODE_EMPTY(110073,"询价单委托招标代理机构编码不能为空"), + + FRAME_EXCEPTION_PROJECT_SECTION_NOT_STATUS(110074, "项目标段信息已经异常处理不可以进行操作！"), ; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java index bf71737..5adc7f1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java @@ -16,7 +16,6 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.Inq import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryVO; import com.chinaunicom.mall.ebtp.project.projectentrust.service.ISeataEntrustService; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; -import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO; import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService; @@ -94,9 +93,9 @@ public class ISeatatEntrustServiceImpl extends BaseServiceImpl evaluationQueryWrapper = new QueryWrapper<>(); evaluationQueryWrapper.eq(ProjectReEvaluationField.SECTION_ID,sectionId); evaluationQueryWrapper.and(wrapper -> wrapper.eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_0).or().eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1));