From d6625b52f4f2f1f1c5e6de57501a5498b365fc49 Mon Sep 17 00:00:00 2001 From: NingHuan <2139614357@qq.com> Date: Wed, 14 May 2025 21:16:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]:=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=84=E4=BC=B0=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E9=83=A8=E5=88=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cationOrchestrationServiceApplication.java | 2 ++ .../controller/EvaluationController.java | 31 +++++++++++++++++++ .../enumeration/LogType.java | 7 +++++ .../mapper/EvaluationMapper.java | 13 ++++++++ .../pojo/ModelEvaluation.java | 24 ++++++++++++++ .../pojo/ModelInfo.java | 20 ++++++++++++ .../pojo/ModelLog.java | 24 ++++++++++++++ .../pojo/ModelLogVO.java | 15 +++++++++ .../pojo/ModelVersion.java | 28 +++++++++++++++++ .../service/EvaluationService.java | 7 +++++ .../service/Impl/EvaluationServiceImpl.java | 26 ++++++++++++++++ src/main/resources/application.properties | 9 +++++- .../resources/mapper/EvaluationMapper.xml | 14 +++++++++ 13 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/enumeration/LogType.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelEvaluation.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelInfo.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLog.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLogVO.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersion.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/EvaluationService.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/EvaluationServiceImpl.java create mode 100644 src/main/resources/mapper/EvaluationMapper.xml diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java index c592c40..47290d7 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java @@ -1,8 +1,10 @@ package com.bipt.intelligentapplicationorchestrationservice; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +@MapperScan("com.bipt.intelligentapplicationorchestrationservice.mapper")//指定扫描Mapper接口的包 @SpringBootApplication public class IntelligentApplicationOrchestrationServiceApplication { diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java new file mode 100644 index 0000000..fae3608 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java @@ -0,0 +1,31 @@ +package com.bipt.intelligentapplicationorchestrationservice.controller; + +import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelLogVO; +import com.bipt.intelligentapplicationorchestrationservice.pojo.OptResult; +import com.bipt.intelligentapplicationorchestrationservice.service.EvaluationService; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/evaluation") +@Slf4j +public class EvaluationController { + @Autowired + private EvaluationService evaluationService; + + /** + * 获取日志详情 + * @param id + * @return + */ + @GetMapping("/detail") + public OptResult detail(Long id){ +// log.info("id:{}", id); + ModelLogVO modelLogVO = evaluationService.detail(id); + return OptResult.success(modelLogVO); + } + +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/enumeration/LogType.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/enumeration/LogType.java new file mode 100644 index 0000000..485372b --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/enumeration/LogType.java @@ -0,0 +1,7 @@ +package com.bipt.intelligentapplicationorchestrationservice.enumeration; + +/** + * 日志类型 + */ +public enum LogType { +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java new file mode 100644 index 0000000..b23ffe5 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java @@ -0,0 +1,13 @@ +package com.bipt.intelligentapplicationorchestrationservice.mapper; + +import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelLogVO; + +public interface EvaluationMapper { + /* + * 查询模型评估日志详情 + * @param id 模型评估日志id + * @return 模型评估日志详情 + */ + ModelLogVO selectLogDetail(Long id); + +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelEvaluation.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelEvaluation.java new file mode 100644 index 0000000..1429342 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelEvaluation.java @@ -0,0 +1,24 @@ +package com.bipt.intelligentapplicationorchestrationservice.pojo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDateTime; +/** + * @author nh + * @description：模型评估记录实体类 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ModelEvaluation implements Serializable { + private Long id; // 评估记录id + private Long modelId; // 关联模型id + private LocalDateTime evaluationTime; // 评估时间 + private String evaluationResult; // 评估结果 + private String operator; // 评估操作人员 +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelInfo.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelInfo.java new file mode 100644 index 0000000..268fdd7 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelInfo.java @@ -0,0 +1,20 @@ +package com.bipt.intelligentapplicationorchestrationservice.pojo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +/** + * @author nh + * @description：模型实体类 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ModelInfo implements Serializable { + private Long id; // 模型id + private String modelName; // 模型名称 +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLog.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLog.java new file mode 100644 index 0000000..b1b15ee --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLog.java @@ -0,0 +1,24 @@ +package com.bipt.intelligentapplicationorchestrationservice.pojo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDateTime; +/** + * @author ：nh + * @description：模型日志实体类 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ModelLog implements Serializable { + private Long id; // 日志id + private Long modelId; // 关联模型id + private Integer logType; // 日志类型（1，2，3...） + private String logPath; // 日志存储路径 + private LocalDateTime logTime; // 日志生成时间 +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLogVO.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLogVO.java new file mode 100644 index 0000000..6eb6c04 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelLogVO.java @@ -0,0 +1,15 @@ +package com.bipt.intelligentapplicationorchestrationservice.pojo; + +import java.time.LocalDateTime; + +public class ModelLogVO { + private Long id; // 日志id + private Long modelId; // 关联模型id + private String modelName; // 模型名称 + private String version; // 模型版本 + private String modelConfig; // 模型配置 + private Integer logType; // 日志类型（1，2，3...） + private String logPath; // 日志存储路径 + private LocalDateTime logTime; // 日志生成时间 +} + diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersion.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersion.java new file mode 100644 index 0000000..6297b43 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersion.java @@ -0,0 +1,28 @@ +package com.bipt.intelligentapplicationorchestrationservice.pojo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDateTime; +/** + * @author ：nh + * @description：模型版本信息实体类 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ModelVersion implements Serializable { + private Long id; // 版本信息表id + private Long modelId; // 关联模型id + private String version; // 模型版本 + private Integer datasetId; // 数据集id + private String modelConfig; // 模型配置信息 + private String modelPath; // 模型存储路径 + private Integer status; // 模型状态（1代表上线，0代表不上线） + private LocalDateTime createTime; // 创建时间 + +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/EvaluationService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/EvaluationService.java new file mode 100644 index 0000000..5f327d5 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/EvaluationService.java @@ -0,0 +1,7 @@ +package com.bipt.intelligentapplicationorchestrationservice.service; + +import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelLogVO; + +public interface EvaluationService { + ModelLogVO detail(Long id); +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/EvaluationServiceImpl.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/EvaluationServiceImpl.java new file mode 100644 index 0000000..8b77c10 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/EvaluationServiceImpl.java @@ -0,0 +1,26 @@ +package com.bipt.intelligentapplicationorchestrationservice.service.Impl; + +import com.bipt.intelligentapplicationorchestrationservice.mapper.EvaluationMapper; +import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelLogVO; +import com.bipt.intelligentapplicationorchestrationservice.service.EvaluationService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class EvaluationServiceImpl implements EvaluationService { + @Autowired + private EvaluationMapper evaluationMapper; + /** + * 获取日志详情 + * @param id 模型日志id + * @return 日志详情 + */ + @Override + public ModelLogVO detail(Long id) { +// log.info("id:{}", id); + ModelLogVO modelLogVO = evaluationMapper.selectLogDetail(id); + return modelLogVO; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c50d915..fdc5805 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,4 +8,11 @@ spring.datasource.password=root spring.datasource.driver-class-name=com.kingbase8.Driver spring.datasource.hikari.maximum-pool-size=10 spring.datasource.hikari.minimum-idle=5 -spring.datasource.hikari.connection-timeout=30000 \ No newline at end of file +spring.datasource.hikari.connection-timeout=30000 + +# SQL映射文件路径配置 +mybatis.mapper-locations=classpath:mapper/*.xml +# 配置实体类别名所在包 +mybatis.type-aliases-package=com.bipt.intelligentapplicationorchestrationservice.pojo +# 开启驼峰命名转换 +mybatis.configuration.map-underscore-to-camel-case=true \ No newline at end of file diff --git a/src/main/resources/mapper/EvaluationMapper.xml b/src/main/resources/mapper/EvaluationMapper.xml new file mode 100644 index 0000000..c6db155 --- /dev/null +++ b/src/main/resources/mapper/EvaluationMapper.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file -- 2.25.1