diff --git a/src/main/java/com/sztzjy/linkCommerce/config/Constant.java b/src/main/java/com/sztzjy/linkCommerce/config/Constant.java index fb6031e..87d5cfb 100644 --- a/src/main/java/com/sztzjy/linkCommerce/config/Constant.java +++ b/src/main/java/com/sztzjy/linkCommerce/config/Constant.java @@ -40,7 +40,7 @@ public class Constant { public static final String MODULE_YHSJFX="用户数据分析"; public static final String PRO_CPGH="产品规划"; - public static final String MODULE_SJHCP="数据化产品"; + public static final String MODULE_SJHCP="数据化选品"; public static final String MODULE_CPDJ="产品定价"; public static final String MODULE_CPCYHDW="产品差异化定位"; public static final String MODULE_CPJGGH="产品结构规划"; diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/CptfController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/CptfController.java index 239bb56..ea16258 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/CptfController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/CptfController.java @@ -153,50 +153,42 @@ public class CptfController { if (Constant.MODULE_FBQDPG.equals(module)) { Boolean b = scoreService.deleteScore(userId, Constant.PRO_CPTFCS, module); - if (b) { + FbqdStuAnswerExample cpdjStuAnswerExample = new FbqdStuAnswerExample(); cpdjStuAnswerExample.createCriteria().andUserIdEqualTo(userId); fbqdStuAnswerMapper.deleteByExample(cpdjStuAnswerExample); return new ResultEntity<>(HttpStatus.OK, "重新实训成功"); - } else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败"); - } + } if (Constant.MODULE_CPTGCS.equals(module)) { Boolean b = scoreService.deleteScore(userId, Constant.PRO_CPTFCS, module); - if (b) { + CptgcsStuAnswerExample cptgcsStuAnswerExample = new CptgcsStuAnswerExample(); cptgcsStuAnswerExample.createCriteria().andUserIdEqualTo(userId); cptgcsStuAnswerMapper.deleteByExample(cptgcsStuAnswerExample); return new ResultEntity<>(HttpStatus.OK, "重新实训成功"); - } else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败"); - } + } if (Constant.MODULE_CPTGCS.equals(module)) { Boolean b = scoreService.deleteScore(userId, Constant.PRO_CPGH, module); - if (b) { + CptgcsStuAnswerExample cptgcsStuAnswerExample = new CptgcsStuAnswerExample(); cptgcsStuAnswerExample.createCriteria().andUserIdEqualTo(userId); cptgcsStuAnswerMapper.deleteByExample(cptgcsStuAnswerExample); return new ResultEntity<>(HttpStatus.OK, "重新实训成功"); - } else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败"); - } + } if (Constant.MODULE_CPYXDW.equals(module)) { Boolean b = scoreService.deleteScore(userId, Constant.PRO_CPGH, module); - if (b) { + CpyxdwStuAnswerExample cpyxdwStuAnswerExample = new CpyxdwStuAnswerExample(); cpyxdwStuAnswerExample.createCriteria().andUserIdEqualTo(userId); cpyxdwStuAnswerMapper.deleteByExample(cpyxdwStuAnswerExample); return new ResultEntity<>(HttpStatus.OK, "重新实训成功"); - } else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败"); - } + } diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/ProductPlanningController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/ProductPlanningController.java index 6c2237c..548d9ca 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/ProductPlanningController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/ProductPlanningController.java @@ -159,6 +159,15 @@ public class ProductPlanningController { + //太贵总结 + String stuAnswerTooSum = stuAnswer.getTooSum(); + + String tooSum = answer.getTooSum(); + //错误次数 + int tooSumCount =compareListsUtil.compareErrorCount(stuAnswerTooSum, tooSum).getErrorCount(); + count = count + tooSumCount; + + //有点贵百分百 String stuTooExpensivePercentage = stuAnswer.getTooExpensivePercentage(); @@ -214,38 +223,32 @@ public class ProductPlanningController { if (Constant.MODULE_CPDJ.equals(module)) { Boolean b=scoreService.deleteScore(userId,Constant.PRO_CPGH,module); - if(b){ + CpdjStuAnswerExample cpdjStuAnswerExample = new CpdjStuAnswerExample(); cpdjStuAnswerExample.createCriteria().andUserIdEqualTo(userId); cpdjStuAnswerMapper.deleteByExample(cpdjStuAnswerExample); return new ResultEntity<>(HttpStatus.OK, "重新实训成功"); - }else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败"); - } + } if (Constant.MODULE_CPCYHDW.equals(module)) { Boolean b=scoreService.deleteScore(userId,Constant.PRO_CPGH,module); - if(b){ + CpcyhdwStuAnswerExample cpcyhdwStuAnswerExample = new CpcyhdwStuAnswerExample(); cpcyhdwStuAnswerExample.createCriteria().andUserIdEqualTo(userId); cpcyhdwStuAnswerMapper.deleteByExample(cpcyhdwStuAnswerExample); return new ResultEntity<>(HttpStatus.OK, "重新实训成功"); - }else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败"); - } + } if (Constant.MODULE_CPJGGH.equals(module)) { Boolean b=scoreService.deleteScore(userId,Constant.PRO_CPGH,module); - if(b){ + CpjgghStuAnswerExample cpjgghStuAnswerExample = new CpjgghStuAnswerExample(); cpjgghStuAnswerExample.createCriteria().andUserIdEqualTo(userId); cpjgghStuAnswerMapper.deleteByExample(cpjgghStuAnswerExample); return new ResultEntity<>(HttpStatus.OK, "重新实训成功"); - }else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败"); - } + } return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败"); diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/CpdjAnswer.java b/src/main/java/com/sztzjy/linkCommerce/entity/CpdjAnswer.java index ebc67d2..3237d54 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/CpdjAnswer.java +++ b/src/main/java/com/sztzjy/linkCommerce/entity/CpdjAnswer.java @@ -52,6 +52,9 @@ public class CpdjAnswer { @ApiModelProperty(notes = "步骤二 价格区间 （json格式存储）") private String priceRange; + @ApiModelProperty(notes = "太贵-累计总和(答案通过逗号隔开，没写就给空)") + private String tooSum; + public String getId() { return id; } @@ -163,4 +166,12 @@ public class CpdjAnswer { public void setPriceRange(String priceRange) { this.priceRange = priceRange == null ? null : priceRange.trim(); } + + public String getTooSum() { + return tooSum; + } + + public void setTooSum(String tooSum) { + this.tooSum = tooSum == null ? null : tooSum.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/CpdjStuAnswer.java b/src/main/java/com/sztzjy/linkCommerce/entity/CpdjStuAnswer.java index 4e58fc2..1df35b9 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/CpdjStuAnswer.java +++ b/src/main/java/com/sztzjy/linkCommerce/entity/CpdjStuAnswer.java @@ -58,6 +58,9 @@ public class CpdjStuAnswer { @ApiModelProperty(notes = "步骤二 价格区间 （json格式存储）") private String priceRange; + @ApiModelProperty(notes = "太贵-累计总和(答案通过逗号隔开，没写就给空)") + private String tooSum; + public String getId() { return id; } @@ -185,4 +188,12 @@ public class CpdjStuAnswer { public void setPriceRange(String priceRange) { this.priceRange = priceRange == null ? null : priceRange.trim(); } + + public String getTooSum() { + return tooSum; + } + + public void setTooSum(String tooSum) { + this.tooSum = tooSum == null ? null : tooSum.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java index 23207a1..f4364a6 100644 --- a/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java @@ -63,7 +63,7 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin //只是自动保存了没有提交 if (machineLearningList.get(0).getSubState() == 1) { - return new ResultEntity<>(HttpStatus.ACCEPTED, "请勿重复提交!"); + return new ResultEntity<>(HttpStatus.OK, "请勿重复提交!"); } else { StuMachineLearning stuMachineLearning = machineLearningList.get(0); Integer id = stuMachineLearning.getId(); diff --git a/src/main/java/com/sztzjy/linkCommerce/util/CompareListsUtil.java b/src/main/java/com/sztzjy/linkCommerce/util/CompareListsUtil.java index 7f3d4d1..3954df4 100644 --- a/src/main/java/com/sztzjy/linkCommerce/util/CompareListsUtil.java +++ b/src/main/java/com/sztzjy/linkCommerce/util/CompareListsUtil.java @@ -88,6 +88,7 @@ public class CompareListsUtil { this.errorPositions = errorPositions; } } + public Result compareErrorCount(String stulist, String answerList) { // 将字符串分割成数组 diff --git a/src/main/resources/mappers/CpdjAnswerMapper.xml b/src/main/resources/mappers/CpdjAnswerMapper.xml index d7a6ebf..26fb9dc 100644 --- a/src/main/resources/mappers/CpdjAnswerMapper.xml +++ b/src/main/resources/mappers/CpdjAnswerMapper.xml @@ -18,6 +18,7 @@ + @@ -82,7 +83,7 @@ cheap_sum, cheap_percentage, cost_effective_sum, cost_effective_percentage, expensive_sum, - expensive_percentage, context, too_expensive_percentage, price_range + expensive_percentage, context, too_expensive_percentage, price_range, too_sum @@ -288,6 +295,9 @@ price_range = #{record.priceRange,jdbcType=LONGVARCHAR}, + + too_sum = #{record.tooSum,jdbcType=LONGVARCHAR}, + @@ -308,7 +318,8 @@ expensive_percentage = #{record.expensivePercentage,jdbcType=LONGVARCHAR}, context = #{record.context,jdbcType=LONGVARCHAR}, too_expensive_percentage = #{record.tooExpensivePercentage,jdbcType=LONGVARCHAR}, - price_range = #{record.priceRange,jdbcType=LONGVARCHAR} + price_range = #{record.priceRange,jdbcType=LONGVARCHAR}, + too_sum = #{record.tooSum,jdbcType=LONGVARCHAR} @@ -366,6 +377,9 @@ price_range = #{priceRange,jdbcType=LONGVARCHAR}, + + too_sum = #{tooSum,jdbcType=LONGVARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -383,7 +397,8 @@ expensive_percentage = #{expensivePercentage,jdbcType=LONGVARCHAR}, context = #{context,jdbcType=LONGVARCHAR}, too_expensive_percentage = #{tooExpensivePercentage,jdbcType=LONGVARCHAR}, - price_range = #{priceRange,jdbcType=LONGVARCHAR} + price_range = #{priceRange,jdbcType=LONGVARCHAR}, + too_sum = #{tooSum,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} diff --git a/src/main/resources/mappers/CpdjStuAnswerMapper.xml b/src/main/resources/mappers/CpdjStuAnswerMapper.xml index 0216841..e5ff292 100644 --- a/src/main/resources/mappers/CpdjStuAnswerMapper.xml +++ b/src/main/resources/mappers/CpdjStuAnswerMapper.xml @@ -20,6 +20,7 @@ + @@ -85,7 +86,7 @@ cheap_sum, cheap_percentage, cost_effective_sum, cost_effective_percentage, expensive_sum, - expensive_percentage, context, too_expensive_percentage, price_range + expensive_percentage, context, too_expensive_percentage, price_range, too_sum @@ -311,6 +318,9 @@ price_range = #{record.priceRange,jdbcType=LONGVARCHAR}, + + too_sum = #{record.tooSum,jdbcType=LONGVARCHAR}, + @@ -333,7 +343,8 @@ expensive_percentage = #{record.expensivePercentage,jdbcType=LONGVARCHAR}, context = #{record.context,jdbcType=LONGVARCHAR}, too_expensive_percentage = #{record.tooExpensivePercentage,jdbcType=LONGVARCHAR}, - price_range = #{record.priceRange,jdbcType=LONGVARCHAR} + price_range = #{record.priceRange,jdbcType=LONGVARCHAR}, + too_sum = #{record.tooSum,jdbcType=LONGVARCHAR} @@ -399,6 +410,9 @@ price_range = #{priceRange,jdbcType=LONGVARCHAR}, + + too_sum = #{tooSum,jdbcType=LONGVARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -418,7 +432,8 @@ expensive_percentage = #{expensivePercentage,jdbcType=LONGVARCHAR}, context = #{context,jdbcType=LONGVARCHAR}, too_expensive_percentage = #{tooExpensivePercentage,jdbcType=LONGVARCHAR}, - price_range = #{priceRange,jdbcType=LONGVARCHAR} + price_range = #{priceRange,jdbcType=LONGVARCHAR}, + too_sum = #{tooSum,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR}