From d14afaf3ca5b055e72b195e0e4b385b7fcdc71fa Mon Sep 17 00:00:00 2001 From: NingHuan <2139614357@qq.com> Date: Thu, 15 May 2025 20:50:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]:=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A8=A1=E5=9E=8B=E8=AF=84=E4=BC=B0=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=9A=84=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 ++++- .../config/WebMvcConfiguration.java | 47 +++++++++++++++++++ .../controller/EvaluationController.java | 18 ++++++- .../mapper/EvaluationMapper.java | 6 +++ .../pojo/ModelLogVO.java | 12 ++++- .../service/EvaluationService.java | 2 + .../service/Impl/EvaluationServiceImpl.java | 12 ++++- .../resources/mapper/EvaluationMapper.xml | 9 ++++ 8 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/WebMvcConfiguration.java diff --git a/pom.xml b/pom.xml index 9a9afc6..6a7f800 100644 --- a/pom.xml +++ b/pom.xml @@ -58,12 +58,21 @@ 1.4.7 - KingbaseES V8/V9 数据库 JDBC 驱动 + com.kingbase8 kingbase8 9.0.0 + + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.2.0 + + org.springframework.boot spring-boot-starter-test diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/WebMvcConfiguration.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/WebMvcConfiguration.java new file mode 100644 index 0000000..8efb176 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/WebMvcConfiguration.java @@ -0,0 +1,47 @@ +package com.bipt.intelligentapplicationorchestrationservice.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.servers.Server; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; + +import java.util.ArrayList; +import java.util.List; + +/** + * 配置类,注册web层相关组件 + */ +@Configuration +@Slf4j +public class WebMvcConfiguration{ + + /** + * 配置OpenAPI信息 + */ + @Bean + public OpenAPI customOpenAPI() { + // 设置服务器信息(可选) + List servers = new ArrayList<>(); + servers.add(new Server().url("/").description("本地服务器")); + + return new OpenAPI() + .info(new Info() + .title("智能应用服务管理") + .version("2.0") + .description("智能应用服务管理接口文档")) + .servers(servers); + } + +// /** +// * 设置静态资源映射(Springdoc不需要特殊配置,保留可能的其他资源映射) +// */ +// @Override +// protected void addResourceHandlers(ResourceHandlerRegistry registry) { +// // 保留其他静态资源映射(如果有) +// // registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/"); +// } +} \ No newline at end of file diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java index fae3608..95bd64a 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java @@ -3,12 +3,16 @@ package com.bipt.intelligentapplicationorchestrationservice.controller; import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelLogVO; import com.bipt.intelligentapplicationorchestrationservice.pojo.OptResult; import com.bipt.intelligentapplicationorchestrationservice.service.EvaluationService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Tag(name = "模型评估相关接口") @RestController @RequestMapping("/evaluation") @Slf4j @@ -21,11 +25,23 @@ public class EvaluationController { * @param id * @return */ + @Operation(summary = "模型日志信息显示") @GetMapping("/detail") public OptResult detail(Long id){ -// log.info("id:{}", id); + log.info("模型日志信息显示id:{}", id); ModelLogVO modelLogVO = evaluationService.detail(id); return OptResult.success(modelLogVO); } + /** + * 模型评估状态,评估通过则上线(1.上线,0.下线) + * @return + */ + @Operation(summary = "模型评估接口") + @PutMapping("/evaluate") + public OptResult evaluate(Long id, Integer status){ + log.info("模型上线状态修改:id:{}, status:{}", id, status); + evaluationService.startOrStop(id, status); + return OptResult.success(); + } } diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java index b23ffe5..35c6778 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java @@ -10,4 +10,10 @@ public interface EvaluationMapper { */ ModelLogVO selectLogDetail(Long id); + /* + * 更新模型评估日志状态(评估通过则上线) + * @param id 模型评估日志id + * @param status 模型评估日志状态 + */ + void update(Long id, Integer status); } diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLogVO.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLogVO.java index 6eb6c04..a708e57 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLogVO.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLogVO.java @@ -1,7 +1,17 @@ package com.bipt.intelligentapplicationorchestrationservice.pojo; -import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import java.time.LocalDateTime; +/** + * @author nh + * @description:模型日志视图对象 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ModelLogVO { private Long id; // 日志id private Long modelId; // 关联模型id diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/EvaluationService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/EvaluationService.java index 5f327d5..38ce226 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/EvaluationService.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/EvaluationService.java @@ -4,4 +4,6 @@ import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelLogVO; public interface EvaluationService { ModelLogVO detail(Long id); + + void startOrStop(Long id, Integer status); } diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/EvaluationServiceImpl.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/EvaluationServiceImpl.java index 8b77c10..b68ad7b 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/EvaluationServiceImpl.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/EvaluationServiceImpl.java @@ -19,8 +19,18 @@ public class EvaluationServiceImpl implements EvaluationService { */ @Override public ModelLogVO detail(Long id) { -// log.info("id:{}", id); + log.info("id:{}", id); ModelLogVO modelLogVO = evaluationMapper.selectLogDetail(id); return modelLogVO; } + + /** + * 评估模型决定是否上线 + * @param id 模型id + * @param status 模型评估状态,评估通过则上线(1.上线,0.下线) + */ + @Override + public void startOrStop(Long id, Integer status) { + evaluationMapper.update(id, status); + } } diff --git a/src/main/resources/mapper/EvaluationMapper.xml b/src/main/resources/mapper/EvaluationMapper.xml index c6db155..a3526b5 100644 --- a/src/main/resources/mapper/EvaluationMapper.xml +++ b/src/main/resources/mapper/EvaluationMapper.xml @@ -1,6 +1,7 @@ + + + + update model_version set + + status=#{status} + + where model_id=#{id} + \ No newline at end of file