diff --git a/src/main/java/com/sztzjy/marketing/controller/stu/QianFanBigModuleController.java b/src/main/java/com/sztzjy/marketing/controller/stu/QianFanBigModuleController.java index 15561c7..0daa59d 100644 --- a/src/main/java/com/sztzjy/marketing/controller/stu/QianFanBigModuleController.java +++ b/src/main/java/com/sztzjy/marketing/controller/stu/QianFanBigModuleController.java @@ -1,6 +1,7 @@ package com.sztzjy.marketing.controller.stu; import com.sztzjy.marketing.annotation.AnonymousAccess; +import com.sztzjy.marketing.config.security.TokenProvider; import com.sztzjy.marketing.entity.StuUploadImgAi; import com.sztzjy.marketing.entity.StuUploadImgAiExample; import com.sztzjy.marketing.entity.dto.StuCreateArticleDTO; @@ -30,7 +31,9 @@ import org.yaml.snakeyaml.reader.StreamReader; import reactor.core.publisher.Flux; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -54,7 +57,8 @@ public class QianFanBigModuleController { @Autowired private QianFanBigModuleService qianFanBigModuleService; - + @Autowired + private IFileUtil fileUtil; @ApiOperation("AI文生图") //@AnonymousAccess @@ -186,4 +190,28 @@ public class QianFanBigModuleController { } + + + @GetMapping("/download") + @ApiOperation("AI修图图片下载") + @AnonymousAccess + public void download(@ApiParam("用户Token")String TOKEN, HttpServletResponse response,String name) { + TokenProvider.getJWTUser(TOKEN); + if ("AI扩图".equals(name)) + { + fileUtil.download(response, "jnaAI扩图--金鱼", "jnaAI扩图--金鱼.png"); + } + if ("AI抠图".equals(name)) + { + fileUtil.download(response, "jna人物照--AI抠图", "jna人物照--AI抠图.jpg"); + } + if ("AI消除".equals(name)) + { + fileUtil.download(response, "jna商品照片", "jna商品照片.png"); + } + if ("AI数据分析".equals(name)) + { + fileUtil.download(response, "jnacustomer_shopping_data", "jnacustomer_shopping_data.csv"); + } + } } diff --git a/src/main/java/com/sztzjy/marketing/controller/task/RankScheduled.java b/src/main/java/com/sztzjy/marketing/controller/task/RankScheduled.java index 690dcbd..b18393e 100644 --- a/src/main/java/com/sztzjy/marketing/controller/task/RankScheduled.java +++ b/src/main/java/com/sztzjy/marketing/controller/task/RankScheduled.java @@ -41,16 +41,16 @@ public class RankScheduled { log.info("定时任务：==================总排名完成结束--end======================,用时：{}",timer.interval()); } - @Scheduled(cron = "0 0 0 * * ?") - public void clearLimit(){ - - log.info("定时任务：==================开始重置AI使用次数======================"); - - StuAiLimitExample limitExample = new StuAiLimitExample(); - limitExample.createCriteria().getAllCriteria(); - stuAiLimitMapper.deleteByExample(limitExample); - log.info("定时任务：==================AI使用次数重置成功！======================"); - } +// @Scheduled(cron = "0 0 0 * * ?") +// public void clearLimit(){ +// +// log.info("定时任务：==================开始重置AI使用次数======================"); +// +// StuAiLimitExample limitExample = new StuAiLimitExample(); +// limitExample.createCriteria().getAllCriteria(); +// stuAiLimitMapper.deleteByExample(limitExample); +// log.info("定时任务：==================AI使用次数重置成功！======================"); +// } diff --git a/src/main/java/com/sztzjy/marketing/entity/TchModuleWeith.java b/src/main/java/com/sztzjy/marketing/entity/TchModuleWeith.java index f153a69..b2ef3c5 100644 --- a/src/main/java/com/sztzjy/marketing/entity/TchModuleWeith.java +++ b/src/main/java/com/sztzjy/marketing/entity/TchModuleWeith.java @@ -52,14 +52,14 @@ public class TchModuleWeith { this.id=(UUID.randomUUID().toString()); this.schoolId=schoolId; this.summaryOfKnowledgeScore=(BigDecimal.valueOf(20.00)); - this.summaryOfKnowledgeWeight=(BigDecimal.valueOf(0.15)); + this.summaryOfKnowledgeWeight=(BigDecimal.valueOf(0.1)); this.resourceLearningScore=(BigDecimal.valueOf(20.00)); - this.resourceLearningWeight=(BigDecimal.valueOf(0.15)); + this.resourceLearningWeight=(BigDecimal.valueOf(0.1)); this.learningAssessmentScore=(BigDecimal.valueOf(10.00)); - this.learningAssessmentWeight=(BigDecimal.valueOf(0.30)); - this.experimentalTrainingScore=(BigDecimal.valueOf(2.00)); - this.experimentalTrainingWeight=(BigDecimal.valueOf(0.20)); - this.reportWeight=(BigDecimal.valueOf(0.20)); + this.learningAssessmentWeight=(BigDecimal.valueOf(0.1)); + this.experimentalTrainingScore=(BigDecimal.valueOf(1.00)); + this.experimentalTrainingWeight=(BigDecimal.valueOf(0.30)); + this.reportWeight=(BigDecimal.valueOf(0.40)); } diff --git a/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java b/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java index ea9b6d2..aa8010d 100644 --- a/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java +++ b/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java @@ -39,6 +39,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.math.BigDecimal; +import java.math.BigInteger; import java.net.URLEncoder; import java.nio.file.Files; import java.util.*; @@ -302,6 +303,9 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { throw new RuntimeException("老师已评分，请勿再次提交报告"); } } + //多次上传 更新 上限就六个 + + StuPracticalTrainingReport report = stuPracticalTrainingReports.get(0); //更新操作 String upload = fileUtil.upload(file); @@ -310,6 +314,8 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { report.setSize((int) file.getSize()); report.setReportName(file.getOriginalFilename()); stuPracticalTrainingReportMapper.updateByPrimaryKey(report); + + return report; } else { //第一次上传 @@ -325,6 +331,44 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { report.setSchoolId(stuBlockProductWithBLOBs.getSchoolId()); report.setReportName(file.getOriginalFilename()); stuPracticalTrainingReportMapper.insertSelective(report); + + //写入成绩表 进度 + StuScoreDetailsExample example = new StuScoreDetailsExample(); + example.createCriteria().andUserIdEqualTo(stuBlockProductWithBLOBs.getUserId()).andLearningProjectsEqualTo("实验报告"); + List stuScoreDetailList = stuScoreDetailsMapper.selectByExample(example); + if (stuScoreDetailList.isEmpty()) { + //第一次插入 + StuScoreDetails stuScoreDetails = new StuScoreDetails(); + stuScoreDetails.setId(IdUtil.simpleUUID()); + stuScoreDetails.setLearningProjects("实验报告"); + stuScoreDetails.setSerialNumber(5); + stuScoreDetails.setScoreWeight(0.2); + stuScoreDetails.setSchedule(17.0); + stuScoreDetails.setUserId(stuBlockProductWithBLOBs.getUserId()); + stuScoreDetailsMapper.insertSelective(stuScoreDetails); + } else { + StuScoreDetails stuScoreDetails = stuScoreDetailList.get(0); + + StuPracticalTrainingReportExample trainingReportExample = new StuPracticalTrainingReportExample(); + stuPracticalTrainingReportExample.createCriteria().andUseridEqualTo(stuBlockProductWithBLOBs.getUserId()); + List stuPracticalTrainingReportList = stuPracticalTrainingReportMapper.selectByExample(trainingReportExample); + if (stuPracticalTrainingReportList.size() == 6) { + stuScoreDetails.setCompletionStatus("1"); + } + int size = stuPracticalTrainingReportList.size(); + BigDecimal bigDecimalSize = BigDecimal.valueOf(size); + BigDecimal bigDecimalValue = BigDecimal.valueOf(6); + BigDecimal info = bigDecimalSize.divide(bigDecimalValue,2,BigDecimal.ROUND_UP).multiply(BigDecimal.valueOf(100)); + + + // System.out.println(info); + stuScoreDetails.setSchedule(info.doubleValue()); + stuScoreDetails.setUserId(stuBlockProductWithBLOBs.getUserId()); + stuScoreDetailsMapper.updateByPrimaryKeySelective(stuScoreDetails); + + } + + return report; } @@ -332,6 +376,7 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { } + /* * @author whb * @Date 2023/10/11 diff --git a/src/main/java/com/sztzjy/marketing/service/impl/StuUserProfileDatabaseServiceImpl.java b/src/main/java/com/sztzjy/marketing/service/impl/StuUserProfileDatabaseServiceImpl.java index 6ba6b44..24d1022 100644 --- a/src/main/java/com/sztzjy/marketing/service/impl/StuUserProfileDatabaseServiceImpl.java +++ b/src/main/java/com/sztzjy/marketing/service/impl/StuUserProfileDatabaseServiceImpl.java @@ -53,10 +53,9 @@ public class StuUserProfileDatabaseServiceImpl implements StuUserProfileDatabase public ResultEntity getBaseInfo(String userId) { List list = new ArrayList<>(); - list.add("用户属性表"); - list.add("用户登录活跃表"); - list.add("用户消费能力表"); - list.add("用户行为表"); + list.add("客户细分数据表"); + list.add("销售预测数据表"); + list.add("购物车数据表"); list.add("用户评论表"); //用户属性表 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 389869d..907248d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -22,5 +22,3 @@ bigModule: - -