From 79101d4587b4dd141ecad1240dc544abc5a30ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Tue, 4 Jun 2024 14:11:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6=E6=90=AD=E5=BB=BA=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E6=8E=A5=E5=8F=A3=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevEnvironmentController.java | 8 ++++---- .../platform/mapper/DevEnvironmentDao.java | 1 + .../service/impl/ExperimentServiceImpl.java | 12 ++++++------ .../impl/ModelDependencyServiceImpl.java | 12 ++++++------ .../DevEnvironmentDaoMapper.xml | 17 ++++++++++++++++- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/devEnvironment/DevEnvironmentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/devEnvironment/DevEnvironmentController.java index a845eae2..3935d50f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/devEnvironment/DevEnvironmentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/devEnvironment/DevEnvironmentController.java @@ -60,7 +60,7 @@ public class DevEnvironmentController extends BaseController { * @return 新增结果 */ @PostMapping - public ResponseEntity add(DevEnvironment devEnvironment) { + public ResponseEntity add(@RequestBody DevEnvironment devEnvironment) { return ResponseEntity.ok(this.devEnvironmentService.insert(devEnvironment)); } @@ -71,7 +71,7 @@ public class DevEnvironmentController extends BaseController { * @return 编辑结果 */ @PutMapping - public ResponseEntity edit(DevEnvironment devEnvironment) { + public ResponseEntity edit(@RequestBody DevEnvironment devEnvironment) { return ResponseEntity.ok(this.devEnvironmentService.update(devEnvironment)); } @@ -82,8 +82,8 @@ public class DevEnvironmentController extends BaseController { * @return 删除是否成功 */ @DeleteMapping("{id}") - public ResponseEntity deleteById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.devEnvironmentService.deleteById(id)); + public ResponseEntity deleteById(@PathVariable("id") Integer id) { + return ResponseEntity.ok(this.devEnvironmentService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DevEnvironmentDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DevEnvironmentDao.java index 0cb652ff..e4f4bbe7 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DevEnvironmentDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DevEnvironmentDao.java @@ -58,6 +58,7 @@ public interface DevEnvironmentDao { * 批量新增或按主键更新数据（MyBatis原生foreach方法） * * @param entities List 实例对象列表 + * * @return 影响行数 * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 */ diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java index 89b2da4a..b53d488b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java @@ -269,7 +269,7 @@ public class ExperimentServiceImpl implements ExperimentService { ExperimentIns insert = experimentInsService.insert(experimentIns); //插入到模型依赖关系表 - insertModelDependendcy(dependendcy,insert.getId(),experiment.getName(),params); + insertModelDependency(dependendcy,insert.getId(),experiment.getName(),params); }catch (Exception e){ throw new RuntimeException(e); @@ -279,7 +279,7 @@ public class ExperimentServiceImpl implements ExperimentService { return experiment; } - private void insertModelDependendcy(Map dependendcy,Integer experimentInsId,String expermentName,List> params)throws Exception { + private void insertModelDependency(Map dependendcy, Integer experimentInsId, String experimentName, List> params) throws Exception { Iterator> dependendcyIterator = dependendcy.entrySet().iterator(); while (dependendcyIterator.hasNext()) { ModelDependency modelDependency = new ModelDependency(); @@ -325,7 +325,7 @@ public class ExperimentServiceImpl implements ExperimentService { TrainTaskDepency trainTaskDepency = new TrainTaskDepency(); trainTaskDepency.setTaskId(key); trainTaskDepency.setInsId(experimentInsId); - trainTaskDepency.setName(expermentName); + trainTaskDepency.setName(experimentName); //训练任务 modelDependency.setTrainTask(JsonUtils.objectToJson(trainTaskDepency)); modelDependency.setExpInsId(experimentInsId); @@ -334,12 +334,12 @@ public class ExperimentServiceImpl implements ExperimentService { List> resultTestDatasets = new ArrayList>(); for(int i=0;i datasets = testDatasetsList.get(i); - List> realDataSetList = (List>) datasets.get("datasets"); + List> realDataSetList = (List>) datasets.get("datasets"); for(int j=0;j realDataSet = realDataSetList.get(j); Dataset dataset = datasetService.queryById((Integer) realDataSet.get("dataset_id")); if (dataset == null){ - throw new Exception("源数据集不存在"); + throw new Exception("源数据集不存在"); } realDataSet.put("dataset_name", dataset.getName()); resultTestDatasets.add(realDataSet); @@ -362,7 +362,7 @@ public class ExperimentServiceImpl implements ExperimentService { //可能是参数，必须从实验参数读取 if (params != null) { for (Map 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(); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java index fcc0d7f7..4d9747e3 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java @@ -101,9 +101,9 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { List modelDependencyList = modelDependencyDao.queryByModelDependency(modelDependencyQuery); if (modelDependencyList!=null&&modelDependencyList.size()>=0){ 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 modelDependencyList = modelDependencyDao.queryChildrenByVersionId("\"model_id\":"+modelId, "\"model_version\":\""+version+"\""); if (modelDependencyList!=null&&modelDependencyList.size()>=0){ 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); diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml index 60d43637..432e9dba 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml @@ -147,7 +147,22 @@ 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} + )