Skip to content

L
lmp_server
Commit 6a5f9921 authored by linpeiqin's avatar linpeiqin
Browse files
Options

整体格式调整

parent 1b77ba51
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2043 additions and 2082 deletions
application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetDetailController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.ImportUtil;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.DatasetDetailDto;
import com.yice.webadmin.app.model.DatasetDetail;
import com.yice.webadmin.app.service.DatasetDetailService;
import com.yice.webadmin.app.vo.DatasetDetailVo;
import com.yice.webadmin.config.ApplicationConfig;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
......@@ -20,7 +23,8 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.*;
import java.util.List;
import java.util.Objects;
/**
* 数据集详情操作控制器类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetManageController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.DatasetManageDto;
import com.yice.webadmin.app.dto.DatasetVersionDto;
import com.yice.webadmin.app.model.DatasetManage;
import com.yice.webadmin.app.model.DatasetVersion;
import com.yice.webadmin.app.service.DatasetManageService;
import com.yice.webadmin.app.vo.DatasetManageVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 数据集管理操作控制器类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetVersionController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
......@@ -27,8 +25,6 @@ import com.yice.webadmin.config.ApplicationConfig;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.http.HttpHeaders;
......@@ -38,7 +34,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
......@@ -167,6 +162,26 @@ public class DatasetVersionController {
return ResponseResult.success(datasetVersionVo);
}
/**
* 查看指定数据集最新版本对象详情。
*
* @param datasetId 指定对象主键Id。
* @return 应答结果对象，包含对象详情。
*/
@GetMapping("/lastDatasetVersion")
public ResponseResult<DatasetVersionVo> lastDatasetVersion(@RequestParam Long datasetId) {
DatasetVersion datasetVersionFilter = new DatasetVersion();
datasetVersionFilter.setDatasetId(datasetId);
List<DatasetVersion> datasetVersions = datasetVersionService.getDatasetVersionList(datasetVersionFilter, "dataset_version");
if (datasetVersions == null) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
DatasetVersion datasetVersion = datasetVersions.get(datasetVersions.size() - 1);
DatasetVersionVo datasetVersionVo = DatasetVersion.INSTANCE.fromModel(datasetVersion);
return ResponseResult.success(datasetVersionVo);
}
private ResponseResult<Void> doDelete(Long versionId) {
String errorMessage;
// 验证关联Id的数据合法性
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelCompressController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.alibaba.fastjson.JSONObject;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.ModelCompressDto;
import com.yice.webadmin.app.dto.ModelTaskDto;
import com.yice.webadmin.app.model.ModelCompress;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelCompressService;
import com.yice.webadmin.app.service.ModelTaskService;
import com.yice.webadmin.app.service.ModelVersionService;
import com.yice.webadmin.app.vo.ModelCompressVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 模型压缩操作控制器类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelDeployController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.ModelDeployDto;
import com.yice.webadmin.app.model.ModelDeploy;
import com.yice.webadmin.app.service.ModelDeployService;
import com.yice.webadmin.app.vo.ModelDeployVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 模型部署操作控制器类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelEstimateController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.alibaba.fastjson.JSONObject;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.ModelEstimateDto;
import com.yice.webadmin.app.dto.ModelTaskDto;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelEstimateService;
import com.yice.webadmin.app.service.ModelTaskService;
import com.yice.webadmin.app.service.ModelVersionService;
import com.yice.webadmin.app.vo.ModelEstimateVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 模型评估操作控制器类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelManageController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.alibaba.fastjson.JSONObject;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.ModelDeployDto;
import com.yice.webadmin.app.dto.ModelManageDto;
import com.yice.webadmin.app.dto.ModelTaskDto;
import com.yice.webadmin.app.dto.ModelVersionDto;
import com.yice.webadmin.app.model.ModelDeploy;
import com.yice.webadmin.app.model.ModelManage;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelManageService;
import com.yice.webadmin.app.service.ModelVersionService;
import com.yice.webadmin.app.vo.ModelManageVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 模型管理操作控制器类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelSquareController.java deleted 100644 → 0
View file @ 1b77ba51
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
/**
* 模型广场操作控制器类。
*
* @author linking
* @date 2023-04-13
*/
@Api(tags = "模型广场管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/modelSquare")
public class ModelSquareController {
@Autowired
private ModelSquareService modelSquareService;
/**
* 新增模型广场数据。
*
* @param modelSquareDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
@ApiOperationSupport(ignoreParameters = {"modelSquareDto.modelId", "modelSquareDto.searchString"})
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody ModelSquareDto modelSquareDto) {
String errorMessage = MyCommonUtil.getModelValidationError(modelSquareDto, false);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
ModelSquare modelSquare = MyModelUtil.copyTo(modelSquareDto, ModelSquare.class);
modelSquare = modelSquareService.saveNew(modelSquare);
return ResponseResult.success(modelSquare.getModelId());
}
/**
* 更新模型广场数据。
*
* @param modelSquareDto 更新对象。
* @return 应答结果对象。
*/
@ApiOperationSupport(ignoreParameters = {"modelSquareDto.searchString"})
@OperationLog(type = SysOperationLogType.UPDATE)
@PostMapping("/update")
public ResponseResult<Void> update(@MyRequestBody ModelSquareDto modelSquareDto) {
String errorMessage = MyCommonUtil.getModelValidationError(modelSquareDto, true);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
ModelSquare modelSquare = MyModelUtil.copyTo(modelSquareDto, ModelSquare.class);
ModelSquare originalModelSquare = modelSquareService.getById(modelSquare.getModelId());
if (originalModelSquare == null) {
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
if (!modelSquareService.update(modelSquare, originalModelSquare)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
return ResponseResult.success();
}
/**
* 删除模型广场数据。
*
* @param modelId 删除对象主键Id。
* @return 应答结果对象。
*/
@OperationLog(type = SysOperationLogType.DELETE)
@PostMapping("/delete")
public ResponseResult<Void> delete(@MyRequestBody Long modelId) {
if (MyCommonUtil.existBlankArgument(modelId)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
return this.doDelete(modelId);
}
/**
* 列出符合过滤条件的模型广场列表。
*
* @param modelSquareDtoFilter 过滤对象。
* @param orderParam 排序参数。
* @param pageParam 分页参数。
* @return 应答结果对象，包含查询结果集。
*/
@PostMapping("/list")
public ResponseResult<MyPageData<ModelSquareVo>> list(
@MyRequestBody ModelSquareDto modelSquareDtoFilter,
@MyRequestBody MyOrderParam orderParam,
@MyRequestBody MyPageParam pageParam) {
if (pageParam != null) {
PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
}
ModelSquare modelSquareFilter = MyModelUtil.copyTo(modelSquareDtoFilter, ModelSquare.class);
String orderBy = MyOrderParam.buildOrderBy(orderParam, ModelSquare.class);
List<ModelSquare> modelSquareList =
modelSquareService.getModelSquareListWithRelation(modelSquareFilter, orderBy);
return ResponseResult.success(MyPageUtil.makeResponseData(modelSquareList, ModelSquare.INSTANCE));
}
/**
* 查看指定模型广场对象详情。
*
* @param modelId 指定对象主键Id。
* @return 应答结果对象，包含对象详情。
*/
@GetMapping("/view")
public ResponseResult<ModelSquareVo> view(@RequestParam Long modelId) {
ModelSquare modelSquare = modelSquareService.getByIdWithRelation(modelId, MyRelationParam.full());
if (modelSquare == null) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
ModelSquareVo modelSquareVo = ModelSquare.INSTANCE.fromModel(modelSquare);
return ResponseResult.success(modelSquareVo);
}
private ResponseResult<Void> doDelete(Long modelId) {
String errorMessage;
// 验证关联Id的数据合法性
ModelSquare originalModelSquare = modelSquareService.getById(modelId);
if (originalModelSquare == null) {
// NOTE: 修改下面方括号中的话述
errorMessage = "数据验证失败，当前 [对象] 并不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
if (!modelSquareService.remove(modelId)) {
errorMessage = "数据操作失败，删除的对象不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
return ResponseResult.success();
}
}
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelTaskController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.alibaba.fastjson.JSONObject;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.ModelCompressDto;
import com.yice.webadmin.app.dto.ModelEstimateDto;
import com.yice.webadmin.app.dto.ModelTaskDto;
import com.yice.webadmin.app.model.ModelCompress;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.service.ModelTaskService;
import com.yice.webadmin.app.vo.ModelTaskVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 模型任务操作控制器类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelVersionController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.ModelVersionDto;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelVersionService;
import com.yice.webadmin.app.vo.ModelVersionVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 模型版本操作控制器类。
......@@ -143,6 +145,25 @@ public class ModelVersionController {
return ResponseResult.success(modelVersionVo);
}
/**
* 查看指定模型最新版本对象详情。
*
* @param modelId 指定对象主键Id。
* @return 应答结果对象，包含对象详情。
*/
@GetMapping("/lastModelVersion")
public ResponseResult<ModelVersionVo> lastModelVersion(@RequestParam Long modelId) {
ModelVersion modelVersionFilter = new ModelVersion();
modelVersionFilter.setModelId(modelId);
List<ModelVersion> modelVersions = modelVersionService.getModelVersionList(modelVersionFilter, "model_version");
if (modelVersions == null) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
ModelVersion modelVersion = modelVersions.get(modelVersions.size() - 1);
ModelVersionVo modelVersionVo = ModelVersion.INSTANCE.fromModel(modelVersion);
return ResponseResult.success(modelVersionVo);
}
private ResponseResult<Void> doDelete(Long versionId) {
String errorMessage;
// 验证关联Id的数据合法性
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/PromptOptimizeBatchController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.PromptOptimizeBatchDto;
import com.yice.webadmin.app.model.PromptOptimizeBatch;
import com.yice.webadmin.app.service.PromptOptimizeBatchService;
import com.yice.webadmin.app.vo.PromptOptimizeBatchVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 提示词批量优化操作控制器类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/PromptTemplateController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.PromptTemplateDto;
import com.yice.webadmin.app.model.PromptTemplate;
import com.yice.webadmin.app.model.PromptTemplateCollect;
import com.yice.webadmin.app.service.PromptTemplateCollectService;
import com.yice.webadmin.app.service.PromptTemplateService;
import com.yice.webadmin.app.vo.PromptTemplateVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.Date;
import java.util.List;
/**
* 提示词模板操作控制器类。
......@@ -174,6 +179,7 @@ public class PromptTemplateController {
promptTemplateCollect = promptTemplateCollectService.saveNew(promptTemplateCollect);
return ResponseResult.success(promptTemplateCollect.getCollectId());
}
/**
* 列出符合过滤条件的提示词模板列表。
*
......@@ -197,6 +203,7 @@ public class PromptTemplateController {
promptTemplateService.getPromptTemplateListWithRelation(promptTemplateFilter, orderBy);
return ResponseResult.success(MyPageUtil.makeResponseData(promptTemplateList, PromptTemplate.INSTANCE));
}
@PostMapping("/listForCollect")
public ResponseResult<MyPageData<PromptTemplateVo>> listForCollect(
@MyRequestBody PromptTemplateDto promptTemplateDtoFilter,
......@@ -212,6 +219,7 @@ public class PromptTemplateController {
promptTemplateService.getPromptTemplateForCollectListWithRelation(promptTemplateFilter, orderBy);
return ResponseResult.success(MyPageUtil.makeResponseData(promptTemplateList, PromptTemplate.INSTANCE));
}
/**
* 查看指定提示词模板对象详情。
*
......@@ -243,6 +251,7 @@ public class PromptTemplateController {
}
return ResponseResult.success();
}
/**
* 删除提示词模板收藏数据。
*
......@@ -257,6 +266,7 @@ public class PromptTemplateController {
}
return this.doDeleteCollect(templateId);
}
private ResponseResult<Void> doDeleteCollect(Long templateId) {
String errorMessage;
PromptTemplateCollect promptTemplateCollect = new PromptTemplateCollect();
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/TuningRunController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.RunPublishDto;
import com.yice.webadmin.app.dto.TuningRunDto;
import com.yice.webadmin.app.model.TuningRun;
import com.yice.webadmin.app.model.TuningTask;
import com.yice.webadmin.app.service.TuningRunService;
import com.yice.webadmin.app.service.TuningTaskService;
import com.yice.webadmin.app.vo.TuningRunVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 精调任务运行操作控制器类。
......@@ -33,6 +38,8 @@ public class TuningRunController {
@Autowired
private TuningRunService tuningRunService;
@Autowired
private TuningTaskService tuningTaskService;
/**
* 新增精调任务运行数据。
......@@ -49,6 +56,13 @@ public class TuningRunController {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
TuningRun tuningRun = MyModelUtil.copyTo(tuningRunDto, TuningRun.class);
TuningRun tuningRunFilter = new TuningRun();
tuningRunFilter.setTaskId(tuningRun.getTaskId());
List<TuningRun> reTuningRunList = this.tuningRunService.getTuningRunList(tuningRunFilter, "run_version");
TuningTask tuningTask = this.tuningTaskService.getById(tuningRun.getTaskId());
Integer lastRunVersion = reTuningRunList.get(reTuningRunList.size() - 1).getRunVersion();
tuningRun.setRunVersion(lastRunVersion);
tuningRun.setRunName(tuningTask.getTaskName() + " V" + lastRunVersion + 1);
tuningRun = tuningRunService.saveNew(tuningRun);
return ResponseResult.success(tuningRun.getRunId());
}
......@@ -79,6 +93,25 @@ public class TuningRunController {
return ResponseResult.success();
}
/**
* 发布运行任务。
*
* @param runPublishDto 更新对象。
* @return 应答结果对象。
*/
@OperationLog(type = SysOperationLogType.PUBLISH)
@PostMapping("/publish")
public ResponseResult<Void> publish(@MyRequestBody RunPublishDto runPublishDto) {
String errorMessage = MyCommonUtil.getModelValidationError(runPublishDto, true);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
if (!this.tuningRunService.publishToModelVersion(runPublishDto)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
return ResponseResult.success();
}
/**
* 删除精调任务运行数据。
*
......@@ -116,6 +149,19 @@ public class TuningRunController {
return ResponseResult.success(MyPageUtil.makeResponseData(tuningRunList, TuningRun.INSTANCE));
}
/**
* 列出符合过滤条件的SFT任务列表。
*
* @return 应答结果对象，包含查询结果集。
*/
@PostMapping("/listForTree")
public ResponseResult<List<TuningRunVo>> listForTree(@MyRequestBody TuningRunDto tuningRunDtoFilter) {
TuningRun tuningRunFilter = MyModelUtil.copyTo(tuningRunDtoFilter, TuningRun.class);
List<TuningRun> tuningRunList =
tuningRunService.getTuningRunListWithRelation(tuningRunFilter, "");
return ResponseResult.success(TuningRun.INSTANCE.fromModelList(tuningRunList));
}
/**
* 查看指定精调任务运行对象详情。
*
......@@ -132,6 +178,25 @@ public class TuningRunController {
return ResponseResult.success(tuningRunVo);
}
/**
* 查看指定精调任务运行新版本对象详情。
*
* @param taskId 指定对象主键Id。
* @return 应答结果对象，包含对象详情。
*/
@GetMapping("/lastRunVersion")
public ResponseResult<TuningRunVo> lastRunVersion(@RequestParam Long taskId) {
TuningRun tuningRunFilter = new TuningRun();
tuningRunFilter.setTaskId(taskId);
List<TuningRun> tuningRuns = tuningRunService.getTuningRunList(tuningRunFilter, "run_version");
if (tuningRuns == null) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
TuningRun tuningRun = tuningRuns.get(tuningRuns.size() - 1);
TuningRunVo tuningRunVo = TuningRun.INSTANCE.fromModel(tuningRun);
return ResponseResult.success(tuningRunVo);
}
private ResponseResult<Void> doDelete(Long runId) {
String errorMessage;
// 验证关联Id的数据合法性
......
application-webadmin/src/main/java/com/yice/webadmin/app/controller/TuningTaskController.java
View file @ 6a5f9921
package com.yice.webadmin.app.controller;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
import com.yice.webadmin.app.vo.*;
import com.yice.webadmin.app.dto.*;
import com.yice.webadmin.app.model.*;
import com.yice.webadmin.app.service.*;
import com.yice.common.core.object.*;
import com.yice.common.core.util.*;
import com.yice.common.core.constant.*;
import com.yice.common.core.annotation.MyRequestBody;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.yice.common.core.annotation.MyRequestBody;
import com.yice.common.core.constant.ErrorCodeEnum;
import com.yice.common.core.object.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.core.util.MyPageUtil;
import com.yice.common.log.annotation.OperationLog;
import com.yice.common.log.model.constant.SysOperationLogType;
import com.yice.webadmin.app.dto.TuningRunDto;
import com.yice.webadmin.app.dto.TuningTaskDto;
import com.yice.webadmin.app.model.TuningRun;
import com.yice.webadmin.app.model.TuningTask;
import com.yice.webadmin.app.service.TuningTaskService;
import com.yice.webadmin.app.vo.TuningTaskVo;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.List;
/**
* 精调任务操作控制器类。
......@@ -43,13 +47,15 @@ public class TuningTaskController {
@ApiOperationSupport(ignoreParameters = {"tuningTaskDto.taskId", "tuningTaskDto.searchString"})
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody TuningTaskDto tuningTaskDto) {
public ResponseResult<Long> add(@MyRequestBody TuningTaskDto tuningTaskDto,
@MyRequestBody TuningRunDto tuningRunDto) {
String errorMessage = MyCommonUtil.getModelValidationError(tuningTaskDto, false);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
TuningTask tuningTask = MyModelUtil.copyTo(tuningTaskDto, TuningTask.class);
tuningTask = tuningTaskService.saveNew(tuningTask);
TuningRun tuningRun = MyModelUtil.copyTo(tuningRunDto, TuningRun.class);
tuningTask = tuningTaskService.saveAndCreateVersion(tuningTask, tuningRun);
return ResponseResult.success(tuningTask.getTaskId());
}
......@@ -121,6 +127,18 @@ public class TuningTaskController {
return ResponseResult.success(MyPageUtil.makeResponseData(tuningTaskList, TuningTask.INSTANCE));
}
/**
* 列出符合过滤条件的SFT任务列表。
*
* @return 应答结果对象，包含查询结果集。
*/
@PostMapping("/listForTree")
public ResponseResult<List<TuningTaskVo>> listForTree() {
List<TuningTask> tuningTaskList =
tuningTaskService.getTuningTaskListWithRelation(new TuningTask(), new TuningRun(), "");
return ResponseResult.success(TuningTask.INSTANCE.fromModelList(tuningTaskList));
}
/**
* 查看指定精调任务对象详情。
*
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/DatasetDetailMapper.java
View file @ 6a5f9921
......@@ -4,7 +4,7 @@ import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.DatasetDetail;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 数据集详情数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/DatasetManageMapper.java
View file @ 6a5f9921
......@@ -5,7 +5,7 @@ import com.yice.webadmin.app.model.DatasetManage;
import com.yice.webadmin.app.model.DatasetVersion;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 数据集管理数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/DatasetVersionMapper.java
View file @ 6a5f9921
package com.yice.webadmin.app.dao;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.DatasetVersion;
import com.yice.webadmin.app.model.DatasetDetail;
import com.yice.webadmin.app.model.DatasetVersion;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 数据集版本数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/ModelCompressMapper.java
View file @ 6a5f9921
......@@ -5,7 +5,7 @@ import com.yice.webadmin.app.model.ModelCompress;
import com.yice.webadmin.app.model.ModelTask;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 模型压缩数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/ModelDeployMapper.java
View file @ 6a5f9921
......@@ -4,7 +4,7 @@ import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.ModelDeploy;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 模型部署数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/ModelEstimateMapper.java
View file @ 6a5f9921
......@@ -6,7 +6,7 @@ import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 模型评估数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/ModelManageMapper.java
View file @ 6a5f9921
package com.yice.webadmin.app.dao;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.ModelDeploy;
import com.yice.webadmin.app.model.ModelManage;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelDeploy;
import com.yice.webadmin.app.model.ModelVersion;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 模型管理数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/ModelSquareMapper.java deleted 100644 → 0
View file @ 1b77ba51
package com.yice.webadmin.app.dao;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.ModelSquare;
import org.apache.ibatis.annotations.Param;
import java.util.*;
/**
* 模型广场数据操作访问接口。
*
* @author linking
* @date 2023-04-13
*/
public interface ModelSquareMapper extends BaseDaoMapper<ModelSquare> {
/**
* 批量插入对象列表。
*
* @param modelSquareList 新增对象列表。
*/
void insertList(List<ModelSquare> modelSquareList);
/**
* 获取过滤后的对象列表。
*
* @param modelSquareFilter 主表过滤对象。
* @param orderBy 排序字符串，order by从句的参数。
* @return 对象列表。
*/
List<ModelSquare> getModelSquareList(
@Param("modelSquareFilter") ModelSquare modelSquareFilter, @Param("orderBy") String orderBy);
}
application-webadmin/src/main/java/com/yice/webadmin/app/dao/ModelTaskMapper.java
View file @ 6a5f9921
package com.yice.webadmin.app.dao;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelCompress;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 模型任务数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/ModelVersionMapper.java
View file @ 6a5f9921
......@@ -4,7 +4,7 @@ import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.ModelVersion;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 模型版本数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/PromptOptimizeBatchMapper.java
View file @ 6a5f9921
......@@ -4,7 +4,7 @@ import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.PromptOptimizeBatch;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 提示词批量优化数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/PromptTemplateCollectMapper.java
View file @ 6a5f9921
......@@ -4,7 +4,7 @@ import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.PromptTemplateCollect;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 提示词模板收藏数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/PromptTemplateMapper.java
View file @ 6a5f9921
......@@ -4,7 +4,7 @@ import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.PromptTemplate;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 提示词模板数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/TuningRunMapper.java
View file @ 6a5f9921
......@@ -4,7 +4,7 @@ import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.TuningRun;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 精调任务运行数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/TuningTaskMapper.java
View file @ 6a5f9921
package com.yice.webadmin.app.dao;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.webadmin.app.model.TuningTask;
import com.yice.webadmin.app.model.TuningRun;
import com.yice.webadmin.app.model.TuningTask;
import org.apache.ibatis.annotations.Param;
import java.util.*;
import java.util.List;
/**
* 精调任务数据操作访问接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/DatasetDetailMapper.xml
View file @ 6a5f9921
......@@ -25,7 +25,7 @@
dataset_value,
serial_number)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.detailId},
#{item.datasetId},
#{item.createUserId},
......@@ -56,7 +56,8 @@
</if>
</sql>
<select id="getDatasetDetailList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetDetail">
<select id="getDatasetDetailList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.DatasetDetail">
SELECT * FROM lmp_dataset_detail
<where>
<include refid="filterRef"/>
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/DatasetManageMapper.xml
View file @ 6a5f9921
......@@ -25,7 +25,7 @@
update_time,
data_type)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.datasetId},
#{item.datasetName},
#{item.dimensionType},
......@@ -57,13 +57,14 @@
AND lmp_dataset_manage.dimension_type = #{datasetManageFilter.dimensionType}
</if>
<if test="datasetManageFilter.searchString != null and datasetManageFilter.searchString != ''">
<bind name = "safeDatasetManageSearchString" value = "'%' + datasetManageFilter.searchString + '%'" />
<bind name="safeDatasetManageSearchString" value="'%' + datasetManageFilter.searchString + '%'"/>
AND IFNULL(lmp_dataset_manage.dataset_name,'') LIKE #{safeDatasetManageSearchString}
</if>
</if>
</sql>
<select id="getDatasetManageList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetManage">
<select id="getDatasetManageList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.DatasetManage">
SELECT * FROM lmp_dataset_manage
<where>
<include refid="filterRef"/>
......@@ -74,7 +75,7 @@
</select>
<!-- 支持基于一对一或者一对多从表字段过滤的SQL_ID -->
<select id="getDatasetManageListEx" resultMap="BaseResultMap" >
<select id="getDatasetManageListEx" resultMap="BaseResultMap">
SELECT
lmp_dataset_manage.*
FROM
......@@ -86,7 +87,8 @@
<where>
lmp_dataset_manage.dataset_id = lmp_dataset_version.dataset_id
<include refid="com.yice.webadmin.app.dao.DatasetVersionMapper.filterRef"/>
</where>)
</where>
)
</if>
</where>
<if test="orderBy != null and orderBy != ''">
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/DatasetVersionMapper.xml
View file @ 6a5f9921
......@@ -44,7 +44,7 @@
is_inherit,
his_version)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.versionId},
#{item.datasetVersion},
#{item.inputStatus},
......@@ -85,7 +85,8 @@
</if>
</sql>
<select id="getDatasetVersionList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetVersion">
<select id="getDatasetVersionList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.DatasetVersion">
SELECT * FROM lmp_dataset_version
<where>
<include refid="filterRef"/>
......@@ -96,7 +97,7 @@
</select>
<!-- 支持基于一对一或者一对多从表字段过滤的SQL_ID -->
<select id="getDatasetVersionListEx" resultMap="BaseResultMap" >
<select id="getDatasetVersionListEx" resultMap="BaseResultMap">
SELECT
lmp_dataset_version.*
FROM
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelCompressMapper.xml
View file @ 6a5f9921
......@@ -27,7 +27,7 @@
create_method,
target_model_id)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.taskId},
#{item.createUserId},
#{item.createTime},
......@@ -54,13 +54,14 @@
AND lmp_model_compress.task_id = #{modelCompressFilter.taskId}
</if>
<if test="modelCompressFilter.searchString != null and modelCompressFilter.searchString != ''">
<bind name = "safeModelCompressSearchString" value = "'%' + modelCompressFilter.searchString + '%'" />
<bind name="safeModelCompressSearchString" value="'%' + modelCompressFilter.searchString + '%'"/>
AND IFNULL(lmp_model_compress.task_name,'') LIKE #{safeModelCompressSearchString}
</if>
</if>
</sql>
<select id="getModelCompressList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.ModelCompress">
<select id="getModelCompressList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.ModelCompress">
SELECT * FROM lmp_model_compress
<where>
<include refid="filterRef"/>
......@@ -71,7 +72,7 @@
</select>
<!-- 支持基于一对一或者一对多从表字段过滤的SQL_ID -->
<select id="getModelCompressListEx" resultMap="BaseResultMap" >
<select id="getModelCompressListEx" resultMap="BaseResultMap">
SELECT
lmp_model_compress.*
FROM
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelDeployMapper.xml
View file @ 6a5f9921
......@@ -33,7 +33,7 @@
service_name,
service_version)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.deployId},
#{item.modelId},
#{item.versionId},
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelEstimateMapper.xml
View file @ 6a5f9921
......@@ -27,7 +27,7 @@
dataset_version_id,
scoring_mode)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.taskId},
#{item.createUserId},
#{item.createTime},
......@@ -54,13 +54,14 @@
AND lmp_model_estimate.task_id = #{modelEstimateFilter.taskId}
</if>
<if test="modelEstimateFilter.searchString != null and modelEstimateFilter.searchString != ''">
<bind name = "safeModelEstimateSearchString" value = "'%' + modelEstimateFilter.searchString + '%'" />
<bind name="safeModelEstimateSearchString" value="'%' + modelEstimateFilter.searchString + '%'"/>
AND IFNULL(lmp_model_estimate.task_name,'') LIKE #{safeModelEstimateSearchString}
</if>
</if>
</sql>
<select id="getModelEstimateList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.ModelEstimate">
<select id="getModelEstimateList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.ModelEstimate">
SELECT * FROM lmp_model_estimate
<where>
<include refid="filterRef"/>
......@@ -71,7 +72,7 @@
</select>
<!-- 支持基于一对一或者一对多从表字段过滤的SQL_ID -->
<select id="getModelEstimateListEx" resultMap="BaseResultMap" >
<select id="getModelEstimateListEx" resultMap="BaseResultMap">
SELECT
lmp_model_estimate.*
FROM
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelManageMapper.xml
View file @ 6a5f9921
......@@ -31,7 +31,7 @@
is_base_model,
last_version_source)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.modelId},
#{item.modelName},
#{item.modelType},
......@@ -57,8 +57,9 @@
<sql id="inputFilterRef">
<if test="modelManageFilter != null">
<if test="modelManageFilter.searchString != null and modelManageFilter.searchString != ''">
<bind name = "safeModelManageSearchString" value = "'%' + modelManageFilter.searchString + '%'" />
AND CONCAT(IFNULL(lmp_model_manage.model_name,''), IFNULL(lmp_model_manage.business_label,'')) LIKE #{safeModelManageSearchString}
<bind name="safeModelManageSearchString" value="'%' + modelManageFilter.searchString + '%'"/>
AND CONCAT(IFNULL(lmp_model_manage.model_name,''), IFNULL(lmp_model_manage.business_label,'')) LIKE
#{safeModelManageSearchString}
</if>
</if>
</sql>
......@@ -74,7 +75,7 @@
</select>
<!-- 支持基于一对一或者一对多从表字段过滤的SQL_ID -->
<select id="getModelManageListEx" resultMap="BaseResultMap" >
<select id="getModelManageListEx" resultMap="BaseResultMap">
SELECT
lmp_model_manage.*
FROM
......@@ -86,21 +87,24 @@
<where>
lmp_model_manage.model_id = lmp_model_version.model_id
<include refid="com.yice.webadmin.app.dao.ModelVersionMapper.filterRef"/>
</where>)
</where>
)
</if>
<if test="modelTaskFilter != null">
AND EXISTS (SELECT * FROM lmp_model_task
<where>
lmp_model_manage.model_id = lmp_model_task.model_id
<include refid="com.yice.webadmin.app.dao.ModelTaskMapper.filterRef"/>
</where>)
</where>
)
</if>
<if test="modelDeployFilter != null">
AND EXISTS (SELECT * FROM lmp_model_deploy
<where>
lmp_model_manage.model_id = lmp_model_deploy.model_id
<include refid="com.yice.webadmin.app.dao.ModelDeployMapper.filterRef"/>
</where>)
</where>
)
</if>
</where>
<if test="orderBy != null and orderBy != ''">
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelSquareMapper.xml deleted 100644 → 0
View file @ 1b77ba51
<?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="com.yice.webadmin.app.dao.ModelSquareMapper">
<resultMap id="BaseResultMap" type="com.yice.webadmin.app.model.ModelSquare">
<id column="model_id" jdbcType="BIGINT" property="modelId"/>
<result column="model_name" jdbcType="VARCHAR" property="modelName"/>
<result column="model_type" jdbcType="TINYINT" property="modelType"/>
<result column="model_describe" jdbcType="VARCHAR" property="modelDescribe"/>
<result column="version_count" jdbcType="TINYINT" property="versionCount"/>
</resultMap>
<insert id="insertList">
INSERT INTO lmp_model_square
(model_id,
model_name,
model_type,
model_describe,
version_count)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
(#{item.modelId},
#{item.modelName},
#{item.modelType},
#{item.modelDescribe},
#{item.versionCount})
</foreach>
</insert>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.yice.webadmin.app.dao.ModelSquareMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
<sql id="inputFilterRef">
<if test="modelSquareFilter != null">
<if test="modelSquareFilter.searchString != null and modelSquareFilter.searchString != ''">
<bind name = "safeModelSquareSearchString" value = "'%' + modelSquareFilter.searchString + '%'" />
AND IFNULL(lmp_model_square.model_name,'') LIKE #{safeModelSquareSearchString}
</if>
</if>
</sql>
<select id="getModelSquareList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.ModelSquare">
SELECT * FROM lmp_model_square
<where>
<include refid="filterRef"/>
</where>
<if test="orderBy != null and orderBy != ''">
ORDER BY ${orderBy}
</if>
</select>
</mapper>
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelTaskMapper.xml
View file @ 6a5f9921
......@@ -31,7 +31,7 @@
update_time,
model_version)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.taskId},
#{item.modelId},
#{item.versionId},
......@@ -76,7 +76,7 @@
</select>
<!-- 支持基于一对一或者一对多从表字段过滤的SQL_ID -->
<select id="getModelTaskListEx" resultMap="BaseResultMap" >
<select id="getModelTaskListEx" resultMap="BaseResultMap">
SELECT
lmp_model_task.*
FROM
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/ModelVersionMapper.xml
View file @ 6a5f9921
......@@ -25,6 +25,8 @@
<result column="training_task" jdbcType="VARCHAR" property="trainingTask"/>
<result column="model_url" jdbcType="VARCHAR" property="modelUrl"/>
<result column="is_compress" jdbcType="TINYINT" property="isCompress"/>
<result column="task_id" jdbcType="BIGINT" property="taskId"/>
<result column="run_id" jdbcType="BIGINT" property="runId"/>
</resultMap>
<insert id="insertList">
......@@ -51,10 +53,12 @@
run_name,
training_task,
model_url,
is_compress
is_compress,
task_id,
run_id
)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.versionId},
#{item.modelId},
#{item.versionName},
......@@ -77,7 +81,9 @@
#{item.runName},
#{item.trainingTask},
#{item.modelUrl},
#{item.isCompress})
#{item.isCompress},
#{item.taskId},
#{item.runId})
</foreach>
</insert>
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/PromptOptimizeBatchMapper.xml
View file @ 6a5f9921
......@@ -49,7 +49,7 @@
fail_count,
finish_time)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.batchTaskId},
#{item.taskName},
#{item.taskDescribe},
......@@ -84,13 +84,15 @@
<sql id="inputFilterRef">
<if test="promptOptimizeBatchFilter != null">
<if test="promptOptimizeBatchFilter.searchString != null and promptOptimizeBatchFilter.searchString != ''">
<bind name = "safePromptOptimizeBatchSearchString" value = "'%' + promptOptimizeBatchFilter.searchString + '%'" />
<bind name="safePromptOptimizeBatchSearchString"
value="'%' + promptOptimizeBatchFilter.searchString + '%'"/>
AND IFNULL(lmp_prompt_optimize_batch.task_name,'') LIKE #{safePromptOptimizeBatchSearchString}
</if>
</if>
</sql>
<select id="getPromptOptimizeBatchList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.PromptOptimizeBatch">
<select id="getPromptOptimizeBatchList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.PromptOptimizeBatch">
SELECT * FROM lmp_prompt_optimize_batch
<where>
<include refid="filterRef"/>
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/PromptTemplateCollectMapper.xml
View file @ 6a5f9921
......@@ -15,7 +15,7 @@
user_id,
collect_time)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.collectId},
#{item.templateId},
#{item.userId},
......@@ -38,7 +38,8 @@
</if>
</sql>
<select id="getPromptTemplateCollectList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.PromptTemplateCollect">
<select id="getPromptTemplateCollectList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.PromptTemplateCollect">
SELECT * FROM lmp_prompt_template_collect
<where>
<include refid="filterRef"/>
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/PromptTemplateMapper.xml
View file @ 6a5f9921
......@@ -20,7 +20,7 @@
<result column="negative_template_content" jdbcType="VARCHAR" property="negativeTemplateContent"/>
<result column="negative_template_variables" jdbcType="VARCHAR" property="negativeTemplateVariables"/>
<result column="is_preset" jdbcType="TINYINT" property="isPreset"/>
<result column="is_collect" jdbcType="TINYINT" property="isCollect" />
<result column="is_collect" jdbcType="TINYINT" property="isCollect"/>
</resultMap>
<insert id="insertList">
......@@ -43,7 +43,7 @@
negative_template_content,
negative_template_variables)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.templateId},
#{item.createUserId},
#{item.createTime},
......@@ -74,11 +74,12 @@
<sql id="inputFilterRef">
<if test="promptTemplateFilter != null">
<if test="promptTemplateFilter.templateName != null and promptTemplateFilter.templateName != ''">
<bind name = "safePromptTemplateTemplateName" value = "'%' + promptTemplateFilter.templateName + '%'" />
<bind name="safePromptTemplateTemplateName" value="'%' + promptTemplateFilter.templateName + '%'"/>
AND lmp_prompt_template.template_name LIKE #{safePromptTemplateTemplateName}
</if>
<if test="promptTemplateFilter.templateContent != null and promptTemplateFilter.templateContent != ''">
<bind name = "safePromptTemplateTemplateContent" value = "'%' + promptTemplateFilter.templateContent + '%'" />
<bind name="safePromptTemplateTemplateContent"
value="'%' + promptTemplateFilter.templateContent + '%'"/>
AND lmp_prompt_template.template_content LIKE #{safePromptTemplateTemplateContent}
</if>
<if test="promptTemplateFilter.createUserId != null and promptTemplateFilter.createUserId != ''">
......@@ -88,19 +89,23 @@
AND lmp_prompt_template.is_preset = #{promptTemplateFilter.isPreset}
</if>
<if test="promptTemplateFilter.searchString != null and promptTemplateFilter.searchString != ''">
<bind name = "safePromptTemplateSearchString" value = "'%' + promptTemplateFilter.searchString + '%'" />
AND CONCAT(IFNULL(lmp_prompt_template.template_name,''), IFNULL(lmp_prompt_template.template_content,''), IFNULL(lmp_prompt_template.negative_template_content,'')) LIKE #{safePromptTemplateSearchString}
<bind name="safePromptTemplateSearchString" value="'%' + promptTemplateFilter.searchString + '%'"/>
AND CONCAT(IFNULL(lmp_prompt_template.template_name,''),
IFNULL(lmp_prompt_template.template_content,''),
IFNULL(lmp_prompt_template.negative_template_content,'')) LIKE #{safePromptTemplateSearchString}
</if>
</if>
</sql>
<select id="getPromptTemplateList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.PromptTemplate">
<select id="getPromptTemplateList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.PromptTemplate">
SELECT
lmp_prompt_template.*,
if (lmp_prompt_template_collect.template_id is not null,1,0) as is_collect
FROM
lmp_prompt_template
LEFT JOIN lmp_prompt_template_collect ON lmp_prompt_template.template_id = lmp_prompt_template_collect.template_id
LEFT JOIN lmp_prompt_template_collect ON lmp_prompt_template.template_id =
lmp_prompt_template_collect.template_id
<where>
<include refid="filterRef"/>
</where>
......@@ -109,13 +114,15 @@
</if>
</select>
<select id="getPromptTemplateForCollectList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.PromptTemplate">
<select id="getPromptTemplateForCollectList" resultMap="BaseResultMap"
parameterType="com.yice.webadmin.app.model.PromptTemplate">
SELECT
lmp_prompt_template.*,
if (lmp_prompt_template_collect.template_id is not null,1,0) as is_collect
FROM
lmp_prompt_template
LEFT JOIN lmp_prompt_template_collect ON lmp_prompt_template.template_id = lmp_prompt_template_collect.template_id
LEFT JOIN lmp_prompt_template_collect ON lmp_prompt_template.template_id =
lmp_prompt_template_collect.template_id
<where>
<include refid="filterRef"/>
AND lmp_prompt_template_collect.user_id = #{promptTemplateFilter.createUserId}
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/TuningRunMapper.xml
View file @ 6a5f9921
......@@ -43,7 +43,7 @@
update_user_id,
update_time)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.runId},
#{item.taskId},
#{item.runStatus},
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/TuningTaskMapper.xml
View file @ 6a5f9921
......@@ -23,7 +23,7 @@
update_user_id,
update_time)
VALUES
<foreach collection="list" index="index" item="item" separator="," >
<foreach collection="list" index="index" item="item" separator=",">
(#{item.taskId},
#{item.taskName},
#{item.taskType},
......@@ -48,11 +48,11 @@
AND lmp_tuning_task.task_id = #{tuningTaskFilter.taskId}
</if>
<if test="tuningTaskFilter.taskName != null and tuningTaskFilter.taskName != ''">
<bind name = "safeTuningTaskTaskName" value = "'%' + tuningTaskFilter.taskName + '%'" />
<bind name="safeTuningTaskTaskName" value="'%' + tuningTaskFilter.taskName + '%'"/>
AND lmp_tuning_task.task_name LIKE #{safeTuningTaskTaskName}
</if>
<if test="tuningTaskFilter.searchString != null and tuningTaskFilter.searchString != ''">
<bind name = "safeTuningTaskSearchString" value = "'%' + tuningTaskFilter.searchString + '%'" />
<bind name="safeTuningTaskSearchString" value="'%' + tuningTaskFilter.searchString + '%'"/>
AND IFNULL(lmp_tuning_task.task_name,'') LIKE #{safeTuningTaskSearchString}
</if>
</if>
......@@ -69,7 +69,7 @@
</select>
<!-- 支持基于一对一或者一对多从表字段过滤的SQL_ID -->
<select id="getTuningTaskListEx" resultMap="BaseResultMap" >
<select id="getTuningTaskListEx" resultMap="BaseResultMap">
SELECT
lmp_tuning_task.*
FROM
......@@ -81,7 +81,8 @@
<where>
lmp_tuning_task.task_id = lmp_tuning_run.task_id
<include refid="com.yice.webadmin.app.dao.TuningRunMapper.filterRef"/>
</where>)
</where>
)
</if>
</where>
<if test="orderBy != null and orderBy != ''">
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/DatasetDetailDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* DatasetDetailDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/DatasetManageDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* DatasetManageDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/DatasetVersionDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* DatasetVersionDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelCompressDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* ModelCompressDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelDeployDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* ModelDeployDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelEstimateDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* ModelEstimateDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelManageDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* ModelManageDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelSquareDto.java deleted 100644 → 0
View file @ 1b77ba51
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
/**
* ModelSquareDto对象。
*
* @author linking
* @date 2023-04-13
*/
@ApiModel("ModelSquareDto对象")
@Data
public class ModelSquareDto {
/**
* 模型ID。
*/
@ApiModelProperty(value = "模型ID", required = true)
@NotNull(message = "数据验证失败，模型ID不能为空！", groups = {UpdateGroup.class})
private Long modelId;
/**
* 模型名称。
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
/**
* 模型类型。
*/
@ApiModelProperty(value = "模型类型")
private Integer modelType;
/**
* 模型描述。
*/
@ApiModelProperty(value = "模型描述")
private String modelDescribe;
/**
* 版本数量。
*/
@ApiModelProperty(value = "版本数量")
private Integer versionCount;
/**
* model_name LIKE搜索字符串。
*/
@ApiModelProperty(value = "LIKE模糊搜索字符串")
private String searchString;
}
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelTaskDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/ModelVersionDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* ModelVersionDto对象。
......@@ -133,4 +132,16 @@ public class ModelVersionDto {
*/
@ApiModelProperty(value = "是否被压缩")
private Integer isCompress;
/**
* 训练运行ID。
*/
@ApiModelProperty(value = "训练运行ID")
private Long runId;
/**
* 训练任务ID。
*/
@ApiModelProperty(value = "训练任务ID")
private Long taskId;
}
application-webadmin/src/main/java/com/yice/webadmin/app/dto/PromptOptimizeBatchDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/PromptTemplateCollectDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/PromptTemplateDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* PromptTemplateDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/TuningRunDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* TuningRunDto对象。
......@@ -76,7 +75,7 @@ public class TuningRunDto {
/**
* 拆分比例。
*/
@ApiModelProperty(value = "拆分比例")
@ApiModelProperty(value = "拆分比例(0~100)")
private Integer splitRatio;
/**
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/TuningTaskDto.java
View file @ 6a5f9921
package com.yice.webadmin.app.dto;
import com.yice.common.core.validator.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
/**
* TuningTaskDto对象。
......
application-webadmin/src/main/java/com/yice/webadmin/app/model/DatasetDetail.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.DatasetDetailVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
......@@ -49,5 +50,6 @@ public class DatasetDetail extends BaseModel {
@Mapper
public interface DatasetDetailModelMapper extends BaseModelMapper<DatasetDetailVo, DatasetDetail> {
}
public static final DatasetDetailModelMapper INSTANCE = Mappers.getMapper(DatasetDetailModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/DatasetManage.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationOneToMany;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.DatasetManageVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.List;
/**
......@@ -82,6 +86,7 @@ public class DatasetManage extends BaseModel {
@Mapping(target = "datasetVersionList", expression = "java(mapToBean(datasetManageVo.getDatasetVersionList(), com.yice.webadmin.app.model.DatasetVersion.class))")
@Override
DatasetManage toModel(DatasetManageVo datasetManageVo);
/**
* 转换实体对象到VO对象。
*
......@@ -92,5 +97,6 @@ public class DatasetManage extends BaseModel {
@Override
DatasetManageVo fromModel(DatasetManage datasetManage);
}
public static final DatasetManageModelMapper INSTANCE = Mappers.getMapper(DatasetManageModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/DatasetVersion.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.DatasetVersionVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
......@@ -114,6 +117,7 @@ public class DatasetVersion extends BaseModel {
@Mapping(target = "datasetDetail", expression = "java(mapToBean(datasetVersionVo.getDatasetDetail(), com.yice.webadmin.app.model.DatasetDetail.class))")
@Override
DatasetVersion toModel(DatasetVersionVo datasetVersionVo);
/**
* 转换实体对象到VO对象。
*
......@@ -124,5 +128,6 @@ public class DatasetVersion extends BaseModel {
@Override
DatasetVersionVo fromModel(DatasetVersion datasetVersion);
}
public static final DatasetVersionModelMapper INSTANCE = Mappers.getMapper(DatasetVersionModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelCompress.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.ModelCompressVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
......@@ -94,6 +96,7 @@ public class ModelCompress extends BaseModel {
@Mapping(target = "modelTask", expression = "java(mapToBean(modelCompressVo.getModelTask(), com.yice.webadmin.app.model.ModelTask.class))")
@Override
ModelCompress toModel(ModelCompressVo modelCompressVo);
/**
* 转换实体对象到VO对象。
*
......@@ -104,5 +107,6 @@ public class ModelCompress extends BaseModel {
@Override
ModelCompressVo fromModel(ModelCompress modelCompress);
}
public static final ModelCompressModelMapper INSTANCE = Mappers.getMapper(ModelCompressModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelDeploy.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.ModelDeployVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
......@@ -69,5 +70,6 @@ public class ModelDeploy extends BaseModel {
@Mapper
public interface ModelDeployModelMapper extends BaseModelMapper<ModelDeployVo, ModelDeploy> {
}
public static final ModelDeployModelMapper INSTANCE = Mappers.getMapper(ModelDeployModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelEstimate.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.ModelEstimateVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
......@@ -81,6 +84,7 @@ public class ModelEstimate extends BaseModel {
@Mapping(target = "modelTask", expression = "java(mapToBean(modelEstimateVo.getModelTask(), com.yice.webadmin.app.model.ModelTask.class))")
@Override
ModelEstimate toModel(ModelEstimateVo modelEstimateVo);
/**
* 转换实体对象到VO对象。
*
......@@ -91,5 +95,6 @@ public class ModelEstimate extends BaseModel {
@Override
ModelEstimateVo fromModel(ModelEstimate modelEstimate);
}
public static final ModelEstimateModelMapper INSTANCE = Mappers.getMapper(ModelEstimateModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelManage.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationOneToMany;
import com.yice.common.core.annotation.RelationOneToManyAggregation;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.constant.AggregationType;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.webadmin.app.vo.ModelManageVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.List;
/**
......@@ -131,6 +136,7 @@ public class ModelManage extends BaseModel {
@Mapping(target = "modelDeployList", expression = "java(mapToBean(modelManageVo.getModelDeployList(), com.yice.webadmin.app.model.ModelDeploy.class))")
@Override
ModelManage toModel(ModelManageVo modelManageVo);
/**
* 转换实体对象到VO对象。
*
......@@ -143,5 +149,6 @@ public class ModelManage extends BaseModel {
@Override
ModelManageVo fromModel(ModelManage modelManage);
}
public static final ModelManageModelMapper INSTANCE = Mappers.getMapper(ModelManageModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelSquare.java deleted 100644 → 0
View file @ 1b77ba51
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.webadmin.app.vo.ModelSquareVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
/**
* ModelSquare实体对象。
*
* @author linking
* @date 2023-04-13
*/
@Data
@TableName(value = "lmp_model_square")
public class ModelSquare {
/**
* 模型ID。
*/
@TableId(value = "model_id")
private Long modelId;
/**
* 模型名称。
*/
private String modelName;
/**
* 模型类型。
*/
private Integer modelType;
/**
* 模型描述。
*/
private String modelDescribe;
/**
* 版本数量。
*/
private Integer versionCount;
/**
* model_name LIKE搜索字符串。
*/
@TableField(exist = false)
private String searchString;
public void setSearchString(String searchString) {
this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
}
@Mapper
public interface ModelSquareModelMapper extends BaseModelMapper<ModelSquareVo, ModelSquare> {
}
public static final ModelSquareModelMapper INSTANCE = Mappers.getMapper(ModelSquareModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelTask.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.ModelTaskVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.Date;
......@@ -90,6 +93,7 @@ public class ModelTask extends BaseModel {
@Mapping(target = "modelCompress", expression = "java(mapToBean(modelTaskVo.getModelCompress(), com.yice.webadmin.app.model.ModelCompress.class))")
@Override
ModelTask toModel(ModelTaskVo modelTaskVo);
/**
* 转换实体对象到VO对象。
*
......@@ -101,5 +105,6 @@ public class ModelTask extends BaseModel {
@Override
ModelTaskVo fromModel(ModelTask modelTask);
}
public static final ModelTaskModelMapper INSTANCE = Mappers.getMapper(ModelTaskModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/ModelVersion.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.ModelVersionVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
......@@ -107,7 +110,15 @@ public class ModelVersion extends BaseModel {
*/
private String trainingTask;
/**
* 训练运行ID。
*/
private Long runId;
/**
* 训练任务ID。
*/
private Long taskId;
/**
* 模型地址。
*/
......@@ -136,6 +147,7 @@ public class ModelVersion extends BaseModel {
@Mapping(target = "modelManage", expression = "java(mapToBean(modelVersionVo.getModelManage(), com.yice.webadmin.app.model.ModelManage.class))")
@Override
ModelVersion toModel(ModelVersionVo modelVersionVo);
/**
* 转换实体对象到VO对象。
*
......@@ -146,5 +158,6 @@ public class ModelVersion extends BaseModel {
@Override
ModelVersionVo fromModel(ModelVersion modelVersion);
}
public static final ModelVersionModelMapper INSTANCE = Mappers.getMapper(ModelVersionModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/PromptOptimizeBatch.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.PromptOptimizeBatchVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.Date;
......@@ -122,5 +124,6 @@ public class PromptOptimizeBatch extends BaseModel {
@Mapper
public interface PromptOptimizeBatchModelMapper extends BaseModelMapper<PromptOptimizeBatchVo, PromptOptimizeBatch> {
}
public static final PromptOptimizeBatchModelMapper INSTANCE = Mappers.getMapper(PromptOptimizeBatchModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/PromptTemplate.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationGlobalDict;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.PromptTemplateVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.Map;
......@@ -135,6 +137,7 @@ public class PromptTemplate extends BaseModel {
dictCode = "ParameterFormatLabel")
@TableField(exist = false)
private Map<String, Object> parameterFormatDictMap;
@Mapper
public interface PromptTemplateModelMapper extends BaseModelMapper<PromptTemplateVo, PromptTemplate> {
/**
......@@ -145,6 +148,7 @@ public class PromptTemplate extends BaseModel {
*/
@Override
PromptTemplate toModel(PromptTemplateVo promptTemplateVo);
/**
* 转换实体对象到VO对象。
*
......@@ -154,5 +158,6 @@ public class PromptTemplate extends BaseModel {
@Override
PromptTemplateVo fromModel(PromptTemplate promptTemplate);
}
public static final PromptTemplateModelMapper INSTANCE = Mappers.getMapper(PromptTemplateModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/PromptTemplateCollect.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.webadmin.app.vo.PromptTemplateCollectVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.Date;
......@@ -43,5 +44,6 @@ public class PromptTemplateCollect {
@Mapper
public interface PromptTemplateCollectModelMapper extends BaseModelMapper<PromptTemplateCollectVo, PromptTemplateCollect> {
}
public static final PromptTemplateCollectModelMapper INSTANCE = Mappers.getMapper(PromptTemplateCollectModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/TuningRun.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.TuningRunVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
......@@ -94,5 +95,6 @@ public class TuningRun extends BaseModel {
@Mapper
public interface TuningRunModelMapper extends BaseModelMapper<TuningRunVo, TuningRun> {
}
public static final TuningRunModelMapper INSTANCE = Mappers.getMapper(TuningRunModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/model/TuningTask.java
View file @ 6a5f9921
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.*;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.common.core.annotation.*;
import com.yice.common.core.base.model.BaseModel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationOneToMany;
import com.yice.common.core.annotation.RelationOneToManyAggregation;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.constant.AggregationType;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.TuningTaskVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.List;
import java.util.Map;
/**
* TuningTask实体对象。
......@@ -54,6 +63,17 @@ public class TuningTask extends BaseModel {
this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
}
/**
* 运行数量 (一对多聚合计算字段)。
*/
@RelationOneToManyAggregation(
masterIdField = "taskId",
slaveModelClass = TuningRun.class,
slaveIdField = "taskId",
aggregationType = AggregationType.COUNT,
aggregationField = "taskId")
@TableField(exist = false)
private Integer runCount = 0;
/**
* TuningRun 的一对多关联表数据对象。
* 通常在一对多的关联中，我们基于从表数据过滤主表数据，此时需要先对从表数据进行嵌套子查询过滤，并将从表过滤数据列表集成到该字段。
......@@ -65,6 +85,17 @@ public class TuningTask extends BaseModel {
@TableField(exist = false)
private List<TuningRun> tuningRunList;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
@Mapper
public interface TuningTaskModelMapper extends BaseModelMapper<TuningTaskVo, TuningTask> {
/**
......@@ -76,6 +107,7 @@ public class TuningTask extends BaseModel {
@Mapping(target = "tuningRunList", expression = "java(mapToBean(tuningTaskVo.getTuningRunList(), com.yice.webadmin.app.model.TuningRun.class))")
@Override
TuningTask toModel(TuningTaskVo tuningTaskVo);
/**
* 转换实体对象到VO对象。
*
......@@ -86,5 +118,6 @@ public class TuningTask extends BaseModel {
@Override
TuningTaskVo fromModel(TuningTask tuningTask);
}
public static final TuningTaskModelMapper INSTANCE = Mappers.getMapper(TuningTaskModelMapper.class);
}
application-webadmin/src/main/java/com/yice/webadmin/app/service/DatasetDetailService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.DatasetDetail;
import java.util.*;
import java.util.List;
/**
* 数据集详情数据操作服务接口。
......@@ -35,6 +35,7 @@ public interface DatasetDetailService extends IBaseService<DatasetDetail, Long>
* @param batchSize 每批插入的数量。如果该值小于等于0，则使用缺省值10000。
*/
void saveNewBatch(List<DatasetDetail> datasetDetailList, int batchSize);
/**
* 更新数据对象。
*
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/DatasetManageService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.DatasetManage;
import com.yice.webadmin.app.model.DatasetVersion;
import java.util.*;
import java.util.List;
/**
* 数据集管理数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/DatasetVersionService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.DatasetDetail;
import com.yice.webadmin.app.model.DatasetVersion;
import java.util.*;
import java.util.List;
/**
* 数据集版本数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/ModelCompressService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.alibaba.fastjson.JSONObject;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.ModelCompress;
import com.yice.webadmin.app.model.ModelTask;
import java.util.*;
import java.util.List;
/**
* 模型压缩数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/ModelDeployService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.ModelDeploy;
import java.util.*;
import java.util.List;
/**
* 模型部署数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/ModelEstimateService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.alibaba.fastjson.JSONObject;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import java.util.*;
import java.util.List;
/**
* 模型评估数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/ModelManageService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.alibaba.fastjson.JSONObject;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.ModelDeploy;
import com.yice.webadmin.app.model.ModelManage;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelVersion;
import java.util.*;
import java.util.List;
/**
* 模型管理数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/ModelSquareService.java deleted 100644 → 0
View file @ 1b77ba51
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import java.util.*;
/**
* 模型广场数据操作服务接口。
*
* @author linking
* @date 2023-04-13
*/
public interface ModelSquareService extends IBaseService<ModelSquare, Long> {
/**
* 保存新增对象。
*
* @param modelSquare 新增对象。
* @return 返回新增对象。
*/
ModelSquare saveNew(ModelSquare modelSquare);
/**
* 利用数据库的insertList语法，批量插入对象列表。
*
* @param modelSquareList 新增对象列表。
*/
void saveNewBatch(List<ModelSquare> modelSquareList);
/**
* 更新数据对象。
*
* @param modelSquare 更新的对象。
* @param originalModelSquare 原有数据对象。
* @return 成功返回true，否则false。
*/
boolean update(ModelSquare modelSquare, ModelSquare originalModelSquare);
/**
* 删除指定数据。
*
* @param modelId 主键Id。
* @return 成功返回true，否则false。
*/
boolean remove(Long modelId);
/**
* 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
* 如果需要同时获取关联数据，请移步(getModelSquareListWithRelation)方法。
*
* @param filter 过滤对象。
* @param orderBy 排序参数。
* @return 查询结果集。
*/
List<ModelSquare> getModelSquareList(ModelSquare filter, String orderBy);
/**
* 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
* 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
* 如果仅仅需要获取主表数据，请移步(getModelSquareList)，以便获取更好的查询性能。
*
* @param filter 主表过滤对象。
* @param orderBy 排序参数。
* @return 查询结果集。
*/
List<ModelSquare> getModelSquareListWithRelation(ModelSquare filter, String orderBy);
}
application-webadmin/src/main/java/com/yice/webadmin/app/service/ModelTaskService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.alibaba.fastjson.JSONObject;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.ModelCompress;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import java.util.*;
import java.util.List;
/**
* 模型任务数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/ModelVersionService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.ModelVersion;
import java.util.*;
import java.util.List;
/**
* 模型版本数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/PromptOptimizeBatchService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.PromptOptimizeBatch;
import java.util.*;
import java.util.List;
/**
* 提示词批量优化数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/PromptTemplateCollectService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.PromptTemplateCollect;
import java.util.*;
import java.util.List;
/**
* 提示词模板收藏数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/PromptTemplateService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.PromptTemplate;
import java.util.*;
import java.util.List;
/**
* 提示词模板数据操作服务接口。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/TuningRunService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.dto.RunPublishDto;
import com.yice.webadmin.app.model.TuningRun;
import java.util.*;
import java.util.List;
/**
* 精调任务运行数据操作服务接口。
......@@ -73,4 +74,6 @@ public interface TuningRunService extends IBaseService<TuningRun, Long> {
* @return 查询结果集。
*/
List<TuningRun> getTuningRunListWithRelation(TuningRun filter, String orderBy);
boolean publishToModelVersion(RunPublishDto runPublishDto);
}
application-webadmin/src/main/java/com/yice/webadmin/app/service/TuningTaskService.java
View file @ 6a5f9921
package com.yice.webadmin.app.service;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.service.IBaseService;
import com.yice.webadmin.app.model.TuningRun;
import com.yice.webadmin.app.model.TuningTask;
import java.util.*;
import java.util.List;
/**
* 精调任务数据操作服务接口。
......@@ -66,4 +67,6 @@ public interface TuningTaskService extends IBaseService<TuningTask, Long> {
* @return 查询结果集。
*/
List<TuningTask> getTuningTaskListWithRelation(TuningTask filter, TuningRun tuningRunFilter, String orderBy);
TuningTask saveAndCreateVersion(TuningTask tuningTask, TuningRun tuningRun);
}
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/DatasetDetailServiceImpl.java
View file @ 6a5f9921
package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.dao.DatasetDetailMapper;
import com.yice.webadmin.app.model.DatasetDetail;
import com.yice.webadmin.app.service.DatasetDetailService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.List;
/**
* 数据集详情数据操作服务类。
......@@ -70,6 +70,7 @@ public class DatasetDetailServiceImpl extends BaseService<DatasetDetail, Long> i
datasetDetailMapper.insertList(datasetDetailList);
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void saveNewBatch(List<DatasetDetail> datasetDetailList, int batchSize) {
......@@ -94,6 +95,7 @@ public class DatasetDetailServiceImpl extends BaseService<DatasetDetail, Long> i
start += batchSize;
} while (true);
}
/**
* 更新数据对象。
*
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/DatasetManageServiceImpl.java
View file @ 6a5f9921
......@@ -2,21 +2,23 @@ package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.dao.DatasetManageMapper;
import com.yice.webadmin.app.model.DatasetManage;
import com.yice.webadmin.app.model.DatasetVersion;
import com.yice.webadmin.app.service.DatasetManageService;
import com.yice.webadmin.app.service.DatasetVersionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.List;
/**
* 数据集管理数据操作服务类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/DatasetVersionServiceImpl.java
View file @ 6a5f9921
package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.object.CallResult;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.CallResult;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.dao.DatasetVersionMapper;
import com.yice.webadmin.app.model.DatasetDetail;
import com.yice.webadmin.app.model.DatasetVersion;
import com.yice.webadmin.app.service.DatasetDetailService;
import com.yice.webadmin.app.service.DatasetManageService;
import com.yice.webadmin.app.service.DatasetVersionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.List;
/**
* 数据集版本数据操作服务类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelCompressServiceImpl.java
View file @ 6a5f9921
......@@ -3,21 +3,27 @@ package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.dao.ModelCompressMapper;
import com.yice.webadmin.app.model.ModelCompress;
import com.yice.webadmin.app.model.ModelManage;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelCompressService;
import com.yice.webadmin.app.service.ModelManageService;
import com.yice.webadmin.app.service.ModelTaskService;
import com.yice.webadmin.app.service.ModelVersionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.List;
/**
* 模型压缩数据操作服务类。
......@@ -39,6 +45,7 @@ public class ModelCompressServiceImpl extends BaseService<ModelCompress, Long> i
private ModelVersionService modelVersionService;
@Autowired
private ModelManageService modelManageService;
/**
* 返回当前Service的主表Mapper对象。
*
......@@ -95,7 +102,7 @@ public class ModelCompressServiceImpl extends BaseService<ModelCompress, Long> i
modelManage.setModelType(0);
modelVersion.setIsCompress(1);
modelManage.setModelDescribe("模型压缩");
this.modelManageService.saveAndCreateVersion(modelManage,modelVersion);
this.modelManageService.saveAndCreateVersion(modelManage, modelVersion);
}
this.saveNew(modelCompress);
this.saveOrUpdateOneToOneRelationData(modelCompress, relationData);
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelDeployServiceImpl.java
View file @ 6a5f9921
package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.object.CallResult;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.CallResult;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.dao.ModelDeployMapper;
import com.yice.webadmin.app.model.ModelDeploy;
import com.yice.webadmin.app.service.ModelDeployService;
import com.yice.webadmin.app.service.ModelManageService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.List;
/**
* 模型部署数据操作服务类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelEstimateServiceImpl.java
View file @ 6a5f9921
......@@ -3,21 +3,23 @@ package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.dao.ModelEstimateMapper;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.service.ModelEstimateService;
import com.yice.webadmin.app.service.ModelTaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.List;
/**
* 模型评估数据操作服务类。
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelManageServiceImpl.java
View file @ 6a5f9921
......@@ -4,21 +4,29 @@ import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.dao.ModelManageMapper;
import com.yice.webadmin.app.model.ModelDeploy;
import com.yice.webadmin.app.model.ModelManage;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.model.ModelVersion;
import com.yice.webadmin.app.service.ModelDeployService;
import com.yice.webadmin.app.service.ModelManageService;
import com.yice.webadmin.app.service.ModelTaskService;
import com.yice.webadmin.app.service.ModelVersionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* 模型管理数据操作服务类。
......@@ -104,7 +112,8 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple
private void saveOrUpdateRelationData(ModelManage modelManage, JSONObject relationData) {
List<ModelVersion> modelVersionList =
relationData.getObject("modelVersionList", new TypeReference<List<ModelVersion>>() {});
relationData.getObject("modelVersionList", new TypeReference<List<ModelVersion>>() {
});
// 对于一对多更新，分为以下三步：
// 1. 在关联从表中，删除掉与主表字段关联，但是又没有出现在本地更新中的数据。我们将这些数据视为需要删除的数据。
// 2. 在本次更新数据列表中，如果从表的对象没有主键Id，我们视为新数据，可以批量插入。
......@@ -170,6 +179,7 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple
this.buildRelationForDataList(resultList, MyRelationParam.full(), batchSize, ignoreFields);
return resultList;
}
@Transactional
@Override
public ModelManage saveAndCreateVersion(ModelManage modelManage, ModelVersion modelVersion) {
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelSquareServiceImpl.java deleted 100644 → 0
View file @ 1b77ba51
package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
/**
* 模型广场数据操作服务类。
*
* @author linking
* @date 2023-04-13
*/
@Slf4j
@Service("modelSquareService")
public class ModelSquareServiceImpl extends BaseService<ModelSquare, Long> implements ModelSquareService {
@Autowired
private ModelSquareMapper modelSquareMapper;
@Autowired
private IdGeneratorWrapper idGenerator;
/**
* 返回当前Service的主表Mapper对象。
*
* @return 主表Mapper对象。
*/
@Override
protected BaseDaoMapper<ModelSquare> mapper() {
return modelSquareMapper;
}
/**
* 保存新增对象。
*
* @param modelSquare 新增对象。
* @return 返回新增对象。
*/
@Transactional(rollbackFor = Exception.class)
@Override
public ModelSquare saveNew(ModelSquare modelSquare) {
modelSquareMapper.insert(this.buildDefaultValue(modelSquare));
return modelSquare;
}
/**
* 利用数据库的insertList语法，批量插入对象列表。
*
* @param modelSquareList 新增对象列表。
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void saveNewBatch(List<ModelSquare> modelSquareList) {
if (CollUtil.isNotEmpty(modelSquareList)) {
modelSquareList.forEach(this::buildDefaultValue);
modelSquareMapper.insertList(modelSquareList);
}
}
/**
* 更新数据对象。
*
* @param modelSquare 更新的对象。
* @param originalModelSquare 原有数据对象。
* @return 成功返回true，否则false。
*/
@Transactional(rollbackFor = Exception.class)
@Override
public boolean update(ModelSquare modelSquare, ModelSquare originalModelSquare) {
// 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
UpdateWrapper<ModelSquare> uw = this.createUpdateQueryForNullValue(modelSquare, modelSquare.getModelId());
return modelSquareMapper.update(modelSquare, uw) == 1;
}
/**
* 删除指定数据。
*
* @param modelId 主键Id。
* @return 成功返回true，否则false。
*/
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(Long modelId) {
return modelSquareMapper.deleteById(modelId) == 1;
}
/**
* 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
* 如果需要同时获取关联数据，请移步(getModelSquareListWithRelation)方法。
*
* @param filter 过滤对象。
* @param orderBy 排序参数。
* @return 查询结果集。
*/
@Override
public List<ModelSquare> getModelSquareList(ModelSquare filter, String orderBy) {
return modelSquareMapper.getModelSquareList(filter, orderBy);
}
/**
* 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
* 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
* 如果仅仅需要获取主表数据，请移步(getModelSquareList)，以便获取更好的查询性能。
*
* @param filter 主表过滤对象。
* @param orderBy 排序参数。
* @return 查询结果集。
*/
@Override
public List<ModelSquare> getModelSquareListWithRelation(ModelSquare filter, String orderBy) {
List<ModelSquare> resultList = modelSquareMapper.getModelSquareList(filter, orderBy);
// 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
// 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
int batchSize = resultList instanceof Page ? 0 : 1000;
this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
return resultList;
}
private ModelSquare buildDefaultValue(ModelSquare modelSquare) {
if (modelSquare.getModelId() == null) {
modelSquare.setModelId(idGenerator.nextLongId());
}
return modelSquare;
}
}
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelTaskServiceImpl.java
View file @ 6a5f9921
......@@ -2,24 +2,29 @@ package com.yice.webadmin.app.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yice.webadmin.app.service.*;
import com.yice.webadmin.app.dao.*;
import com.yice.webadmin.app.model.*;
import com.github.pagehelper.Page;
import com.yice.common.core.base.dao.BaseDaoMapper;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.object.CallResult;
import com.yice.common.core.base.service.BaseService;
import com.yice.common.core.object.CallResult;
import com.yice.common.core.object.MyRelationParam;
import com.yice.common.core.util.MyModelUtil;
import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import com.yice.webadmin.app.dao.ModelTaskMapper;
import com.yice.webadmin.app.model.ModelCompress;
import com.yice.webadmin.app.model.ModelEstimate;
import com.yice.webadmin.app.model.ModelTask;
import com.yice.webadmin.app.service.ModelCompressService;
import com.yice.webadmin.app.service.ModelEstimateService;
import com.yice.webadmin.app.service.ModelManageService;
import com.yice.webadmin.app.service.ModelTaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.List;
/**
* 模型任务数据操作服务类。
......
pom.xml
View file @ 6a5f9921
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment