From 77563450535843479fccbfe582225b2b1e3ba532 Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Sun, 7 Jan 2018 09:27:41 +0800 Subject: [PATCH] . --- conf/application.xml | 2 +- conf/persistence.xml | 6 +++--- root/index.html | 10 ++++++++-- root/res/mods/index.js | 6 ++++++ src/com/lxyer/bbs/base/bean/ActLogBean.java | 2 -- src/com/lxyer/bbs/base/entity/ActLog.java | 2 +- src/com/lxyer/bbs/base/entity/DynaAttr.java | 2 +- src/com/lxyer/bbs/base/user/User.java | 2 +- src/com/lxyer/bbs/base/user/UserService.java | 21 +++++++++++--------- src/com/lxyer/bbs/comment/Comment.java | 2 +- src/com/lxyer/bbs/content/Content.java | 2 +- 11 files changed, 35 insertions(+), 22 deletions(-) diff --git a/conf/application.xml b/conf/application.xml index ff81fa9..b0e8d2b 100644 --- a/conf/application.xml +++ b/conf/application.xml @@ -26,5 +26,5 @@ - + diff --git a/conf/persistence.xml b/conf/persistence.xml index 5e5936c..a630763 100644 --- a/conf/persistence.xml +++ b/conf/persistence.xml @@ -5,10 +5,10 @@ ALL - + - - + + diff --git a/root/index.html b/root/index.html index 51b2ae6..0cad5b7 100644 --- a/root/index.html +++ b/root/index.html @@ -161,7 +161,10 @@
-

最新加入

+

+ 最新加入| + 总用户：0人 +

#for(x : lastReg.rows??) @@ -231,6 +234,9 @@ ,base: '../res/mods/' //这里实际使用时，建议改成绝对路径 }).extend({ fly: 'index' - }).use('fly'); + }).use('fly',function () { + var fly = layui.fly; + fly.userstat(); + }); #end \ No newline at end of file diff --git a/root/res/mods/index.js b/root/res/mods/index.js index 2cd737d..338e5ba 100644 --- a/root/res/mods/index.js +++ b/root/res/mods/index.js @@ -309,6 +309,12 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f } return arguments.callee; } + + ,userstat: function () { + $.getJSON("/os/user/stat",{},function (data) { + $("#user_count").html(data.count); + }); + } }; diff --git a/src/com/lxyer/bbs/base/bean/ActLogBean.java b/src/com/lxyer/bbs/base/bean/ActLogBean.java index d133589..81182a0 100644 --- a/src/com/lxyer/bbs/base/bean/ActLogBean.java +++ b/src/com/lxyer/bbs/base/bean/ActLogBean.java @@ -4,14 +4,12 @@ import org.redkale.convert.json.JsonConvert; import org.redkale.source.FilterBean; import javax.persistence.Column; -import javax.persistence.Table; import java.io.Serializable; /** * * @author lxyer */ -@Table(catalog = "db_redbbs", name = "act_log") public class ActLogBean implements Serializable, FilterBean { @Column(comment = "[日志id]") diff --git a/src/com/lxyer/bbs/base/entity/ActLog.java b/src/com/lxyer/bbs/base/entity/ActLog.java index 89381cc..a8017b1 100644 --- a/src/com/lxyer/bbs/base/entity/ActLog.java +++ b/src/com/lxyer/bbs/base/entity/ActLog.java @@ -9,7 +9,7 @@ import javax.persistence.*; * @author lxyer */ @Cacheable -@Table(catalog = "db_redbbs", name = "act_log") +@Table(catalog = "redbbs", name = "act_log") public class ActLog implements java.io.Serializable { @Id diff --git a/src/com/lxyer/bbs/base/entity/DynaAttr.java b/src/com/lxyer/bbs/base/entity/DynaAttr.java index 5f90b73..41d5e97 100644 --- a/src/com/lxyer/bbs/base/entity/DynaAttr.java +++ b/src/com/lxyer/bbs/base/entity/DynaAttr.java @@ -12,7 +12,7 @@ import javax.persistence.Table; * @author lxyer */ @Cacheable(interval = 5*60) -@Table(catalog = "db_art_red", name = "dyna_attr", comment = "[动态属性表]") +@Table(catalog = "redbbs", name = "dyna_attr", comment = "[动态属性表]") public class DynaAttr implements java.io.Serializable { @Id diff --git a/src/com/lxyer/bbs/base/user/User.java b/src/com/lxyer/bbs/base/user/User.java index d1d4bd4..fe72be1 100644 --- a/src/com/lxyer/bbs/base/user/User.java +++ b/src/com/lxyer/bbs/base/user/User.java @@ -17,7 +17,7 @@ import java.security.NoSuchAlgorithmException; * @author lxyer */ @Cacheable(interval = 5*60) -@Table(catalog = "db_redbbs", name = "user") +@Table(catalog = "redbbs", name = "user") public class User implements java.io.Serializable { @Id diff --git a/src/com/lxyer/bbs/base/user/UserService.java b/src/com/lxyer/bbs/base/user/UserService.java index 02150df..95a0c8c 100644 --- a/src/com/lxyer/bbs/base/user/UserService.java +++ b/src/com/lxyer/bbs/base/user/UserService.java @@ -1,26 +1,21 @@ package com.lxyer.bbs.base.user; +import com.jfinal.kit.Kv; import com.lxyer.bbs.base.BaseService; import com.lxyer.bbs.base.LxyKit; import com.lxyer.bbs.base.RetCodes; -import com.lxyer.bbs.base.user.LoginBean; -import com.lxyer.bbs.base.user.UserBean; -import com.lxyer.bbs.base.user.UserInfo; -import com.lxyer.bbs.base.user.User; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; import org.redkale.net.http.RestSessionid; import org.redkale.service.RetResult; -import org.redkale.source.CacheSource; -import org.redkale.source.FilterFunc; -import org.redkale.source.FilterNode; -import org.redkale.source.Flipper; +import org.redkale.source.*; import org.redkale.util.SelectColumn; import org.redkale.util.Sheet; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Map; import java.util.Objects; import java.util.Random; @@ -114,7 +109,7 @@ public class UserService extends BaseService { user.setCreateTime(System.currentTimeMillis()); user.setPassword(user.passwordForMd5()); - user.setStatus(1);//待激活 + user.setStatus(1); user.setUsername(user.getEmail()); user.setAvatar("/res/images/avatar/"+ new Random().nextInt(21) +".jpg");//默认头像 @@ -157,4 +152,12 @@ public class UserService extends BaseService { return infos; } + + @RestMapping(name = "stat", auth = false, comment = "用户数据统计") + public Map userStat(){ + + Number count = source.getNumberResult(User.class, FilterFunc.COUNT, "userId", FilterNode.create("status", FilterExpress.NOTEQUAL, -1)); + + return Kv.by("count", count); + } } diff --git a/src/com/lxyer/bbs/comment/Comment.java b/src/com/lxyer/bbs/comment/Comment.java index 1c42c6e..a99a6a1 100644 --- a/src/com/lxyer/bbs/comment/Comment.java +++ b/src/com/lxyer/bbs/comment/Comment.java @@ -10,7 +10,7 @@ import javax.persistence.*; * @author lxyer */ @Cacheable(interval = 5*60) -@Table(catalog = "db_redbbs", name = "comment", comment = "[评论表]") +@Table(catalog = "redbbs", name = "comment", comment = "[评论表]") public class Comment implements java.io.Serializable { @Id diff --git a/src/com/lxyer/bbs/content/Content.java b/src/com/lxyer/bbs/content/Content.java index 3b1c0c2..3805471 100644 --- a/src/com/lxyer/bbs/content/Content.java +++ b/src/com/lxyer/bbs/content/Content.java @@ -11,7 +11,7 @@ import javax.persistence.*; * @author lxyer */ @Cacheable(interval = 5*60) -@Table(catalog = "db_redbbs", name = "content", comment = "[内容表]") +@Table(catalog = "redbbs", name = "content", comment = "[内容表]") public class Content implements java.io.Serializable { @Id