Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
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
haoban3.0
haoban-manage3.0
Commits
0ed3d8c0
Commit
0ed3d8c0
authored
Dec 08, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/社群' into 'developer'
Feature/社群 See merge request
!557
parents
84900acc
790afaa8
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
255 additions
and
48 deletions
+255
-48
GroupChatDataDTO.java
.../com/gic/haoban/manage/api/dto/chat/GroupChatDataDTO.java
+10
-1
GroupChatHmDTO.java
...va/com/gic/haoban/manage/api/dto/chat/GroupChatHmDTO.java
+10
-0
ChatDataSearchQDTO.java
...c/haoban/manage/api/dto/qdto/chat/ChatDataSearchQDTO.java
+47
-0
GroupChatSearchQDTO.java
.../haoban/manage/api/dto/qdto/chat/GroupChatSearchQDTO.java
+27
-10
TabGroupChatHm.java
...gic/haoban/manage/service/entity/chat/TabGroupChatHm.java
+11
-1
GroupChatHmBO.java
...gic/haoban/manage/service/pojo/bo/chat/GroupChatHmBO.java
+11
-1
GroupChatDataService.java
...ban/manage/service/service/chat/GroupChatDataService.java
+15
-2
GroupChatDataServiceImpl.java
...e/service/service/chat/impl/GroupChatDataServiceImpl.java
+15
-0
GroupChatApiServiceImpl.java
...ervice/service/out/impl/chat/GroupChatApiServiceImpl.java
+29
-10
GroupChatHmMapper.xml
...vice/src/main/resources/mapper/chat/GroupChatHmMapper.xml
+31
-20
GroupChatMapper.xml
...ervice/src/main/resources/mapper/chat/GroupChatMapper.xml
+31
-2
GroupChatPlanMapper.xml
...ce/src/main/resources/mapper/chat/GroupChatPlanMapper.xml
+18
-1
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatDataDTO.java
View file @
0ed3d8c0
...
...
@@ -18,6 +18,7 @@ public class GroupChatDataDTO implements Serializable{
private
Long
dataId
;
private
String
wxEnterpriseId
;
private
String
staffId
;
private
String
staffName
;
/**统计日期*/
private
java
.
util
.
Date
date
;
/**新增客户群数量*/
...
...
@@ -38,7 +39,15 @@ public class GroupChatDataDTO implements Serializable{
private
Integer
migrateTraineeChatCnt
;
private
java
.
util
.
Date
createTime
;
public
void
setDataId
(
Long
dataId
){
public
String
getStaffName
()
{
return
staffName
;
}
public
void
setStaffName
(
String
staffName
)
{
this
.
staffName
=
staffName
;
}
public
void
setDataId
(
Long
dataId
){
this
.
dataId
=
dataId
;
}
...
...
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatHmDTO.java
View file @
0ed3d8c0
...
...
@@ -43,6 +43,16 @@ public class GroupChatHmDTO implements Serializable {
private
List
<
Long
>
chatIdList
;
/**已关联链接数*/
private
Integer
linkCount
;
// 1有效 2作废 3待生效
private
Integer
statusFlag
;
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
public
void
setChatHmId
(
Long
chatHmId
)
{
this
.
chatHmId
=
chatHmId
;
...
...
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/ChatDataSearchQDTO.java
0 → 100644
View file @
0ed3d8c0
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
.
qdto
.
chat
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
public
class
ChatDataSearchQDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
2777117993521926985L
;
private
String
wxEnterpriseId
;
private
Date
startDate
;
private
Date
endDate
;
private
List
<
String
>
staffIdList
;
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
Date
getStartDate
()
{
return
startDate
;
}
public
Date
getEndDate
()
{
return
endDate
;
}
public
List
<
String
>
getStaffIdList
()
{
return
staffIdList
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
public
void
setStartDate
(
Date
startDate
)
{
this
.
startDate
=
startDate
;
}
public
void
setEndDate
(
Date
endDate
)
{
this
.
endDate
=
endDate
;
}
public
void
setStaffIdList
(
List
<
String
>
staffIdList
)
{
this
.
staffIdList
=
staffIdList
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatSearchQDTO.java
View file @
0ed3d8c0
...
...
@@ -19,24 +19,41 @@ public class GroupChatSearchQDTO implements Serializable {
private
Date
dismissEndDate
;
// 群主列表
private
List
<
String
>
staffIdList
;
// 群活码id
private
Long
chatHmId
;
private
String
staffId
;
private
int
gicFlag
=
1
;
private
String
sortColumn
;
private
String
sortType
=
"desc"
;
public
String
getSortColumn
()
{
return
sortColumn
;
}
public
String
getS
taffId
()
{
return
s
taffId
;
public
String
getS
ortType
()
{
return
s
ortType
;
}
public
void
setStaffId
(
String
staffId
)
{
this
.
staffId
=
staffId
;
public
void
setSortColumn
(
String
sortColumn
)
{
this
.
sortColumn
=
sortColumn
;
}
public
void
setSortType
(
String
sortType
)
{
this
.
sortType
=
sortType
;
}
public
Long
getChatHmId
()
{
return
chatHmId
;
public
int
getGicFlag
()
{
return
gicFlag
;
}
public
void
setChatHmId
(
Long
chatHmId
)
{
this
.
chatHmId
=
chatHmId
;
public
void
setGicFlag
(
int
gicFlag
)
{
this
.
gicFlag
=
gicFlag
;
}
public
String
getStaffId
()
{
return
staffId
;
}
public
void
setStaffId
(
String
staffId
)
{
this
.
staffId
=
staffId
;
}
public
Date
getDismissStartDate
()
{
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/chat/TabGroupChatHm.java
View file @
0ed3d8c0
...
...
@@ -40,8 +40,18 @@ public class TabGroupChatHm implements Serializable{
private
Integer
chatCount
;
/**已关联链接数*/
private
Integer
linkCount
;
// 1有效 2作废 3待生效
private
Integer
statusFlag
;
public
void
setChatHmId
(
Long
chatHmId
){
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
public
void
setChatHmId
(
Long
chatHmId
){
this
.
chatHmId
=
chatHmId
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/chat/GroupChatHmBO.java
View file @
0ed3d8c0
...
...
@@ -40,8 +40,18 @@ public class GroupChatHmBO implements Serializable{
private
Integer
chatCount
;
/**已关联链接数*/
private
Integer
linkCount
;
// 1有效 2作废 3待生效
private
Integer
statusFlag
;
public
void
setChatHmId
(
Long
chatHmId
){
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
public
void
setChatHmId
(
Long
chatHmId
){
this
.
chatHmId
=
chatHmId
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/GroupChatDataService.java
View file @
0ed3d8c0
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
chat
;
import
java.util.List
;
import
com.gic.api.base.commons.BasePageInfo
;
import
com.gic.api.base.commons.Page
;
import
com.gic.haoban.manage.api.dto.chat.GroupChatDataDTO
;
import
com.gic.haoban.manage.api.dto.qdto.chat.ChatDataSearchQDTO
;
public
interface
GroupChatDataService
{
/**
*
* @Title: chatDataTimer
...
...
@@ -10,5 +17,10 @@ public interface GroupChatDataService {
* @param params
* @throws
*/
public
void
chatDataTimer
(
String
params
)
;
public
void
chatDataTimer
(
String
params
);
public
Page
<
GroupChatDataDTO
>
listPage
(
ChatDataSearchQDTO
qdto
,
BasePageInfo
basePageInfo
);
public
List
<
GroupChatDataDTO
>
list
(
ChatDataSearchQDTO
qdto
);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatDataServiceImpl.java
View file @
0ed3d8c0
...
...
@@ -14,11 +14,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.BasePageInfo
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.DateUtil
;
import
com.gic.commons.util.UniqueIdUtils
;
import
com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO
;
import
com.gic.haoban.manage.api.dto.chat.GroupChatDataDTO
;
import
com.gic.haoban.manage.api.dto.chat.GroupChatOwnerDTO
;
import
com.gic.haoban.manage.api.dto.qdto.chat.ChatDataSearchQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO
;
import
com.gic.haoban.manage.service.config.Config
;
import
com.gic.haoban.manage.service.dao.mapper.chat.GroupChatDataMapper
;
...
...
@@ -46,6 +50,17 @@ public class GroupChatDataServiceImpl implements GroupChatDataService {
@Autowired
private
GroupChatDataMapper
groupChatDataMapper
;
@Override
public
List
<
GroupChatDataDTO
>
list
(
ChatDataSearchQDTO
qdto
)
{
return
null
;
}
@Override
public
Page
<
GroupChatDataDTO
>
listPage
(
ChatDataSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
return
null
;
}
@Override
public
void
chatDataTimer
(
String
params
)
{
t
(
"f5f8c78e395e4ca1a493707316096097"
);
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatApiServiceImpl.java
View file @
0ed3d8c0
...
...
@@ -49,16 +49,35 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
@Autowired
private
WxEnterpriseRelatedService
wxEnterpriseRelatedService
;
@Autowired
private
StaffClerkRelationService
staffClerkRelationService
;
private
StaffClerkRelationService
staffClerkRelationService
;
@Override
public
ServiceResponse
<
Page
<
GroupChatDTO
>>
listPage
(
GroupChatSearchQDTO
qdto
,
BasePageInfo
basePageInfo
)
{
String
sortColumn
=
qdto
.
getSortColumn
();
if
(
StringUtils
.
isBlank
(
sortColumn
))
{
sortColumn
=
null
;
}
else
if
(
"totalCount"
.
equals
(
sortColumn
))
{
sortColumn
=
"total_count"
;
}
else
if
(
"totalMemberCount"
.
equals
(
sortColumn
))
{
sortColumn
=
"total_member_count"
;
}
else
if
(
"addMemberCount"
.
equals
(
sortColumn
))
{
sortColumn
=
"add_member_count"
;
}
else
if
(
"addCount"
.
equals
(
sortColumn
))
{
sortColumn
=
"add_count"
;
}
else
if
(
"quitCount"
.
equals
(
sortColumn
))
{
sortColumn
=
"quit_count"
;
}
else
if
(
"quitMemberCount"
.
equals
(
sortColumn
))
{
sortColumn
=
"quit_member_count"
;
}
Page
<
GroupChatBO
>
page
=
this
.
groupChatService
.
listPage
(
qdto
,
basePageInfo
);
Page
<
GroupChatDTO
>
resultPage
=
PageHelperUtils
.
changePageToCurrentPage
(
page
,
GroupChatDTO
.
class
);
List
<
GroupChatDTO
>
dtoList
=
resultPage
.
getResult
()
;
if
(
CollectionUtils
.
isNotEmpty
(
dtoList
))
{
List
<
String
>
staffIdList
=
dtoList
.
stream
().
filter
(
dto
->
StringUtils
.
isNotBlank
(
dto
.
getStaffId
())).
map
(
dto
->
dto
.
getStaffId
()).
collect
(
Collectors
.
toList
())
;
List
<
String
>
relationIdList
=
this
.
staffClerkRelationService
.
listRelationsStaffId
(
new
HashSet
<>(
staffIdList
));
List
<
GroupChatDTO
>
dtoList
=
resultPage
.
getResult
();
// 处理关联状态
if
(
CollectionUtils
.
isNotEmpty
(
dtoList
)
&&
qdto
.
getStatus
()
==
1
)
{
List
<
String
>
staffIdList
=
dtoList
.
stream
().
filter
(
dto
->
StringUtils
.
isNotBlank
(
dto
.
getStaffId
()))
.
map
(
dto
->
dto
.
getStaffId
()).
collect
(
Collectors
.
toList
());
List
<
String
>
relationIdList
=
this
.
staffClerkRelationService
.
listRelationsStaffId
(
new
HashSet
<>(
staffIdList
));
dtoList
.
forEach
(
one
->
{
one
.
setClerkRelationFlag
(
relationIdList
.
contains
(
one
.
getStaffId
())
?
1
:
0
);
});
...
...
@@ -141,13 +160,13 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
this
.
groupChatService
.
transfer
(
wxEnterpriseId
,
staffId
,
groupChatIdList
);
return
ServiceResponse
.
success
();
}
@Override
public
ServiceResponse
<
Boolean
>
getSetGicFlag
(
String
wxEnterpriseId
)
{
List
<
TabHaobanWxEnterpriseRelated
>
list
=
this
.
wxEnterpriseRelatedService
.
getByWxEnterpriseId
(
wxEnterpriseId
)
;
if
(
CollectionUtils
.
isNotEmpty
(
list
)
&&
list
.
size
()==
1
)
{
return
ServiceResponse
.
success
(
Boolean
.
TRUE
)
;
List
<
TabHaobanWxEnterpriseRelated
>
list
=
this
.
wxEnterpriseRelatedService
.
getByWxEnterpriseId
(
wxEnterpriseId
);
if
(
CollectionUtils
.
isNotEmpty
(
list
)
&&
list
.
size
()
==
1
)
{
return
ServiceResponse
.
success
(
Boolean
.
TRUE
);
}
return
ServiceResponse
.
success
(
Boolean
.
FALSE
)
;
return
ServiceResponse
.
success
(
Boolean
.
FALSE
);
}
}
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatHmMapper.xml
View file @
0ed3d8c0
...
...
@@ -24,6 +24,7 @@
<result
column=
"update_time"
property=
"updateTime"
/>
<result
column=
"chat_count"
property=
"chatCount"
/>
<result
column=
"link_count"
property=
"linkCount"
/>
<result
column=
"status_flag"
property=
"statusFlag"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
chat_hm_id,
...
...
@@ -45,7 +46,7 @@
create_time,
update_time,
chat_count,
link_count
link_count
, status_flag
</sql>
<!-- ===================== 新增 ======================== -->
<insert
id=
"insert"
...
...
@@ -71,12 +72,12 @@
create_time,
update_time,
chat_count,
link_count
link_count
, status_flag
)VALUES(
#{chatHmId
,jdbcType=BIGINT
},
#{chatHmId},
#{chatHmCode},
#{wxEnterpriseId
,jdbcType=CHAR
},
#{enterpriseId
,jdbcType=CHAR
},
#{wxEnterpriseId},
#{enterpriseId},
#{name},
#{remark},
#{autoCreateRoom},
...
...
@@ -89,17 +90,19 @@
#{modifierId},
#{modifierName},
#{deleteFlag},
#{createTime
,jdbcType=TIMESTAMP
},
#{updateTime
,jdbcType=TIMESTAMP
},
#{createTime},
#{updateTime},
#{chatCount},
0
0
, 1
)
]]>
</insert>
<!-- =====================删除==================== -->
<update
id=
"deleteById"
parameterType=
"long"
>
UPDATE tab_haoban_group_chat_hm SET delete_flag = 1 WHERE chat_hm_id = #{chatHmId}
UPDATE
tab_haoban_group_chat_hm SET delete_flag = 1 WHERE chat_hm_id =
#{chatHmId}
</update>
...
...
@@ -122,19 +125,26 @@
</update>
<!-- ============ 查询============= -->
<select
id=
"selectById"
parameterType=
"long"
resultMap=
"result-map-tabHaobanGroupChatHm"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM tab_haoban_group_chat_hm WHERE chat_hm_id = #{chatHmId} and delete_flag = 0
<select
id=
"selectById"
parameterType=
"long"
resultMap=
"result-map-tabHaobanGroupChatHm"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM tab_haoban_group_chat_hm WHERE chat_hm_id = #{chatHmId} and
delete_flag = 0
</select>
<select
id=
"list"
resultMap=
"result-map-tabHaobanGroupChatHm"
>
<select
id=
"list"
resultMap=
"result-map-tabHaobanGroupChatHm"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM tab_haoban_group_chat_hm WHERE
wx_enterprise_id =#{wxEnterpriseId} and enterprise_id=#{enterpriseId}
and delete_flag = 0
<include
refid=
"Base_Column_List"
/>
FROM tab_haoban_group_chat_hm WHERE wx_enterprise_id =#{wxEnterpriseId} and enterprise_id=#{enterpriseId}
and delete_flag = 0
<if
test=
"null != startDate"
>
and create_time >= #{startDate} and create_time
<![CDATA[<=]]>
#{endDate}
</if>
<if
test=
"null != searchParams"
>
and plan like '%${searchParams}%'
</if>
</select>
</mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatMapper.xml
View file @
0ed3d8c0
...
...
@@ -177,8 +177,9 @@
group by wx_enterprise_id , staff_id
</select>
<select
id=
"list"
resultMap=
"result-map-tabHaobanGroupChat"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_group_chat where wx_enterprise_id=#{wxEnterpriseId} and delete_flag = 0
<select
id=
"list"
resultMap=
"result-map-tabHaobanGroupChat"
parameterType=
"com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_group_chat where wx_enterprise_id=#{wxEnterpriseId}
and (enterpries_id = #{enterpriseId} or enterprise_id is null)
<if
test=
"null != staffId"
>
and staff_id = #{staffId}
</if>
...
...
@@ -194,6 +195,34 @@
<if
test=
"null != status and 4==status"
>
and chat_status = 4
</if>
<if
test=
"null != searchParams"
>
and name like '%${searchParams}%'
</if>
<if
test=
"null != staffIdList and staffIdList.size>0"
>
and staff_id in
<foreach
collection=
"staffIdList"
close=
")"
index=
"index"
item=
"staffId"
open=
"("
separator=
","
>
#{staffId}
</foreach>
</if>
<if
test=
"null != startDate"
>
and chat_add_time
<![CDATA[ >=]]>
#{startDate} and chat_add_time
<![CDATA[ <= ]]>
#{endDate}
</if>
<if
test=
"null != dismissStartDate"
>
and chat_dissolve_time
<![CDATA[ >=]]>
#{startDate} and chat_dissolve_time
<![CDATA[ <= ]]>
#{endDate}
</if>
<if
test=
"null != gicFlag and gicFlag ==0 "
>
and gic_flag = 0
</if>
<if
test=
"null = gicFlag or gicFlag ==1 "
>
and gic_flag = 1
</if>
and delete_flag = 0
<if
test=
"null == sortColumn"
>
order by chat_add_time desc
</if>
<if
test=
"null != sortColumn"
>
order by #{sortColumn} #{sortType}
</if>
</select>
<update
id=
"updateChatEnterpriseId"
>
...
...
haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanMapper.xml
View file @
0ed3d8c0
...
...
@@ -137,6 +137,22 @@
<select
id=
"list"
parameterType=
"com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO"
resultMap=
"result-map-tabHaobanGroupChatPlan"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_group_chat_plan
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_group_chat_plan where wx_enterprise_id =#{wxEnterpriseId}
and enterprise_id = #{enterpriseId} and delete_flag = 0
<if
test=
"null != status and status==1"
>
and start_time
<![CDATA[<= ]]>
now() and end_time >= now()
</if>
<if
test=
"null != status and status==2"
>
and start_time > now()
</if>
<if
test=
"null != status and status==3"
>
and end_time
<![CDATA[<]]>
now()
</if>
<if
test=
"null != searchParams"
>
and name like '%#{searchParams}%'
</if>
<if
test=
"null != startDate"
>
and create_time
<![CDATA[>=]]>
#{startDate} and create_time
<![CDATA[<=]]>
#{endDate}
</if>
</select>
</mapper>
\ No newline at end of file
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