Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
80d802391a
|
@ -18,4 +18,6 @@ public class Constant {
|
||||||
public final static String Computing_Resource_CPU = "CPU"; // 计算资源_CPU
|
public final static String Computing_Resource_CPU = "CPU"; // 计算资源_CPU
|
||||||
|
|
||||||
public final static String Computing_Resource_GPU = "GPU"; // 计算资源_GPU
|
public final static String Computing_Resource_GPU = "GPU"; // 计算资源_GPU
|
||||||
|
|
||||||
|
public final static int Git_Category_Id = 39;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
|
||||||
import com.ruoyi.common.core.utils.DateUtils;
|
import com.ruoyi.common.core.utils.DateUtils;
|
||||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
||||||
import com.ruoyi.platform.annotations.CheckDuplicate;
|
import com.ruoyi.platform.annotations.CheckDuplicate;
|
||||||
|
import com.ruoyi.platform.constant.Constant;
|
||||||
import com.ruoyi.platform.domain.AssetIcon;
|
import com.ruoyi.platform.domain.AssetIcon;
|
||||||
import com.ruoyi.platform.domain.ModelDependency1;
|
import com.ruoyi.platform.domain.ModelDependency1;
|
||||||
import com.ruoyi.platform.domain.Models;
|
import com.ruoyi.platform.domain.Models;
|
||||||
|
@ -572,6 +573,7 @@ public class ModelsServiceImpl implements ModelsService {
|
||||||
gitProjectVo.setDescription(modelsVo.getDescription());
|
gitProjectVo.setDescription(modelsVo.getDescription());
|
||||||
gitProjectVo.setPrivate(!modelsVo.getIsPublic());
|
gitProjectVo.setPrivate(!modelsVo.getIsPublic());
|
||||||
gitProjectVo.setUserId(userId);
|
gitProjectVo.setUserId(userId);
|
||||||
|
gitProjectVo.setProjectCategoryId(Constant.Git_Category_Id);
|
||||||
|
|
||||||
// 创建项目
|
// 创建项目
|
||||||
Map project = gitService.createProject(token, gitProjectVo);
|
Map project = gitService.createProject(token, gitProjectVo);
|
||||||
|
@ -871,7 +873,7 @@ public class ModelsServiceImpl implements ModelsService {
|
||||||
String modelTagName = modelsVo.getModelTag();
|
String modelTagName = modelsVo.getModelTag();
|
||||||
String modelTypeName = modelsVo.getModelType();
|
String modelTypeName = modelsVo.getModelType();
|
||||||
|
|
||||||
String url = gitendpoint + "/api/projects.json";
|
String url = gitendpoint + "/api/projects.json?sort_direction=praises_count&sort_by=desc&category_id=" + Constant.Git_Category_Id;
|
||||||
|
|
||||||
String name = modelsVo.getName();
|
String name = modelsVo.getName();
|
||||||
if (StringUtils.isNotEmpty(name)) {
|
if (StringUtils.isNotEmpty(name)) {
|
||||||
|
|
|
@ -2,6 +2,7 @@ package com.ruoyi.platform.service.impl;
|
||||||
|
|
||||||
import com.ruoyi.common.core.utils.DateUtils;
|
import com.ruoyi.common.core.utils.DateUtils;
|
||||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
||||||
|
import com.ruoyi.platform.constant.Constant;
|
||||||
import com.ruoyi.platform.domain.Dataset;
|
import com.ruoyi.platform.domain.Dataset;
|
||||||
import com.ruoyi.platform.domain.DatasetTempStorage;
|
import com.ruoyi.platform.domain.DatasetTempStorage;
|
||||||
import com.ruoyi.platform.service.DatasetTempStorageService;
|
import com.ruoyi.platform.service.DatasetTempStorageService;
|
||||||
|
@ -90,6 +91,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
|
||||||
gitProjectVo.setDescription(datasetVo.getDescription());
|
gitProjectVo.setDescription(datasetVo.getDescription());
|
||||||
gitProjectVo.setPrivate(!datasetVo.getIsPublic());
|
gitProjectVo.setPrivate(!datasetVo.getIsPublic());
|
||||||
gitProjectVo.setUserId(userId);
|
gitProjectVo.setUserId(userId);
|
||||||
|
gitProjectVo.setProjectCategoryId(Constant.Git_Category_Id);
|
||||||
// 创建项目
|
// 创建项目
|
||||||
Map project = gitService.createProject(token, gitProjectVo);
|
Map project = gitService.createProject(token, gitProjectVo);
|
||||||
Integer gitlinIid = (Integer) project.get("id");
|
Integer gitlinIid = (Integer) project.get("id");
|
||||||
|
@ -272,7 +274,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
|
||||||
Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
|
Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
|
||||||
Integer userId = (Integer) userInfo.get("user_id");
|
Integer userId = (Integer) userInfo.get("user_id");
|
||||||
// 拼接查询url
|
// 拼接查询url
|
||||||
String url = gitendpoint + "/api/projects.json?user_id=" + userId + "&sort_by=praises_count";
|
String url = gitendpoint + "/api/projects.json?sort_direction=praises_count&sort_by=desc&category_id=" + Constant.Git_Category_Id;
|
||||||
|
|
||||||
String name = dataset.getName();
|
String name = dataset.getName();
|
||||||
if (StringUtils.isNotEmpty(name)) {
|
if (StringUtils.isNotEmpty(name)) {
|
||||||
|
|
|
@ -25,8 +25,8 @@ public class GitProjectVo implements Serializable {
|
||||||
@ApiModelProperty(value = "项目标识", required = true)
|
@ApiModelProperty(value = "项目标识", required = true)
|
||||||
private String repositoryName;
|
private String repositoryName;
|
||||||
|
|
||||||
// @ApiModelProperty(value = "项目分类ID", required = false)
|
@ApiModelProperty(value = "项目分类ID", required = false)
|
||||||
// private int projectCategoryId;
|
private int projectCategoryId;
|
||||||
|
|
||||||
//
|
//
|
||||||
// @ApiModelProperty(value = "项目语言ID", required = false)
|
// @ApiModelProperty(value = "项目语言ID", required = false)
|
||||||
|
|
Loading…
Reference in New Issue