191250028 пре 3 година
родитељ
комит
609c60ef72
100 измењених фајлова са 535 додато и 489 уклоњено
  1. 4 0
      java_compile/Dockerfile
  2. 0 36
      java_compile/README.en.md
  3. 66 2
      java_compile/README.md
  4. 28 28
      java_compile/pom.xml
  5. 10 10
      java_compile/src/main/java/cn/seecoder/ai/Application.java
  6. 1 3
      java_compile/src/main/java/cn/seecoder/ai/config/AppConfig.java
  7. 1 2
      java_compile/src/main/java/cn/seecoder/ai/config/JwtFilter.java
  8. 1 1
      java_compile/src/main/java/cn/seecoder/ai/config/MysqlDialog.java
  9. 6 7
      java_compile/src/main/java/cn/seecoder/ai/controller/ConfigController.java
  10. 11 11
      java_compile/src/main/java/cn/seecoder/ai/controller/FileController.java
  11. 8 9
      java_compile/src/main/java/cn/seecoder/ai/controller/LoginController.java
  12. 10 10
      java_compile/src/main/java/cn/seecoder/ai/controller/ModelController.java
  13. 5 5
      java_compile/src/main/java/cn/seecoder/ai/controller/PicController.java
  14. 1 1
      java_compile/src/main/java/cn/seecoder/ai/controller/response/ErrorRes.java
  15. 2 1
      java_compile/src/main/java/cn/seecoder/ai/controller/response/NormalRes.java
  16. 1 1
      java_compile/src/main/java/cn/seecoder/ai/controller/response/Response.java
  17. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/ConfigDAO.java
  18. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/DLModelDAO.java
  19. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/FileInfoDAO.java
  20. 3 5
      java_compile/src/main/java/cn/seecoder/ai/dao/FuncInfoDAO.java
  21. 5 6
      java_compile/src/main/java/cn/seecoder/ai/dao/HdfsDAO.java
  22. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/HeaderInfoDAO.java
  23. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/ModelDAO.java
  24. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/ModelTypeDAO.java
  25. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/PictureCategoryDAO.java
  26. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/PictureFileDAO.java
  27. 3 4
      java_compile/src/main/java/cn/seecoder/ai/dao/PictureInfoDAO.java
  28. 3 3
      java_compile/src/main/java/cn/seecoder/ai/dao/UserDAO.java
  29. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/Config.java
  30. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/DLModel.java
  31. 1 3
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/FileInfo.java
  32. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/FuncInfo.java
  33. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/HeaderInfo.java
  34. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/LayerArgument.java
  35. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/Model.java
  36. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/ModelArgument.java
  37. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/ModelType.java
  38. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/PicCategory.java
  39. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/PicFile.java
  40. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/PicInfo.java
  41. 1 1
      java_compile/src/main/java/cn/seecoder/ai/dao/entity/User.java
  42. 1 1
      java_compile/src/main/java/cn/seecoder/ai/enums/TrainParamEnum.java
  43. 37 0
      java_compile/src/main/java/cn/seecoder/ai/exception/GlobalExceptionHandler.java
  44. 3 3
      java_compile/src/main/java/cn/seecoder/ai/model/bo/ConfigBO.java
  45. 4 5
      java_compile/src/main/java/cn/seecoder/ai/model/bo/ConfigDetailBO.java
  46. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/ConfigModelBO.java
  47. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/DLGeneralModelBO.java
  48. 2 3
      java_compile/src/main/java/cn/seecoder/ai/model/bo/DLModelBO.java
  49. 4 4
      java_compile/src/main/java/cn/seecoder/ai/model/bo/FileAndFuncInfoBO.java
  50. 3 3
      java_compile/src/main/java/cn/seecoder/ai/model/bo/FileDetailBO.java
  51. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/FileNameBO.java
  52. 3 3
      java_compile/src/main/java/cn/seecoder/ai/model/bo/HeaderInfoUpdatedBO.java
  53. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/InnerHeaderInfoBO.java
  54. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/LoginBO.java
  55. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/ModelBO.java
  56. 3 3
      java_compile/src/main/java/cn/seecoder/ai/model/bo/ModelTypeBO.java
  57. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/PicCategoryBO.java
  58. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/PicFileBO.java
  59. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/PicInfoBO.java
  60. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/bo/TestFileValueBO.java
  61. 2 5
      java_compile/src/main/java/cn/seecoder/ai/model/bo/_ConfigBO.java
  62. 1 1
      java_compile/src/main/java/cn/seecoder/ai/model/vo/ConfigVO.java
  63. 1 1
      java_compile/src/main/java/cn/seecoder/ai/model/vo/DLModelVO.java
  64. 1 2
      java_compile/src/main/java/cn/seecoder/ai/model/vo/FileInfoVO.java
  65. 1 1
      java_compile/src/main/java/cn/seecoder/ai/model/vo/HeaderInfoVO.java
  66. 2 2
      java_compile/src/main/java/cn/seecoder/ai/model/vo/ModelTypeVO.java
  67. 1 1
      java_compile/src/main/java/cn/seecoder/ai/model/vo/ModelVO.java
  68. 27 28
      java_compile/src/main/java/cn/seecoder/ai/service/ConfigService.java
  69. 34 35
      java_compile/src/main/java/cn/seecoder/ai/service/FileService.java
  70. 7 7
      java_compile/src/main/java/cn/seecoder/ai/service/LoginService.java
  71. 33 33
      java_compile/src/main/java/cn/seecoder/ai/service/ModelService.java
  72. 28 28
      java_compile/src/main/java/cn/seecoder/ai/service/PictureService.java
  73. 1 1
      java_compile/src/main/java/cn/seecoder/ai/util/Constant.java
  74. 3 2
      java_compile/src/main/java/cn/seecoder/ai/util/CsvLoader.java
  75. 1 1
      java_compile/src/main/java/cn/seecoder/ai/util/FileHelper.java
  76. 1 4
      java_compile/src/main/java/cn/seecoder/ai/util/Json2Object.java
  77. 1 1
      java_compile/src/main/java/cn/seecoder/ai/util/Object2Json.java
  78. 2 1
      java_compile/src/main/java/cn/seecoder/ai/util/SasAdapter.java
  79. 1 2
      java_compile/src/main/java/cn/seecoder/ai/util/SasLoader.java
  80. 4 2
      java_compile/src/main/java/cn/seecoder/ai/util/TrainParamLoader.java
  81. 1 1
      java_compile/src/main/resources/application.yml
  82. 9 8
      java_compile/src/main/scala/cn/seecoder/ai/SparkConnect.scala
  83. 7 8
      java_compile/src/main/scala/cn/seecoder/ai/analysis/FeatureProject.scala
  84. 6 6
      java_compile/src/main/scala/cn/seecoder/ai/analysis/FileAnalysis.scala
  85. 8 9
      java_compile/src/main/scala/cn/seecoder/ai/data/CsvAdapter.scala
  86. 5 5
      java_compile/src/main/scala/cn/seecoder/ai/data/DataSetHelper.scala
  87. 10 10
      java_compile/src/main/scala/cn/seecoder/ai/data/FitTestData.scala
  88. 5 5
      java_compile/src/main/scala/cn/seecoder/ai/data/LibsvmAdapter.scala
  89. 5 5
      java_compile/src/main/scala/cn/seecoder/ai/model/classification/DTClassification.scala
  90. 7 5
      java_compile/src/main/scala/cn/seecoder/ai/model/classification/DefaultClassification.scala
  91. 1 1
      java_compile/src/main/scala/cn/seecoder/ai/model/classification/GDBTClassification.scala
  92. 5 4
      java_compile/src/main/scala/cn/seecoder/ai/model/classification/LRClassification.scala
  93. 5 4
      java_compile/src/main/scala/cn/seecoder/ai/model/classification/MulPerClassification.scala
  94. 4 4
      java_compile/src/main/scala/cn/seecoder/ai/model/classification/NaiveBayesClassification.scala
  95. 4 4
      java_compile/src/main/scala/cn/seecoder/ai/model/classification/RFClassification.scala
  96. 3 4
      java_compile/src/main/scala/cn/seecoder/ai/model/cluster/KmeansCluster.scala
  97. 1 1
      java_compile/src/main/scala/cn/seecoder/ai/model/helper/Stringcyz.scala
  98. 5 5
      java_compile/src/main/scala/cn/seecoder/ai/model/helper/Utils.scala
  99. 3 4
      java_compile/src/main/scala/cn/seecoder/ai/model/regression/RFRegression.scala
  100. 3 1
      java_compile/src/main/scala/cn/seecoder/ai/util/TrainParamReader.scala

+ 4 - 0
java_compile/Dockerfile

@@ -0,0 +1,4 @@
+FROM openjdk:8-jdk-alpine
+
+COPY target/java_compile-0.0.1-SNAPSHOT.jar java_compile-0.0.1-SNAPSHOT.jar
+ENTRYPOINT ["java","-jar","java_compile-0.0.1-SNAPSHOT.jar"]

+ 0 - 36
java_compile/README.en.md

@@ -1,36 +0,0 @@
-# al_cloud
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

+ 66 - 2
java_compile/README.md

@@ -1,11 +1,75 @@
+## 注意! 3月24日大格式更新
+
+#### 文件结构及介绍如下:
+
+```
+src
+├─main
+│  ├─java
+│  │  └─cn 
+│  │      └─seecoder 所属组织
+│  │          └─ai 软件制品名称
+│  │              ├─config 			配置
+│  │              ├─controller 		处理REST
+│  │              │  └─response 	返回格式,todo:待修改
+│  │              ├─dao 			数据库访问层
+│  │              │  └─entity 		数据表实体类
+│  │              ├─enums 			枚举类
+│  │              ├─exception 		异常处理
+│  │              ├─model 			pojo,java普通对象
+│  │              │  ├─bo 			业务逻辑对象,business object
+│  │              │  └─vo 			显示层对象,view object
+│  │              ├─service 		业务逻辑层,todo: 将impl和抽象接口分离
+│  │              └─util 			工具类,可复用的方法
+│  ├─resources						
+│  │  └─templates
+│  └─scala
+│      └─cn
+│          └─seecoder
+│              └─ai
+│                  ├─analysis	分析相关的代码,todo: 需要移动位置,不可在根文件夹下
+│                  ├─data		数据读取处理相关的代码,todo: 需要移动位置,不可在根文件夹下
+│                  ├─model		具体模型
+│                  │  ├─classification	分类模型,已实现
+│                  │  ├─cluster			聚类模型,未实现
+│                  │  ├─helper			助手类,需要优化
+│                  │  └─regression		回归模型,与分类模型重合度极高,实现流程仅有少许修改(模型评价方面)
+│                  └─util				scala环境下的工具类
+└─test				测试类
+    ├─java
+    │  └─cn
+    │      └─seecoder
+    │          └─ai
+    └─scala
+
+```
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 mvn clean scala:compile compile package
 tail -f -n 100 consoleMsg.log
 nohup java -jar java_compile-0.0.1-SNAPSHOT.jar --server.port=7788 >consoleMsg.log 2>&1 &
 
 ps -ef | grep java
 
-
-
 ## 注意
 
 模型model_Type已经在spring启动时自动执行

+ 28 - 28
java_compile/pom.xml

@@ -8,11 +8,11 @@
         <version>2.4.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.example</groupId>
-    <artifactId>java_compile</artifactId>
+    <groupId>cn.seecoder</groupId>
+    <artifactId>ai</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>java_compile</name>
-    <description>Demo project for Spring Boot</description>
+    <name>ai</name>
+    <description>The AI sub system of seecoder.cn</description>
 
     <properties>
         <java.version>1.8</java.version>
@@ -258,30 +258,30 @@
             </plugins>
         </pluginManagement>
         <plugins>
-            <!--<plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>scala-compile-first</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>scala-test-compile</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <scalaVersion>2.12.10</scalaVersion>
-                </configuration>
-            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>net.alchim31.maven</groupId>-->
+<!--                <artifactId>scala-maven-plugin</artifactId>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>scala-compile-first</id>-->
+<!--                        <phase>process-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>add-source</goal>-->
+<!--                            <goal>compile</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>scala-test-compile</id>-->
+<!--                        <phase>process-test-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>testCompile</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <scalaVersion>2.12.10</scalaVersion>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.scala-tools</groupId>
                 <artifactId>maven-scala-plugin</artifactId>

+ 10 - 10
java_compile/src/main/java/com/example/Application.java → java_compile/src/main/java/cn/seecoder/ai/Application.java

@@ -1,11 +1,11 @@
-package com.example;
+package cn.seecoder.ai;
 
-import com.example.analysis.FileAnalysis;
-import com.example.dao.ModelDao;
-import com.example.dao.UserDao;
-import com.example.data.CsvAdapter;
-import com.example.data.LibsvmAdapter;
-import com.example.services.LoginService;
+import cn.seecoder.ai.analysis.FileAnalysis;
+import cn.seecoder.ai.dao.ModelDAO;
+import cn.seecoder.ai.dao.UserDAO;
+import cn.seecoder.ai.data.CsvAdapter;
+import cn.seecoder.ai.data.LibsvmAdapter;
+import cn.seecoder.ai.service.LoginService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -21,15 +21,15 @@ import java.util.List;
 @SpringBootApplication
 public class Application implements CommandLineRunner {
 
-    private final UserDao dao;
+    private final UserDAO dao;
     private final CsvAdapter csvAdapter;
     private final LibsvmAdapter libsvmAdapter;
 
     @Autowired
     private            LoginService  loginService;
-    @Autowired private ModelDao modelDao;
+    @Autowired private ModelDAO modelDao;
     @Autowired private FileAnalysis fileAnalysis;
-    public Application(UserDao repository, CsvAdapter csvAdapter, LibsvmAdapter libsvmAdapter) {
+    public Application(UserDAO repository, CsvAdapter csvAdapter, LibsvmAdapter libsvmAdapter) {
         this.dao = repository;
         this.csvAdapter = csvAdapter;
         this.libsvmAdapter = libsvmAdapter;

+ 1 - 3
java_compile/src/main/java/com/example/config/AppConfig.java → java_compile/src/main/java/cn/seecoder/ai/config/AppConfig.java

@@ -1,11 +1,9 @@
-package com.example.config;
+package cn.seecoder.ai.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.util.Map;
-
 /**
  *
  * Created by lucas on 2016/10/10.

+ 1 - 2
java_compile/src/main/java/com/example/config/JwtFilter.java → java_compile/src/main/java/cn/seecoder/ai/config/JwtFilter.java

@@ -1,9 +1,8 @@
-package com.example.config;
+package cn.seecoder.ai.config;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureException;
-import org.springframework.stereotype.Component;
 import org.springframework.web.filter.GenericFilterBean;
 
 import javax.servlet.FilterChain;

+ 1 - 1
java_compile/src/main/java/com/example/config/MysqlDialog.java → java_compile/src/main/java/cn/seecoder/ai/config/MysqlDialog.java

@@ -1,4 +1,4 @@
-package com.example.config;
+package cn.seecoder.ai.config;
 
 import org.hibernate.dialect.MySQL5Dialect;
 

+ 6 - 7
java_compile/src/main/java/com/example/controller/ConfigController.java → java_compile/src/main/java/cn/seecoder/ai/controller/ConfigController.java

@@ -1,11 +1,10 @@
-package com.example.controller;
+package cn.seecoder.ai.controller;
 
-import com.example.controller.response.ErrorRes;
-import com.example.controller.response.NormalRes;
-import com.example.controller.response.Response;
-import com.example.controller.vo.ConfigVO;
-import com.example.entity.Config;
-import com.example.services.ConfigService;
+import cn.seecoder.ai.controller.response.ErrorRes;
+import cn.seecoder.ai.controller.response.NormalRes;
+import cn.seecoder.ai.controller.response.Response;
+import cn.seecoder.ai.model.vo.ConfigVO;
+import cn.seecoder.ai.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 11 - 11
java_compile/src/main/java/com/example/controller/FileController.java → java_compile/src/main/java/cn/seecoder/ai/controller/FileController.java

@@ -1,11 +1,11 @@
-package com.example.controller;
-
-import com.example.controller.response.ErrorRes;
-import com.example.controller.response.NormalRes;
-import com.example.controller.response.Response;
-import com.example.data.CsvAdapter;
-import com.example.services.FileService;
-import com.example.services.pojo.HeaderInfoUpdatedPojo;
+package cn.seecoder.ai.controller;
+
+import cn.seecoder.ai.controller.response.ErrorRes;
+import cn.seecoder.ai.controller.response.NormalRes;
+import cn.seecoder.ai.controller.response.Response;
+import cn.seecoder.ai.data.CsvAdapter;
+import cn.seecoder.ai.service.FileService;
+import cn.seecoder.ai.model.bo.HeaderInfoUpdatedBO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -175,13 +175,13 @@ public class FileController {
 
     /**
      *
-     * @param headerInfoUpdatedPojo
+     * @param headerInfoUpdatedBO
      * @return
      */
     @PostMapping(value = "update")
-    public Response updateFileInfo(@RequestBody HeaderInfoUpdatedPojo headerInfoUpdatedPojo){
+    public Response updateFileInfo(@RequestBody HeaderInfoUpdatedBO headerInfoUpdatedBO){
         try {
-            boolean rsl = fileService.updateAllHeaders(headerInfoUpdatedPojo.getHeaderInfo(),headerInfoUpdatedPojo.getHeaderNeedUpdate());
+            boolean rsl = fileService.updateAllHeaders(headerInfoUpdatedBO.getHeaderInfo(), headerInfoUpdatedBO.getHeaderNeedUpdate());
             return rsl? new NormalRes() : new ErrorRes(40002, "Server error.");
         } catch (Exception e) {
             log.info("error updateFileInfo");

+ 8 - 9
java_compile/src/main/java/com/example/controller/LoginController.java → java_compile/src/main/java/cn/seecoder/ai/controller/LoginController.java

@@ -1,13 +1,12 @@
-package com.example.controller;
+package cn.seecoder.ai.controller;
 
-import com.example.controller.response.ErrorRes;
-import com.example.controller.response.NormalRes;
-import com.example.controller.response.Response;
-import com.example.entity.User;
-import com.example.services.LoginService;
-import com.example.services.pojo.LoginPojo;
+import cn.seecoder.ai.controller.response.ErrorRes;
+import cn.seecoder.ai.controller.response.NormalRes;
+import cn.seecoder.ai.controller.response.Response;
+import cn.seecoder.ai.dao.entity.User;
+import cn.seecoder.ai.service.LoginService;
+import cn.seecoder.ai.model.bo.LoginBO;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,7 +32,7 @@ public class LoginController {
     public Response userLogin(@RequestParam(value="username", required = false) String username,
                               @RequestParam(value = "password", required = false) String password) {
         try {
-            LoginPojo rsl = loginService.verifyUser(username, password);
+            LoginBO rsl = loginService.verifyUser(username, password);
             return new NormalRes(rsl);
         } catch (NullPointerException e) {
             return new ErrorRes(40001, "Username does not exist.");

+ 10 - 10
java_compile/src/main/java/com/example/controller/ModelController.java → java_compile/src/main/java/cn/seecoder/ai/controller/ModelController.java

@@ -1,14 +1,14 @@
-package com.example.controller;
+package cn.seecoder.ai.controller;
 
 
-import com.example.controller.response.ErrorRes;
-import com.example.controller.response.NormalRes;
-import com.example.controller.response.Response;
-import com.example.controller.vo.DLModelVO;
-import com.example.controller.vo.ModelVO;
-import com.example.services.FileService;
-import com.example.services.ModelService;
-import com.example.services.pojo.TestFileValuePojo;
+import cn.seecoder.ai.controller.response.ErrorRes;
+import cn.seecoder.ai.controller.response.NormalRes;
+import cn.seecoder.ai.controller.response.Response;
+import cn.seecoder.ai.model.vo.DLModelVO;
+import cn.seecoder.ai.model.vo.ModelVO;
+import cn.seecoder.ai.service.FileService;
+import cn.seecoder.ai.service.ModelService;
+import cn.seecoder.ai.model.bo.TestFileValueBO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -187,7 +187,7 @@ public class ModelController {
                                    @RequestParam(value="file", required = false) MultipartFile file,
                                    @RequestParam(value="fileName") String filename) {
         try {
-            TestFileValuePojo rsl = fileService.uploadTestFile(Integer.parseInt(userId), file, filename);
+            TestFileValueBO rsl = fileService.uploadTestFile(Integer.parseInt(userId), file, filename);
             return rsl != null ? new NormalRes(rsl) : new ErrorRes(40002, "Server error.");
         } catch (Exception e) {
             e.printStackTrace();

+ 5 - 5
java_compile/src/main/java/com/example/controller/PicController.java → java_compile/src/main/java/cn/seecoder/ai/controller/PicController.java

@@ -1,9 +1,9 @@
-package com.example.controller;
+package cn.seecoder.ai.controller;
 
-import com.example.controller.response.ErrorRes;
-import com.example.controller.response.NormalRes;
-import com.example.controller.response.Response;
-import com.example.services.PictureService;
+import cn.seecoder.ai.controller.response.ErrorRes;
+import cn.seecoder.ai.controller.response.NormalRes;
+import cn.seecoder.ai.controller.response.Response;
+import cn.seecoder.ai.service.PictureService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
java_compile/src/main/java/com/example/controller/response/ErrorRes.java → java_compile/src/main/java/cn/seecoder/ai/controller/response/ErrorRes.java

@@ -1,4 +1,4 @@
-package com.example.controller.response;
+package cn.seecoder.ai.controller.response;
 
 import lombok.Data;
 import org.springframework.http.HttpStatus;

+ 2 - 1
java_compile/src/main/java/com/example/controller/response/NormalRes.java → java_compile/src/main/java/cn/seecoder/ai/controller/response/NormalRes.java

@@ -1,4 +1,4 @@
-package com.example.controller.response;
+package cn.seecoder.ai.controller.response;
 
 import lombok.Data;
 import org.springframework.http.HttpStatus;
@@ -18,4 +18,5 @@ public class NormalRes extends Response {
         super(HttpStatus.OK.value());
         this.data = data;
     }
+
 }

+ 1 - 1
java_compile/src/main/java/com/example/controller/response/Response.java → java_compile/src/main/java/cn/seecoder/ai/controller/response/Response.java

@@ -1,4 +1,4 @@
-package com.example.controller.response;
+package cn.seecoder.ai.controller.response;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 3 - 4
java_compile/src/main/java/com/example/dao/ConfigDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/ConfigDAO.java

@@ -1,17 +1,16 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.Config;
+import cn.seecoder.ai.dao.entity.Config;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Created by LXY on 2016/11/14.
  */
 @Repository
-public interface ConfigDao extends JpaRepository<Config, String> {
+public interface ConfigDAO extends JpaRepository<Config, String> {
 
     public Config findById(int id);
     public List<Config> findByFileInfoId(int fileInfoId);

+ 3 - 4
java_compile/src/main/java/com/example/dao/DLModelDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/DLModelDAO.java

@@ -1,18 +1,17 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.DLModel;
+import cn.seecoder.ai.dao.entity.DLModel;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * DLModel mongo repository
  * Created by lucas on 2017/6/18.
  */
 @Repository
-public interface DLModelDao extends JpaRepository<DLModel, String> {
+public interface DLModelDAO extends JpaRepository<DLModel, String> {
 
     public List<DLModel> findByPicFileId(int picFileId);
 

+ 3 - 4
java_compile/src/main/java/com/example/dao/FileInfoDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/FileInfoDAO.java

@@ -1,15 +1,14 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.FileInfo;
+import cn.seecoder.ai.dao.entity.FileInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 
 @Repository
-public interface FileInfoDao extends JpaRepository<FileInfo, String> {
+public interface FileInfoDAO extends JpaRepository<FileInfo, String> {
     public FileInfo findById(int id);
 
     public List<FileInfo> findByUserId(int userId);  //find all files which belongs one user

+ 3 - 5
java_compile/src/main/java/com/example/dao/FuncInfoDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/FuncInfoDAO.java

@@ -1,14 +1,12 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
 
-import com.example.entity.FuncInfo;
+import cn.seecoder.ai.dao.entity.FuncInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
-
 @Repository
-public interface FuncInfoDao extends JpaRepository<FuncInfo, String> {
+public interface FuncInfoDAO extends JpaRepository<FuncInfo, String> {
 
     public FuncInfo findById(int Id);
 

+ 5 - 6
java_compile/src/main/java/com/example/dao/HdfsDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/HdfsDAO.java

@@ -1,7 +1,7 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.config.AppConfig;
-import com.example.util.FileHelper;
+import cn.seecoder.ai.config.AppConfig;
+import cn.seecoder.ai.util.FileHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.util.Map;
 
 /**
  * this file is used to complete hdfs operates and mongodb operates
@@ -19,7 +18,7 @@ import java.util.Map;
  */
 @Component
 @Slf4j
-public class HdfsDao {
+public class HdfsDAO {
 
     private final AppConfig appConfig;
     //connect to hdfs
@@ -31,7 +30,7 @@ public class HdfsDao {
 
 
     @Autowired
-    public HdfsDao(AppConfig appConfig) {   //在初始化方法中使用到的bean需要以注入初始化方法的形式导入,否则读取到的引用可能是null。
+    public HdfsDAO(AppConfig appConfig) {   //在初始化方法中使用到的bean需要以注入初始化方法的形式导入,否则读取到的引用可能是null。
         this.appConfig = appConfig;
         //hdfs主机地址 hdfs://ip:port/
         hdfsServerAddr= appConfig.getHdfsServerAddr();

+ 3 - 4
java_compile/src/main/java/com/example/dao/HeaderInfoDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/HeaderInfoDAO.java

@@ -1,15 +1,14 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.HeaderInfo;
+import cn.seecoder.ai.dao.entity.HeaderInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 
 @Repository
-public interface HeaderInfoDao extends JpaRepository<HeaderInfo, String> {
+public interface HeaderInfoDAO extends JpaRepository<HeaderInfo, String> {
     public HeaderInfo findById(int id);
     public List<HeaderInfo> findByFileInfoId(int fileInfoId);
     public List<HeaderInfo> findByFieldNameAndFileInfoId(String fieldName, int fileInfoId);

+ 3 - 4
java_compile/src/main/java/com/example/dao/ModelDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/ModelDAO.java

@@ -1,14 +1,13 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.Model;
+import cn.seecoder.ai.dao.entity.Model;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 @Repository
-public interface ModelDao extends JpaRepository<Model, String> {
+public interface ModelDAO extends JpaRepository<Model, String> {
 
     public List<Model> findByFileInfoId(int fileInfoId);
     public List<Model> findByConfigId(int configId);

+ 3 - 4
java_compile/src/main/java/com/example/dao/ModelTypeDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/ModelTypeDAO.java

@@ -1,15 +1,14 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.ModelType;
+import cn.seecoder.ai.dao.entity.ModelType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 
 @Repository
-public interface ModelTypeDao  extends JpaRepository<ModelType, String> {
+public interface ModelTypeDAO extends JpaRepository<ModelType, String> {
 
     public ModelType findById(int Id);
 

+ 3 - 4
java_compile/src/main/java/com/example/dao/PictureCategoryDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/PictureCategoryDAO.java

@@ -1,18 +1,17 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.PicCategory;
+import cn.seecoder.ai.dao.entity.PicCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * FileInfo mongo auto dao
  *
  */
 @Repository
-public interface PictureCategoryDao extends JpaRepository<PicCategory, String> {
+public interface PictureCategoryDAO extends JpaRepository<PicCategory, String> {
 
     public PicCategory findById(int id);
 

+ 3 - 4
java_compile/src/main/java/com/example/dao/PictureFileDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/PictureFileDAO.java

@@ -1,18 +1,17 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.PicFile;
+import cn.seecoder.ai.dao.entity.PicFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * FileInfo mongo auto dao
  *
  */
 @Repository
-public interface PictureFileDao extends JpaRepository<PicFile, String> {
+public interface PictureFileDAO extends JpaRepository<PicFile, String> {
 
     public PicFile findById(int id);
 

+ 3 - 4
java_compile/src/main/java/com/example/dao/PictureInfoDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/PictureInfoDAO.java

@@ -1,18 +1,17 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.PicInfo;
+import cn.seecoder.ai.dao.entity.PicInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * FileInfo mongo auto dao
  *
  */
 @Repository
-public interface PictureInfoDao extends JpaRepository<PicInfo, String> {
+public interface PictureInfoDAO extends JpaRepository<PicInfo, String> {
 
     public PicInfo findById(int id);
 

+ 3 - 3
java_compile/src/main/java/com/example/dao/UserDao.java → java_compile/src/main/java/cn/seecoder/ai/dao/UserDAO.java

@@ -1,6 +1,6 @@
-package com.example.dao;
+package cn.seecoder.ai.dao;
 
-import com.example.entity.User;
+import cn.seecoder.ai.dao.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -8,6 +8,6 @@ import org.springframework.stereotype.Repository;
  * User mongo auto dao
  */
 @Repository
-public interface UserDao extends JpaRepository<User, String> {
+public interface UserDAO extends JpaRepository<User, String> {
     public User findByUsername(String username);
 }

+ 1 - 1
java_compile/src/main/java/com/example/entity/Config.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/Config.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/entity/DLModel.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/DLModel.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 3
java_compile/src/main/java/com/example/entity/FileInfo.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/FileInfo.java

@@ -1,11 +1,9 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.Data;
 
 import javax.persistence.*;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * File Location Table

+ 1 - 1
java_compile/src/main/java/com/example/entity/FuncInfo.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/FuncInfo.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/entity/HeaderInfo.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/HeaderInfo.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/entity/inner/LayerArgument.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/LayerArgument.java

@@ -1,4 +1,4 @@
-package com.example.entity.inner;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/entity/Model.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/Model.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/entity/inner/ModelArgument.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/ModelArgument.java

@@ -1,4 +1,4 @@
-package com.example.entity.inner;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/entity/ModelType.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/ModelType.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/entity/PicCategory.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/PicCategory.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
java_compile/src/main/java/com/example/entity/PicFile.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/PicFile.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
java_compile/src/main/java/com/example/entity/PicInfo.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/PicInfo.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.Data;
 

+ 1 - 1
java_compile/src/main/java/com/example/entity/User.java → java_compile/src/main/java/cn/seecoder/ai/dao/entity/User.java

@@ -1,4 +1,4 @@
-package com.example.entity;
+package cn.seecoder.ai.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/util/TrainParamEnum.java → java_compile/src/main/java/cn/seecoder/ai/enums/TrainParamEnum.java

@@ -1,4 +1,4 @@
-package com.example.util;
+package cn.seecoder.ai.enums;
 
 /**
  * @author fanyanpeng

+ 37 - 0
java_compile/src/main/java/cn/seecoder/ai/exception/GlobalExceptionHandler.java

@@ -0,0 +1,37 @@
+package cn.seecoder.ai.exception;
+
+import cn.seecoder.ai.controller.response.ErrorRes;
+import cn.seecoder.ai.controller.response.Response;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * 全局异常处理器
+ * RuntimeException可以直接上抛出的,在此处被捕获
+ * @author fanyanpeng
+ * @date 2023/3/24 2:49
+ */
+@Slf4j
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(value = IllegalArgumentException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public Response handleValidException(MethodArgumentNotValidException e) {
+        BindingResult bindingResult = e.getBindingResult();
+        String message = null;
+        if (bindingResult.hasErrors()) {
+            FieldError fieldError = bindingResult.getFieldError();
+            if (fieldError != null) {
+                message = fieldError.getField()+fieldError.getDefaultMessage();
+            }
+        }
+        return new ErrorRes(200,message);
+    }
+}

+ 3 - 3
java_compile/src/main/java/com/example/services/pojo/ConfigPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/ConfigBO.java

@@ -1,6 +1,6 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
-import com.example.entity.HeaderInfo;
+import cn.seecoder.ai.dao.entity.HeaderInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -9,7 +9,7 @@ import java.util.List;
 
 @Data
 @AllArgsConstructor
-public class ConfigPojo {
+public class ConfigBO {
 
     private String fileId;
 

+ 4 - 5
java_compile/src/main/java/com/example/services/pojo/ConfigDetilePojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/ConfigDetailBO.java

@@ -1,7 +1,6 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
-import com.example.entity.HeaderInfo;
-import com.example.entity.Model;
+import cn.seecoder.ai.dao.entity.HeaderInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -14,7 +13,7 @@ import java.util.List;
 
 @Data
 @AllArgsConstructor
-public class ConfigDetilePojo {
+public class ConfigDetailBO {
 
     private String configId;
 
@@ -26,6 +25,6 @@ public class ConfigDetilePojo {
     //
     private List<HeaderInfo> featureList;
 
-    private List<ConfigModelPojo> modelInfos;
+    private List<ConfigModelBO> modelInfos;
 
 }

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/ConfigModelPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/ConfigModelBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class ConfigModelPojo {
+public class ConfigModelBO {
     private String modelName;
 
     private String modelDetailName;

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/DLGeneralModelPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/DLGeneralModelBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class DLGeneralModelPojo {
+public class DLGeneralModelBO {
     public String modelId;
     public String modelName;
     public String fileId;

+ 2 - 3
java_compile/src/main/java/com/example/services/pojo/DLModelPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/DLModelBO.java

@@ -1,12 +1,11 @@
 /**
  * Alipay.com Inc. Copyright (c) 2004-2021 All Rights Reserved.
  */
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import javax.persistence.Id;
 import java.util.HashMap;
 
 /**
@@ -16,7 +15,7 @@ import java.util.HashMap;
  */
 @Data
 @AllArgsConstructor
-public class DLModelPojo {
+public class DLModelBO {
 
     private String modelTypeId; //模型的类别
 

+ 4 - 4
java_compile/src/main/java/com/example/services/pojo/FileAndFuncInfoPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/FileAndFuncInfoBO.java

@@ -1,6 +1,6 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
-import com.example.entity.FuncInfo;
+import cn.seecoder.ai.dao.entity.FuncInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import java.util.List;
  */
 @Data
 @AllArgsConstructor
-public class FileAndFuncInfoPojo {
-    List<FileNamePojo> fileNamePojos;
+public class FileAndFuncInfoBO {
+    List<FileNameBO> fileNameBOS;
     List<FuncInfo>     funcInfos;
 }

+ 3 - 3
java_compile/src/main/java/com/example/services/pojo/FileDetailPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/FileDetailBO.java

@@ -1,7 +1,7 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 
-import com.example.entity.HeaderInfo;
+import cn.seecoder.ai.dao.entity.HeaderInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -15,7 +15,7 @@ import java.util.List;
 
 @Data
 @AllArgsConstructor
-public class FileDetailPojo {
+public class FileDetailBO {
 
     //private String fileId;
     private String                  fileName;

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/FileNamePojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/FileNameBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class FileNamePojo {
+public class FileNameBO {
     private String fileId;
     private String fileName;
 }

+ 3 - 3
java_compile/src/main/java/com/example/services/pojo/HeaderInfoUpdatedPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/HeaderInfoUpdatedBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -11,7 +11,7 @@ import java.util.List;
  */
 @Data
 @AllArgsConstructor
-public class HeaderInfoUpdatedPojo {
-    List<InnerHeaderInfo> headerInfo;
+public class HeaderInfoUpdatedBO {
+    List<InnerHeaderInfoBO> headerInfo;
     List<Integer> headerNeedUpdate;
 }

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/InnerHeaderInfo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/InnerHeaderInfoBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class InnerHeaderInfo {
+public class InnerHeaderInfoBO {
     private String id;
     private String fileInfoId;  //文件id
     private String fieldName;   //文件头的字段信息

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/LoginPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/LoginBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class LoginPojo {
+public class LoginBO {
     private boolean loginStatus;
     private Integer userId;
     private String jwtToken;

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/ModelPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/ModelBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -11,7 +11,7 @@ import java.util.HashMap;
  */
 @Data
 @AllArgsConstructor
-public class ModelPojo {
+public class ModelBO {
 
     private String configId;
 

+ 3 - 3
java_compile/src/main/java/com/example/services/pojo/ModelTypePojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/ModelTypeBO.java

@@ -1,9 +1,9 @@
 /**
  * Alipay.com Inc. Copyright (c) 2004-2021 All Rights Reserved.
  */
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
-import com.example.entity.inner.ModelArgument;
+import cn.seecoder.ai.dao.entity.ModelArgument;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -16,7 +16,7 @@ import java.util.List;
  */
 @Data
 @AllArgsConstructor
-public class ModelTypePojo {
+public class ModelTypeBO {
     private int id;
 
     private String modelTypeName;

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/PicCategoryPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/PicCategoryBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class PicCategoryPojo {
+public class PicCategoryBO {
     private String categoryId;
     private String categoryName;
 }

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/PicFilePojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/PicFileBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class PicFilePojo {
+public class PicFileBO {
     private String fileId;
     private String fileName;
 }

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/PicInfoPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/PicInfoBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
-public class PicInfoPojo {
+public class PicInfoBO {
     private String picId;
     private String picName;
     private String picLoc;

+ 2 - 2
java_compile/src/main/java/com/example/services/pojo/TestFileValuePojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/TestFileValueBO.java

@@ -1,4 +1,4 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -12,7 +12,7 @@ import java.util.Map;
  */
 @Data
 @AllArgsConstructor
-public class TestFileValuePojo {
+public class TestFileValueBO {
     private String fileId;
     private List<Map<String, String>> values;
 }

+ 2 - 5
java_compile/src/main/java/com/example/services/pojo/_ConfigPojo.java → java_compile/src/main/java/cn/seecoder/ai/model/bo/_ConfigBO.java

@@ -1,11 +1,8 @@
-package com.example.services.pojo;
+package cn.seecoder.ai.model.bo;
 
-import com.example.entity.HeaderInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * Created by twenbo on 2016/11/17.
  * Changed by Lucas on 2016/11/22.
@@ -13,7 +10,7 @@ import java.util.List;
 
 @Data
 @AllArgsConstructor
-public class _ConfigPojo {
+public class _ConfigBO {
 
     private String fileId;
 

+ 1 - 1
java_compile/src/main/java/com/example/controller/vo/ConfigVO.java → java_compile/src/main/java/cn/seecoder/ai/model/vo/ConfigVO.java

@@ -1,4 +1,4 @@
-package com.example.controller.vo;
+package cn.seecoder.ai.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
java_compile/src/main/java/com/example/controller/vo/DLModelVO.java → java_compile/src/main/java/cn/seecoder/ai/model/vo/DLModelVO.java

@@ -1,4 +1,4 @@
-package com.example.controller.vo;
+package cn.seecoder.ai.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 2
java_compile/src/main/java/com/example/controller/vo/FileInfoVO.java → java_compile/src/main/java/cn/seecoder/ai/model/vo/FileInfoVO.java

@@ -1,9 +1,8 @@
-package com.example.controller.vo;
+package cn.seecoder.ai.model.vo;
 
 import lombok.Data;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 
 /**

+ 1 - 1
java_compile/src/main/java/com/example/controller/vo/HeaderInfoVO.java → java_compile/src/main/java/cn/seecoder/ai/model/vo/HeaderInfoVO.java

@@ -1,4 +1,4 @@
-package com.example.controller.vo;
+package cn.seecoder.ai.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 2 - 2
java_compile/src/main/java/com/example/controller/vo/ModelTypeVO.java → java_compile/src/main/java/cn/seecoder/ai/model/vo/ModelTypeVO.java

@@ -1,6 +1,6 @@
-package com.example.controller.vo;
+package cn.seecoder.ai.model.vo;
 
-import com.example.entity.inner.ModelArgument;
+import cn.seecoder.ai.dao.entity.ModelArgument;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
java_compile/src/main/java/com/example/controller/vo/ModelVO.java → java_compile/src/main/java/cn/seecoder/ai/model/vo/ModelVO.java

@@ -1,4 +1,4 @@
-package com.example.controller.vo;
+package cn.seecoder.ai.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 27 - 28
java_compile/src/main/java/com/example/services/ConfigService.java → java_compile/src/main/java/cn/seecoder/ai/service/ConfigService.java

@@ -1,20 +1,19 @@
-package com.example.services;
+package cn.seecoder.ai.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.example.analysis.FeatureProject;
-import com.example.controller.vo.ConfigVO;
-import com.example.dao.*;
-import com.example.entity.Config;
-import com.example.entity.HeaderInfo;
-import com.example.entity.Model;
-import com.example.entity.ModelType;
-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 cn.seecoder.ai.analysis.FeatureProject;
+import cn.seecoder.ai.model.vo.ConfigVO;
+import cn.seecoder.ai.dao.*;
+import cn.seecoder.ai.dao.entity.Config;
+import cn.seecoder.ai.dao.entity.HeaderInfo;
+import cn.seecoder.ai.dao.entity.Model;
+import cn.seecoder.ai.dao.entity.ModelType;
+import cn.seecoder.ai.model.bo.ConfigDetailBO;
+import cn.seecoder.ai.model.bo.ConfigModelBO;
+import cn.seecoder.ai.model.bo.ConfigBO;
+import cn.seecoder.ai.model.bo._ConfigBO;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,15 +29,15 @@ import java.util.stream.Collectors;
 public class ConfigService {
 
     @Autowired
-    private ConfigDao      configDao;
+    private ConfigDAO configDao;
     @Autowired
-    private FileInfoDao    fileInfoDao;
+    private FileInfoDAO fileInfoDao;
     @Autowired
-    private ModelTypeDao   modelTypeDao;
+    private ModelTypeDAO modelTypeDao;
     @Autowired
-    private HeaderInfoDao  headerInfoDao;
+    private HeaderInfoDAO headerInfoDao;
     @Autowired
-    private ModelDao       modelDao;
+    private ModelDAO modelDao;
     @Autowired
     private FeatureProject featureProject;
 
@@ -62,12 +61,12 @@ public class ConfigService {
      * @param userId
      * @return
      */
-    public List<ConfigPojo> getAllConfigs(int userId) {
-        List<ConfigPojo> rsl = configDao.findByUserId(userId).stream().map((config) -> {
+    public List<ConfigBO> getAllConfigs(int userId) {
+        List<ConfigBO> 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();
-            return new ConfigPojo(String.valueOf(config.getFileInfoId()),
+            return new ConfigBO(String.valueOf(config.getFileInfoId()),
                     fileName,
                     String.valueOf(config.getId()),
                     String.valueOf(config.getModelTypeId()),
@@ -84,10 +83,10 @@ public class ConfigService {
      * @param userId
      * @return
      */
-    public List<_ConfigPojo> _getAllConfigsByUserId(int userId) {
-        List<_ConfigPojo> rsl = configDao.findByUserId(userId).stream().map((config) -> {
+    public List<_ConfigBO> _getAllConfigsByUserId(int userId) {
+        List<_ConfigBO> rsl = configDao.findByUserId(userId).stream().map((config) -> {
             String fileName = fileInfoDao.findById(config.getFileInfoId()).getFilename();
-            _ConfigPojo configPojo = new _ConfigPojo(String.valueOf(config.getFileInfoId()),
+            _ConfigBO configPojo = new _ConfigBO(String.valueOf(config.getFileInfoId()),
                     fileName,
                     String.valueOf(config.getId()),
                     config.getConfName());
@@ -100,8 +99,8 @@ public class ConfigService {
      * @param configId
      * @return
      */
-    public ConfigDetilePojo getConfigInfoByConfigId(int configId) {
-        List<ConfigModelPojo> modelInfos = new ArrayList<>();
+    public ConfigDetailBO getConfigInfoByConfigId(int configId) {
+        List<ConfigModelBO> modelInfos = new ArrayList<>();
         List<Model> models = modelDao.findByConfigId(configId);
         for (Model model : models) {
             ModelType modelType = modelTypeDao.findById(model.getModelTypeId());
@@ -111,7 +110,7 @@ public class ConfigService {
             } else if (model.isTrained() && model.getResOfModel() == null) {
                 flag = 0;
             }
-            modelInfos.add(new ConfigModelPojo(
+            modelInfos.add(new ConfigModelBO(
                     model.getModelName(), modelType == null ? "自动训练" : modelType.getModelDetailName(), flag
             ));
         }
@@ -121,7 +120,7 @@ public class ConfigService {
         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(
+        ConfigDetailBO configPojo = new ConfigDetailBO(
                 String.valueOf(config.getId()),
                 String.valueOf(modelTypeId),
                 modelTypeName,

+ 34 - 35
java_compile/src/main/java/com/example/services/FileService.java → java_compile/src/main/java/cn/seecoder/ai/service/FileService.java

@@ -1,19 +1,18 @@
-package com.example.services;
+package cn.seecoder.ai.service;
 
-import com.example.analysis.FileAnalysis;
-import com.example.dao.*;
-import com.example.data.CsvAdapter;
-import com.example.data.CsvLoader;
-import com.example.data.SasLoader;
-import com.example.entity.Config;
-import com.example.entity.FileInfo;
-import com.example.entity.HeaderInfo;
-import com.example.entity.Model;
-import com.example.services.pojo.*;
-import com.example.util.FileHelper;
-import com.example.util.Json2Object;
+import cn.seecoder.ai.analysis.FileAnalysis;
+import cn.seecoder.ai.dao.*;
+import cn.seecoder.ai.data.CsvAdapter;
+import cn.seecoder.ai.util.CsvLoader;
+import cn.seecoder.ai.util.SasLoader;
+import cn.seecoder.ai.dao.entity.Config;
+import cn.seecoder.ai.dao.entity.FileInfo;
+import cn.seecoder.ai.dao.entity.HeaderInfo;
+import cn.seecoder.ai.dao.entity.Model;
+import cn.seecoder.ai.model.bo.*;
+import cn.seecoder.ai.util.FileHelper;
+import cn.seecoder.ai.util.Json2Object;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -38,19 +37,19 @@ public class FileService {
     @Autowired
     private CsvAdapter csvAdapter;
     @Autowired
-    private HdfsDao hdfsDao;
+    private HdfsDAO hdfsDao;
     @Autowired
-    private FileInfoDao fileInfoDao;
+    private FileInfoDAO fileInfoDao;
     @Autowired
-    private ConfigDao configDao;
+    private ConfigDAO configDao;
     @Autowired
-    private HeaderInfoDao headerInfoDao;
+    private HeaderInfoDAO headerInfoDao;
     @Autowired
     private FileAnalysis  fileAnalysis;
     @Autowired
-    private ModelDao modelDao;
+    private ModelDAO modelDao;
     @Autowired
-    private FuncInfoDao funcInfoDao;
+    private FuncInfoDAO funcInfoDao;
 
     /**
      * @param userId
@@ -85,13 +84,13 @@ public class FileService {
         hdfsDao.deleteFileInHdfs(fileLoc, true);
     }
 
-    public TestFileValuePojo uploadTestFile(int userId, MultipartFile inFile, String filename) throws Exception {
+    public TestFileValueBO uploadTestFile(int userId, MultipartFile inFile, String filename) throws Exception {
         int fileId = uploadFile(userId, inFile, filename);
         String fileLoc = fileInfoDao.findById(fileId).getLocation();
         List<Map<String, String>> values = csvAdapter.parquetFileReader(fileLoc);
         log.error("Test File values: ", values);
         //deleteFile(fileId);
-        return new TestFileValuePojo(String.valueOf(fileId), values);
+        return new TestFileValueBO(String.valueOf(fileId), values);
     }
 
     /**
@@ -99,9 +98,9 @@ public class FileService {
      * @return
      * @throws Exception
      */
-    public List<FileNamePojo> getAllFiles(int userId) throws Exception {
+    public List<FileNameBO> getAllFiles(int userId) throws Exception {
         List<FileInfo> files = fileInfoDao.findByUserId(userId);
-        List<FileNamePojo> rsl = files.stream().map((file) -> new FileNamePojo(String.valueOf(file.getId()), file.getFilename()))
+        List<FileNameBO> rsl = files.stream().map((file) -> new FileNameBO(String.valueOf(file.getId()), file.getFilename()))
                 .collect(Collectors.toList());
         return rsl;
     }
@@ -111,8 +110,8 @@ public class FileService {
      * @return
      * @throws Exception
      */
-    public FileAndFuncInfoPojo getAllFilesAndFunc(int userId) throws Exception {
-        return new FileAndFuncInfoPojo(getAllFiles(userId), funcInfoDao.findAll());
+    public FileAndFuncInfoBO getAllFilesAndFunc(int userId) throws Exception {
+        return new FileAndFuncInfoBO(getAllFiles(userId), funcInfoDao.findAll());
     }
 
     /**
@@ -120,10 +119,10 @@ public class FileService {
      * @return
      * @throws Exception
      */
-    public FileDetailPojo getFileDetailInfo(int fileId) throws Exception {
+    public FileDetailBO getFileDetailInfo(int fileId) throws Exception {
         FileInfo fileInfo = fileInfoDao.findById(fileId);
         List<HeaderInfo> headerInfos = headerInfoDao.findByFileInfoId(fileId);
-        return new FileDetailPojo(fileInfo.getFilename(), fileInfo.getUploadTime(), new Json2Object().Json2HashMap(fileInfo.getFileStrucInfo()), headerInfos);
+        return new FileDetailBO(fileInfo.getFilename(), fileInfo.getUploadTime(), new Json2Object().Json2HashMap(fileInfo.getFileStrucInfo()), headerInfos);
     }
 
     /**
@@ -206,21 +205,21 @@ public class FileService {
     }
 
     /**
-     * @param innerHeaderInfos
+     * @param innerHeaderInfoBOS
      * @param headerToUpdate
      * @return
      */
-    public boolean updateAllHeaders(List<InnerHeaderInfo> innerHeaderInfos, List<Integer> headerToUpdate) {
-        if (innerHeaderInfos == null || headerToUpdate == null) {
+    public boolean updateAllHeaders(List<InnerHeaderInfoBO> innerHeaderInfoBOS, List<Integer> headerToUpdate) {
+        if (innerHeaderInfoBOS == null || headerToUpdate == null) {
             return false;
         }
         int currLen = headerToUpdate.size();
-        System.out.println("headerInfos = [" + innerHeaderInfos + "], headerToUpdate = [" + headerToUpdate + "]");
+        System.out.println("headerInfos = [" + innerHeaderInfoBOS + "], headerToUpdate = [" + headerToUpdate + "]");
         System.out.println(currLen);
         for (int index : headerToUpdate) {
-            InnerHeaderInfo innerheaderInfo = innerHeaderInfos.get(index);
-            if (!updateHeaderInfo(Integer.parseInt(innerheaderInfo.getId()), innerheaderInfo.getAliasName(),
-                    innerheaderInfo.getFieldDes())) {
+            InnerHeaderInfoBO innerheaderInfoBO = innerHeaderInfoBOS.get(index);
+            if (!updateHeaderInfo(Integer.parseInt(innerheaderInfoBO.getId()), innerheaderInfoBO.getAliasName(),
+                    innerheaderInfoBO.getFieldDes())) {
                 return false;
             }
         }

+ 7 - 7
java_compile/src/main/java/com/example/services/LoginService.java → java_compile/src/main/java/cn/seecoder/ai/service/LoginService.java

@@ -1,8 +1,8 @@
-package com.example.services;
+package cn.seecoder.ai.service;
 
-import com.example.dao.UserDao;
-import com.example.entity.User;
-import com.example.services.pojo.LoginPojo;
+import cn.seecoder.ai.dao.UserDAO;
+import cn.seecoder.ai.dao.entity.User;
+import cn.seecoder.ai.model.bo.LoginBO;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import lombok.extern.slf4j.Slf4j;
@@ -20,9 +20,9 @@ import java.util.Date;
 public class LoginService {
 
     @Autowired
-    private UserDao userDao;
+    private UserDAO userDao;
 
-    public LoginPojo verifyUser(String username, String password) throws Exception {
+    public LoginBO verifyUser(String username, String password) throws Exception {
         log.info("User login: {username: " + username + ", password: " + password + "}");
         User user = userDao.findByUsername(username);
         boolean equals = user.getPassword().equals(password);
@@ -30,7 +30,7 @@ public class LoginService {
         String jwtToken="";  //保存jwt token秘钥
         jwtToken = Jwts.builder().setSubject(username).claim("roles", "user").setIssuedAt(new Date())
                 .signWith(SignatureAlgorithm.HS256, "secretkey").compact();
-        return new LoginPojo(equals, equals ? user.getId() : null, equals ? jwtToken : null);
+        return new LoginBO(equals, equals ? user.getId() : null, equals ? jwtToken : null);
     }
 
     public boolean addUser(User user){

+ 33 - 33
java_compile/src/main/java/com/example/services/ModelService.java → java_compile/src/main/java/cn/seecoder/ai/service/ModelService.java

@@ -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.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.extern.slf4j.Slf4j;
 import org.apache.spark.ml.PipelineModel;
@@ -40,19 +40,19 @@ import java.util.stream.Collectors;
 public class ModelService {
 
     @Autowired
-    private ConfigDao configDao;
+    private ConfigDAO configDao;
     @Autowired
-    private FileInfoDao fileInfoDao;
+    private FileInfoDAO fileInfoDao;
     @Autowired
-    private PictureFileDao pictureFileDao;
+    private PictureFileDAO pictureFileDao;
     @Autowired
-    private ModelDao modelDao;
+    private ModelDAO modelDao;
     @Autowired
-    private ModelTypeDao modelTypeDao;
+    private ModelTypeDAO modelTypeDao;
     @Autowired
-    private DLModelDao dlModelDao;
+    private DLModelDAO dlModelDao;
     @Autowired
-    private HeaderInfoDao headerInfoDao;
+    private HeaderInfoDAO headerInfoDao;
     @Autowired
     private LibsvmAdapter libsvmAdapter;
     @Autowired
@@ -120,11 +120,11 @@ public class ModelService {
      * @param userId
      * @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();
             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());
                 int flag = -1;
                 if(model.isTrained() && model.getResOfModel()!=null){
@@ -132,7 +132,7 @@ public class ModelService {
                 }else if(model.isTrained() && model.getResOfModel()==null){
                     flag = 0;
                 }
-                return new ModelPojo(String.valueOf(configId),
+                return new ModelBO(String.valueOf(configId),
                         configName,
                         String.valueOf(model.getModelTypeId()),
                         modelType != null ? modelType.getModelTypeName() : "",
@@ -158,12 +158,12 @@ public class ModelService {
      * @param userId
      * @return
      */
-    public List<DLGeneralModelPojo> getAllGeneralModelByUserId(int userId){
+    public List<DLGeneralModelBO> getAllGeneralModelByUserId(int 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());
             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))
                     .collect(Collectors.toList());
         }).reduce(new ArrayList<>(), (listA, listB) -> {
@@ -173,9 +173,9 @@ public class ModelService {
         return result;
     }
 
-    public DLModelPojo getDLModelDetailById(int modelId) {
+    public DLModelBO getDLModelDetailById(int 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())
         ,new Json2Object().Json2HashMap(dlModel.getArguments()));
     }

+ 28 - 28
java_compile/src/main/java/com/example/services/PictureService.java → java_compile/src/main/java/cn/seecoder/ai/service/PictureService.java

@@ -1,17 +1,17 @@
-package com.example.services;
-
-import com.example.analysis.FileAnalysis;
-import com.example.config.AppConfig;
-import com.example.dao.*;
-import com.example.data.CsvAdapter;
-import com.example.data.CsvLoader;
-import com.example.entity.PicCategory;
-import com.example.entity.PicFile;
-import com.example.entity.PicInfo;
-import com.example.services.pojo.PicCategoryPojo;
-import com.example.services.pojo.PicFilePojo;
-import com.example.services.pojo.PicInfoPojo;
-import com.example.util.FileHelper;
+package cn.seecoder.ai.service;
+
+import cn.seecoder.ai.analysis.FileAnalysis;
+import cn.seecoder.ai.config.AppConfig;
+import cn.seecoder.ai.dao.*;
+import cn.seecoder.ai.data.CsvAdapter;
+import cn.seecoder.ai.util.CsvLoader;
+import cn.seecoder.ai.dao.entity.PicCategory;
+import cn.seecoder.ai.dao.entity.PicFile;
+import cn.seecoder.ai.dao.entity.PicInfo;
+import cn.seecoder.ai.model.bo.PicCategoryBO;
+import cn.seecoder.ai.model.bo.PicFileBO;
+import cn.seecoder.ai.model.bo.PicInfoBO;
+import cn.seecoder.ai.util.FileHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,22 +31,22 @@ import java.util.zip.ZipFile;
 public class PictureService {
     @Autowired private CsvLoader csvLoader;
     @Autowired private CsvAdapter csvAdapter;
-    @Autowired private HdfsDao hdfsDao;
+    @Autowired private HdfsDAO hdfsDao;
 
-    @Autowired private PictureInfoDao pictureInfoDao;
+    @Autowired private PictureInfoDAO pictureInfoDao;
 
-    @Autowired private ConfigDao configDao;
+    @Autowired private ConfigDAO configDao;
 
-    @Autowired private HeaderInfoDao headerInfoDao;
+    @Autowired private HeaderInfoDAO headerInfoDao;
     @Autowired private FileAnalysis fileAnalysis;
 
-    @Autowired private ModelDao modelDao;
+    @Autowired private ModelDAO modelDao;
 
-    @Autowired private FuncInfoDao funcInfoDao;
+    @Autowired private FuncInfoDAO funcInfoDao;
 
-    @Autowired private PictureCategoryDao pictureCategoryDao;
+    @Autowired private PictureCategoryDAO pictureCategoryDao;
 
-    @Autowired private PictureFileDao pictureFileDao;
+    @Autowired private PictureFileDAO pictureFileDao;
 
     @Autowired private AppConfig appConfig;
     /**
@@ -152,23 +152,23 @@ public class PictureService {
         return true;
     }
 
-    public List<PicFilePojo> getAllProj(int userId){
+    public List<PicFileBO> getAllProj(int userId){
         List<PicFile> picFiles = pictureFileDao.findByUserId(userId);
-        List<PicFilePojo> res = picFiles.stream().map((picInfo) -> new PicFilePojo(String.valueOf(picInfo.getId()), picInfo.getFileName()))
+        List<PicFileBO> res = picFiles.stream().map((picInfo) -> new PicFileBO(String.valueOf(picInfo.getId()), picInfo.getFileName()))
                 .collect(Collectors.toList());
         return res;
     }
 
-    public List<PicCategoryPojo> getOneProj(int picFileId){
+    public List<PicCategoryBO> getOneProj(int picFileId){
         List<PicCategory> picCategories = pictureCategoryDao.findByPicFileId(picFileId);
-        List<PicCategoryPojo> res = picCategories.stream().map((picInfo) -> new PicCategoryPojo(String.valueOf(picInfo.getId()), picInfo.getCategoryName()))
+        List<PicCategoryBO> res = picCategories.stream().map((picInfo) -> new PicCategoryBO(String.valueOf(picInfo.getId()), picInfo.getCategoryName()))
                 .collect(Collectors.toList());
         return res;
     }
 
-    public List<PicInfoPojo> getAllPicAddr(int picTag){
+    public List<PicInfoBO> getAllPicAddr(int picTag){
         List<PicInfo> picInfos = pictureInfoDao.findByCategoryId(picTag);
-        List<PicInfoPojo> res = picInfos.stream().map((picInfo) -> new PicInfoPojo(String.valueOf(picInfo.getId()), picInfo.getPicname(),picInfo.getLocation()))
+        List<PicInfoBO> res = picInfos.stream().map((picInfo) -> new PicInfoBO(String.valueOf(picInfo.getId()), picInfo.getPicname(),picInfo.getLocation()))
                 .collect(Collectors.toList());
         return res;
     }

+ 1 - 1
java_compile/src/main/java/com/example/util/Constant.java → java_compile/src/main/java/cn/seecoder/ai/util/Constant.java

@@ -1,4 +1,4 @@
-package com.example.util;
+package cn.seecoder.ai.util;
 
 /**
  * @author fanyanpeng

+ 3 - 2
java_compile/src/main/java/com/example/data/CsvLoader.java → java_compile/src/main/java/cn/seecoder/ai/util/CsvLoader.java

@@ -1,6 +1,7 @@
-package com.example.data;
+package cn.seecoder.ai.util;
 
-import com.example.util.FileHelper;
+import cn.seecoder.ai.data.CsvAdapter;
+import cn.seecoder.ai.util.FileHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

+ 1 - 1
java_compile/src/main/java/com/example/util/FileHelper.java → java_compile/src/main/java/cn/seecoder/ai/util/FileHelper.java

@@ -1,4 +1,4 @@
-package com.example.util;
+package cn.seecoder.ai.util;
 
 import org.springframework.web.multipart.MultipartFile;
 

+ 1 - 4
java_compile/src/main/java/com/example/util/Json2Object.java → java_compile/src/main/java/cn/seecoder/ai/util/Json2Object.java

@@ -1,15 +1,12 @@
 /**
  * Alipay.com Inc. Copyright (c) 2004-2021 All Rights Reserved.
  */
-package com.example.util;
+package cn.seecoder.ai.util;
 
-import cats.kernel.Hash;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 
 /**

+ 1 - 1
java_compile/src/main/java/com/example/util/Object2Json.java → java_compile/src/main/java/cn/seecoder/ai/util/Object2Json.java

@@ -1,7 +1,7 @@
 /**
  * Alipay.com Inc. Copyright (c) 2004-2021 All Rights Reserved.
  */
-package com.example.util;
+package cn.seecoder.ai.util;
 
 import com.alibaba.fastjson.JSON;
 

+ 2 - 1
java_compile/src/main/java/com/example/data/SasAdapter.java → java_compile/src/main/java/cn/seecoder/ai/util/SasAdapter.java

@@ -1,5 +1,6 @@
-package com.example.data;
+package cn.seecoder.ai.util;
 
+import cn.seecoder.ai.data.CsvAdapter;
 import com.epam.parso.SasFileProperties;
 import com.epam.parso.SasFileReader;
 import com.epam.parso.impl.SasFileReaderImpl;

+ 1 - 2
java_compile/src/main/java/com/example/data/SasLoader.java → java_compile/src/main/java/cn/seecoder/ai/util/SasLoader.java

@@ -1,6 +1,5 @@
-package com.example.data;
+package cn.seecoder.ai.util;
 
-import com.example.util.FileHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

+ 4 - 2
java_compile/src/main/java/com/example/util/TrainParamLoader.java → java_compile/src/main/java/cn/seecoder/ai/util/TrainParamLoader.java

@@ -1,7 +1,9 @@
-package com.example.util;
+package cn.seecoder.ai.util;
 
 
 
+import cn.seecoder.ai.enums.TrainParamEnum;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -11,7 +13,7 @@ import java.util.Map;
  */
 public class TrainParamLoader {
 
-    static private Map<String,TrainParamEnum[]> modelTrainParamMap = new HashMap<String,TrainParamEnum[]>();
+    static private Map<String, TrainParamEnum[]> modelTrainParamMap = new HashMap<String,TrainParamEnum[]>();
 
     static {
         modelTrainParamMap.put("LogisticRegression",new TrainParamEnum[]{

+ 1 - 1
java_compile/src/main/resources/application.yml

@@ -33,5 +33,5 @@ spring:
       ddl-auto: update
     properties:
       hibernate:
-        dialect: com.example.config.MysqlDialog
+        dialect: cn.seecoder.ai.config.MysqlDialog
     show-sql: true

+ 9 - 8
java_compile/src/main/scala/com/example/SparkConnect.scala → java_compile/src/main/scala/cn/seecoder/ai/SparkConnect.scala

@@ -1,20 +1,21 @@
-package com.example
+package cn.seecoder.ai
 
-import com.example.config.AppConfig
-import javax.annotation.PostConstruct
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.{SparkConf, SparkContext}
 import org.slf4j.{Logger, LoggerFactory}
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
+import cn.seecoder.ai.config.AppConfig
+
+import javax.annotation.PostConstruct
 
 /**
-  * the basic spark configuration interface
-  */
+ * the basic spark configuration interface
+ */
 @Component
 trait SparkConnect {
   @Autowired
-  val conf:AppConfig = null
+  val conf: AppConfig = null
 
   val log: Logger = LoggerFactory.getLogger(getClass)
 
@@ -23,8 +24,8 @@ trait SparkConnect {
   var hdfsUri: String = _
 
   /**
-    * initial of spark connection info
-    */
+   * initial of spark connection info
+   */
   @PostConstruct
   def Init() = {
     val serverAddr = conf.getSparkServer

+ 7 - 8
java_compile/src/main/scala/com/example/analysis/FeatureProject.scala → java_compile/src/main/scala/cn/seecoder/ai/analysis/FeatureProject.scala

@@ -1,11 +1,10 @@
-package com.example.analysis
+package cn.seecoder.ai.analysis
 
+import cn.seecoder.ai.SparkConnect
+import cn.seecoder.ai.dao.entity.HeaderInfo
 import java.util
-
-import com.example.SparkConnect
-import com.example.dao.{FileInfoDao, HeaderInfoDao}
-import com.example.data.LibsvmAdapter
-import com.example.entity.HeaderInfo
+import cn.seecoder.ai.dao.{FileInfoDAO, HeaderInfoDAO}
+import cn.seecoder.ai.data.LibsvmAdapter
 import org.apache.spark.ml.feature.ChiSqSelector
 import org.apache.spark.ml.linalg.Vectors
 import org.apache.spark.sql.SparkSession
@@ -21,8 +20,8 @@ import scala.util.control.Exception
  */
 @Component
 class FeatureProject extends SparkConnect{
-  @Autowired val fileInfoDao: FileInfoDao = null
-  @Autowired val headerInfoDao: HeaderInfoDao = null
+  @Autowired val fileInfoDao: FileInfoDAO = null
+  @Autowired val headerInfoDao: HeaderInfoDAO = null
   @Autowired val libsvmAdapter: LibsvmAdapter = null
 
   /**

+ 6 - 6
java_compile/src/main/scala/com/example/analysis/FileAnalysis.scala → java_compile/src/main/scala/cn/seecoder/ai/analysis/FileAnalysis.scala

@@ -1,11 +1,11 @@
-package com.example.analysis
+package cn.seecoder.ai.analysis
 
+import cn.seecoder.ai.SparkConnect
 import java.util
 
 import com.alibaba.fastjson.JSON
-import com.example.SparkConnect
-import com.example.dao.{FileInfoDao, HeaderInfoDao}
-import com.example.util.Object2Json
+import cn.seecoder.ai.dao.{FileInfoDAO, HeaderInfoDAO}
+import cn.seecoder.ai.util.Object2Json
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 
@@ -19,8 +19,8 @@ import scala.util.control._
 @Component
 class FileAnalysis extends SparkConnect {
 
-  @Autowired val headerInfoDao: HeaderInfoDao = null
-  @Autowired val fileInfoDao: FileInfoDao = null
+  @Autowired val headerInfoDao: HeaderInfoDAO = null
+  @Autowired val fileInfoDao: FileInfoDAO = null
 
   /**
    *

+ 8 - 9
java_compile/src/main/scala/com/example/data/CsvAdapter.scala → java_compile/src/main/scala/cn/seecoder/ai/data/CsvAdapter.scala

@@ -1,11 +1,10 @@
-package com.example.data
+package cn.seecoder.ai.data
 
+import cn.seecoder.ai.SparkConnect
+import cn.seecoder.ai.dao.entity.{FileInfo, HeaderInfo}
 import java.util
-
-import com.example.SparkConnect
-import com.example.dao.{FileInfoDao, HdfsDao, HeaderInfoDao}
-import com.example.entity.{FileInfo, HeaderInfo}
-import com.example.services.FileService
+import cn.seecoder.ai.dao.{FileInfoDAO, HdfsDAO, HeaderInfoDAO}
+import cn.seecoder.ai.service.FileService
 import org.apache.spark.sql.{DataFrame, SaveMode}
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
@@ -24,10 +23,10 @@ import scala.collection.JavaConverters._
 @Component
 class CsvAdapter extends SparkConnect{
 
-  @Autowired val hdfsDao: HdfsDao = null
+  @Autowired val hdfsDao: HdfsDAO = null
 
-  @Autowired val fileInfoDao: FileInfoDao = null
-  @Autowired val headerInfoDao: HeaderInfoDao = null
+  @Autowired val fileInfoDao: FileInfoDAO = null
+  @Autowired val headerInfoDao: HeaderInfoDAO = null
   @Autowired val fileService: FileService = null
 
   /**

+ 5 - 5
java_compile/src/main/scala/com/example/data/DataSetHelper.scala → java_compile/src/main/scala/cn/seecoder/ai/data/DataSetHelper.scala

@@ -1,7 +1,7 @@
-package com.example.data
+package cn.seecoder.ai.data
 
-import com.example.SparkConnect
-import com.example.dao.{FileInfoDao, HdfsDao}
+import cn.seecoder.ai.SparkConnect
+import cn.seecoder.ai.dao.{FileInfoDAO, HdfsDAO}
 import org.apache.spark.ml.{Pipeline, PipelineModel}
 import org.apache.spark.ml.feature.{IndexToString, StringIndexer, StringIndexerModel, VectorAssembler}
 import org.apache.spark.sql.functions.{col, lit}
@@ -14,10 +14,10 @@ import org.springframework.stereotype.Component
 class DataSetHelper extends SparkConnect{
 
   @Autowired
-  val fileLocDao: FileInfoDao = null
+  val fileLocDao: FileInfoDAO = null
 
   @Autowired
-  val hdfsDao: HdfsDao = null
+  val hdfsDao: HdfsDAO = null
 
   /**
    * 填写null值,目前处理了StringType

+ 10 - 10
java_compile/src/main/scala/com/example/data/FitTestData.scala → java_compile/src/main/scala/cn/seecoder/ai/data/FitTestData.scala

@@ -1,10 +1,10 @@
-package com.example.data
+package cn.seecoder.ai.data
 
+import cn.seecoder.ai.SparkConnect
 import java.util
-import com.example.SparkConnect
-import com.example.dao._
-import com.example.entity.{Config, Model}
-import com.example.util.Json2Object
+import cn.seecoder.ai.dao._
+import cn.seecoder.ai.dao.entity.{Config, Model}
+import cn.seecoder.ai.util.Json2Object
 
 import org.apache.spark.ml.classification.LogisticRegressionModel
 import org.apache.spark.ml.clustering.KMeansModel
@@ -28,18 +28,18 @@ class FitTestData extends SparkConnect{
   @Autowired
   val libsvmAdapter: LibsvmAdapter = null
   @Autowired
-  val fileInfoDao: FileInfoDao = null
+  val fileInfoDao: FileInfoDAO = null
 
   @Autowired
-  val hdfsDao: HdfsDao = null
+  val hdfsDao: HdfsDAO = null
 
   @Autowired
-  val modelDao: ModelDao = null
+  val modelDao: ModelDAO = null
   @Autowired
-  val configDao: ConfigDao = null
+  val configDao: ConfigDAO = null
 
   @Autowired
-  val headerInfoDao: HeaderInfoDao = null
+  val headerInfoDao: HeaderInfoDAO = null
 
   @Autowired
   val dataSetHelper : DataSetHelper = null

+ 5 - 5
java_compile/src/main/scala/com/example/data/LibsvmAdapter.scala → java_compile/src/main/scala/cn/seecoder/ai/data/LibsvmAdapter.scala

@@ -1,7 +1,7 @@
-package com.example.data
+package cn.seecoder.ai.data
 
-import com.example.SparkConnect
-import com.example.dao.{FileInfoDao, HdfsDao}
+import cn.seecoder.ai.SparkConnect
+import cn.seecoder.ai.dao.{FileInfoDAO, HdfsDAO}
 import org.apache.spark.ml.Pipeline
 import org.apache.spark.ml.feature.{StringIndexer, StringIndexerModel}
 import org.apache.spark.sql.types.StringType
@@ -22,10 +22,10 @@ import org.springframework.stereotype.Component
 class LibsvmAdapter extends SparkConnect{
 
   @Autowired
-  val fileLocDao: FileInfoDao = null
+  val fileLocDao: FileInfoDAO = null
 
   @Autowired
-  val hdfsDao: HdfsDao = null
+  val hdfsDao: HdfsDAO = null
 
   //val spark: SparkSession = sparkSession
 

+ 5 - 5
java_compile/src/main/scala/com/example/model/classification/DTClassification.scala → java_compile/src/main/scala/cn/seecoder/ai/model/classification/DTClassification.scala

@@ -1,9 +1,9 @@
-package com.example.model.classification
+package cn.seecoder.ai.model.classification
 
+import cn.seecoder.ai.SparkConnect
+import cn.seecoder.ai.dao.entity.Model
 import java.util
-import com.example.SparkConnect
-import com.example.entity.Model
-import com.example.model.helper.Utils
+import cn.seecoder.ai.model.helper.Utils
 import org.apache.spark.ml.classification.{DecisionTreeClassificationModel, DecisionTreeClassifier}
 import org.apache.spark.ml.evaluation.MulticlassClassificationEvaluator
 import org.apache.spark.ml.feature.{IndexToString, StringIndexer, VectorIndexer}
@@ -11,7 +11,7 @@ import org.apache.spark.ml.{Pipeline, PipelineModel, PipelineStage}
 import org.apache.spark.sql.{Dataset, Row}
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
-import com.example.util.Constant
+import cn.seecoder.ai.util.Constant
 
 
 @Component

+ 7 - 5
java_compile/src/main/scala/com/example/model/classification/DefaultClassification.scala → java_compile/src/main/scala/cn/seecoder/ai/model/classification/DefaultClassification.scala

@@ -1,8 +1,10 @@
-package com.example.model.classification
+package cn.seecoder.ai.model.classification
+
+import cn.seecoder.ai.SparkConnect
+import cn.seecoder.ai.dao.entity.Model
 import java.util
-import com.example.SparkConnect
-import com.example.entity.Model
-import com.example.model.helper.Utils
+import cn.seecoder.ai.enums.TrainParamEnum
+import cn.seecoder.ai.model.helper.Utils
 import org.apache.spark.ml.classification.{DecisionTreeClassificationModel, DecisionTreeClassifier, LogisticRegression, LogisticRegressionModel}
 import org.apache.spark.ml.evaluation.MulticlassClassificationEvaluator
 import org.apache.spark.ml.feature.{IndexToString, StringIndexer, VectorIndexer}
@@ -10,7 +12,7 @@ import org.apache.spark.ml.{Pipeline, PipelineModel, PipelineStage}
 import org.apache.spark.sql.{Dataset, Row}
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
-import com.example.util.{Constant, TrainParamEnum, TrainParamReader}
+import cn.seecoder.ai.util.{Constant, TrainParamReader}
 
 import scala.collection.mutable
 

+ 1 - 1
java_compile/src/main/scala/com/example/model/classification/GDBTClassification.scala → java_compile/src/main/scala/cn/seecoder/ai/model/classification/GDBTClassification.scala

@@ -1,4 +1,4 @@
-package com.example.model.classification
+package cn.seecoder.ai.model.classification
 import java.util
 import org.apache.spark.ml.{PipelineStage}
 import org.apache.spark.ml.classification.{GBTClassifier}

+ 5 - 4
java_compile/src/main/scala/com/example/model/classification/LRClassification.scala → java_compile/src/main/scala/cn/seecoder/ai/model/classification/LRClassification.scala

@@ -1,8 +1,9 @@
-package com.example.model.classification
+package cn.seecoder.ai.model.classification
 
+import cn.seecoder.ai.SparkConnect
 import java.util
-import com.example.SparkConnect
-import com.example.model.helper.Utils
+import cn.seecoder.ai.enums.TrainParamEnum
+import cn.seecoder.ai.model.helper.Utils
 import org.apache.spark.ml.{Pipeline, PipelineModel, PipelineStage}
 import org.apache.spark.ml.classification.{BinaryLogisticRegressionSummary, DecisionTreeClassificationModel, GBTClassifier, LogisticRegression, LogisticRegressionModel}
 import org.apache.spark.ml.evaluation.MulticlassClassificationEvaluator
@@ -12,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 
 import collection.JavaConverters._
-import com.example.util.{Constant, TrainParamEnum, TrainParamReader}
+import cn.seecoder.ai.util.{Constant, TrainParamReader}
 
 @Component
 class LRClassification extends DefaultClassification {

+ 5 - 4
java_compile/src/main/scala/com/example/model/classification/MulPerClassification.scala → java_compile/src/main/scala/cn/seecoder/ai/model/classification/MulPerClassification.scala

@@ -1,8 +1,9 @@
-package com.example.model.classification
+package cn.seecoder.ai.model.classification
 
+import cn.seecoder.ai.SparkConnect
 import java.util
-import com.example.SparkConnect
-import com.example.model.helper.Utils
+import cn.seecoder.ai.enums.TrainParamEnum
+import cn.seecoder.ai.model.helper.Utils
 import org.apache.spark.ml.classification.{DecisionTreeClassificationModel, DecisionTreeClassifier, MultilayerPerceptronClassificationModel, MultilayerPerceptronClassifier}
 import org.apache.spark.ml.evaluation.MulticlassClassificationEvaluator
 import org.apache.spark.ml.{Pipeline, PipelineModel, PipelineStage}
@@ -10,7 +11,7 @@ import org.apache.spark.ml.feature.{IndexToString, StringIndexer, VectorIndexer}
 import org.apache.spark.sql.{Dataset, Row}
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
-import com.example.util.{Constant, TrainParamEnum, TrainParamReader}
+import cn.seecoder.ai.util.{Constant, TrainParamReader}
 
 
 

+ 4 - 4
java_compile/src/main/scala/com/example/model/classification/NaiveBayesClassification.scala → java_compile/src/main/scala/cn/seecoder/ai/model/classification/NaiveBayesClassification.scala

@@ -1,8 +1,8 @@
-package com.example.model.classification
+package cn.seecoder.ai.model.classification
 
+import cn.seecoder.ai.SparkConnect
 import java.util
-import com.example.SparkConnect
-import com.example.model.helper.Utils
+import cn.seecoder.ai.model.helper.Utils
 import org.apache.spark.ml.{Pipeline, PipelineModel, PipelineStage}
 import org.apache.spark.ml.classification.{MultilayerPerceptronClassificationModel, MultilayerPerceptronClassifier, NaiveBayes, NaiveBayesModel}
 import org.apache.spark.ml.evaluation.MulticlassClassificationEvaluator
@@ -10,7 +10,7 @@ import org.apache.spark.ml.feature.{IndexToString, StringIndexer, VectorIndexer}
 import org.apache.spark.sql.{Dataset, Row}
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
-import com.example.util.Constant
+import cn.seecoder.ai.util.Constant
 
 
 

+ 4 - 4
java_compile/src/main/scala/com/example/model/classification/RFClassification.scala → java_compile/src/main/scala/cn/seecoder/ai/model/classification/RFClassification.scala

@@ -1,8 +1,8 @@
-package com.example.model.classification
+package cn.seecoder.ai.model.classification
 
+import cn.seecoder.ai.SparkConnect
 import java.util
-import com.example.SparkConnect
-import com.example.model.helper.Utils
+import cn.seecoder.ai.model.helper.Utils
 import org.apache.spark.ml.{Pipeline, PipelineModel, PipelineStage}
 import org.apache.spark.ml.classification.{DecisionTreeClassifier, RandomForestClassificationModel, RandomForestClassifier}
 import org.apache.spark.ml.evaluation.MulticlassClassificationEvaluator
@@ -10,7 +10,7 @@ import org.apache.spark.ml.feature.{IndexToString, StringIndexer, VectorIndexer}
 import org.apache.spark.sql.{Dataset, Row}
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
-import com.example.util.Constant
+import cn.seecoder.ai.util.Constant
 
 
 

+ 3 - 4
java_compile/src/main/scala/com/example/model/cluster/KmeansCluster.scala → java_compile/src/main/scala/cn/seecoder/ai/model/cluster/KmeansCluster.scala

@@ -1,9 +1,8 @@
-package com.example.model.cluster
+package cn.seecoder.ai.model.cluster
 
+import cn.seecoder.ai.SparkConnect
 import java.util
-
-import com.example.SparkConnect
-import com.example.model.helper.Utils
+import cn.seecoder.ai.model.helper.Utils
 import org.apache.spark.ml.PipelineModel
 import org.apache.spark.sql.{Dataset, Row}
 import org.apache.spark.ml.clustering.KMeansModel

+ 1 - 1
java_compile/src/main/scala/com/example/model/helper/Stringcyz.scala → java_compile/src/main/scala/cn/seecoder/ai/model/helper/Stringcyz.scala

@@ -1,4 +1,4 @@
-package com.example.model.helper
+package cn.seecoder.ai.model.helper
 
 import org.springframework.stereotype.Component
 

+ 5 - 5
java_compile/src/main/scala/com/example/model/helper/Utils.scala → java_compile/src/main/scala/cn/seecoder/ai/model/helper/Utils.scala

@@ -1,7 +1,7 @@
-package com.example.model.helper
+package cn.seecoder.ai.model.helper
 
-import com.example.SparkConnect
-import com.example.dao.{HdfsDao, ModelDao}
+import cn.seecoder.ai.SparkConnect
+import cn.seecoder.ai.dao.{HdfsDAO, ModelDAO}
 import org.apache.spark.ml.PipelineModel
 import org.apache.spark.ml.classification.LogisticRegressionModel
 import org.apache.spark.ml.clustering.KMeansModel
@@ -15,10 +15,10 @@ import org.springframework.stereotype.Component
 class Utils extends SparkConnect{
 
   @Autowired
-  val hdfsDao: HdfsDao = null
+  val hdfsDao: HdfsDAO = null
 
   @Autowired
-  val modelDao: ModelDao = null
+  val modelDao: ModelDAO = null
 
 
   @throws(classOf[Exception])

+ 3 - 4
java_compile/src/main/scala/com/example/model/regression/RFRegression.scala → java_compile/src/main/scala/cn/seecoder/ai/model/regression/RFRegression.scala

@@ -1,9 +1,8 @@
-package com.example.model.regression
+package cn.seecoder.ai.model.regression
 
+import cn.seecoder.ai.SparkConnect
 import java.util
-
-import com.example.SparkConnect
-import com.example.model.helper.Utils
+import cn.seecoder.ai.model.helper.Utils
 import org.apache.spark.ml.{Pipeline, PipelineModel}
 import org.apache.spark.ml.evaluation.RegressionEvaluator
 import org.apache.spark.ml.feature.{IndexToString, StringIndexer, VectorIndexer}

+ 3 - 1
java_compile/src/main/scala/com/example/util/TrainParamReader.scala → java_compile/src/main/scala/cn/seecoder/ai/util/TrainParamReader.scala

@@ -1,4 +1,6 @@
-package com.example.util
+package cn.seecoder.ai.util
+
+import cn.seecoder.ai.enums.TrainParamEnum
 
 import java.util
 

Неке датотеке нису приказане због велике количине промена