From 2afc8ced5610192b6254449a5b365ef2406b7867 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 20 Aug 2024 11:44:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8E=9F=E5=AD=90=E6=8C=87=E6=A0=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=9C=89=E8=AF=AFbug=202.=20=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E7=9A=84swagger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/supervision/config/WebConfig.java | 26 ++++++++++++------- .../dto/caseScore/CaseScoreDetailBuilder.java | 10 ++++++- .../police/dto/caseScore/IndexResult.java | 11 ++++---- .../police/service/impl/ChatServiceImpl.java | 2 +- 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/supervision/config/WebConfig.java b/src/main/java/com/supervision/config/WebConfig.java index 6825e8f..794e7d6 100644 --- a/src/main/java/com/supervision/config/WebConfig.java +++ b/src/main/java/com/supervision/config/WebConfig.java @@ -1,14 +1,19 @@ package com.supervision.config; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @Configuration +@RequiredArgsConstructor public class WebConfig implements WebMvcConfigurer { + private final Environment environment; @Override public void addInterceptors(InterceptorRegistry registry) { @@ -20,13 +25,6 @@ public class WebConfig implements WebMvcConfigurer { public List ignorePathPatterns() { List paths = new ArrayList<>(); - paths.add("/swagger-resources/**"); - paths.add("/webjars/**"); - paths.add("/v3/**"); - paths.add("/swagger-ui.html/**"); - paths.add("/swagger-ui/**"); - paths.add("/webjars/"); - paths.add("/doc.html/**"); paths.add("/error"); paths.add("/favicon.ico"); paths.add("/user/login"); @@ -34,8 +32,18 @@ public class WebConfig implements WebMvcConfigurer { paths.add("/minio/uploadFile"); paths.add("/user/changePassWord"); paths.add("/fileManage/downloadFile"); - // 开发环境,放开不校验token.每次修改这里需要重启(热部署不行) -// paths.add("/**"); + + // 开发环境放开swagger + long count = Arrays.stream(environment.getActiveProfiles()).filter("dev"::equals).count(); + if (count > 0){ + paths.add("/swagger-resources/**"); + paths.add("/webjars/**"); + paths.add("/v3/**"); + paths.add("/swagger-ui.html/**"); + paths.add("/swagger-ui/**"); + paths.add("/webjars/"); + paths.add("/doc.html/**"); + } return paths; } } diff --git a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java index 6ca6cea..975bd53 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java +++ b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java @@ -15,7 +15,9 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; +import java.util.function.Predicate; import java.util.stream.Collectors; /** @@ -200,11 +202,17 @@ public class CaseScoreDetailBuilder { .flatMap(indexResult -> indexResult.getAtomicResults().stream()).filter(atomicResult -> { JudgeResultEnum instance = JudgeResultEnum.getInstance(atomicResult.getJudgeResult()); return instance == null || !instance.flagIsTrue(); - }).count() + }).filter(distinctPredicate(AtomicResult::getAtomicId)).count() ); return caseScoreDetailDTO; } + private Predicate distinctPredicate(Function function){ + ConcurrentHashMap map = new ConcurrentHashMap<>(); + return (t)-> null == map.putIfAbsent(function.apply(t),true); + + } + private Integer sumIndexGroupScore(String indexGroup) { if (CollUtil.isEmpty(this.indexResultList)){ return 0; diff --git a/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java b/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java index ced53ce..2967cfd 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java +++ b/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java @@ -64,17 +64,16 @@ public class IndexResult { // 填充原子指标结果属性 List atomicIdList = Arrays.stream(modelIndexResult.getAtomicIds().split(",")).toList(); - atomicResultList = atomicResultList.stream().filter(atomicResult -> atomicIdList.contains(atomicResult.getAtomicId())).distinct().toList(); - if (CollUtil.isEmpty(atomicResultList)){ + List atomicResultListFilter = atomicResultList.stream() + .filter(atomicResult -> atomicIdList.contains(atomicResult.getAtomicId()) + && StrUtil.equals(this.indexId, atomicResult.getIndexId())).toList(); + if (CollUtil.isEmpty(atomicResultListFilter)){ log.info("IndexResult:经过过滤后的原子指标结果为空"); return; } - if (Objects.isNull(atomicIndexList)){ - atomicIndexList = new ArrayList<>(1); - } // 注意不要有重复值 Map atomicIndexMap = atomicIndexList.stream().collect(Collectors.toMap(ModelAtomicIndex::getId, k -> k, (k1, k2) -> k1)); - this.atomicResults = atomicResultList.stream().map(atomicResult -> new AtomicResult(indexId, + this.atomicResults = atomicResultListFilter.stream().map(atomicResult -> new AtomicResult(indexId, atomicIndexMap.get(atomicResult.getAtomicId()), atomicResult)).toList(); } diff --git a/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java index bc26cdc..3d4d28a 100644 --- a/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java @@ -47,7 +47,7 @@ public class ChatServiceImpl implements ChatService { } catch (Exception e) { log.error("chat: caseNo:{},query{},error:{}", modelCase.getCaseNo(), chatReqVO.getQuery(), e.getMessage(),e); chat = new ChatResDTO(); - chat.setAnswer("我暂时还不知道怎么回答，您可以尝试换一种问法！"); + chat.setAnswer("服务繁忙，请稍后重试！"); } if (null ==chat){