diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index aff295cb0..ecc356ace 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -35,6 +35,7 @@ ruoyi-common-websocket ruoyi-common-sse ruoyi-common-mongo + ruoyi-common-rabbitmq ruoyi-common diff --git a/ruoyi-common/ruoyi-common-mongo/src/main/resources/META-INF/maven/archetype.xml b/ruoyi-common/ruoyi-common-mongo/src/main/resources/META-INF/maven/archetype.xml deleted file mode 100644 index 223e1e18d..000000000 --- a/ruoyi-common/ruoyi-common-mongo/src/main/resources/META-INF/maven/archetype.xml +++ /dev/null @@ -1,9 +0,0 @@ - - ruoyi-common-mongo - - src/main/java/App.java - - - src/test/java/AppTest.java - - diff --git a/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/pom.xml b/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 54309cd56..000000000 --- a/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - $org.dromara - $ruoyi-common-mongo - $5.3.1 - - - junit - junit - 3.8.1 - test - - - diff --git a/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/src/main/java/App.java b/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/src/main/java/App.java deleted file mode 100644 index ed7b66c32..000000000 --- a/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/src/main/java/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package $org.dromara; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/src/test/java/AppTest.java b/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/src/test/java/AppTest.java deleted file mode 100644 index 75b67fcd1..000000000 --- a/ruoyi-common/ruoyi-common-mongo/src/main/resources/archetype-resources/src/test/java/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package $org.dromara; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java index 2c3a32a29..2030dffd4 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java @@ -18,7 +18,6 @@ import java.util.List; @NoArgsConstructor public class TableDataInfo implements Serializable { - @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-rabbitmq/pom.xml b/ruoyi-common/ruoyi-common-rabbitmq/pom.xml new file mode 100644 index 000000000..8e9a55dd8 --- /dev/null +++ b/ruoyi-common/ruoyi-common-rabbitmq/pom.xml @@ -0,0 +1,34 @@ + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-mongo + + + ruoyi-common-mongo + + + + + + org.dromara + ruoyi-common-core + + + org.dromara + ruoyi-common-log + + + + org.springframework.boot + rabbitmq-spring-boot-starter + + + + + diff --git a/ruoyi-modules/ruoyi-content/pom.xml b/ruoyi-modules/ruoyi-content/pom.xml index 72bb2e911..882d96f48 100644 --- a/ruoyi-modules/ruoyi-content/pom.xml +++ b/ruoyi-modules/ruoyi-content/pom.xml @@ -144,6 +144,12 @@ okhttp 4.12.0 + + org.dromara + ruoyi-common-rabbitmq + 5.3.1 + + diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/base/BaseInfoProperties.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/base/BaseInfoProperties.java index 77b7e6009..71c5649e0 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/base/BaseInfoProperties.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/base/BaseInfoProperties.java @@ -2,9 +2,6 @@ package com.wzj.soopin.content.domain.base; - -import com.github.pagehelper.PageInfo; - import com.wzj.soopin.content.utils.PagedGridResult; import com.wzj.soopin.content.utils.RedisOperator; import org.springframework.beans.factory.annotation.Autowired; @@ -13,8 +10,7 @@ import java.util.List; public class BaseInfoProperties { - @Autowired - public RedisOperator redis; + public RedisOperator redis; public static final Integer COMMON_START_PAGE = 1; public static final Integer COMMON_START_PAGE_ZERO = 0; @@ -52,14 +48,5 @@ public class BaseInfoProperties { // 用户是否喜欢/点赞视频，取代数据库的关联关系，1：喜欢，0：不喜欢（默认） redis_user_like_vlog:{userId}:{vlogId} public static final String REDIS_USER_LIKE_VLOG = "redis_user_like_vlog"; - public PagedGridResult setterPagedGrid(List list, Integer page) { - PageInfo pageList = new PageInfo<>(list); - PagedGridResult gridResult = new PagedGridResult(); - gridResult.setRows(list); - gridResult.setPage(page); - gridResult.setRecords(pageList.getTotal()); - gridResult.setTotal(pageList.getPages()); - return gridResult; - } } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/po/Comment.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/po/Comment.java index bf300c8c5..bd216976b 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/po/Comment.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/po/Comment.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.tenant.core.TenantEntity; +import java.time.LocalDateTime; import java.util.Date; @TableName("t_comment") @@ -51,6 +52,6 @@ public class Comment extends TenantEntity { /** * 留言时间 */ - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/repository/MessageRepository.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/repository/MessageRepository.java index e43dc3c9e..3470d9b65 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/repository/MessageRepository.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/repository/MessageRepository.java @@ -1,7 +1,6 @@ package com.wzj.soopin.content.mapper.repository; import com.wzj.soopin.content.domain.mo.MessageMO; -import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java index 3dc5f87c2..098d99657 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/CommentServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -51,7 +52,7 @@ public class CommentServiceImpl extends BaseInfoProperties implements CommentSer comment.setFatherCommentId(commentBO.getFatherCommentId()); comment.setContent(commentBO.getContent()); comment.setLikeCounts(0); - comment.setCreateTime(new Date()); + comment.setCreateTime(LocalDateTime.now()); commentMapper.insert(comment); // redis操作放在service中，评论总数的累加 redis.increment(REDIS_VLOG_COMMENT_COUNTS + ":" + commentBO.getVlogId(), 1); @@ -104,7 +105,7 @@ public class CommentServiceImpl extends BaseInfoProperties implements CommentSer } return cv; }).collect(Collectors.toList()); - return setterPagedGrid(list, page); + return null; } @Override diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/FansServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/FansServiceImpl.java index 24d4d8cd1..b5081b390 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/FansServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/FansServiceImpl.java @@ -74,7 +74,7 @@ public class FansServiceImpl extends BaseInfoProperties implements FansService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Fans::getVlogerId, vlogerId) .eq(Fans::getFanId, fanId); - + return fansMapper.selectOne(queryWrapper); } @@ -110,7 +110,7 @@ public class FansServiceImpl extends BaseInfoProperties implements FansService { Page pageParam = new Page<>(page, pageSize); List list = fansMapperCustom.queryMyFollows(map); - return setterPagedGrid(list, page); + return null; } @Override @@ -128,6 +128,6 @@ public class FansServiceImpl extends BaseInfoProperties implements FansService { } } - return setterPagedGrid(list, page); + return null; } } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index 0a081db91..f463e832d 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -161,7 +161,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { return vo; }).collect(Collectors.toList()); - return setterPagedGrid(voList, page); + return null; } @Override @@ -252,7 +252,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { return vo; }).collect(Collectors.toList()); - return setterPagedGrid(voList, page); + return null; } @Transactional @@ -332,7 +332,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { return vo; }).filter(Objects::nonNull).collect(Collectors.toList()); - return setterPagedGrid(voList, page); + return null; } @Override @@ -341,8 +341,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { Map map = new HashMap<>(); map.put("myId", myId); List voList = vlogMapperCustom.getMyFollowVlogList(map); - - return setterPagedGrid(voList, page); + return null; } @Override @@ -351,7 +350,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { Map map = new HashMap<>(); map.put("myId", myId); List voList = vlogMapperCustom.getMyFriendVlogList(map); - - return setterPagedGrid(voList, page); + + return null; } }