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
12d5d65b
Commit
12d5d65b
authored
Aug 19, 2020
by
吴博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 【1003414】 优化学舍页面修改为我的社群
parent
d4ef8c23
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
11 deletions
+10
-11
BookGroupClassifyBizImpl.java
.../pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
+2
-3
PcloudGroupActivityBizImpl.java
...cloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java
+5
-6
GroupUpdateTypeEnum.java
...java/com/pcloud/book/skill/enums/GroupUpdateTypeEnum.java
+3
-2
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
View file @
12d5d65b
...
@@ -103,7 +103,7 @@ import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
...
@@ -103,7 +103,7 @@ import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
import
com.pcloud.book.skill.dao.PcloudGroupActivityDao
;
import
com.pcloud.book.skill.dao.PcloudGroupActivityDao
;
import
com.pcloud.book.skill.dto.GroupActivity4AppletDTO
;
import
com.pcloud.book.skill.dto.GroupActivity4AppletDTO
;
import
com.pcloud.book.skill.enums.ActivityGroupTypeEnum
;
import
com.pcloud.book.skill.enums.ActivityGroupTypeEnum
;
import
com.pcloud.book.skill.enums.UpdateTypeEnum
;
import
com.pcloud.book.skill.enums.
Group
UpdateTypeEnum
;
import
com.pcloud.book.util.common.ThreadPoolUtils
;
import
com.pcloud.book.util.common.ThreadPoolUtils
;
import
com.pcloud.book.util.properties.BookProps
;
import
com.pcloud.book.util.properties.BookProps
;
import
com.pcloud.common.core.aspect.ParamLog
;
import
com.pcloud.common.core.aspect.ParamLog
;
...
@@ -143,7 +143,6 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -143,7 +143,6 @@ import org.springframework.transaction.annotation.Transactional;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.time.format.DateTimeFormatter
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -531,7 +530,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
...
@@ -531,7 +530,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
deleteSpecification
(
classifyDTO
.
getProductId
(),
classifyDTO
.
getChannelId
(),
classifyDTO
.
getProductSpecId
());
deleteSpecification
(
classifyDTO
.
getProductId
(),
classifyDTO
.
getChannelId
(),
classifyDTO
.
getProductSpecId
());
//发送topic
//发送topic
groupSet
.
sendGroupClassifyDeleteTopic
(
classifyId
);
groupSet
.
sendGroupClassifyDeleteTopic
(
classifyId
);
readerConsr
.
deleteGroupRecore
(
Lists
.
newArrayList
(
classifyId
),
ActivityGroupTypeEnum
.
NORMAL_GROUP
.
value
,
UpdateTypeEnum
.
DELETE
.
value
,
null
);
readerConsr
.
deleteGroupRecore
(
Lists
.
newArrayList
(
classifyId
),
ActivityGroupTypeEnum
.
NORMAL_GROUP
.
value
,
Group
UpdateTypeEnum
.
DELETE
.
value
,
null
);
}
}
@Override
@Override
...
...
pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java
View file @
12d5d65b
...
@@ -42,7 +42,7 @@ import com.pcloud.book.skill.entity.PcloudGroupActivity;
...
@@ -42,7 +42,7 @@ import com.pcloud.book.skill.entity.PcloudGroupActivity;
import
com.pcloud.book.skill.entity.PcloudSkill
;
import
com.pcloud.book.skill.entity.PcloudSkill
;
import
com.pcloud.book.skill.enums.ActivityGroupTypeEnum
;
import
com.pcloud.book.skill.enums.ActivityGroupTypeEnum
;
import
com.pcloud.book.skill.enums.SkillTypeEnum
;
import
com.pcloud.book.skill.enums.SkillTypeEnum
;
import
com.pcloud.book.skill.enums.UpdateTypeEnum
;
import
com.pcloud.book.skill.enums.
Group
UpdateTypeEnum
;
import
com.pcloud.book.skill.facade.request.GroupActivityClassifyVO
;
import
com.pcloud.book.skill.facade.request.GroupActivityClassifyVO
;
import
com.pcloud.book.skill.facade.request.GroupActivityShowStateVO
;
import
com.pcloud.book.skill.facade.request.GroupActivityShowStateVO
;
import
com.pcloud.book.skill.facade.request.SaveGroupActivityRequestVO
;
import
com.pcloud.book.skill.facade.request.SaveGroupActivityRequestVO
;
...
@@ -60,7 +60,6 @@ import com.pcloud.common.utils.httpclient.UrlUtils;
...
@@ -60,7 +60,6 @@ import com.pcloud.common.utils.httpclient.UrlUtils;
import
com.pcloud.common.utils.string.StringUtil
;
import
com.pcloud.common.utils.string.StringUtil
;
import
com.pcloud.common.utils.string.StringUtilParent
;
import
com.pcloud.common.utils.string.StringUtilParent
;
import
com.pcloud.readercenter.common.enums.YesOrNoNumEnum
;
import
com.pcloud.readercenter.common.enums.YesOrNoNumEnum
;
import
com.pcloud.usercenter.common.enums.GroupTypeEnum
;
import
com.pcloud.usercenter.party.adviser.service.AdviserService
;
import
com.pcloud.usercenter.party.adviser.service.AdviserService
;
import
com.pcloud.usercenter.party.agent.service.AgentService
;
import
com.pcloud.usercenter.party.agent.service.AgentService
;
import
com.sdk.wxgroup.RobotProcessTypeEnum
;
import
com.sdk.wxgroup.RobotProcessTypeEnum
;
...
@@ -156,7 +155,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
...
@@ -156,7 +155,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
@Override
@Override
public
void
batchUpdateShowState
(
GroupActivityShowStateVO
groupActivityShowStateVO
)
{
public
void
batchUpdateShowState
(
GroupActivityShowStateVO
groupActivityShowStateVO
)
{
pcloudGroupActivityDao
.
batchUpdateShowState
(
groupActivityShowStateVO
);
pcloudGroupActivityDao
.
batchUpdateShowState
(
groupActivityShowStateVO
);
readerConsr
.
deleteGroupRecore
(
groupActivityShowStateVO
.
getIds
(),
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
,
UpdateTypeEnum
.
UPDATE
.
value
,
groupActivityShowStateVO
.
getShowState
()
?
1
:
0
);
readerConsr
.
deleteGroupRecore
(
groupActivityShowStateVO
.
getIds
(),
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
,
Group
UpdateTypeEnum
.
UPDATE
.
value
,
groupActivityShowStateVO
.
getShowState
()
?
1
:
0
);
}
}
@ParamLog
(
"批量删除共读模板"
)
@ParamLog
(
"批量删除共读模板"
)
...
@@ -166,7 +165,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
...
@@ -166,7 +165,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
throw
new
BookBizException
(
BookBizException
.
PARAM_IS_ERROR
,
"参数有误!"
);
throw
new
BookBizException
(
BookBizException
.
PARAM_IS_ERROR
,
"参数有误!"
);
}
}
pcloudGroupActivityDao
.
deleteByIds
(
ids
);
pcloudGroupActivityDao
.
deleteByIds
(
ids
);
readerConsr
.
deleteGroupRecore
(
ids
,
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
,
UpdateTypeEnum
.
DELETE
.
value
,
null
);
readerConsr
.
deleteGroupRecore
(
ids
,
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
,
Group
UpdateTypeEnum
.
DELETE
.
value
,
null
);
}
}
...
@@ -234,7 +233,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
...
@@ -234,7 +233,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
throw
new
BookBizException
(
BookBizException
.
PARAM_IS_EXIST
,
"该共读活动已经关联技能,无法删除!"
);
throw
new
BookBizException
(
BookBizException
.
PARAM_IS_EXIST
,
"该共读活动已经关联技能,无法删除!"
);
}
}
pcloudGroupActivityDao
.
deleteById
(
id
);
pcloudGroupActivityDao
.
deleteById
(
id
);
readerConsr
.
deleteGroupRecore
(
Lists
.
newArrayList
(
id
),
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
,
UpdateTypeEnum
.
DELETE
.
value
,
null
);
readerConsr
.
deleteGroupRecore
(
Lists
.
newArrayList
(
id
),
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
,
Group
UpdateTypeEnum
.
DELETE
.
value
,
null
);
}
}
@Override
@Override
...
@@ -636,7 +635,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
...
@@ -636,7 +635,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
}
}
byId
.
setIsShow
(
showStateDTO
.
getIsShow
());
byId
.
setIsShow
(
showStateDTO
.
getIsShow
());
pcloudGroupActivityDao
.
updateByPrimaryKeySelective
(
byId
);
pcloudGroupActivityDao
.
updateByPrimaryKeySelective
(
byId
);
readerConsr
.
deleteGroupRecore
(
Lists
.
newArrayList
(
byId
.
getId
()),
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
,
UpdateTypeEnum
.
UPDATE
.
value
,
showStateDTO
.
getIsShow
());
readerConsr
.
deleteGroupRecore
(
Lists
.
newArrayList
(
byId
.
getId
()),
ActivityGroupTypeEnum
.
THIRD_GROUP
.
value
,
Group
UpdateTypeEnum
.
UPDATE
.
value
,
showStateDTO
.
getIsShow
());
}
}
@Override
@Override
...
...
pcloud-service-book/src/main/java/com/pcloud/book/skill/enums/UpdateTypeEnum.java
→
pcloud-service-book/src/main/java/com/pcloud/book/skill/enums/
Group
UpdateTypeEnum.java
View file @
12d5d65b
package
com
.
pcloud
.
book
.
skill
.
enums
;
package
com
.
pcloud
.
book
.
skill
.
enums
;
public
enum
UpdateTypeEnum
{
public
enum
Group
UpdateTypeEnum
{
DELETE
(
0
),
DELETE
(
0
),
UPDATE
(
1
);
UPDATE
(
1
);
public
final
Integer
value
;
public
final
Integer
value
;
UpdateTypeEnum
(
Integer
value
)
{
Group
UpdateTypeEnum
(
Integer
value
)
{
this
.
value
=
value
;
this
.
value
=
value
;
}
}
}
}
\ 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