|
@@ -1,23 +1,23 @@
|
|
|
-package com.example.services;
|
|
|
|
|
|
|
+package cn.seecoder.ai.service;
|
|
|
|
|
|
|
|
|
|
+import cn.seecoder.ai.dao.*;
|
|
|
|
|
+import cn.seecoder.ai.dao.entity.*;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.example.controller.vo.DLModelVO;
|
|
|
|
|
-import com.example.controller.vo.ModelVO;
|
|
|
|
|
-import com.example.dao.*;
|
|
|
|
|
-import com.example.data.DataSetHelper;
|
|
|
|
|
-import com.example.data.FitTestData;
|
|
|
|
|
-import com.example.data.LibsvmAdapter;
|
|
|
|
|
-import com.example.entity.*;
|
|
|
|
|
-import com.example.model.classification.*;
|
|
|
|
|
-import com.example.model.cluster.KmeansCluster;
|
|
|
|
|
-import com.example.model.helper.Utils;
|
|
|
|
|
-import com.example.model.regression.RFRegression;
|
|
|
|
|
-import com.example.services.pojo.DLGeneralModelPojo;
|
|
|
|
|
-import com.example.services.pojo.DLModelPojo;
|
|
|
|
|
-import com.example.services.pojo.ModelPojo;
|
|
|
|
|
-import com.example.util.Json2Object;
|
|
|
|
|
-import com.example.util.TrainParamLoader;
|
|
|
|
|
|
|
+import cn.seecoder.ai.model.vo.DLModelVO;
|
|
|
|
|
+import cn.seecoder.ai.model.vo.ModelVO;
|
|
|
|
|
+import cn.seecoder.ai.data.DataSetHelper;
|
|
|
|
|
+import cn.seecoder.ai.data.FitTestData;
|
|
|
|
|
+import cn.seecoder.ai.data.LibsvmAdapter;
|
|
|
|
|
+import cn.seecoder.ai.model.classification.*;
|
|
|
|
|
+import cn.seecoder.ai.model.cluster.KmeansCluster;
|
|
|
|
|
+import cn.seecoder.ai.model.helper.Utils;
|
|
|
|
|
+import cn.seecoder.ai.model.regression.RFRegression;
|
|
|
|
|
+import cn.seecoder.ai.model.bo.DLGeneralModelBO;
|
|
|
|
|
+import cn.seecoder.ai.model.bo.DLModelBO;
|
|
|
|
|
+import cn.seecoder.ai.model.bo.ModelBO;
|
|
|
|
|
+import cn.seecoder.ai.util.Json2Object;
|
|
|
|
|
+import cn.seecoder.ai.util.TrainParamLoader;
|
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.spark.ml.PipelineModel;
|
|
import org.apache.spark.ml.PipelineModel;
|
|
@@ -40,19 +40,19 @@ import java.util.stream.Collectors;
|
|
|
public class ModelService {
|
|
public class ModelService {
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private ConfigDao configDao;
|
|
|
|
|
|
|
+ private ConfigDAO configDao;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private FileInfoDao fileInfoDao;
|
|
|
|
|
|
|
+ private FileInfoDAO fileInfoDao;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private PictureFileDao pictureFileDao;
|
|
|
|
|
|
|
+ private PictureFileDAO pictureFileDao;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private ModelDao modelDao;
|
|
|
|
|
|
|
+ private ModelDAO modelDao;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private ModelTypeDao modelTypeDao;
|
|
|
|
|
|
|
+ private ModelTypeDAO modelTypeDao;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private DLModelDao dlModelDao;
|
|
|
|
|
|
|
+ private DLModelDAO dlModelDao;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- private HeaderInfoDao headerInfoDao;
|
|
|
|
|
|
|
+ private HeaderInfoDAO headerInfoDao;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private LibsvmAdapter libsvmAdapter;
|
|
private LibsvmAdapter libsvmAdapter;
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -120,11 +120,11 @@ public class ModelService {
|
|
|
* @param userId
|
|
* @param userId
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- public List<ModelPojo> getAllModelByUserId(int userId){
|
|
|
|
|
- List<ModelPojo> rsl = configDao.findByUserId(userId).stream().map((config) -> {
|
|
|
|
|
|
|
+ public List<ModelBO> getAllModelByUserId(int userId){
|
|
|
|
|
+ List<ModelBO> rsl = configDao.findByUserId(userId).stream().map((config) -> {
|
|
|
int configId = config.getId();
|
|
int configId = config.getId();
|
|
|
String configName = config.getConfName();
|
|
String configName = config.getConfName();
|
|
|
- List<ModelPojo> modelPerConfig = modelDao.findByConfigId(configId).stream().map((model) -> {
|
|
|
|
|
|
|
+ List<ModelBO> modelPerConfig = modelDao.findByConfigId(configId).stream().map((model) -> {
|
|
|
ModelType modelType = modelTypeDao.findById(model.getModelTypeId());
|
|
ModelType modelType = modelTypeDao.findById(model.getModelTypeId());
|
|
|
int flag = -1;
|
|
int flag = -1;
|
|
|
if(model.isTrained() && model.getResOfModel()!=null){
|
|
if(model.isTrained() && model.getResOfModel()!=null){
|
|
@@ -132,7 +132,7 @@ public class ModelService {
|
|
|
}else if(model.isTrained() && model.getResOfModel()==null){
|
|
}else if(model.isTrained() && model.getResOfModel()==null){
|
|
|
flag = 0;
|
|
flag = 0;
|
|
|
}
|
|
}
|
|
|
- return new ModelPojo(String.valueOf(configId),
|
|
|
|
|
|
|
+ return new ModelBO(String.valueOf(configId),
|
|
|
configName,
|
|
configName,
|
|
|
String.valueOf(model.getModelTypeId()),
|
|
String.valueOf(model.getModelTypeId()),
|
|
|
modelType != null ? modelType.getModelTypeName() : "",
|
|
modelType != null ? modelType.getModelTypeName() : "",
|
|
@@ -158,12 +158,12 @@ public class ModelService {
|
|
|
* @param userId
|
|
* @param userId
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- public List<DLGeneralModelPojo> getAllGeneralModelByUserId(int userId){
|
|
|
|
|
|
|
+ public List<DLGeneralModelBO> getAllGeneralModelByUserId(int userId){
|
|
|
List<PicFile> picFiles = pictureFileDao.findByUserId(userId);
|
|
List<PicFile> picFiles = pictureFileDao.findByUserId(userId);
|
|
|
- List<DLGeneralModelPojo> result = picFiles.stream().map(picFile -> {
|
|
|
|
|
|
|
+ List<DLGeneralModelBO> result = picFiles.stream().map(picFile -> {
|
|
|
List<DLModel> dlModels = dlModelDao.findByPicFileId(picFile.getId());
|
|
List<DLModel> dlModels = dlModelDao.findByPicFileId(picFile.getId());
|
|
|
return dlModels.stream()
|
|
return dlModels.stream()
|
|
|
- .map(dlModel -> new DLGeneralModelPojo(String.valueOf(dlModel.getId()), dlModel.getModelName(), String.valueOf(picFile.getId()), picFile.getFileName(),dlModel.isTrained()
|
|
|
|
|
|
|
+ .map(dlModel -> new DLGeneralModelBO(String.valueOf(dlModel.getId()), dlModel.getModelName(), String.valueOf(picFile.getId()), picFile.getFileName(),dlModel.isTrained()
|
|
|
,dlModel.getResOfModel()!=null))
|
|
,dlModel.getResOfModel()!=null))
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
}).reduce(new ArrayList<>(), (listA, listB) -> {
|
|
}).reduce(new ArrayList<>(), (listA, listB) -> {
|
|
@@ -173,9 +173,9 @@ public class ModelService {
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public DLModelPojo getDLModelDetailById(int modelId) {
|
|
|
|
|
|
|
+ public DLModelBO getDLModelDetailById(int modelId) {
|
|
|
DLModel dlModel = dlModelDao.findById(modelId);
|
|
DLModel dlModel = dlModelDao.findById(modelId);
|
|
|
- return new DLModelPojo(String.valueOf(dlModel.getModelTypeId()),String.valueOf(dlModel.getPicFileId()),
|
|
|
|
|
|
|
+ return new DLModelBO(String.valueOf(dlModel.getModelTypeId()),String.valueOf(dlModel.getPicFileId()),
|
|
|
dlModel.getModelName(),dlModel.isTrained(),dlModel.getModelPath(),new Json2Object().Json2HashMap(dlModel.getResOfModel())
|
|
dlModel.getModelName(),dlModel.isTrained(),dlModel.getModelPath(),new Json2Object().Json2HashMap(dlModel.getResOfModel())
|
|
|
,new Json2Object().Json2HashMap(dlModel.getArguments()));
|
|
,new Json2Object().Json2HashMap(dlModel.getArguments()));
|
|
|
}
|
|
}
|