From 196e0370775ad365067173c4a386dc5e124c45f7 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Wed, 29 Jun 2022 10:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=BE=E5=A0=82=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/redis/service/RedisService.java | 29 +++++++++ xjs-business/pom.xml | 1 + .../filter/DesensitizedValueFilter.java | 2 +- .../service/impl/SinaNewsServiceImpl.java | 2 + .../java/com/xjs/sina/task/SinaNewsTask.java | 7 +-- .../classroom-model/pom.xml | 47 ++++++++++++++ .../classroom-service-vod/pom.xml | 62 +++++++++++++++++++ .../classroom-service/pom.xml | 61 ++++++++++++++++++ xjs-business/xjs-project-classroom/pom.xml | 61 ++++++++++++++++++ 9 files changed, 267 insertions(+), 5 deletions(-) create mode 100644 xjs-business/xjs-project-classroom/classroom-model/pom.xml create mode 100644 xjs-business/xjs-project-classroom/classroom-service/classroom-service-vod/pom.xml create mode 100644 xjs-business/xjs-project-classroom/classroom-service/pom.xml create mode 100644 xjs-business/xjs-project-classroom/pom.xml diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java index 70ee1612..7b17ec6e 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java @@ -259,4 +259,33 @@ public class RedisService { public void dHashByKey(String key, String hkey) { redisTemplate.opsForHash().delete(key, hkey); } + + + /** + * 递增 + * + * @param key 键 + * @param delta 要增加几(大于0) + * @return + */ + public long incr(String key, long delta) { + if (delta < 0) { + throw new RuntimeException("递增因子必须大于0"); + } + return redisTemplate.opsForValue().increment(key, delta); + } + + /** + * 递减 + * + * @param key 键 + * @param delta 要减少几(小于0) + * @return + */ + public long decr(String key, long delta) { + if (delta < 0) { + throw new RuntimeException("递减因子必须大于0"); + } + return redisTemplate.opsForValue().increment(key, -delta); + } } diff --git a/xjs-business/pom.xml b/xjs-business/pom.xml index f5985dd5..dff8dbd3 100644 --- a/xjs-business/pom.xml +++ b/xjs-business/pom.xml @@ -28,6 +28,7 @@ xjs-business-workflow xjs-project-blog xjs-project-exam + xjs-project-classroom diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/filter/DesensitizedValueFilter.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/filter/DesensitizedValueFilter.java index 77ac2f7d..856d5b56 100644 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/filter/DesensitizedValueFilter.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/filter/DesensitizedValueFilter.java @@ -50,7 +50,7 @@ public class DesensitizedValueFilter implements ValueFilter { default: } } catch (NoSuchFieldException e) { - log.error("当前数据类型为{},值为{}", object.getClass(), value); + //log.error("当前数据类型为{},值为{}", object.getClass(), value); return value; } return value; diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java index e8bf8b36..9d53cb08 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java @@ -8,6 +8,7 @@ import com.xjs.sina.mapper.SinaNewsMapper; import com.xjs.sina.pojo.SinaNews; import com.xjs.sina.service.SinaNewsService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -20,6 +21,7 @@ import java.util.Map; * @since 2022-02-15 */ @Service +@Transactional public class SinaNewsServiceImpl extends ServiceImpl implements SinaNewsService { @Resource private SinaNewsMapper sinaNewsMapper; diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/task/SinaNewsTask.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/task/SinaNewsTask.java index 75213b55..8ac80ef2 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/task/SinaNewsTask.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/task/SinaNewsTask.java @@ -54,6 +54,9 @@ public class SinaNewsTask { } finally { //执行完初始化 this.count = 0L; + //删除重复 + int num = sinaNewsService.deleteRepeatData(); + log.info("重复数据为:{}", num); } return thisCount; } @@ -190,10 +193,6 @@ public class SinaNewsTask { sinaNewsService.saveBatch(collect, 30); - //删除重复 - int num = sinaNewsService.deleteRepeatData(); - log.info("重复数据为:{}", num); - } catch (Exception e) { log.error(e.getMessage()); } diff --git a/xjs-business/xjs-project-classroom/classroom-model/pom.xml b/xjs-business/xjs-project-classroom/classroom-model/pom.xml new file mode 100644 index 00000000..cb5cc7c4 --- /dev/null +++ b/xjs-business/xjs-project-classroom/classroom-model/pom.xml @@ -0,0 +1,47 @@ + + + + xjs-project-classroom + com.xjs + 3.3.0 + + 4.0.0 + 课堂项目-模型模块 + + classroom-model + + + 11 + 11 + + + + + com.alibaba + easyexcel + provided + + + + org.springframework.boot + spring-boot-starter-data-mongodb + provided + + + + com.alibaba + fastjson + provided + + + + + org.springframework.boot + spring-boot-starter-data-elasticsearch + provided + + + + diff --git a/xjs-business/xjs-project-classroom/classroom-service/classroom-service-vod/pom.xml b/xjs-business/xjs-project-classroom/classroom-service/classroom-service-vod/pom.xml new file mode 100644 index 00000000..d933ea7c --- /dev/null +++ b/xjs-business/xjs-project-classroom/classroom-service/classroom-service-vod/pom.xml @@ -0,0 +1,62 @@ + + + + classroom-service + com.xjs + 3.3.0 + + 4.0.0 + 课堂项目-服务模块-视频点播 + classroom-service-vod + + + 11 + 11 + + + + + com.baomidou + mybatis-plus-generator + 3.3.1 + + + + org.apache.velocity + velocity-engine-core + 2.0 + + + + com.qcloud + cos_api + 5.6.54 + + + + + joda-time + joda-time + + + + com.alibaba + easyexcel + + + + com.qcloud + vod_api + 2.1.4 + + + org.slf4j + slf4j-log4j12 + + + + + + diff --git a/xjs-business/xjs-project-classroom/classroom-service/pom.xml b/xjs-business/xjs-project-classroom/classroom-service/pom.xml new file mode 100644 index 00000000..9ce3292e --- /dev/null +++ b/xjs-business/xjs-project-classroom/classroom-service/pom.xml @@ -0,0 +1,61 @@ + + + + xjs-project-classroom + com.xjs + 3.3.0 + + 4.0.0 + pom + 课堂项目-服务模块 + + classroom-service-vod + + + classroom-service + + + 11 + 11 + + + + + com.xjs + classroom-model + 3.3.0 + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + src/main/java + + **/*.yml + **/*.properties + **/*.xml + + false + + + src/main/resources + **/*.yml + **/*.properties + **/*.xml + + false + + + + + diff --git a/xjs-business/xjs-project-classroom/pom.xml b/xjs-business/xjs-project-classroom/pom.xml new file mode 100644 index 00000000..a5e766ac --- /dev/null +++ b/xjs-business/xjs-project-classroom/pom.xml @@ -0,0 +1,61 @@ + + + + xjs-business + com.xjs + 3.3.0 + + 4.0.0 + pom + 课堂项目 + + classroom-model + classroom-service + + + xjs-project-classroom + + + 11 + 11 + + true + 3.0.5 + 4.5.14 + 2.10.1 + 2.3.0 + + + + + + com.xjs + xjs-business-common + + + + + joda-time + joda-time + ${jodatime.version} + + + + com.xuxueli + xxl-job-core + ${xxl-job.version} + + + + com.alibaba + easyexcel + ${easyexcel.version} + + + + + + +