人工备份增加
This commit is contained in:
parent
a1b68f8617
commit
4a19a8f743
@ -125,11 +125,18 @@ public class ModelAssessTaskManualController {
|
||||
@PostMapping("/backup")
|
||||
@Operation(summary = "备份")
|
||||
@PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:update')")
|
||||
public CommonResult<Boolean> backedUp(@Valid @RequestBody ModelAssessTaskManualBackupReqVO backupReqVO) {
|
||||
modelAssessTaskManualService.backupModelAssessTaskManual(backupReqVO);
|
||||
public CommonResult<Boolean> backedUp(@RequestParam("id") Long id) {
|
||||
modelAssessTaskManualService.backupModelAssessTaskManual(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@PostMapping("/unBackup")
|
||||
@Operation(summary = "取消备份")
|
||||
@PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:update')")
|
||||
public CommonResult<Boolean> unBackup(@RequestParam("id") Long id) {
|
||||
modelAssessTaskManualService.unBackup(id);
|
||||
return success(true);
|
||||
}
|
||||
@PostMapping("/saveTheLabelData")
|
||||
@Operation(summary = "保存标注数据")
|
||||
@PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:create')")
|
||||
|
@ -0,0 +1,40 @@
|
||||
package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 模型评估人工标注 模型回答分页 Request VO")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
public class ManualModelAnswerBackupPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "人工标注主表id", example = "11254")
|
||||
private Long manalTaskId;
|
||||
|
||||
@Schema(description = "数据集问题id", example = "3739")
|
||||
private Long questionId;
|
||||
|
||||
@Schema(description = "数据集id", example = "25952")
|
||||
private Long datasetId;
|
||||
|
||||
@Schema(description = "标注状态", example = "1")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "模型回答内容")
|
||||
private String modelAnswer;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
@Schema(description = "标注信息")
|
||||
private String reqRespVos;
|
||||
|
||||
}
|
@ -0,0 +1,47 @@
|
||||
package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 模型评估人工标注 模型回答 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class ManualModelAnswerBackupRespVO {
|
||||
|
||||
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6118")
|
||||
@ExcelProperty("主键id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "人工标注主表id", example = "11254")
|
||||
@ExcelProperty("人工标注主表id")
|
||||
private Long manalTaskId;
|
||||
|
||||
@Schema(description = "数据集问题id", example = "3739")
|
||||
@ExcelProperty("数据集问题id")
|
||||
private Long questionId;
|
||||
|
||||
@Schema(description = "数据集id", example = "25952")
|
||||
@ExcelProperty("数据集id")
|
||||
private Long datasetId;
|
||||
|
||||
@Schema(description = "标注状态", example = "1")
|
||||
@ExcelProperty("标注状态")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "模型回答内容")
|
||||
@ExcelProperty("模型回答内容")
|
||||
private String modelAnswer;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "标注信息")
|
||||
@ExcelProperty("标注信息")
|
||||
private String reqRespVos;
|
||||
|
||||
}
|
@ -0,0 +1,33 @@
|
||||
package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 模型评估人工标注 模型回答新增/修改 Request VO")
|
||||
@Data
|
||||
public class ManualModelAnswerBackupSaveReqVO {
|
||||
|
||||
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6118")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "人工标注主表id", example = "11254")
|
||||
private Long manalTaskId;
|
||||
|
||||
@Schema(description = "数据集问题id", example = "3739")
|
||||
private Long questionId;
|
||||
|
||||
@Schema(description = "数据集id", example = "25952")
|
||||
private Long datasetId;
|
||||
|
||||
@Schema(description = "标注状态", example = "1")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "模型回答内容")
|
||||
private String modelAnswer;
|
||||
|
||||
@Schema(description = "标注信息")
|
||||
private String reqRespVos;
|
||||
|
||||
}
|
@ -0,0 +1,31 @@
|
||||
package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 人工打分 评估维度分页 Request VO")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
public class ModelAssessTaskDimensionBackupPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "任务ID", example = "23100")
|
||||
private Long taskId;
|
||||
|
||||
@Schema(description = "评估维度ID", example = "20347")
|
||||
private Long dimensionId;
|
||||
|
||||
@Schema(description = "备注", example = "你猜")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
@ -0,0 +1,35 @@
|
||||
package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 人工打分 评估维度 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class ModelAssessTaskDimensionBackupRespVO {
|
||||
|
||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17617")
|
||||
@ExcelProperty("ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23100")
|
||||
@ExcelProperty("任务ID")
|
||||
private Long taskId;
|
||||
|
||||
@Schema(description = "评估维度ID", example = "20347")
|
||||
@ExcelProperty("评估维度ID")
|
||||
private Long dimensionId;
|
||||
|
||||
@Schema(description = "备注", example = "你猜")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
@ -0,0 +1,25 @@
|
||||
package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 人工打分 评估维度新增/修改 Request VO")
|
||||
@Data
|
||||
public class ModelAssessTaskDimensionBackupSaveReqVO {
|
||||
|
||||
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17617")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23100")
|
||||
@NotNull(message = "任务ID不能为空")
|
||||
private Long taskId;
|
||||
|
||||
@Schema(description = "评估维度ID", example = "20347")
|
||||
private Long dimensionId;
|
||||
|
||||
@Schema(description = "备注", example = "你猜")
|
||||
private String remark;
|
||||
|
||||
}
|
@ -65,5 +65,9 @@ public class ModelAssessTaskManualDO extends BaseDO {
|
||||
* 模型类型
|
||||
*/
|
||||
private Integer modelType;
|
||||
/**
|
||||
* 备份目标id
|
||||
*/
|
||||
private Long backupId;
|
||||
|
||||
}
|
@ -0,0 +1,57 @@
|
||||
package cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup;
|
||||
|
||||
import cn.iocoder.yudao.module.llm.handler.ListHashMapTypeHandler;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
|
||||
/**
|
||||
* 模型评估人工标注 模型回答 DO
|
||||
*
|
||||
* @author 华大大模型
|
||||
*/
|
||||
@TableName("llm_manual_model_answer_backup")
|
||||
@KeySequence("llm_manual_model_answer_backup_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ManualModelAnswerBackupDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 人工标注主表id
|
||||
*/
|
||||
private Long manalTaskId;
|
||||
/**
|
||||
* 数据集问题id
|
||||
*/
|
||||
private Long questionId;
|
||||
/**
|
||||
* 数据集id
|
||||
*/
|
||||
private Long datasetId;
|
||||
/**
|
||||
* 标注状态
|
||||
*/
|
||||
private Integer status;
|
||||
/**
|
||||
* 模型回答内容
|
||||
*/
|
||||
private String modelAnswer;
|
||||
/**
|
||||
* 标注信息
|
||||
*/
|
||||
@TableField(typeHandler = ListHashMapTypeHandler.class)
|
||||
private List<HashMap<String, Object>> reqRespVos;
|
||||
|
||||
}
|
@ -0,0 +1,40 @@
|
||||
package cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup;
|
||||
|
||||
import lombok.*;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
|
||||
/**
|
||||
* 人工打分 评估维度 DO
|
||||
*
|
||||
* @author 华大大模型
|
||||
*/
|
||||
@TableName("llm_model_assess_task_dimension_backup")
|
||||
@KeySequence("llm_model_assess_task_dimension_backup_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ModelAssessTaskDimensionBackupDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 任务ID
|
||||
*/
|
||||
private Long taskId;
|
||||
/**
|
||||
* 评估维度ID
|
||||
*/
|
||||
private Long dimensionId;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
@ -0,0 +1,34 @@
|
||||
package cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo.ManualModelAnswerBackupPageReqVO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ManualModelAnswerBackupDO;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 模型评估人工标注 模型回答 Mapper
|
||||
*
|
||||
* @author 华大大模型
|
||||
*/
|
||||
@Mapper
|
||||
public interface ManualModelAnswerBackupMapper extends BaseMapperX<ManualModelAnswerBackupDO> {
|
||||
|
||||
default PageResult<ManualModelAnswerBackupDO> selectPage(ManualModelAnswerBackupPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<ManualModelAnswerBackupDO>()
|
||||
.eqIfPresent(ManualModelAnswerBackupDO::getManalTaskId, reqVO.getManalTaskId())
|
||||
.eqIfPresent(ManualModelAnswerBackupDO::getQuestionId, reqVO.getQuestionId())
|
||||
.eqIfPresent(ManualModelAnswerBackupDO::getDatasetId, reqVO.getDatasetId())
|
||||
.eqIfPresent(ManualModelAnswerBackupDO::getStatus, reqVO.getStatus())
|
||||
.eqIfPresent(ManualModelAnswerBackupDO::getModelAnswer, reqVO.getModelAnswer())
|
||||
.betweenIfPresent(ManualModelAnswerBackupDO::getCreateTime, reqVO.getCreateTime())
|
||||
.eqIfPresent(ManualModelAnswerBackupDO::getReqRespVos, reqVO.getReqRespVos())
|
||||
.orderByDesc(ManualModelAnswerBackupDO::getId));
|
||||
}
|
||||
@Delete("delete from llm_manual_model_answer_backup where manal_task_id = #{id}")
|
||||
void deleteTrue(Long id);
|
||||
}
|
@ -0,0 +1,29 @@
|
||||
package cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo.ModelAssessTaskDimensionBackupPageReqVO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupDO;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 人工打分 评估维度 Mapper
|
||||
*
|
||||
* @author 华大大模型
|
||||
*/
|
||||
@Mapper
|
||||
public interface ModelAssessTaskDimensionBackupMapper extends BaseMapperX<ModelAssessTaskDimensionBackupDO> {
|
||||
|
||||
default PageResult<ModelAssessTaskDimensionBackupDO> selectPage(ModelAssessTaskDimensionBackupPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<ModelAssessTaskDimensionBackupDO>()
|
||||
.eqIfPresent(ModelAssessTaskDimensionBackupDO::getTaskId, reqVO.getTaskId())
|
||||
.eqIfPresent(ModelAssessTaskDimensionBackupDO::getDimensionId, reqVO.getDimensionId())
|
||||
.eqIfPresent(ModelAssessTaskDimensionBackupDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(ModelAssessTaskDimensionBackupDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(ModelAssessTaskDimensionBackupDO::getId));
|
||||
}
|
||||
@Delete("delete from llm_model_assess_task_dimension_backup where task_id = #{id}")
|
||||
void deleteTrue(Long id);
|
||||
}
|
@ -6,8 +6,10 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskManualBackupDO;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo.*;
|
||||
import org.apache.ibatis.annotations.Update;
|
||||
|
||||
/**
|
||||
* 人工评估备份 Mapper
|
||||
@ -30,5 +32,6 @@ public interface ModelAssessTaskManualBackupMapper extends BaseMapperX<ModelAsse
|
||||
.eqIfPresent(ModelAssessTaskManualBackupDO::getProgress, reqVO.getProgress())
|
||||
.orderByDesc(ModelAssessTaskManualBackupDO::getId));
|
||||
}
|
||||
|
||||
@Delete("delete from llm_model_assess_task_manual_backup where id = #{id}")
|
||||
void deleteTrue(Long id);
|
||||
}
|
@ -1,18 +1,28 @@
|
||||
package cn.iocoder.yudao.module.llm.service.async;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.module.llm.controller.admin.dataset.vo.DatasetQuestionRespVO;
|
||||
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualSaveReqVO;
|
||||
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo.ModelAssessTaskManualBackupSaveReqVO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ManualModelAnswerDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskDimensionDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskManualDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ManualModelAnswerBackupDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskManualBackupDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetMapper;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ManualModelAnswerMapper;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ModelAssessTaskDimensionMapper;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ModelAssessTaskManualMapper;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ManualModelAnswerBackupMapper;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupMapper;
|
||||
import cn.iocoder.yudao.module.llm.service.conversation.ConversationService;
|
||||
import cn.iocoder.yudao.module.llm.service.dataset.DatasetQuestionService;
|
||||
import cn.iocoder.yudao.module.llm.service.http.ModelService;
|
||||
import cn.iocoder.yudao.module.llm.service.http.vo.ModelCompletionsReqVO;
|
||||
import cn.iocoder.yudao.module.llm.service.http.vo.ModelCompletionsRespVO;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
@ -35,6 +45,13 @@ public class AsyncModelAccessManualService {
|
||||
private ManualModelAnswerMapper manualModelAnswerMapper;
|
||||
@Resource
|
||||
private ModelAssessTaskManualMapper modelAssessTaskManualMapper;
|
||||
@Resource
|
||||
private ModelAssessTaskDimensionMapper modelAssessTaskDimensionMapper;
|
||||
@Resource
|
||||
private ModelAssessTaskDimensionBackupMapper modelAssessTaskDimensionBackupMapper;
|
||||
@Resource
|
||||
private ManualModelAnswerBackupMapper manualModelAnswerBackupMapper;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -76,4 +93,38 @@ public class AsyncModelAccessManualService {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Async
|
||||
public void manualBackup(ModelAssessTaskManualBackupDO backupDo) {
|
||||
try {
|
||||
// 源数据表
|
||||
Long srcId = backupDo.getSrcId();
|
||||
// 备份人工打分评估维度
|
||||
List<ModelAssessTaskDimensionDO> modelAssessTaskDimensionDOS = modelAssessTaskDimensionMapper.selectList(new LambdaQueryWrapper<ModelAssessTaskDimensionDO>()
|
||||
.eq(ModelAssessTaskDimensionDO::getTaskId, srcId));
|
||||
if (!CollectionUtils.isAnyEmpty(modelAssessTaskDimensionDOS)){
|
||||
modelAssessTaskDimensionDOS.forEach(item -> {
|
||||
ModelAssessTaskDimensionBackupDO bean = BeanUtils.toBean(item, ModelAssessTaskDimensionBackupDO.class);
|
||||
bean.setId(null);
|
||||
bean.setTaskId(backupDo.getId());
|
||||
modelAssessTaskDimensionBackupMapper.insert(bean);
|
||||
});
|
||||
}
|
||||
List<ManualModelAnswerDO> manualModelAnswerDOS = manualModelAnswerMapper.selectList(new LambdaQueryWrapper<ManualModelAnswerDO>()
|
||||
.eq(ManualModelAnswerDO::getManalTaskId, srcId));
|
||||
if (!CollectionUtils.isAnyEmpty(manualModelAnswerDOS)){
|
||||
manualModelAnswerDOS.forEach(item -> {
|
||||
ManualModelAnswerBackupDO bean = BeanUtils.toBean(item, ManualModelAnswerBackupDO.class);
|
||||
bean.setId(null);
|
||||
bean.setManalTaskId(backupDo.getId());
|
||||
manualModelAnswerBackupMapper.insert(bean);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}catch (Exception e){
|
||||
log.error("Manual backup failed manually : {}",e.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -56,5 +56,7 @@ public interface ModelAssessTaskManualService {
|
||||
|
||||
List<ManualEvaluationReportRespVO> gitViewTheReportDetails(Long id);
|
||||
|
||||
void backupModelAssessTaskManual(ModelAssessTaskManualBackupReqVO updateReqVO);
|
||||
void backupModelAssessTaskManual(Long id);
|
||||
|
||||
void unBackup(Long id);
|
||||
}
|
||||
|
@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ManualMo
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ManualModelAnswerDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessDimensionDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskDimensionDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskManualBackupDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.basemodel.BaseModelMapper;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetMapper;
|
||||
@ -242,16 +243,29 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe
|
||||
|
||||
|
||||
@Override
|
||||
public void backupModelAssessTaskManual(ModelAssessTaskManualBackupReqVO backupReqVO) {
|
||||
ModelAssessTaskManualDO modelDo = modelAssessTaskManualMapper.selectById(backupReqVO.getId());
|
||||
public void backupModelAssessTaskManual(Long id) {
|
||||
ModelAssessTaskManualDO modelDo = modelAssessTaskManualMapper.selectById(id);
|
||||
if(modelDo == null) {
|
||||
throw exception(MODEL_ASSESS_TASK_MANUAL_NOT_EXISTS);
|
||||
}
|
||||
this.modelAssessTaskManualBackupService.isBackup(backupReqVO.getId());
|
||||
this.modelAssessTaskManualBackupService.isBackup(id);
|
||||
ModelAssessTaskManualBackupSaveReqVO backupDo = BeanUtils.toBean(modelDo, ModelAssessTaskManualBackupSaveReqVO.class);
|
||||
backupDo.setId(null);
|
||||
backupDo.setSrcId(backupReqVO.getId());
|
||||
this.modelAssessTaskManualBackupService.createModelAssessTaskManualBackup(backupDo);
|
||||
backupDo.setSrcId(id);
|
||||
Long modelAssessTaskManualBackup = this.modelAssessTaskManualBackupService.createModelAssessTaskManualBackup(backupDo);
|
||||
|
||||
modelDo.setBackupId(modelAssessTaskManualBackup);
|
||||
modelAssessTaskManualMapper.updateById(modelDo);
|
||||
ModelAssessTaskManualBackupDO modelAssessTaskManualBackup1 = this.modelAssessTaskManualBackupService.getModelAssessTaskManualBackup(modelAssessTaskManualBackup);
|
||||
asyncModelAccessManualService.manualBackup(modelAssessTaskManualBackup1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unBackup(Long id) {
|
||||
ModelAssessTaskManualDO modelAssessTaskManualDO = modelAssessTaskManualMapper.selectById(id);
|
||||
this.modelAssessTaskManualBackupService.unBackup(modelAssessTaskManualDO.getBackupId());
|
||||
modelAssessTaskManualDO.setBackupId(0L);
|
||||
modelAssessTaskManualMapper.updateById(modelAssessTaskManualDO);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,4 +54,5 @@ public interface ModelAssessTaskManualBackupService {
|
||||
|
||||
void isBackup(Long srcId);
|
||||
|
||||
void unBackup(Long id);
|
||||
}
|
@ -1,5 +1,8 @@
|
||||
package cn.iocoder.yudao.module.llm.service.modelassesstaskmanualbackup;
|
||||
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ManualModelAnswerMapper;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ManualModelAnswerBackupMapper;
|
||||
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@ -28,6 +31,10 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa
|
||||
|
||||
@Resource
|
||||
private ModelAssessTaskManualBackupMapper modelAssessTaskManualBackupMapper;
|
||||
@Resource
|
||||
private ModelAssessTaskDimensionBackupMapper modelAssessTaskDimensionBackupMapper;
|
||||
@Resource
|
||||
private ManualModelAnswerBackupMapper manualModelAnswerBackupMapper;
|
||||
|
||||
@Override
|
||||
public Long createModelAssessTaskManualBackup(ModelAssessTaskManualBackupSaveReqVO createReqVO) {
|
||||
@ -79,4 +86,11 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unBackup(Long id) {
|
||||
modelAssessTaskManualBackupMapper.deleteTrue(id);
|
||||
modelAssessTaskDimensionBackupMapper.deleteTrue(id);
|
||||
manualModelAnswerBackupMapper.deleteTrue(id);
|
||||
}
|
||||
|
||||
}
|
@ -109,8 +109,8 @@ public class ModelServiceServiceImpl implements ModelServiceService {
|
||||
//todo 关闭模型服务
|
||||
asyncModelServiceService.stopModelService(updateObj);
|
||||
|
||||
updateObj.setStatus(3);
|
||||
modelServiceMapper.updateById(updateObj);
|
||||
/* updateObj.setStatus(3);
|
||||
modelServiceMapper.updateById(updateObj);*/
|
||||
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupMapper">
|
||||
|
||||
<!--
|
||||
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
|
||||
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
|
||||
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
|
||||
文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
|
||||
-->
|
||||
|
||||
</mapper>
|
Loading…
x
Reference in New Issue
Block a user