| @@ -60,7 +60,7 @@ public class DevEnvironmentController extends BaseController { | |||||
| * @return 新增结果 | * @return 新增结果 | ||||
| */ | */ | ||||
| @PostMapping | @PostMapping | ||||
| public ResponseEntity<DevEnvironment> add(DevEnvironment devEnvironment) { | |||||
| public ResponseEntity<DevEnvironment> add(@RequestBody DevEnvironment devEnvironment) { | |||||
| return ResponseEntity.ok(this.devEnvironmentService.insert(devEnvironment)); | return ResponseEntity.ok(this.devEnvironmentService.insert(devEnvironment)); | ||||
| } | } | ||||
| @@ -71,7 +71,7 @@ public class DevEnvironmentController extends BaseController { | |||||
| * @return 编辑结果 | * @return 编辑结果 | ||||
| */ | */ | ||||
| @PutMapping | @PutMapping | ||||
| public ResponseEntity<DevEnvironment> edit(DevEnvironment devEnvironment) { | |||||
| public ResponseEntity<DevEnvironment> edit(@RequestBody DevEnvironment devEnvironment) { | |||||
| return ResponseEntity.ok(this.devEnvironmentService.update(devEnvironment)); | return ResponseEntity.ok(this.devEnvironmentService.update(devEnvironment)); | ||||
| } | } | ||||
| @@ -82,8 +82,8 @@ public class DevEnvironmentController extends BaseController { | |||||
| * @return 删除是否成功 | * @return 删除是否成功 | ||||
| */ | */ | ||||
| @DeleteMapping("{id}") | @DeleteMapping("{id}") | ||||
| public ResponseEntity<Boolean> deleteById(@PathVariable("id") Integer id) { | |||||
| return ResponseEntity.ok(this.devEnvironmentService.deleteById(id)); | |||||
| public ResponseEntity<String> deleteById(@PathVariable("id") Integer id) { | |||||
| return ResponseEntity.ok(this.devEnvironmentService.removeById(id)); | |||||
| } | } | ||||
| } | } | ||||
| @@ -58,6 +58,7 @@ public interface DevEnvironmentDao { | |||||
| * 批量新增或按主键更新数据(MyBatis原生foreach方法) | * 批量新增或按主键更新数据(MyBatis原生foreach方法) | ||||
| * | * | ||||
| * @param entities List<DevEnvironment> 实例对象列表 | * @param entities List<DevEnvironment> 实例对象列表 | ||||
| * | |||||
| * @return 影响行数 | * @return 影响行数 | ||||
| * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参 | * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参 | ||||
| */ | */ | ||||
| @@ -269,7 +269,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| ExperimentIns insert = experimentInsService.insert(experimentIns); | ExperimentIns insert = experimentInsService.insert(experimentIns); | ||||
| //插入到模型依赖关系表 | //插入到模型依赖关系表 | ||||
| insertModelDependendcy(dependendcy,insert.getId(),experiment.getName(),params); | |||||
| insertModelDependency(dependendcy,insert.getId(),experiment.getName(),params); | |||||
| }catch (Exception e){ | }catch (Exception e){ | ||||
| throw new RuntimeException(e); | throw new RuntimeException(e); | ||||
| @@ -279,7 +279,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| return experiment; | return experiment; | ||||
| } | } | ||||
| private void insertModelDependendcy(Map<String ,Object> dependendcy,Integer experimentInsId,String expermentName,List<Map<String, Object>> params)throws Exception { | |||||
| private void insertModelDependency(Map<String ,Object> dependendcy, Integer experimentInsId, String experimentName, List<Map<String, Object>> params) throws Exception { | |||||
| Iterator<Map.Entry<String, Object>> dependendcyIterator = dependendcy.entrySet().iterator(); | Iterator<Map.Entry<String, Object>> dependendcyIterator = dependendcy.entrySet().iterator(); | ||||
| while (dependendcyIterator.hasNext()) { | while (dependendcyIterator.hasNext()) { | ||||
| ModelDependency modelDependency = new ModelDependency(); | ModelDependency modelDependency = new ModelDependency(); | ||||
| @@ -325,7 +325,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| TrainTaskDepency trainTaskDepency = new TrainTaskDepency(); | TrainTaskDepency trainTaskDepency = new TrainTaskDepency(); | ||||
| trainTaskDepency.setTaskId(key); | trainTaskDepency.setTaskId(key); | ||||
| trainTaskDepency.setInsId(experimentInsId); | trainTaskDepency.setInsId(experimentInsId); | ||||
| trainTaskDepency.setName(expermentName); | |||||
| trainTaskDepency.setName(experimentName); | |||||
| //训练任务 | //训练任务 | ||||
| modelDependency.setTrainTask(JsonUtils.objectToJson(trainTaskDepency)); | modelDependency.setTrainTask(JsonUtils.objectToJson(trainTaskDepency)); | ||||
| modelDependency.setExpInsId(experimentInsId); | modelDependency.setExpInsId(experimentInsId); | ||||
| @@ -334,12 +334,12 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| List<Map<String, Object>> resultTestDatasets = new ArrayList<Map<String, Object>>(); | List<Map<String, Object>> resultTestDatasets = new ArrayList<Map<String, Object>>(); | ||||
| for(int i=0;i<testDatasetsList.size();i++){ | for(int i=0;i<testDatasetsList.size();i++){ | ||||
| Map<String, Object> datasets = testDatasetsList.get(i); | Map<String, Object> datasets = testDatasetsList.get(i); | ||||
| List<Map<String, Object>> realDataSetList = (List<Map<String, Object>>) datasets.get("datasets"); | |||||
| List<Map<String, Object>> realDataSetList = (List<Map<String, Object>>) datasets.get("datasets"); | |||||
| for(int j=0;j<realDataSetList.size();j++){ | for(int j=0;j<realDataSetList.size();j++){ | ||||
| Map<String, Object> realDataSet = realDataSetList.get(j); | Map<String, Object> realDataSet = realDataSetList.get(j); | ||||
| Dataset dataset = datasetService.queryById((Integer) realDataSet.get("dataset_id")); | Dataset dataset = datasetService.queryById((Integer) realDataSet.get("dataset_id")); | ||||
| if (dataset == null){ | if (dataset == null){ | ||||
| throw new Exception("源数据集不存在"); | |||||
| throw new Exception("源数据集不存在"); | |||||
| } | } | ||||
| realDataSet.put("dataset_name", dataset.getName()); | realDataSet.put("dataset_name", dataset.getName()); | ||||
| resultTestDatasets.add(realDataSet); | resultTestDatasets.add(realDataSet); | ||||
| @@ -362,7 +362,7 @@ public class ExperimentServiceImpl implements ExperimentService { | |||||
| //可能是参数,必须从实验参数读取 | //可能是参数,必须从实验参数读取 | ||||
| if (params != null) { | if (params != null) { | ||||
| for (Map<String, Object> param : params) { | for (Map<String, Object> param : params) { | ||||
| if (param.containsKey("param_name") && StringUtils.equals("model_version",(String)param.get("param_name"))) { | |||||
| if (param.containsKey("param_name") && StringUtils.equals("model_version",(String) param.get("param_name"))) { | |||||
| version = param.get("param_value").toString(); | version = param.get("param_value").toString(); | ||||
| } | } | ||||
| } | } | ||||
| @@ -101,9 +101,9 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { | |||||
| List<ModelDependency> modelDependencyList = modelDependencyDao.queryByModelDependency(modelDependencyQuery); | List<ModelDependency> modelDependencyList = modelDependencyDao.queryByModelDependency(modelDependencyQuery); | ||||
| if (modelDependencyList!=null&&modelDependencyList.size()>=0){ | if (modelDependencyList!=null&&modelDependencyList.size()>=0){ | ||||
| for (ModelDependency modelDependency:modelDependencyList){ | for (ModelDependency modelDependency:modelDependencyList){ | ||||
| ModelDependcyTreeVo modelDependcyTreeVoIn = ModelDependencyConvertToTree(modelDependency); | |||||
| processParentModel(modelDependcyTreeVoIn); | |||||
| ps.add(modelDependcyTreeVoIn); | |||||
| ModelDependcyTreeVo modelDependencyTreeVoIn = ModelDependencyConvertToTree(modelDependency); | |||||
| processParentModel(modelDependencyTreeVoIn); | |||||
| ps.add(modelDependencyTreeVoIn); | |||||
| } | } | ||||
| } | } | ||||
| @@ -122,9 +122,9 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { | |||||
| List<ModelDependency> modelDependencyList = modelDependencyDao.queryChildrenByVersionId("\"model_id\":"+modelId, "\"model_version\":\""+version+"\""); | List<ModelDependency> modelDependencyList = modelDependencyDao.queryChildrenByVersionId("\"model_id\":"+modelId, "\"model_version\":\""+version+"\""); | ||||
| if (modelDependencyList!=null&&modelDependencyList.size()>=0){ | if (modelDependencyList!=null&&modelDependencyList.size()>=0){ | ||||
| for (ModelDependency modelDependency:modelDependencyList){ | for (ModelDependency modelDependency:modelDependencyList){ | ||||
| ModelDependcyTreeVo modelDependcyTreeVoIn = ModelDependencyConvertToTree(modelDependency); | |||||
| processChildrenModel(modelDependcyTreeVoIn); | |||||
| cs.add(modelDependcyTreeVoIn); | |||||
| ModelDependcyTreeVo modelDependencyTreeVoIn = ModelDependencyConvertToTree(modelDependency); | |||||
| processChildrenModel(modelDependencyTreeVoIn); | |||||
| cs.add(modelDependencyTreeVoIn); | |||||
| } | } | ||||
| } | } | ||||
| modelDependcyTreeVo.setChildrenModels(cs); | modelDependcyTreeVo.setChildrenModels(cs); | ||||
| @@ -147,7 +147,22 @@ | |||||
| <!--新增所有列--> | <!--新增所有列--> | ||||
| <insert id="insert" keyProperty="id" useGeneratedKeys="true"> | <insert id="insert" keyProperty="id" useGeneratedKeys="true"> | ||||
| insert into dev_environment(name,status,computing_resource,standard,env_variable,image,dataset,model,alt_field1,alt_field2,create_by,create_time,update_by,update_time,state) | insert into dev_environment(name,status,computing_resource,standard,env_variable,image,dataset,model,alt_field1,alt_field2,create_by,create_time,update_by,update_time,state) | ||||
| values (#{name},#{status},#{computingResource},#{standard},#{envVariable},#{image},#{dataset},#{model},#{altField1},#{altField2},#{createBy},#{createTime},#{updateBy},#{updateTime},#{state}) | |||||
| values (#{devEnvironment.name}, | |||||
| #{devEnvironment.status}, | |||||
| #{devEnvironment.computingResource}, | |||||
| #{devEnvironment.standard}, | |||||
| #{devEnvironment.envVariable}, | |||||
| #{devEnvironment.image}, | |||||
| #{devEnvironment.dataset}, | |||||
| #{devEnvironment.model}, | |||||
| #{devEnvironment.altField1}, | |||||
| #{devEnvironment.altField2}, | |||||
| #{devEnvironment.createBy}, | |||||
| #{devEnvironment.createTime}, | |||||
| #{devEnvironment.updateBy}, | |||||
| #{devEnvironment.updateTime}, | |||||
| #{devEnvironment.state} | |||||
| ) | |||||
| </insert> | </insert> | ||||
| <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true"> | <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true"> | ||||