Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
LuJin-Im
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yangzhaojun
LuJin-Im
Commits
dc82d9cc
Commit
dc82d9cc
authored
Jul 04, 2018
by
李博今
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增用户可以在管理员聊天界面显示了,不会使佚名
parent
2ce01a9e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
93 additions
and
2 deletions
+93
-2
ImController.java
...va/com/qiqiim/webserver/user/controller/ImController.java
+40
-0
UserDepartmentDao.java
...java/com/qiqiim/webserver/user/dao/UserDepartmentDao.java
+2
-0
UserDepartmentDao.xml
.../java/com/qiqiim/webserver/user/dao/UserDepartmentDao.xml
+5
-0
UserDepartmentService.java
.../qiqiim/webserver/user/service/UserDepartmentService.java
+3
-0
UserDepartmentServiceImpl.java
...ebserver/user/service/impl/UserDepartmentServiceImpl.java
+18
-0
layim.jsp
src/main/webapp/WEB-INF/page/layim.jsp
+25
-2
No files found.
src/main/java/com/qiqiim/webserver/user/controller/ImController.java
View file @
dc82d9cc
...
...
@@ -195,6 +195,46 @@ public class ImController extends BaseController{
return
JSONArray
.
toJSON
(
""
);
}
}
@RequestMapping
(
value
=
"/getusers2"
,
produces
=
"text/html;charset=UTF-8"
)
@ResponseBody
public
Object
getAllUser2
(
HttpServletResponse
response
,
HttpServletRequest
request
,
RedirectAttributes
redirectAttributes
)
throws
Exception
{
// 数据格式请参考文档 http://www.layui.com/doc/modules/layim.html
if
(
getLoginUser
()!=
null
){
UserInfoEntity
user
=
getLoginUser
().
getUserInfo
();
ImFriendUserInfoData
my
=
new
ImFriendUserInfoData
();
my
.
setId
(
user
.
getUid
());
my
.
setAvatar
(
user
.
getProfilephoto
());
my
.
setSign
(
user
.
getSignature
());
my
.
setUsername
(
user
.
getName
());
my
.
setStatus
(
"online"
);
//模拟群信息
ImGroupUserData
group
=
new
ImGroupUserData
();
group
.
setAvatar
(
"http://tva2.sinaimg.cn/crop.0.0.199.199.180/005Zseqhjw1eplix1brxxj305k05kjrf.jpg"
);
group
.
setId
(
1L
);
group
.
setGroupname
(
"公司群"
);
List
<
ImGroupUserData
>
groups
=
new
ArrayList
<
ImGroupUserData
>();
groups
.
add
(
group
);
Map
map
=
new
HashMap
();
ImUserData
us
=
new
ImUserData
();
us
.
setCode
(
"0"
);
us
.
setMsg
(
""
);
map
.
put
(
"mine"
,
my
);
//获取用户分组 及用户
List
<
ImFriendUserData
>
friends
=
new
ArrayList
<>();
//管理员查看所有人员信息
friends
=
userDepartmentServiceImpl
.
adminsQueryGroupAndUser2
();
map
.
put
(
"friend"
,
friends
);
us
.
setData
(
map
);
return
JSONArray
.
toJSON
(
us
);
}
else
{
return
JSONArray
.
toJSON
(
""
);
}
}
/**
...
...
src/main/java/com/qiqiim/webserver/user/dao/UserDepartmentDao.java
View file @
dc82d9cc
...
...
@@ -23,4 +23,6 @@ public interface UserDepartmentDao extends BaseDao<UserDepartmentEntity> {
public
List
<
ImFriendUserData
>
adminsQueryGroupAndUser
();
public
List
<
ImFriendUserInfoData
>
adminsGetHistoryUser
(
@Param
(
"id"
)
long
id
,
@Param
(
"userId"
)
long
userId
);
public
List
<
ImFriendUserInfoData
>
adminsGetAllUser
(
@Param
(
"id"
)
long
id
);
}
src/main/java/com/qiqiim/webserver/user/dao/UserDepartmentDao.xml
View file @
dc82d9cc
...
...
@@ -68,6 +68,11 @@
where deptid = #{id} and (senduser = #{userId} or receiveuser =#{userId})
</select>
<select
id=
"adminsGetAllUser"
resultType=
"com.qiqiim.webserver.user.model.ImFriendUserInfoData"
>
select DISTINCT uid as id ,name as username , signature as sign , profilephoto as avatar from user_info
where deptid = #{id}
</select>
<select
id=
"queryList"
resultType=
"com.qiqiim.webserver.user.model.UserDepartmentEntity"
>
select
<include
refid=
"Base_Column_List"
/>
from user_department
<choose>
...
...
src/main/java/com/qiqiim/webserver/user/service/UserDepartmentService.java
View file @
dc82d9cc
...
...
@@ -27,6 +27,9 @@ public interface UserDepartmentService {
//客服看到的用户列表
List
<
ImFriendUserData
>
adminsQueryGroupAndUser
(
long
userId
);
//客服查看所有用户的信息
List
<
ImFriendUserData
>
adminsQueryGroupAndUser2
();
int
queryTotal
(
Map
<
String
,
Object
>
map
);
void
save
(
UserDepartmentEntity
userDepartment
);
...
...
src/main/java/com/qiqiim/webserver/user/service/impl/UserDepartmentServiceImpl.java
View file @
dc82d9cc
...
...
@@ -124,4 +124,22 @@ public class UserDepartmentServiceImpl implements UserDepartmentService {
return
friendgroup
;
}
@Override
public
List
<
ImFriendUserData
>
adminsQueryGroupAndUser2
()
{
List
<
ImFriendUserData
>
friendgroup
=
userDepartmentDao
.
adminsQueryGroupAndUser
();
for
(
ImFriendUserData
fg:
friendgroup
){
List
<
ImFriendUserInfoData
>
friends
=
userDepartmentDao
.
adminsGetAllUser
(
fg
.
getId
());
fg
.
setList
(
friends
);
if
(
friends
!=
null
&&
friends
.
size
()>
0
){
for
(
ImFriendUserInfoData
fr:
friends
){
boolean
exist
=
sessionManager
.
exist
(
fr
.
getId
().
toString
());
if
(
exist
)
fr
.
setStatus
(
"online"
);
}
}
}
return
friendgroup
;
}
}
src/main/webapp/WEB-INF/page/layim.jsp
View file @
dc82d9cc
...
...
@@ -22,6 +22,7 @@
<script
src=
"layui/layui.js"
></script>
<script
src=
"js/websocketconfig.js"
></script>
<script>
var
findNum
=
0
;
var
currentsession
=
"${sessionScope.user.id}"
;
var
showmsg
,
lm
;
//一般直接写在一个js文件中
...
...
@@ -231,15 +232,37 @@
//收到消息后
socket
.
onmessage
=
function
(
event
)
{
if
(
event
.
data
instanceof
ArrayBuffer
){
// console.log(findNum);
//判断方法次数
var
msg
=
proto
.
Model
.
deserializeBinary
(
event
.
data
);
//如果后端发送的是二进制帧(protobuf)会收到前面定义的类型
// console.log("msg",msg);
var
msgCon
=
proto
.
MessageBody
.
deserializeBinary
(
msg
.
getContent
());
var
cache
=
layui
.
layim
.
cache
();
var
local
=
layui
.
data
(
'layim'
)[
cache
.
mine
.
id
];
// console.log("local",local);
var
username
=
""
,
avatar
=
""
,
friend
=
false
;
// console.log("cache",cache);
if
(
findNum
>
0
){
$
.
ajax
({
url
:
"getusers2"
,
type
:
"get"
,
dataType
:
"json"
,
success
:
function
(
data
){
// console.log("data",data);
// console.log("data.friend",data.data.friend);
cache
.
friend
=
data
.
data
.
friend
;
}
});
}
findNum
++
;
// console.log("cache",cache);
// console.log("friend",friend);
layui
.
each
(
cache
.
friend
,
function
(
index1
,
item1
){
// console.log("item1",item1);
layui
.
each
(
item1
.
list
,
function
(
index
,
item
){
console
.
log
(
item
.
id
);
console
.
log
(
msg
.
getSender
());
//
console.log(item.id);
//
console.log(msg.getSender());
if
(
item
.
id
==
msg
.
getSender
()){
username
=
item
.
username
;
avatar
=
item
.
avatar
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment