Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
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
徐少华
midjourney-proxy
Commits
56b7a37b
Commit
56b7a37b
authored
Sep 27, 2020
by
郑永强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: [1003657] ERP新增样书拍照数据导出功能
parent
678e80bc
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
97 additions
and
0 deletions
+97
-0
BookGroupBiz.java
...src/main/java/com/pcloud/book/group/biz/BookGroupBiz.java
+4
-0
BookGroupBizImpl.java
...java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
+24
-0
BookGroupDao.java
...src/main/java/com/pcloud/book/group/dao/BookGroupDao.java
+2
-0
BookGroupDaoImpl.java
...java/com/pcloud/book/group/dao/impl/BookGroupDaoImpl.java
+9
-0
BookGroupDTO.java
...src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java
+22
-0
BookGroupFacade.java
...in/java/com/pcloud/book/group/facade/BookGroupFacade.java
+5
-0
BookGroupFacadeImpl.java
...om/pcloud/book/group/facade/impl/BookGroupFacadeImpl.java
+9
-0
BookGroupMapper.xml
...-book/src/main/resources/mapper/group/BookGroupMapper.xml
+22
-0
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupBiz.java
View file @
56b7a37b
...
...
@@ -57,11 +57,13 @@ import com.pcloud.book.group.vo.UserBookInfoVO;
import
com.pcloud.book.group.vo.WxGroupStatisticVO
;
import
com.pcloud.book.keywords.vo.ListKeywordVO
;
import
com.pcloud.book.skill.entity.PcloudGroupActivity
;
import
com.pcloud.common.dto.ResponseDto
;
import
com.pcloud.common.dto.StoreFlowInfoDto
;
import
com.pcloud.common.exceptions.BizException
;
import
com.pcloud.common.page.PageBean
;
import
com.pcloud.common.page.PageBeanNew
;
import
com.pcloud.common.page.PageParam
;
import
com.pcloud.wechatgroup.group.dto.GroupUserCountDTO
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.util.List
;
...
...
@@ -968,4 +970,6 @@ public interface BookGroupBiz {
* * @param null
*/
BookGroupDTO
getRayBookByBookGroupId
(
Long
bookGroupId
);
List
<
BookGroupDTO
>
getBookGroupsByBookIds
(
List
<
Long
>
bookIds
,
List
<
Long
>
adviserIds
,
List
<
Long
>
channelIds
);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
View file @
56b7a37b
...
...
@@ -5817,4 +5817,28 @@ public class BookGroupBizImpl implements BookGroupBiz {
return
list
.
get
(
new
Random
().
nextInt
(
list
.
size
()));
}
}
@Override
public
List
<
BookGroupDTO
>
getBookGroupsByBookIds
(
List
<
Long
>
bookIds
,
List
<
Long
>
adviserIds
,
List
<
Long
>
channelIds
)
{
if
(
CollectionUtils
.
isEmpty
(
bookIds
)){
return
new
ArrayList
<>();
}
List
<
BookGroupDTO
>
bookGroupDTOList
=
bookGroupDao
.
getDTOByBookIds
(
bookIds
,
adviserIds
,
channelIds
);
if
(
CollectionUtils
.
isEmpty
(
bookGroupDTOList
)){
return
new
ArrayList
<>();
}
List
<
Long
>
bookGroupIds
=
bookGroupDTOList
.
stream
().
map
(
x
->
x
.
getId
()).
collect
(
Collectors
.
toList
());
Map
<
Long
,
GroupUserCountDTO
>
groupUserCountDTOMap
=
wechatGroupConsr
.
getScanCountByGroup
(
bookGroupIds
,
null
);
if
(
MapUtils
.
isEmpty
(
groupUserCountDTOMap
)){
return
new
ArrayList
<>();
}
for
(
BookGroupDTO
bookGroupDTO
:
bookGroupDTOList
)
{
GroupUserCountDTO
groupUserCountDTO
=
groupUserCountDTOMap
.
get
(
bookGroupDTO
.
getId
());
bookGroupDTO
.
setScanCount
(
groupUserCountDTO
==
null
?
0
:
groupUserCountDTO
.
getCount
());
bookGroupDTO
.
setUserCount
(
groupUserCountDTO
==
null
?
0
:
groupUserCountDTO
.
getUserCount
());
}
return
bookGroupDTOList
;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupDao.java
View file @
56b7a37b
...
...
@@ -59,6 +59,8 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
List
<
BookGroupDTO
>
getDTOByBookIdsAdviserIdsChannelIds
(
List
<
Long
>
bookIds
,
List
<
Long
>
adviserIds
,
List
<
Long
>
channelIds
);
List
<
BookGroupDTO
>
getDTOByBookIds
(
List
<
Long
>
bookIds
,
List
<
Long
>
adviserIds
,
List
<
Long
>
channelIds
);
/**
* 根据书刊ID删除
* @param bookId 书刊ID
...
...
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/BookGroupDaoImpl.java
View file @
56b7a37b
...
...
@@ -79,6 +79,15 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
return
super
.
getSqlSession
().
selectList
(
getStatement
(
"getDTOByBookIdsAdviserIdsChannelIds"
),
paramMap
);
}
@Override
public
List
<
BookGroupDTO
>
getDTOByBookIds
(
List
<
Long
>
bookIds
,
List
<
Long
>
adviserIds
,
List
<
Long
>
channelIds
)
{
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<>();
paramMap
.
put
(
"bookIds"
,
bookIds
);
paramMap
.
put
(
"adviserIds"
,
adviserIds
);
paramMap
.
put
(
"channelIds"
,
channelIds
);
return
super
.
getSqlSession
().
selectList
(
getStatement
(
"getDTOByBookIds"
),
paramMap
);
}
/**
* 根据书刊ID删除
*/
...
...
pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java
View file @
56b7a37b
...
...
@@ -293,6 +293,28 @@ public class BookGroupDTO extends BaseDto {
*/
private
String
qrcodeType
;
// 浏览量、扫码量
private
Integer
scanCount
;
// 读者量、扫码人数
private
Integer
userCount
;
public
Integer
getScanCount
()
{
return
scanCount
;
}
public
void
setScanCount
(
Integer
scanCount
)
{
this
.
scanCount
=
scanCount
;
}
public
Integer
getUserCount
()
{
return
userCount
;
}
public
void
setUserCount
(
Integer
userCount
)
{
this
.
userCount
=
userCount
;
}
public
String
getQrcodeType
()
{
return
qrcodeType
;
}
...
...
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupFacade.java
View file @
56b7a37b
package
com
.
pcloud
.
book
.
group
.
facade
;
import
com.pcloud.book.book.dto.MapResourceTotalCountDTO
;
import
com.pcloud.book.group.dto.BookAppletSceneDTO
;
import
com.pcloud.book.group.dto.BookGroupDTO
;
import
com.pcloud.book.group.dto.ChangeQrCodeTypeDto
;
...
...
@@ -790,4 +791,8 @@ public interface BookGroupFacade {
@ApiOperation
(
"根据bookgroupId查小睿书"
)
@GetMapping
(
"getRayBookByBookGroupId"
)
ResponseDto
<?>
getRayBookByBookGroupId
(
@RequestParam
(
"bookGroupId"
)
Long
bookGroupId
);
@RequestMapping
(
value
=
"getBookGroupsByBookIds"
,
method
=
RequestMethod
.
POST
)
ResponseDto
<?>
getBookGroupsByBookIds
(
@RequestBody
MapResourceTotalCountDTO
requestDTO
)
throws
BizException
,
PermissionException
;
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupFacadeImpl.java
View file @
56b7a37b
package
com
.
pcloud
.
book
.
group
.
facade
.
impl
;
import
com.pcloud.book.base.exception.BookBizException
;
import
com.pcloud.book.book.dto.MapResourceTotalCountDTO
;
import
com.pcloud.book.group.biz.BookGroupBiz
;
import
com.pcloud.book.group.biz.BookGroupClassifyBiz
;
import
com.pcloud.book.group.dao.BookGroupDao
;
...
...
@@ -52,6 +53,7 @@ import lombok.SneakyThrows;
import
lombok.extern.slf4j.Slf4j
;
import
org.codehaus.jackson.JsonParseException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.CookieValue
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
...
@@ -1296,4 +1298,11 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
public
ResponseDto
<?>
getRayBookByBookGroupId
(
@RequestParam
(
"bookGroupId"
)
Long
bookGroupId
){
return
new
ResponseDto
<>(
bookGroupBiz
.
getRayBookByBookGroupId
(
bookGroupId
));
}
@Override
public
ResponseDto
<?>
getBookGroupsByBookIds
(
@RequestBody
MapResourceTotalCountDTO
requestDTO
)
throws
BizException
,
PermissionException
{
if
(
CollectionUtils
.
isEmpty
(
requestDTO
.
getBookIds
())){
return
new
ResponseDto
<>(
new
ArrayList
<>());
}
return
new
ResponseDto
<>(
bookGroupBiz
.
getBookGroupsByBookIds
(
requestDTO
.
getBookIds
(),
requestDTO
.
getAdviserIds
(),
requestDTO
.
getChannelIds
()));
}
}
pcloud-service-book/src/main/resources/mapper/group/BookGroupMapper.xml
View file @
56b7a37b
...
...
@@ -162,6 +162,28 @@
</foreach>
</select>
<select
id=
"getDTOByBookIds"
resultMap=
"BookGroupDTO"
parameterType=
"map"
>
select
<include
refid=
"Base_Column_List"
/>
from book_group
where book_id in
<foreach
collection=
"bookIds"
open=
"("
close=
")"
item=
"item"
separator=
","
>
${item}
</foreach>
<if
test=
"adviserIds != null and adviserIds.size()>0"
>
and create_user in
<foreach
collection=
"adviserIds"
open=
"("
close=
")"
item=
"item"
separator=
","
>
${item}
</foreach>
</if>
<if
test=
"channelIds != null and channelIds.size()>0"
>
and channel_id in
<foreach
collection=
"channelIds"
open=
"("
close=
")"
item=
"item"
separator=
","
>
${item}
</foreach>
</if>
</select>
<select
id=
"getBookGroupCount"
resultType=
"Integer"
parameterType=
"Long"
>
SELECT
COUNT(DISTINCT G.id)
...
...
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