一些改动

java_compile/src/main/java/com/example/services/ConfigService.java

@@ -13,11 +13,10 @@ import com.example.services.pojo.ConfigDetilePojo;
 import com.example.services.pojo.ConfigModelPojo;
 import com.example.services.pojo.ConfigPojo;
 import com.example.services.pojo._ConfigPojo;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,9 +26,8 @@ import java.util.stream.Collectors;
  * Config-related service Created by twenbo on 2016/11/16. Changed by lucas on 2016/11/18.
  */
 @Slf4j
-@Component
-@Data
-public class                ConfigService {
+@Service
+public class ConfigService {
 
     @Autowired
     private ConfigDao      configDao;
@@ -50,15 +48,13 @@ public class                ConfigService {
      */
 
     public String addConfig(ConfigVO configVO) {
-
         Config configInfo = new Config();
         configInfo.setFileInfoId(Integer.parseInt(configVO.getFileInfoId()));
         configInfo.setUserId(Integer.parseInt(configVO.getUserId()));
         configInfo.setModelTypeId(Integer.parseInt(configVO.getModelTypeId()));
         configInfo.setConfName(configVO.getConfName());
         configInfo.setFieldIds(JSON.toJSON(configVO.getFieldIds()).toString());
-        val configId = configDao.save(configInfo).getId();
-
+        int configId = configDao.save(configInfo).getId();
         return String.valueOf(configId);
     }
 
@@ -67,12 +63,11 @@ public class                ConfigService {
      * @return
      */
     public List<ConfigPojo> getAllConfigs(int userId) {
-
-        val rsl = configDao.findByUserId(userId).stream().map((config) -> {
+        List<ConfigPojo> rsl = configDao.findByUserId(userId).stream().map((config) -> {
             String fileName = fileInfoDao.findById(config.getFileInfoId()).getFilename();
             String modelTypeName = modelTypeDao.findById(config.getModelTypeId()) == null ? "" :
                     modelTypeDao.findById(config.getModelTypeId()).getModelTypeName();
-            ConfigPojo configPojo = new ConfigPojo(String.valueOf(config.getFileInfoId()),
+            return new ConfigPojo(String.valueOf(config.getFileInfoId()),
                     fileName,
                     String.valueOf(config.getId()),
                     String.valueOf(config.getModelTypeId()),
@@ -81,7 +76,6 @@ public class                ConfigService {
                     JSONObject.parseArray(config.getFieldIds(), String.class).stream().map(fieldId ->
                             headerInfoDao.findById(Integer.parseInt(fieldId))
                     ).collect(Collectors.toList()));
-            return configPojo;
         }).collect(Collectors.toList());
         return rsl;
     }
@@ -91,8 +85,7 @@ public class                ConfigService {
      * @return
      */
     public List<_ConfigPojo> _getAllConfigsByUserId(int userId) {
-
-        val rsl = configDao.findByUserId(userId).stream().map((config) -> {
+        List<_ConfigPojo> rsl = configDao.findByUserId(userId).stream().map((config) -> {
             String fileName = fileInfoDao.findById(config.getFileInfoId()).getFilename();
             _ConfigPojo configPojo = new _ConfigPojo(String.valueOf(config.getFileInfoId()),
                     fileName,
@@ -110,42 +103,30 @@ public class                ConfigService {
     public ConfigDetilePojo getConfigInfoByConfigId(int configId) {
         List<ConfigModelPojo> modelInfos = new ArrayList<>();
         List<Model> models = modelDao.findByConfigId(configId);
-        String modelTypeName = "";
-        String modelTypeDes = "";
-        int modelTypeId = 0;
-        for (int i = 0; i < models.size(); i++) {
-            Model model = models.get(i);
+        for (Model model : models) {
             ModelType modelType = modelTypeDao.findById(model.getModelTypeId());
             int flag = -1;
             if (model.isTrained() && model.getResOfModel() != null) {
                 flag = 1;
             } else if (model.isTrained() && model.getResOfModel() == null) {
                 flag = 0;
-            } else {
-                flag = -1;
             }
             modelInfos.add(new ConfigModelPojo(
                     model.getModelName(), modelType == null ? "自动训练" : modelType.getModelDetailName(), flag
             ));
-            modelTypeId = modelType == null ? 0 : modelType.getId();
-            modelTypeName = modelType == null ? "dl" : modelType.getModelTypeName();
-            modelTypeDes = modelType == null ? "" : modelType.getModelDes();
         }
 
-        val config = configDao.findById(configId);
-                modelTypeId=config.getModelTypeId();
-                 modelTypeName = modelTypeDao.findById(config.getModelTypeId()) == null ? "" :
-                        modelTypeDao.findById(config.getModelTypeId()).getModelTypeName();
-                 modelTypeDes = modelTypeDao.findById(config.getModelTypeId()) == null ? "" :
-                        modelTypeDao.findById(config.getModelTypeId()).getModelDes();
-        String modelDetileDes = modelTypeDao.findById(config.getModelTypeId()) == null ? "" :
-                modelTypeDao.findById(config.getModelTypeId()).getModelDetailDes();
+        Config config = configDao.findById(configId);
+        int modelTypeId=config.getModelTypeId();
+        String modelTypeName = modelTypeDao.findById(config.getModelTypeId()) == null ? "" : modelTypeDao.findById(config.getModelTypeId()).getModelTypeName();
+        String modelTypeDes = modelTypeDao.findById(config.getModelTypeId()) == null ? "" : modelTypeDao.findById(config.getModelTypeId()).getModelDes();
+        String modelDetailDes = modelTypeDao.findById(config.getModelTypeId()) == null ? "" : modelTypeDao.findById(config.getModelTypeId()).getModelDetailDes();
         ConfigDetilePojo configPojo = new ConfigDetilePojo(
                 String.valueOf(config.getId()),
                 String.valueOf(modelTypeId),
                 modelTypeName,
                 modelTypeDes,
-                modelDetileDes,
+                modelDetailDes,
                 JSONObject.parseArray(config.getFieldIds(), String.class).stream().map(fieldId ->
                         headerInfoDao.findById(Integer.parseInt(fieldId))
                 ).collect(Collectors.toList()),
@@ -160,17 +141,17 @@ public class                ConfigService {
      * @return
      */
     public boolean changeConfig(int configId, String confName, List<String> trainFeatureList) {
-
         Config configInfo = configDao.findById(configId);
+        if(configInfo==null){
+            return false;
+        }
         configInfo.setConfName(confName);
         configInfo.setFieldIds(JSON.toJSON(trainFeatureList).toString());
-        val configObject_get = configDao.save(configInfo);
-
-        return configObject_get != null;
+        configDao.save(configInfo);
+        return true;
     }
 
     public boolean deleteConfigById(int configId) {
-
         Config configInfo = configDao.findById(configId);
         if(configInfo==null){
             return false;
@@ -187,7 +168,7 @@ public class                ConfigService {
 
     public List<HeaderInfo> getSelectedFeature(int fileId, String fieldName) {
         log.info("FeatureSelector: ", fileId + ", " + fieldName);
-        val res = featureProject.featureSelector(fileId, fieldName);
+        List<HeaderInfo> res = featureProject.featureSelector(fileId, fieldName);
         return res;
     }
 }

java_compile/src/main/java/com/example/services/LoginService.java

@@ -2,13 +2,12 @@ package com.example.services;
 
 import com.example.dao.UserDao;
 import com.example.entity.User;
-import com.example.services.pojo.*;
+import com.example.services.pojo.LoginPojo;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.Date;
 
@@ -17,10 +16,11 @@ import java.util.Date;
  * Created by lucas on 2016/11/13.
  */
 @Slf4j
-@Component
-@Data
+@Service
 public class LoginService {
-    @Autowired private UserDao userDao;
+
+    @Autowired
+    private UserDao userDao;
 
     public LoginPojo verifyUser(String username, String password) throws Exception {
         log.info("User login: {username: " + username + ", password: " + password + "}");