diff --git a/src/main/java/com/sztzjy/marketing/config/Constant.java b/src/main/java/com/sztzjy/marketing/config/Constant.java index a6fb784..90c1231 100644 --- a/src/main/java/com/sztzjy/marketing/config/Constant.java +++ b/src/main/java/com/sztzjy/marketing/config/Constant.java @@ -8,11 +8,7 @@ import org.springframework.stereotype.Component; @Component public class Constant { - public static final String ZSGY_TCHMODULE = "知识概要"; - public static final String ZYXX_TCHMODULE = "资源学习"; - public static final String XXCP_TCHMODULE = "学习测评"; - public static final String SYSX_TCHMODULE = "实验实训"; - public static final String SYBG_TCHMODULE = "实验报告"; + public static final String JUPYTERHUB_API_URL = "http://120.78.220.29:8000/hub/api"; public static final String ADMIN_TOKEN = "170bed30b34242cfb3fda3171e1a111d"; // 替换为你的JupyterHub管理员API令牌 diff --git a/src/main/java/com/sztzjy/marketing/config/security/TokenProvider.java b/src/main/java/com/sztzjy/marketing/config/security/TokenProvider.java index f65566a..796e841 100644 --- a/src/main/java/com/sztzjy/marketing/config/security/TokenProvider.java +++ b/src/main/java/com/sztzjy/marketing/config/security/TokenProvider.java @@ -23,7 +23,7 @@ public class TokenProvider { private final static String SECRET = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAghgsx+OLLThi7c+/HgCaRla8n+/QLHt++uscoK22dMeaVa3WJvRb5C5qtHGzj9V74pI96JpxdWWCN3Zr1QtanQIDAQABAkB2fWRUD1jVMBVS+rPctLnPNPMKTRdzXGv0SC5D3tRfGZqdcfsmZg8hzBVndHxngmwZS73d+hPjofcdefDDnXq1AiEAz/r1AMF7fweN70mbKgBJuTja37puJMsH2Szwrvb5jlcCIQCgIaLZ5d9J7OomL0NwH8ghba/xgBEpKzErfGbFnTfeKwIgc8ptczFFV1DWZb2eJIEqinOr79l0jwl2YiQSD+cyw1sCIHqxCvv1Wx5jPgy/zeYNE+Q5DMP3Ii7u/x+Yk436JiI9AiEAio84hFm44YTUuV7YCYsbyvnCn/vtcAaqZlczbeHlP1I="; private final static long EXP_TIME = 1000 * 60 * 60 * 4; - private final static String SECRET_ZHIYUN = "zy_zx_mnjy_fp76ckwuczzmb67w0a8x0"; + private final static String SECRET_ZHIYUN = "zy_yx_mnjy_fp76ckwuczzmb67w0a8x0"; private final static String CURRENT_TO_ZHIYUN = "jVzvfoZU_eFN0CJcFARg0K6DlzTLa7oMWB7lV_y2s7bkv2Bem0281wEwlJp5afhsmM-Ynwvh3mAUTpwblGEz1A"; diff --git a/src/main/java/com/sztzjy/marketing/controller/stu/UserController.java b/src/main/java/com/sztzjy/marketing/controller/stu/UserController.java index a96c6d5..e7633f6 100644 --- a/src/main/java/com/sztzjy/marketing/controller/stu/UserController.java +++ b/src/main/java/com/sztzjy/marketing/controller/stu/UserController.java @@ -126,7 +126,7 @@ public class UserController { type = 0; } - if (type ==1 ) + if (type ==1) { jwtUser = TokenProvider.getJWTUserOne(TOKEN); }else { diff --git a/src/main/java/com/sztzjy/marketing/entity/StuMachineLearning.java b/src/main/java/com/sztzjy/marketing/entity/StuMachineLearning.java index 6528b81..e14bd5a 100644 --- a/src/main/java/com/sztzjy/marketing/entity/StuMachineLearning.java +++ b/src/main/java/com/sztzjy/marketing/entity/StuMachineLearning.java @@ -1,15 +1,21 @@ package com.sztzjy.marketing.entity; +import java.io.Serializable; import java.util.Date; +import java.util.List; +import com.sztzjy.marketing.entity.dto.StuMachineLearningInfoDTO; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + /** * 实验实训根据模块存储 * * @author whb * stu_machine_learning */ -public class StuMachineLearning { +@Data +public class StuMachineLearning implements Serializable { @ApiModelProperty("id") private Integer id; @@ -181,6 +187,56 @@ public class StuMachineLearning { @ApiModelProperty("错误字段") private String errorField; + @ApiModelProperty("34") + private String stepNew; + + @ApiModelProperty("35") + private String stepNewOne; + + @ApiModelProperty("36") + private String stepNewTwo; + + @ApiModelProperty("37") + private String stepNewThree; + + @ApiModelProperty("38") + private String stepNewFive; + + @ApiModelProperty("39") + private String stepNewSix; + + @ApiModelProperty("40") + private String stepNewNine; + + @ApiModelProperty("41") + private String stepNewEight; + + @ApiModelProperty("35") + private String stepNewTen; + + @ApiModelProperty("36") + private String stepNewEleven; + + @ApiModelProperty("37") + private String stepNewShier; + + @ApiModelProperty("38") + private String stepNewShisan; + + @ApiModelProperty("39") + private String stepNewShisi; + + @ApiModelProperty("40") + private String stepNewShiwu; + + @ApiModelProperty("41") + private String stepNewShiliu; + + @ApiModelProperty("活跃用户分析") + private String activeUserAnalysis; + + private List stuMachineLearningInfoDTOList; + public Integer getId() { return id; } @@ -636,4 +692,132 @@ public class StuMachineLearning { public void setErrorField(String errorField) { this.errorField = errorField == null ? null : errorField.trim(); } + + public String getStepNew() { + return stepNew; + } + + public void setStepNew(String stepNew) { + this.stepNew = stepNew == null ? null : stepNew.trim(); + } + + public String getStepNewOne() { + return stepNewOne; + } + + public void setStepNewOne(String stepNewOne) { + this.stepNewOne = stepNewOne == null ? null : stepNewOne.trim(); + } + + public String getStepNewTwo() { + return stepNewTwo; + } + + public void setStepNewTwo(String stepNewTwo) { + this.stepNewTwo = stepNewTwo == null ? null : stepNewTwo.trim(); + } + + public String getStepNewThree() { + return stepNewThree; + } + + public void setStepNewThree(String stepNewThree) { + this.stepNewThree = stepNewThree == null ? null : stepNewThree.trim(); + } + + public String getStepNewFive() { + return stepNewFive; + } + + public void setStepNewFive(String stepNewFive) { + this.stepNewFive = stepNewFive == null ? null : stepNewFive.trim(); + } + + public String getStepNewSix() { + return stepNewSix; + } + + public void setStepNewSix(String stepNewSix) { + this.stepNewSix = stepNewSix == null ? null : stepNewSix.trim(); + } + + public String getStepNewNine() { + return stepNewNine; + } + + public void setStepNewNine(String stepNewNine) { + this.stepNewNine = stepNewNine == null ? null : stepNewNine.trim(); + } + + public String getStepNewEight() { + return stepNewEight; + } + + public void setStepNewEight(String stepNewEight) { + this.stepNewEight = stepNewEight == null ? null : stepNewEight.trim(); + } + + public String getStepNewTen() { + return stepNewTen; + } + + public void setStepNewTen(String stepNewTen) { + this.stepNewTen = stepNewTen == null ? null : stepNewTen.trim(); + } + + public String getStepNewEleven() { + return stepNewEleven; + } + + public void setStepNewEleven(String stepNewEleven) { + this.stepNewEleven = stepNewEleven == null ? null : stepNewEleven.trim(); + } + + public String getStepNewShier() { + return stepNewShier; + } + + public void setStepNewShier(String stepNewShier) { + this.stepNewShier = stepNewShier == null ? null : stepNewShier.trim(); + } + + public String getStepNewShisan() { + return stepNewShisan; + } + + public void setStepNewShisan(String stepNewShisan) { + this.stepNewShisan = stepNewShisan == null ? null : stepNewShisan.trim(); + } + + public String getStepNewShisi() { + return stepNewShisi; + } + + public void setStepNewShisi(String stepNewShisi) { + this.stepNewShisi = stepNewShisi == null ? null : stepNewShisi.trim(); + } + + public String getStepNewShiwu() { + return stepNewShiwu; + } + + public void setStepNewShiwu(String stepNewShiwu) { + this.stepNewShiwu = stepNewShiwu == null ? null : stepNewShiwu.trim(); + } + + public String getStepNewShiliu() { + return stepNewShiliu; + } + + public void setStepNewShiliu(String stepNewShiliu) { + this.stepNewShiliu = stepNewShiliu == null ? null : stepNewShiliu.trim(); + } + + public String getActiveUserAnalysis() { + return activeUserAnalysis; + } + + public void setActiveUserAnalysis(String activeUserAnalysis) { + this.activeUserAnalysis = activeUserAnalysis == null ? null : activeUserAnalysis.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/marketing/entity/StuMachineLearningExample.java b/src/main/java/com/sztzjy/marketing/entity/StuMachineLearningExample.java index 09270e2..3f8393d 100644 --- a/src/main/java/com/sztzjy/marketing/entity/StuMachineLearningExample.java +++ b/src/main/java/com/sztzjy/marketing/entity/StuMachineLearningExample.java @@ -3974,6 +3974,1056 @@ public class StuMachineLearningExample { addCriterion("error_field not between", value1, value2, "errorField"); return (Criteria) this; } + + public Criteria andStepNewIsNull() { + addCriterion("step_new is null"); + return (Criteria) this; + } + + public Criteria andStepNewIsNotNull() { + addCriterion("step_new is not null"); + return (Criteria) this; + } + + public Criteria andStepNewEqualTo(String value) { + addCriterion("step_new =", value, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewNotEqualTo(String value) { + addCriterion("step_new <>", value, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewGreaterThan(String value) { + addCriterion("step_new >", value, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewGreaterThanOrEqualTo(String value) { + addCriterion("step_new >=", value, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewLessThan(String value) { + addCriterion("step_new <", value, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewLessThanOrEqualTo(String value) { + addCriterion("step_new <=", value, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewLike(String value) { + addCriterion("step_new like", value, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewNotLike(String value) { + addCriterion("step_new not like", value, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewIn(List values) { + addCriterion("step_new in", values, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewNotIn(List values) { + addCriterion("step_new not in", values, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewBetween(String value1, String value2) { + addCriterion("step_new between", value1, value2, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewNotBetween(String value1, String value2) { + addCriterion("step_new not between", value1, value2, "stepNew"); + return (Criteria) this; + } + + public Criteria andStepNewOneIsNull() { + addCriterion("step_new_one is null"); + return (Criteria) this; + } + + public Criteria andStepNewOneIsNotNull() { + addCriterion("step_new_one is not null"); + return (Criteria) this; + } + + public Criteria andStepNewOneEqualTo(String value) { + addCriterion("step_new_one =", value, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneNotEqualTo(String value) { + addCriterion("step_new_one <>", value, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneGreaterThan(String value) { + addCriterion("step_new_one >", value, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneGreaterThanOrEqualTo(String value) { + addCriterion("step_new_one >=", value, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneLessThan(String value) { + addCriterion("step_new_one <", value, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneLessThanOrEqualTo(String value) { + addCriterion("step_new_one <=", value, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneLike(String value) { + addCriterion("step_new_one like", value, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneNotLike(String value) { + addCriterion("step_new_one not like", value, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneIn(List values) { + addCriterion("step_new_one in", values, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneNotIn(List values) { + addCriterion("step_new_one not in", values, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneBetween(String value1, String value2) { + addCriterion("step_new_one between", value1, value2, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewOneNotBetween(String value1, String value2) { + addCriterion("step_new_one not between", value1, value2, "stepNewOne"); + return (Criteria) this; + } + + public Criteria andStepNewTwoIsNull() { + addCriterion("step_new_two is null"); + return (Criteria) this; + } + + public Criteria andStepNewTwoIsNotNull() { + addCriterion("step_new_two is not null"); + return (Criteria) this; + } + + public Criteria andStepNewTwoEqualTo(String value) { + addCriterion("step_new_two =", value, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoNotEqualTo(String value) { + addCriterion("step_new_two <>", value, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoGreaterThan(String value) { + addCriterion("step_new_two >", value, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoGreaterThanOrEqualTo(String value) { + addCriterion("step_new_two >=", value, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoLessThan(String value) { + addCriterion("step_new_two <", value, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoLessThanOrEqualTo(String value) { + addCriterion("step_new_two <=", value, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoLike(String value) { + addCriterion("step_new_two like", value, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoNotLike(String value) { + addCriterion("step_new_two not like", value, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoIn(List values) { + addCriterion("step_new_two in", values, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoNotIn(List values) { + addCriterion("step_new_two not in", values, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoBetween(String value1, String value2) { + addCriterion("step_new_two between", value1, value2, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewTwoNotBetween(String value1, String value2) { + addCriterion("step_new_two not between", value1, value2, "stepNewTwo"); + return (Criteria) this; + } + + public Criteria andStepNewThreeIsNull() { + addCriterion("step_new_three is null"); + return (Criteria) this; + } + + public Criteria andStepNewThreeIsNotNull() { + addCriterion("step_new_three is not null"); + return (Criteria) this; + } + + public Criteria andStepNewThreeEqualTo(String value) { + addCriterion("step_new_three =", value, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeNotEqualTo(String value) { + addCriterion("step_new_three <>", value, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeGreaterThan(String value) { + addCriterion("step_new_three >", value, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeGreaterThanOrEqualTo(String value) { + addCriterion("step_new_three >=", value, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeLessThan(String value) { + addCriterion("step_new_three <", value, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeLessThanOrEqualTo(String value) { + addCriterion("step_new_three <=", value, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeLike(String value) { + addCriterion("step_new_three like", value, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeNotLike(String value) { + addCriterion("step_new_three not like", value, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeIn(List values) { + addCriterion("step_new_three in", values, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeNotIn(List values) { + addCriterion("step_new_three not in", values, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeBetween(String value1, String value2) { + addCriterion("step_new_three between", value1, value2, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewThreeNotBetween(String value1, String value2) { + addCriterion("step_new_three not between", value1, value2, "stepNewThree"); + return (Criteria) this; + } + + public Criteria andStepNewFiveIsNull() { + addCriterion("step_new_five is null"); + return (Criteria) this; + } + + public Criteria andStepNewFiveIsNotNull() { + addCriterion("step_new_five is not null"); + return (Criteria) this; + } + + public Criteria andStepNewFiveEqualTo(String value) { + addCriterion("step_new_five =", value, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveNotEqualTo(String value) { + addCriterion("step_new_five <>", value, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveGreaterThan(String value) { + addCriterion("step_new_five >", value, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveGreaterThanOrEqualTo(String value) { + addCriterion("step_new_five >=", value, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveLessThan(String value) { + addCriterion("step_new_five <", value, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveLessThanOrEqualTo(String value) { + addCriterion("step_new_five <=", value, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveLike(String value) { + addCriterion("step_new_five like", value, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveNotLike(String value) { + addCriterion("step_new_five not like", value, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveIn(List values) { + addCriterion("step_new_five in", values, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveNotIn(List values) { + addCriterion("step_new_five not in", values, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveBetween(String value1, String value2) { + addCriterion("step_new_five between", value1, value2, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewFiveNotBetween(String value1, String value2) { + addCriterion("step_new_five not between", value1, value2, "stepNewFive"); + return (Criteria) this; + } + + public Criteria andStepNewSixIsNull() { + addCriterion("step_new_six is null"); + return (Criteria) this; + } + + public Criteria andStepNewSixIsNotNull() { + addCriterion("step_new_six is not null"); + return (Criteria) this; + } + + public Criteria andStepNewSixEqualTo(String value) { + addCriterion("step_new_six =", value, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixNotEqualTo(String value) { + addCriterion("step_new_six <>", value, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixGreaterThan(String value) { + addCriterion("step_new_six >", value, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixGreaterThanOrEqualTo(String value) { + addCriterion("step_new_six >=", value, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixLessThan(String value) { + addCriterion("step_new_six <", value, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixLessThanOrEqualTo(String value) { + addCriterion("step_new_six <=", value, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixLike(String value) { + addCriterion("step_new_six like", value, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixNotLike(String value) { + addCriterion("step_new_six not like", value, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixIn(List values) { + addCriterion("step_new_six in", values, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixNotIn(List values) { + addCriterion("step_new_six not in", values, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixBetween(String value1, String value2) { + addCriterion("step_new_six between", value1, value2, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewSixNotBetween(String value1, String value2) { + addCriterion("step_new_six not between", value1, value2, "stepNewSix"); + return (Criteria) this; + } + + public Criteria andStepNewNineIsNull() { + addCriterion("step_new_nine is null"); + return (Criteria) this; + } + + public Criteria andStepNewNineIsNotNull() { + addCriterion("step_new_nine is not null"); + return (Criteria) this; + } + + public Criteria andStepNewNineEqualTo(String value) { + addCriterion("step_new_nine =", value, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineNotEqualTo(String value) { + addCriterion("step_new_nine <>", value, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineGreaterThan(String value) { + addCriterion("step_new_nine >", value, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineGreaterThanOrEqualTo(String value) { + addCriterion("step_new_nine >=", value, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineLessThan(String value) { + addCriterion("step_new_nine <", value, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineLessThanOrEqualTo(String value) { + addCriterion("step_new_nine <=", value, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineLike(String value) { + addCriterion("step_new_nine like", value, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineNotLike(String value) { + addCriterion("step_new_nine not like", value, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineIn(List values) { + addCriterion("step_new_nine in", values, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineNotIn(List values) { + addCriterion("step_new_nine not in", values, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineBetween(String value1, String value2) { + addCriterion("step_new_nine between", value1, value2, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewNineNotBetween(String value1, String value2) { + addCriterion("step_new_nine not between", value1, value2, "stepNewNine"); + return (Criteria) this; + } + + public Criteria andStepNewEightIsNull() { + addCriterion("step_new_eight is null"); + return (Criteria) this; + } + + public Criteria andStepNewEightIsNotNull() { + addCriterion("step_new_eight is not null"); + return (Criteria) this; + } + + public Criteria andStepNewEightEqualTo(String value) { + addCriterion("step_new_eight =", value, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightNotEqualTo(String value) { + addCriterion("step_new_eight <>", value, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightGreaterThan(String value) { + addCriterion("step_new_eight >", value, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightGreaterThanOrEqualTo(String value) { + addCriterion("step_new_eight >=", value, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightLessThan(String value) { + addCriterion("step_new_eight <", value, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightLessThanOrEqualTo(String value) { + addCriterion("step_new_eight <=", value, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightLike(String value) { + addCriterion("step_new_eight like", value, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightNotLike(String value) { + addCriterion("step_new_eight not like", value, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightIn(List values) { + addCriterion("step_new_eight in", values, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightNotIn(List values) { + addCriterion("step_new_eight not in", values, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightBetween(String value1, String value2) { + addCriterion("step_new_eight between", value1, value2, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewEightNotBetween(String value1, String value2) { + addCriterion("step_new_eight not between", value1, value2, "stepNewEight"); + return (Criteria) this; + } + + public Criteria andStepNewTenIsNull() { + addCriterion("step_new_ten is null"); + return (Criteria) this; + } + + public Criteria andStepNewTenIsNotNull() { + addCriterion("step_new_ten is not null"); + return (Criteria) this; + } + + public Criteria andStepNewTenEqualTo(String value) { + addCriterion("step_new_ten =", value, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenNotEqualTo(String value) { + addCriterion("step_new_ten <>", value, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenGreaterThan(String value) { + addCriterion("step_new_ten >", value, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenGreaterThanOrEqualTo(String value) { + addCriterion("step_new_ten >=", value, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenLessThan(String value) { + addCriterion("step_new_ten <", value, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenLessThanOrEqualTo(String value) { + addCriterion("step_new_ten <=", value, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenLike(String value) { + addCriterion("step_new_ten like", value, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenNotLike(String value) { + addCriterion("step_new_ten not like", value, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenIn(List values) { + addCriterion("step_new_ten in", values, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenNotIn(List values) { + addCriterion("step_new_ten not in", values, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenBetween(String value1, String value2) { + addCriterion("step_new_ten between", value1, value2, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewTenNotBetween(String value1, String value2) { + addCriterion("step_new_ten not between", value1, value2, "stepNewTen"); + return (Criteria) this; + } + + public Criteria andStepNewElevenIsNull() { + addCriterion("step_new_eleven is null"); + return (Criteria) this; + } + + public Criteria andStepNewElevenIsNotNull() { + addCriterion("step_new_eleven is not null"); + return (Criteria) this; + } + + public Criteria andStepNewElevenEqualTo(String value) { + addCriterion("step_new_eleven =", value, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenNotEqualTo(String value) { + addCriterion("step_new_eleven <>", value, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenGreaterThan(String value) { + addCriterion("step_new_eleven >", value, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenGreaterThanOrEqualTo(String value) { + addCriterion("step_new_eleven >=", value, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenLessThan(String value) { + addCriterion("step_new_eleven <", value, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenLessThanOrEqualTo(String value) { + addCriterion("step_new_eleven <=", value, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenLike(String value) { + addCriterion("step_new_eleven like", value, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenNotLike(String value) { + addCriterion("step_new_eleven not like", value, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenIn(List values) { + addCriterion("step_new_eleven in", values, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenNotIn(List values) { + addCriterion("step_new_eleven not in", values, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenBetween(String value1, String value2) { + addCriterion("step_new_eleven between", value1, value2, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewElevenNotBetween(String value1, String value2) { + addCriterion("step_new_eleven not between", value1, value2, "stepNewEleven"); + return (Criteria) this; + } + + public Criteria andStepNewShierIsNull() { + addCriterion("step_new_shier is null"); + return (Criteria) this; + } + + public Criteria andStepNewShierIsNotNull() { + addCriterion("step_new_shier is not null"); + return (Criteria) this; + } + + public Criteria andStepNewShierEqualTo(String value) { + addCriterion("step_new_shier =", value, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierNotEqualTo(String value) { + addCriterion("step_new_shier <>", value, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierGreaterThan(String value) { + addCriterion("step_new_shier >", value, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierGreaterThanOrEqualTo(String value) { + addCriterion("step_new_shier >=", value, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierLessThan(String value) { + addCriterion("step_new_shier <", value, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierLessThanOrEqualTo(String value) { + addCriterion("step_new_shier <=", value, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierLike(String value) { + addCriterion("step_new_shier like", value, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierNotLike(String value) { + addCriterion("step_new_shier not like", value, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierIn(List values) { + addCriterion("step_new_shier in", values, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierNotIn(List values) { + addCriterion("step_new_shier not in", values, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierBetween(String value1, String value2) { + addCriterion("step_new_shier between", value1, value2, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShierNotBetween(String value1, String value2) { + addCriterion("step_new_shier not between", value1, value2, "stepNewShier"); + return (Criteria) this; + } + + public Criteria andStepNewShisanIsNull() { + addCriterion("step_new_shisan is null"); + return (Criteria) this; + } + + public Criteria andStepNewShisanIsNotNull() { + addCriterion("step_new_shisan is not null"); + return (Criteria) this; + } + + public Criteria andStepNewShisanEqualTo(String value) { + addCriterion("step_new_shisan =", value, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanNotEqualTo(String value) { + addCriterion("step_new_shisan <>", value, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanGreaterThan(String value) { + addCriterion("step_new_shisan >", value, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanGreaterThanOrEqualTo(String value) { + addCriterion("step_new_shisan >=", value, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanLessThan(String value) { + addCriterion("step_new_shisan <", value, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanLessThanOrEqualTo(String value) { + addCriterion("step_new_shisan <=", value, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanLike(String value) { + addCriterion("step_new_shisan like", value, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanNotLike(String value) { + addCriterion("step_new_shisan not like", value, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanIn(List values) { + addCriterion("step_new_shisan in", values, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanNotIn(List values) { + addCriterion("step_new_shisan not in", values, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanBetween(String value1, String value2) { + addCriterion("step_new_shisan between", value1, value2, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisanNotBetween(String value1, String value2) { + addCriterion("step_new_shisan not between", value1, value2, "stepNewShisan"); + return (Criteria) this; + } + + public Criteria andStepNewShisiIsNull() { + addCriterion("step_new_shisi is null"); + return (Criteria) this; + } + + public Criteria andStepNewShisiIsNotNull() { + addCriterion("step_new_shisi is not null"); + return (Criteria) this; + } + + public Criteria andStepNewShisiEqualTo(String value) { + addCriterion("step_new_shisi =", value, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiNotEqualTo(String value) { + addCriterion("step_new_shisi <>", value, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiGreaterThan(String value) { + addCriterion("step_new_shisi >", value, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiGreaterThanOrEqualTo(String value) { + addCriterion("step_new_shisi >=", value, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiLessThan(String value) { + addCriterion("step_new_shisi <", value, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiLessThanOrEqualTo(String value) { + addCriterion("step_new_shisi <=", value, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiLike(String value) { + addCriterion("step_new_shisi like", value, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiNotLike(String value) { + addCriterion("step_new_shisi not like", value, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiIn(List values) { + addCriterion("step_new_shisi in", values, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiNotIn(List values) { + addCriterion("step_new_shisi not in", values, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiBetween(String value1, String value2) { + addCriterion("step_new_shisi between", value1, value2, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShisiNotBetween(String value1, String value2) { + addCriterion("step_new_shisi not between", value1, value2, "stepNewShisi"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuIsNull() { + addCriterion("step_new_shiwu is null"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuIsNotNull() { + addCriterion("step_new_shiwu is not null"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuEqualTo(String value) { + addCriterion("step_new_shiwu =", value, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuNotEqualTo(String value) { + addCriterion("step_new_shiwu <>", value, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuGreaterThan(String value) { + addCriterion("step_new_shiwu >", value, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuGreaterThanOrEqualTo(String value) { + addCriterion("step_new_shiwu >=", value, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuLessThan(String value) { + addCriterion("step_new_shiwu <", value, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuLessThanOrEqualTo(String value) { + addCriterion("step_new_shiwu <=", value, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuLike(String value) { + addCriterion("step_new_shiwu like", value, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuNotLike(String value) { + addCriterion("step_new_shiwu not like", value, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuIn(List values) { + addCriterion("step_new_shiwu in", values, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuNotIn(List values) { + addCriterion("step_new_shiwu not in", values, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuBetween(String value1, String value2) { + addCriterion("step_new_shiwu between", value1, value2, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiwuNotBetween(String value1, String value2) { + addCriterion("step_new_shiwu not between", value1, value2, "stepNewShiwu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuIsNull() { + addCriterion("step_new_shiliu is null"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuIsNotNull() { + addCriterion("step_new_shiliu is not null"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuEqualTo(String value) { + addCriterion("step_new_shiliu =", value, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuNotEqualTo(String value) { + addCriterion("step_new_shiliu <>", value, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuGreaterThan(String value) { + addCriterion("step_new_shiliu >", value, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuGreaterThanOrEqualTo(String value) { + addCriterion("step_new_shiliu >=", value, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuLessThan(String value) { + addCriterion("step_new_shiliu <", value, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuLessThanOrEqualTo(String value) { + addCriterion("step_new_shiliu <=", value, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuLike(String value) { + addCriterion("step_new_shiliu like", value, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuNotLike(String value) { + addCriterion("step_new_shiliu not like", value, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuIn(List values) { + addCriterion("step_new_shiliu in", values, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuNotIn(List values) { + addCriterion("step_new_shiliu not in", values, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuBetween(String value1, String value2) { + addCriterion("step_new_shiliu between", value1, value2, "stepNewShiliu"); + return (Criteria) this; + } + + public Criteria andStepNewShiliuNotBetween(String value1, String value2) { + addCriterion("step_new_shiliu not between", value1, value2, "stepNewShiliu"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/main/java/com/sztzjy/marketing/entity/StuUploadExcelUser.java b/src/main/java/com/sztzjy/marketing/entity/StuUploadExcelUser.java index 4a70724..08ad6e8 100644 --- a/src/main/java/com/sztzjy/marketing/entity/StuUploadExcelUser.java +++ b/src/main/java/com/sztzjy/marketing/entity/StuUploadExcelUser.java @@ -21,69 +21,70 @@ public class StuUploadExcelUser { private Integer id; @ApiModelProperty("步骤一 a") - @ExcelProperty(index = 0) private String stepOneA; @ApiModelProperty("步骤一 b") - @ExcelProperty(index = 1) + @ExcelProperty(index = 0) private String stepOneB; @ApiModelProperty("步骤一 c") - @ExcelProperty(index = 2) + @ExcelProperty(index = 1) private String stepOneC; @ApiModelProperty("步骤一 d") - @ExcelProperty(index = 3) + @ExcelProperty(index = 2) private String stepOneD; @ApiModelProperty("4") - @ExcelProperty(index = 4) + @ExcelProperty(index = 3) private String stepTwoA; @ApiModelProperty("5") - @ExcelProperty(index = 5) + @ExcelProperty(index = 4) private String stepTwoB; @ApiModelProperty("6") - @ExcelProperty(index = 6) + @ExcelProperty(index = 5) private String stepTwoC; @ApiModelProperty("7") - @ExcelProperty(index = 7) + @ExcelProperty(index = 6) private String stepThreeA; @ApiModelProperty("8") - @ExcelProperty(index = 8) + @ExcelProperty(index = 7) private String stepThreeB; @ApiModelProperty("9") - @ExcelProperty(index = 9) + @ExcelProperty(index = 8) private String stepThreeC; @ApiModelProperty("10") - @ExcelProperty(index = 10) + @ExcelProperty(index = 9) private String stepThreeD; @ApiModelProperty("11") - @ExcelProperty(index = 11) + @ExcelProperty(index = 10) private String stepFourA; @ApiModelProperty("12") - @ExcelProperty(index = 12) + @ExcelProperty(index = 11) private String stepFourB; @ApiModelProperty("13") - @ExcelProperty(index = 13) + @ExcelProperty(index = 12) private String stepFourC; @ApiModelProperty("14") - @ExcelProperty(index = 14) + @ExcelProperty(index = 13) private String stepFourD; @ApiModelProperty("15") + @ExcelProperty(index = 14) private String stepFiveA; @ApiModelProperty("16") + @ExcelProperty(index = 15) private String stepFiveB; @ApiModelProperty("17") diff --git a/src/main/java/com/sztzjy/marketing/entity/dto/StuMachineLearningInfoDTO.java b/src/main/java/com/sztzjy/marketing/entity/dto/StuMachineLearningInfoDTO.java new file mode 100644 index 0000000..5680e9b --- /dev/null +++ b/src/main/java/com/sztzjy/marketing/entity/dto/StuMachineLearningInfoDTO.java @@ -0,0 +1,37 @@ +package com.sztzjy.marketing.entity.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author 17803 + * @date 2024-08-13 14:56 + */ +@Data +public class StuMachineLearningInfoDTO { + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("登录时间") + private String loginTime; + + + @ApiModelProperty("日活跃用户") + private Integer activeUser; + + + @ApiModelProperty("日活跃率（%）") + private Double activeUserRate; + + + @ApiModelProperty("日活跃平均时长") + private Double activeUserTime; + + + +} diff --git a/src/main/java/com/sztzjy/marketing/mapper/StuMachineLearningMapper.java b/src/main/java/com/sztzjy/marketing/mapper/StuMachineLearningMapper.java index 9233509..685de13 100644 --- a/src/main/java/com/sztzjy/marketing/mapper/StuMachineLearningMapper.java +++ b/src/main/java/com/sztzjy/marketing/mapper/StuMachineLearningMapper.java @@ -16,15 +16,21 @@ public interface StuMachineLearningMapper { int insertSelective(StuMachineLearning record); + List selectByExampleWithBLOBs(StuMachineLearningExample example); + List selectByExample(StuMachineLearningExample example); StuMachineLearning selectByPrimaryKey(Integer id); int updateByExampleSelective(@Param("record") StuMachineLearning record, @Param("example") StuMachineLearningExample example); + int updateByExampleWithBLOBs(@Param("record") StuMachineLearning record, @Param("example") StuMachineLearningExample example); + int updateByExample(@Param("record") StuMachineLearning record, @Param("example") StuMachineLearningExample example); int updateByPrimaryKeySelective(StuMachineLearning record); + int updateByPrimaryKeyWithBLOBs(StuMachineLearning record); + int updateByPrimaryKey(StuMachineLearning record); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/marketing/service/impl/UserBehaviorProfilingAnaServiceImpl.java b/src/main/java/com/sztzjy/marketing/service/impl/UserBehaviorProfilingAnaServiceImpl.java index bcc6ecc..83eb4a6 100644 --- a/src/main/java/com/sztzjy/marketing/service/impl/UserBehaviorProfilingAnaServiceImpl.java +++ b/src/main/java/com/sztzjy/marketing/service/impl/UserBehaviorProfilingAnaServiceImpl.java @@ -5,8 +5,11 @@ package com.sztzjy.marketing.service.impl;/** import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.sztzjy.marketing.config.Constant; import com.sztzjy.marketing.entity.*; +import com.sztzjy.marketing.entity.dto.StuMachineLearningInfoDTO; import com.sztzjy.marketing.mapper.*; import com.sztzjy.marketing.service.UserBehaviorProfilingAnaService; import com.sztzjy.marketing.util.BigDecimalUtils; @@ -16,6 +19,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; @@ -59,9 +63,16 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin @Override public ResultEntity analysisByAutoSave(StuMachineLearning learning) { + Boolean flag = false; + + if (learning.getStuMachineLearningInfoDTOList()!=null) { + flag = true; + } + + StuMachineLearningExample machineLearningExample = new StuMachineLearningExample(); machineLearningExample.createCriteria().andUserIdEqualTo(learning.getUserId()).andModuleEqualTo(learning.getModule()); - List machineLearningList = machineLearningMapper.selectByExample(machineLearningExample); + List machineLearningList = machineLearningMapper.selectByExampleWithBLOBs(machineLearningExample); if (!machineLearningList.isEmpty()) { @@ -80,6 +91,13 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin BeanUtils.copyProperties(learning, machineLearning); machineLearning.setId(id); + if (flag) + { + //讲数据转为json + String json = JSONObject.toJSONString(learning.getStuMachineLearningInfoDTOList()); + machineLearning.setActiveUserAnalysis(json); + + } machineLearningMapper.updateByPrimaryKeySelective(machineLearning); @@ -89,6 +107,13 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin //第一次保存 learning.setId((int) IdUtil.getSnowflakeNextId()); + if (flag) + { + //讲数据转为json + String json = JSONObject.toJSONString(learning.getStuMachineLearningInfoDTOList()); + learning.setActiveUserAnalysis(json); + + } machineLearningMapper.insertSelective(learning); @@ -110,12 +135,19 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin public ResultEntity readTrainInfo(String module, String userId) { StuMachineLearningExample machineLearningExample = new StuMachineLearningExample(); machineLearningExample.createCriteria().andUserIdEqualTo(userId).andModuleEqualTo(module); - List machineLearningList = machineLearningMapper.selectByExample(machineLearningExample); + List machineLearningList = machineLearningMapper.selectByExampleWithBLOBs(machineLearningExample); //查询是否有数据 if (machineLearningList.isEmpty()) { return new ResultEntity<>(HttpStatus.OK); } + String activeUserAnalysis = machineLearningList.get(0).getActiveUserAnalysis(); + List stuMachineLearningInfoDTOList = JSONObject.parseArray(activeUserAnalysis, StuMachineLearningInfoDTO.class); + + + + machineLearningList.get(0).setStuMachineLearningInfoDTOList(stuMachineLearningInfoDTOList); + return new ResultEntity<>(HttpStatus.OK, "查询成功", machineLearningList.get(0)); @@ -539,4 +571,6 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin stuUserMapper.updateByPrimaryKeySelective(stuUser); } + + } diff --git a/src/main/java/com/sztzjy/marketing/util/excel/DemoDataListener.java b/src/main/java/com/sztzjy/marketing/util/excel/DemoDataListener.java index 12ab3d5..67d2cfa 100644 --- a/src/main/java/com/sztzjy/marketing/util/excel/DemoDataListener.java +++ b/src/main/java/com/sztzjy/marketing/util/excel/DemoDataListener.java @@ -2,14 +2,19 @@ package com.sztzjy.marketing.util.excel; import cn.hutool.core.util.IdUtil; import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.listener.ReadListener; +import com.alibaba.excel.util.ConverterUtils; import com.alibaba.excel.util.ListUtils; import com.alibaba.fastjson.JSON; import com.sztzjy.marketing.entity.StuUploadExcelUser; import com.sztzjy.marketing.mapper.StuUploadExcelUserMapper; import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Set; // 有个很重要的点 DemoDataListener 不能被spring管理，要每次读取excel都要new,然后里面用到spring可以构造方法传进去 @Slf4j @@ -29,7 +34,7 @@ public class DemoDataListener implements ReadListener { private StuUploadExcelUserMapper demoDAO; private String userId; private String name; - + List list = new ArrayList(); /** * 如果使用了spring,请使用这个构造方法。每次创建Listener的时候需要把spring管理的类传进来 @@ -42,6 +47,33 @@ public class DemoDataListener implements ReadListener { this.demoDAO = demoDAO; } + + /** + * 这里会一行行的返回头 + * + * @param headMap + * @param context + */ + @Override + public void invokeHead(Map> headMap, AnalysisContext context) { + log.info("解析到一条头数据:{}", JSON.toJSONString(headMap)); + + Map integerStringMap = ConverterUtils.convertToStringMap(headMap, context); + + log.info("转换解析到的一条头数据:{}", integerStringMap); + + + Set integers = integerStringMap.keySet(); + for (Integer integer : integers) { + list.add(integerStringMap.get(integer)); + } + + + // 如果想转成成 Map + // 方案1： 不要implements ReadListener 而是 extends AnalysisEventListener + // 方案2： 调用 ConverterUtils.convertToStringMap(headMap, context) 自动会转换 + } + /** * 这个每一条数据解析都会来调用 * @@ -81,6 +113,7 @@ public class DemoDataListener implements ReadListener { cachedDataList.forEach(item->{ item.setUserId(userId); item.setModule(name); + item.setStepOneA(JSON.toJSONString(list)); }); demoDAO.insertBatch(cachedDataList); diff --git a/src/main/resources/mappers/StuMachineLearningMapper.xml b/src/main/resources/mappers/StuMachineLearningMapper.xml index 503dd5d..4b255c9 100644 --- a/src/main/resources/mappers/StuMachineLearningMapper.xml +++ b/src/main/resources/mappers/StuMachineLearningMapper.xml @@ -59,6 +59,24 @@ + + + + + + + + + + + + + + + + + + @@ -127,8 +145,30 @@ step_nine_c, success_number, user_id, sub_state, module, one_sub_state, two_sub_state, three_sub_state, four_sub_state, five_sub_state, six_sub_state, seven_sub_state, create_time, update_time, step_nine_d, step_ten_a, step_ten_b, step_ten_c, step_ten_d, - step_eleven_a, step_eleven_b, step_eleven_c, error_field + step_eleven_a, step_eleven_b, step_eleven_c, error_field, step_new, step_new_one, + step_new_two, step_new_three, step_new_five, step_new_six, step_new_nine, step_new_eight, + step_new_ten, step_new_eleven, step_new_shier, step_new_shisan, step_new_shisi, step_new_shiwu, + step_new_shiliu + + + active_user_analysis + - select + , + from stu_machine_learning where id = #{id,jdbcType=INTEGER} @@ -178,8 +220,13 @@ seven_sub_state, create_time, update_time, step_nine_d, step_ten_a, step_ten_b, step_ten_c, step_ten_d, step_eleven_a, - step_eleven_b, step_eleven_c, error_field - ) + step_eleven_b, step_eleven_c, error_field, + step_new, step_new_one, step_new_two, + step_new_three, step_new_five, step_new_six, + step_new_nine, step_new_eight, step_new_ten, + step_new_eleven, step_new_shier, step_new_shisan, + step_new_shisi, step_new_shiwu, step_new_shiliu, + active_user_analysis) values (#{id,jdbcType=INTEGER}, #{stepOneA,jdbcType=VARCHAR}, #{stepOneB,jdbcType=VARCHAR}, #{stepOneC,jdbcType=VARCHAR}, #{stepOneD,jdbcType=VARCHAR}, #{stepTwoA,jdbcType=VARCHAR}, #{stepTwoB,jdbcType=VARCHAR}, #{stepTwoC,jdbcType=VARCHAR}, #{stepThreeA,jdbcType=VARCHAR}, @@ -198,8 +245,13 @@ #{sevenSubState,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{stepNineD,jdbcType=VARCHAR}, #{stepTenA,jdbcType=VARCHAR}, #{stepTenB,jdbcType=VARCHAR}, #{stepTenC,jdbcType=VARCHAR}, #{stepTenD,jdbcType=VARCHAR}, #{stepElevenA,jdbcType=VARCHAR}, - #{stepElevenB,jdbcType=VARCHAR}, #{stepElevenC,jdbcType=VARCHAR}, #{errorField,jdbcType=VARCHAR} - ) + #{stepElevenB,jdbcType=VARCHAR}, #{stepElevenC,jdbcType=VARCHAR}, #{errorField,jdbcType=VARCHAR}, + #{stepNew,jdbcType=VARCHAR}, #{stepNewOne,jdbcType=VARCHAR}, #{stepNewTwo,jdbcType=VARCHAR}, + #{stepNewThree,jdbcType=VARCHAR}, #{stepNewFive,jdbcType=VARCHAR}, #{stepNewSix,jdbcType=VARCHAR}, + #{stepNewNine,jdbcType=VARCHAR}, #{stepNewEight,jdbcType=VARCHAR}, #{stepNewTen,jdbcType=VARCHAR}, + #{stepNewEleven,jdbcType=VARCHAR}, #{stepNewShier,jdbcType=VARCHAR}, #{stepNewShisan,jdbcType=VARCHAR}, + #{stepNewShisi,jdbcType=VARCHAR}, #{stepNewShiwu,jdbcType=VARCHAR}, #{stepNewShiliu,jdbcType=VARCHAR}, + #{activeUserAnalysis,jdbcType=LONGVARCHAR}) insert into stu_machine_learning @@ -375,6 +427,54 @@ error_field, + + step_new, + + + step_new_one, + + + step_new_two, + + + step_new_three, + + + step_new_five, + + + step_new_six, + + + step_new_nine, + + + step_new_eight, + + + step_new_ten, + + + step_new_eleven, + + + step_new_shier, + + + step_new_shisan, + + + step_new_shisi, + + + step_new_shiwu, + + + step_new_shiliu, + + + active_user_analysis, + @@ -548,6 +648,54 @@ #{errorField,jdbcType=VARCHAR}, + + #{stepNew,jdbcType=VARCHAR}, + + + #{stepNewOne,jdbcType=VARCHAR}, + + + #{stepNewTwo,jdbcType=VARCHAR}, + + + #{stepNewThree,jdbcType=VARCHAR}, + + + #{stepNewFive,jdbcType=VARCHAR}, + + + #{stepNewSix,jdbcType=VARCHAR}, + + + #{stepNewNine,jdbcType=VARCHAR}, + + + #{stepNewEight,jdbcType=VARCHAR}, + + + #{stepNewTen,jdbcType=VARCHAR}, + + + #{stepNewEleven,jdbcType=VARCHAR}, + + + #{stepNewShier,jdbcType=VARCHAR}, + + + #{stepNewShisan,jdbcType=VARCHAR}, + + + #{stepNewShisi,jdbcType=VARCHAR}, + + + #{stepNewShiwu,jdbcType=VARCHAR}, + + + #{stepNewShiliu,jdbcType=VARCHAR}, + + + #{activeUserAnalysis,jdbcType=LONGVARCHAR}, +