diff --git a/pom.xml b/pom.xml
index ba122c9..92428ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,13 +74,25 @@
+
+
+
+
+
+
+
+
+ com.hankcs
+ hanlp
+ portable-1.8.4
+
+
com.hankcs.hanlp.restful
hanlp-restful
0.0.12
-
diff --git a/src/main/java/com/sztzjy/marketing/controller/stu/StuDigitalMarketingModelController.java b/src/main/java/com/sztzjy/marketing/controller/stu/StuDigitalMarketingModelController.java
index b63c37a..22a963f 100644
--- a/src/main/java/com/sztzjy/marketing/controller/stu/StuDigitalMarketingModelController.java
+++ b/src/main/java/com/sztzjy/marketing/controller/stu/StuDigitalMarketingModelController.java
@@ -4,14 +4,13 @@ import com.sztzjy.marketing.annotation.AnonymousAccess;
import com.sztzjy.marketing.config.exception.handler.DigitalEconomyxception;
import com.sztzjy.marketing.entity.StuTrainingOperateStepExample;
import com.sztzjy.marketing.entity.StuTrainingOperateStepWithBLOBs;
-import com.sztzjy.marketing.entity.dto.AssociationRulesDTO;
-import com.sztzjy.marketing.entity.dto.ClusterAnalysisDTO;
-import com.sztzjy.marketing.entity.dto.StatisticsDTO;
+import com.sztzjy.marketing.entity.dto.*;
import com.sztzjy.marketing.service.StuDigitalMarketingModelService;
import com.sztzjy.marketing.util.ResultEntity;
import com.sztzjy.marketing.util.algorithm.Apriori;
import com.sztzjy.marketing.util.algorithm.KMeans;
import com.sztzjy.marketing.util.algorithm.LinearRegression;
+import com.sztzjy.marketing.util.algorithm.LogisticRegression;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -24,9 +23,11 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.util.*;
import static com.sztzjy.marketing.util.algorithm.KMeans.readIrisData;
+import static com.sztzjy.marketing.util.algorithm.KMeansResult.*;
/**
* @author tz
@@ -72,6 +73,18 @@ public class StuDigitalMarketingModelController {
}
+ @ApiOperation("数据预处理")
+ @PostMapping("/dataPreprocessing")
+ @AnonymousAccess
+ public ResultEntity dataPreprocessing(@RequestBody DataPreprocessingDTO dto) {
+
+ String userId = dto.getUserId();
+ String method = dto.getMethod();
+ List