Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
C
chinafrica
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
chinafrica
Commits
adcbf081
提交
adcbf081
authored
3月 12, 2021
作者:
吴德鹏
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
查看用户下线
上级
afe371c1
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
148 行增加
和
14 行删除
+148
-14
TbCfUserInfoController.java
.../java/com/platform/controller/TbCfUserInfoController.java
+27
-5
TbCfUserInfoDao.java
...admin/src/main/java/com/platform/dao/TbCfUserInfoDao.java
+3
-2
TbCfUserInfoService.java
...c/main/java/com/platform/service/TbCfUserInfoService.java
+4
-1
TbCfUserInfoServiceImpl.java
...va/com/platform/service/impl/TbCfUserInfoServiceImpl.java
+19
-3
Network.java
platform-admin/src/main/java/com/platform/vo/Network.java
+88
-0
TbCfUserInfoDao.xml
...n/src/main/resources/com/platform/dao/TbCfUserInfoDao.xml
+7
-3
没有找到文件。
platform-admin/src/main/java/com/platform/controller/TbCfUserInfoController.java
浏览文件 @
adcbf081
...
...
@@ -7,14 +7,18 @@ import com.platform.service.TbCfUserInfoService;
import
com.platform.utils.PageUtils
;
import
com.platform.utils.Query
;
import
com.platform.utils.R
;
import
com.platform.vo.Network
;
import
com.platform.vo.StatisticalVo
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -210,11 +214,29 @@ public class TbCfUserInfoController {
return
R
.
ok
();
}
@GetMapping
(
"/getUserNetwork/{userId}"
)
@ResponseBody
public
R
getUserNetwork
(
@PathVariable
String
userId
)
{
List
<
TbCfUserInfoEntity
>
networks
=
tbCfUserInfoService
.
getUserNetwork
(
userId
);
return
R
.
ok
().
put
(
"list"
,
networks
);
@GetMapping
(
"/getUserNetwork"
)
@ResponseBody
public
R
getUserNetwork
(
@RequestParam
Map
<
String
,
Object
>
params
)
{
//查询列表数据
if
(
params
.
isEmpty
())
{
return
R
.
error
(
"参数不能为空"
);
}
String
userId
=
(
String
)
params
.
get
(
"userId"
);
if
(
StringUtils
.
isBlank
(
userId
))
{
return
R
.
error
(
"参数[userId]不能为空"
);
}
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
TbCfUserInfoEntity
parentUser
=
tbCfUserInfoService
.
queryObject
(
userId
);
Network
parent
=
new
Network
();
BeanUtils
.
copyProperties
(
parentUser
,
parent
);
parent
.
setNum
(
tbCfUserInfoService
.
getUserNetworkCount
(
params
));
Query
query
=
new
Query
(
params
);
List
<
Network
>
networks
=
tbCfUserInfoService
.
getUserNetwork
(
query
);
int
total
=
tbCfUserInfoService
.
getUserNetworkCount
(
query
);
PageUtils
pageUtil
=
new
PageUtils
(
networks
,
total
,
query
.
getLimit
(),
query
.
getPage
());
result
.
put
(
"parent"
,
parent
);
result
.
put
(
"networks"
,
pageUtil
);
return
R
.
ok
().
put
(
"list"
,
result
);
}
}
platform-admin/src/main/java/com/platform/dao/TbCfUserInfoDao.java
浏览文件 @
adcbf081
...
...
@@ -2,6 +2,7 @@ package com.platform.dao;
import
com.platform.entity.TbCfUserInfoEntity
;
import
com.platform.entity.VirtualUserEntity
;
import
com.platform.vo.Network
;
import
com.platform.vo.StatisticalVo
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -50,9 +51,9 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> {
String
selectRandomUser
();
List
<
TbCfUserInfoEntity
>
getUserNetwork
(
String
userId
);
List
<
Network
>
getUserNetwork
(
Map
<
String
,
Object
>
params
);
int
getUserNetworkCount
(
String
userId
);
int
getUserNetworkCount
(
Map
<
String
,
Object
>
params
);
BigDecimal
getUserBonus
(
String
userId
);
}
platform-admin/src/main/java/com/platform/service/TbCfUserInfoService.java
浏览文件 @
adcbf081
...
...
@@ -3,6 +3,7 @@ package com.platform.service;
import
com.platform.entity.TbCfUserInfoEntity
;
import
com.platform.entity.VirtualUserEntity
;
import
com.platform.utils.R
;
import
com.platform.vo.Network
;
import
com.platform.vo.StatisticalVo
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.web.bind.annotation.RequestParam
;
...
...
@@ -103,5 +104,7 @@ public interface TbCfUserInfoService {
void
exportData
();
List
<
TbCfUserInfoEntity
>
getUserNetwork
(
String
userId
);
List
<
Network
>
getUserNetwork
(
Map
<
String
,
Object
>
params
);
int
getUserNetworkCount
(
Map
<
String
,
Object
>
params
);
}
platform-admin/src/main/java/com/platform/service/impl/TbCfUserInfoServiceImpl.java
浏览文件 @
adcbf081
...
...
@@ -8,7 +8,9 @@ import com.platform.utils.IdUtil;
import
com.platform.utils.R
;
import
com.platform.utils.excel.ExcelExport
;
import
com.platform.utils.excel.ExcelImport
;
import
com.platform.vo.Network
;
import
com.platform.vo.StatisticalVo
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.multipart.MultipartFile
;
...
...
@@ -40,7 +42,9 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
List
<
TbCfUserInfoEntity
>
users
=
tbCfUserInfoDao
.
queryList
(
map
);
users
.
stream
().
forEach
(
user
->
{
//查询下线人数
user
.
setNetwork
(
tbCfUserInfoDao
.
getUserNetworkCount
(
user
.
getUserId
()));
Map
params
=
new
HashMap
(
3
);
params
.
put
(
"userId"
,
user
.
getUserId
());
user
.
setNetwork
(
tbCfUserInfoDao
.
getUserNetworkCount
(
params
));
user
.
setBonus
(
tbCfUserInfoDao
.
getUserBonus
(
user
.
getUserId
()));
});
return
users
;
...
...
@@ -217,8 +221,20 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
}
@Override
public
List
<
TbCfUserInfoEntity
>
getUserNetwork
(
String
userId
)
{
return
tbCfUserInfoDao
.
getUserNetwork
(
userId
);
public
List
<
Network
>
getUserNetwork
(
Map
<
String
,
Object
>
params
)
{
List
<
Network
>
networks
=
tbCfUserInfoDao
.
getUserNetwork
(
params
);
networks
.
stream
().
forEach
(
network
->
{
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>(
15
);
map
.
put
(
"userId"
,
network
.
getUserId
());
network
.
setNum
(
tbCfUserInfoDao
.
getUserNetworkCount
(
map
));
});
return
networks
;
}
@Override
public
int
getUserNetworkCount
(
Map
<
String
,
Object
>
params
)
{
return
tbCfUserInfoDao
.
getUserNetworkCount
(
params
);
}
/**
...
...
platform-admin/src/main/java/com/platform/vo/Network.java
0 → 100644
浏览文件 @
adcbf081
package
com
.
platform
.
vo
;
import
io.swagger.models.auth.In
;
import
java.util.List
;
/**
* @Auther: wudepeng
* @Date: 2021/03/12
* @Description:下线
*/
public
class
Network
{
private
String
userId
;
private
String
account
;
private
String
avatar
;
private
String
nick
;
private
String
country
;
private
String
email
;
private
String
phone
;
private
Integer
num
;
public
String
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
String
userId
)
{
this
.
userId
=
userId
;
}
public
String
getAccount
()
{
return
account
;
}
public
void
setAccount
(
String
account
)
{
this
.
account
=
account
;
}
public
String
getAvatar
()
{
return
avatar
;
}
public
void
setAvatar
(
String
avatar
)
{
this
.
avatar
=
avatar
;
}
public
String
getNick
()
{
return
nick
;
}
public
void
setNick
(
String
nick
)
{
this
.
nick
=
nick
;
}
public
String
getCountry
()
{
return
country
;
}
public
void
setCountry
(
String
country
)
{
this
.
country
=
country
;
}
public
String
getEmail
()
{
return
email
;
}
public
void
setEmail
(
String
email
)
{
this
.
email
=
email
;
}
public
String
getPhone
()
{
return
phone
;
}
public
void
setPhone
(
String
phone
)
{
this
.
phone
=
phone
;
}
public
Integer
getNum
()
{
return
num
;
}
public
void
setNum
(
Integer
num
)
{
this
.
num
=
num
;
}
}
platform-admin/src/main/resources/com/platform/dao/TbCfUserInfoDao.xml
浏览文件 @
adcbf081
...
...
@@ -339,12 +339,16 @@
</select>
<!--查看用户的下线-->
<select
id=
"getUserNetwork"
resultType=
"com.platform.entity.TbCfUserInfoEntity"
>
SELECT user_id,account,avatar,nick,country,email,phone from tb_cf_user_info u inner join (select network_info_user_id from network where user_info_user_id=#{userId}) temp on u.user_id=temp.network_info_user_id
<select
id=
"getUserNetwork"
resultType=
"com.platform.vo.Network"
parameterType=
"map"
>
SELECT user_id,account,avatar,nick,country,email,phone from tb_cf_user_info u inner join (select
network_info_user_id from network where user_info_user_id=#{userId}) temp on u.user_id=temp.network_info_user_id
<if
test=
"offset != null and limit != null"
>
limit #{offset}, #{limit}
</if>
</select>
<!--查看用户的下线人数-->
<select
id=
"getUserNetworkCount"
resultType=
"int"
>
<select
id=
"getUserNetworkCount"
resultType=
"int"
parameterType=
"map"
>
select count(1) from network where user_info_user_id=#{userId}
</select>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论