diff --git a/blog-admin/src/main/resources/templates/index.ftl b/blog-admin/src/main/resources/templates/index.ftl index 1dab86653ae8febc4535ae746611923ea9d1d2cf..ba0cf14d75788e76945c98354f96345cc6177ecd 100644 --- a/blog-admin/src/main/resources/templates/index.ftl +++ b/blog-admin/src/main/resources/templates/index.ftl @@ -270,6 +270,43 @@ +
+
+
+
+

访问来源

+ +
+
+
+ + + + + + + + + + <@zhydTag method="recentVisitor" pageSize="5"> + <#if recentVisitor?? && (recentVisitor?size > 0)> + <#list recentVisitor as item> + + + + + + + + + +
文章标题
访问IP
访问时间
${item.articleName}
${item.userIp}
${item.lookTime?string('yyyy-MM-dd HH:mm:ss')}
+
+
+
+
<#-- 网站首页的项目介绍内容 --> <@aboutOneBlog> diff --git a/blog-core/src/main/java/com/zyd/blog/business/dto/ArticleLookDto.java b/blog-core/src/main/java/com/zyd/blog/business/dto/ArticleLookDto.java new file mode 100644 index 0000000000000000000000000000000000000000..de08038cafb90c01a338909821eb83c42b060810 --- /dev/null +++ b/blog-core/src/main/java/com/zyd/blog/business/dto/ArticleLookDto.java @@ -0,0 +1,9 @@ +package com.zyd.blog.business.dto; + +import com.zyd.blog.persistence.beans.BizArticleLook; +import lombok.Data; + +@Data +public class ArticleLookDto extends BizArticleLook { + private String articleName; +} diff --git a/blog-core/src/main/java/com/zyd/blog/business/service/BizArticleLookService.java b/blog-core/src/main/java/com/zyd/blog/business/service/BizArticleLookService.java index 655565482656a3bc0dea1de16a62cb3a51d862c5..0f5266fd918c80ea839f093d411adebdace306aa 100644 --- a/blog-core/src/main/java/com/zyd/blog/business/service/BizArticleLookService.java +++ b/blog-core/src/main/java/com/zyd/blog/business/service/BizArticleLookService.java @@ -15,4 +15,7 @@ import com.zyd.blog.business.entity.ArticleLook; public interface BizArticleLookService { ArticleLook insert(ArticleLook articleLook); + + Object getRecentArticleLook(int pageSize); + } diff --git a/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizArticleLookServiceImpl.java b/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizArticleLookServiceImpl.java index dbacd4eb0102941d7549673c06436668bdc5e2ad..956419dc13bc7b8faa5f4dfa266cb1ea576e839d 100644 --- a/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizArticleLookServiceImpl.java +++ b/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizArticleLookServiceImpl.java @@ -1,7 +1,9 @@ package com.zyd.blog.business.service.impl; +import com.github.pagehelper.PageHelper; import com.zyd.blog.business.entity.ArticleLook; import com.zyd.blog.business.service.BizArticleLookService; +import com.zyd.blog.business.vo.CommentConditionVO; import com.zyd.blog.persistence.mapper.BizArticleLookMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,4 +36,12 @@ public class BizArticleLookServiceImpl implements BizArticleLookService { bizArticleLookMapper.insertSelective(entity.getBizArticleLook()); return entity; } + + @Override + public Object getRecentArticleLook(int pageSize) { + CommentConditionVO vo = new CommentConditionVO(); + vo.setPageSize(pageSize); + PageHelper.startPage(vo.getPageNumber(), vo.getPageSize()); + return bizArticleLookMapper.findPageRecentLook(vo); + } } diff --git a/blog-core/src/main/java/com/zyd/blog/framework/tag/CustomTags.java b/blog-core/src/main/java/com/zyd/blog/framework/tag/CustomTags.java index fba977199d29c64a57b66e5c57b8b1ed75b65c6c..45fa2969a5a9aea7032aeebf8cd131fb1e4eb0fc 100644 --- a/blog-core/src/main/java/com/zyd/blog/framework/tag/CustomTags.java +++ b/blog-core/src/main/java/com/zyd/blog/framework/tag/CustomTags.java @@ -56,6 +56,9 @@ public class CustomTags extends BaseTag { @Autowired private SysSocialConfigService sysSocialConfigService; + @Autowired + private BizArticleLookService bizArticleLookService; + public CustomTags() { super(CustomTags.class.getName()); } @@ -77,6 +80,11 @@ public class CustomTags extends BaseTag { return commentService.listRecentComment(pageSize); } + public Object recentVisitor(Map params) { + int pageSize = this.getPageSize(params); + return bizArticleLookService.getRecentArticleLook(pageSize); + } + public Object siteInfo(Map params) { return configService.getSiteInfo(); } diff --git a/blog-core/src/main/java/com/zyd/blog/persistence/mapper/BizArticleLookMapper.java b/blog-core/src/main/java/com/zyd/blog/persistence/mapper/BizArticleLookMapper.java index b50b301ece02ee3d1ca5230384736d294a762449..fc7d8262ea5fa532c45066c41c68aaa61635eb88 100644 --- a/blog-core/src/main/java/com/zyd/blog/persistence/mapper/BizArticleLookMapper.java +++ b/blog-core/src/main/java/com/zyd/blog/persistence/mapper/BizArticleLookMapper.java @@ -1,6 +1,8 @@ package com.zyd.blog.persistence.mapper; +import com.zyd.blog.business.dto.ArticleLookDto; import com.zyd.blog.business.vo.ArticleLookConditionVO; +import com.zyd.blog.business.vo.CommentConditionVO; import com.zyd.blog.persistence.beans.BizArticleLook; import com.zyd.blog.plugin.BaseMapper; import org.springframework.stereotype.Repository; @@ -24,4 +26,6 @@ public interface BizArticleLookMapper extends BaseMapper{ * @return */ List findPageBreakByCondition(ArticleLookConditionVO vo); + + List findPageRecentLook(CommentConditionVO vo); } diff --git a/blog-core/src/main/resources/mybatis/BizArticleLookMapper.xml b/blog-core/src/main/resources/mybatis/BizArticleLookMapper.xml index 83e44656c1b859bd510c589b7e40fd9ebc6ad60c..de87b094f40a8bb2ae8424ab92f6c3bc0d39ff16 100644 --- a/blog-core/src/main/resources/mybatis/BizArticleLookMapper.xml +++ b/blog-core/src/main/resources/mybatis/BizArticleLookMapper.xml @@ -20,5 +20,14 @@ WHERE 1 = 1 + +