Browse Source

主动学习实验功能开发

dev-active_learn
chenzhihang 10 months ago
parent
commit
6e35ca96e6
4 changed files with 27 additions and 3 deletions
  1. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ActiveLearnDao.java
  2. +17
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java
  3. +7
    -0
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ActiveLearnDaoMapper.xml
  4. +2
    -1
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ActiveLearnDao.java View File

@@ -25,5 +25,5 @@ public interface ActiveLearnDao {


List<ActiveLearn> queryByImageId(@Param("imageId") String imageId); List<ActiveLearn> queryByImageId(@Param("imageId") String imageId);


List<ActiveLearn> queryByCodeConfigId(@Param("codeConfigId") String codeConfigId);
List<ActiveLearn> queryByCodeConfig(@Param("codeConfig") String codeConfig);
} }

+ 17
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java View File

@@ -1,9 +1,12 @@
package com.ruoyi.platform.service.impl; package com.ruoyi.platform.service.impl;


import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.constant.Constant; import com.ruoyi.platform.constant.Constant;
import com.ruoyi.platform.domain.ActiveLearn;
import com.ruoyi.platform.domain.AssetWorkflow; import com.ruoyi.platform.domain.AssetWorkflow;
import com.ruoyi.platform.domain.CodeConfig; import com.ruoyi.platform.domain.CodeConfig;
import com.ruoyi.platform.domain.Ray;
import com.ruoyi.platform.mapper.ActiveLearnDao; import com.ruoyi.platform.mapper.ActiveLearnDao;
import com.ruoyi.platform.mapper.AssetWorkflowDao; import com.ruoyi.platform.mapper.AssetWorkflowDao;
import com.ruoyi.platform.mapper.CodeConfigDao; import com.ruoyi.platform.mapper.CodeConfigDao;
@@ -18,6 +21,7 @@ import org.springframework.stereotype.Service;


import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;


@@ -94,7 +98,19 @@ public class CodeConfigServiceImpl implements CodeConfigService {
throw new Exception("该代码配置被流水线:" + workflows + "使用,不能删除,请先删除流水线。"); throw new Exception("该代码配置被流水线:" + workflows + "使用,不能删除,请先删除流水线。");
} }


// rayDao.queryByCodeConfig()
HashMap<String, String> map = new HashMap<>();
map.put("code_path", codeConfig.getGitUrl());
List<Ray> rayList = rayDao.queryByCodeConfig(JSON.toJSONString(map));
if (rayList != null && !rayList.isEmpty()) {
String rays = String.join(",", rayList.stream().map(Ray::getName).collect(Collectors.toSet()));
throw new Exception("该代码配置被超参数自动寻优:" + rays + "使用,不能删除,请先删除超参数自动寻优。");
}

List<ActiveLearn> activeLearnList = activeLearnDao.queryByCodeConfig(JSON.toJSONString(map));
if (activeLearnList != null && !activeLearnList.isEmpty()) {
String activeLearns = String.join(",", activeLearnList.stream().map(ActiveLearn::getName).collect(Collectors.toSet()));
throw new Exception("该代码配置被主动学习:" + activeLearns + "使用,不能删除,请先删除主动学习。");
}


LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
String username = loginUser.getUsername(); String username = loginUser.getUsername();


+ 7
- 0
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ActiveLearnDaoMapper.xml View File

@@ -158,6 +158,13 @@
and state = 1 and state = 1
</select> </select>


<select id="queryByCodeConfig" resultType="com.ruoyi.platform.domain.ActiveLearn">
select *
from active_learn
where JSON_CONTAINS(code_config, #{codeConfig})
and state = 1
</select>

<sql id="common_condition"> <sql id="common_condition">
<where> <where>
state = 1 state = 1


+ 2
- 1
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml View File

@@ -133,7 +133,8 @@
<select id="queryByCodeConfig" resultType="com.ruoyi.platform.domain.Ray"> <select id="queryByCodeConfig" resultType="com.ruoyi.platform.domain.Ray">
select * select *
from ray from ray
where JSON_CONTAINS(
where JSON_CONTAINS(code_config, #{codeConfig})
and state = 1
</select> </select>


<sql id="common_condition"> <sql id="common_condition">


Loading…
Cancel
Save