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
e99de4de
Commit
e99de4de
authored
Dec 13, 2021
by
guiq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: [1006247] 【优化】未开启小睿流程时:支持顶部模块修改透明度
parent
fa0694a5
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
6 deletions
+32
-6
ResourcePageDTO.java
.../main/java/com/pcloud/book/group/dto/ResourcePageDTO.java
+4
-0
ResourcePageBizImpl.java
...a/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
+4
-0
ResourcePage.java
.../main/java/com/pcloud/book/group/entity/ResourcePage.java
+4
-0
ResourcePageVO.java
...rc/main/java/com/pcloud/book/group/vo/ResourcePageVO.java
+4
-0
UpdateResourcePageVO.java
...n/java/com/pcloud/book/group/vo/UpdateResourcePageVO.java
+4
-1
ResourcePageDao.xml
...-book/src/main/resources/mapper/group/ResourcePageDao.xml
+12
-5
No files found.
pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/ResourcePageDTO.java
View file @
e99de4de
...
@@ -74,4 +74,8 @@ public class ResourcePageDTO extends BaseDto {
...
@@ -74,4 +74,8 @@ public class ResourcePageDTO extends BaseDto {
@ApiModelProperty
(
"RAYS码落地页类型1本书服务2企微"
)
@ApiModelProperty
(
"RAYS码落地页类型1本书服务2企微"
)
private
Integer
landingPageType
;
private
Integer
landingPageType
;
/**
* 透明度
*/
private
Integer
transparency
;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
View file @
e99de4de
...
@@ -369,6 +369,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
...
@@ -369,6 +369,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePage
.
setFontColor
(
updateResourcePageVO
.
getFontColor
());
resourcePage
.
setFontColor
(
updateResourcePageVO
.
getFontColor
());
resourcePage
.
setWatermark
(
updateResourcePageVO
.
getWatermark
());
resourcePage
.
setWatermark
(
updateResourcePageVO
.
getWatermark
());
resourcePage
.
setWatermarkStyle
(
updateResourcePageVO
.
getWatermarkStyle
());
resourcePage
.
setWatermarkStyle
(
updateResourcePageVO
.
getWatermarkStyle
());
resourcePage
.
setTransparency
(
updateResourcePageVO
.
getTransparency
());
resourcePageDao
.
update
(
resourcePage
);
resourcePageDao
.
update
(
resourcePage
);
}
}
if
(
updateResourcePageVO
.
getOpenRays
()
==
1
)
{
if
(
updateResourcePageVO
.
getOpenRays
()
==
1
)
{
...
@@ -439,6 +440,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
...
@@ -439,6 +440,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePage
.
setFontColor
(
updateResourcePageVO
.
getFontColor
());
resourcePage
.
setFontColor
(
updateResourcePageVO
.
getFontColor
());
resourcePage
.
setWatermark
(
updateResourcePageVO
.
getWatermark
());
resourcePage
.
setWatermark
(
updateResourcePageVO
.
getWatermark
());
resourcePage
.
setWatermarkStyle
(
updateResourcePageVO
.
getWatermarkStyle
());
resourcePage
.
setWatermarkStyle
(
updateResourcePageVO
.
getWatermarkStyle
());
resourcePage
.
setTransparency
(
updateResourcePageVO
.
getTransparency
());
resourcePageDao
.
update
(
resourcePage
);
resourcePageDao
.
update
(
resourcePage
);
}
}
if
(
updateResourcePageVO
.
getOpenRays
()
==
1
)
{
if
(
updateResourcePageVO
.
getOpenRays
()
==
1
)
{
...
@@ -1770,6 +1772,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
...
@@ -1770,6 +1772,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageVO
.
setWatermark
(
resourcePage
.
getWatermark
());
resourcePageVO
.
setWatermark
(
resourcePage
.
getWatermark
());
resourcePageVO
.
setWatermarkStyle
(
resourcePage
.
getWatermarkStyle
());
resourcePageVO
.
setWatermarkStyle
(
resourcePage
.
getWatermarkStyle
());
resourcePageVO
.
setLandingPageType
(
resourcePage
.
getLandingPageType
());
resourcePageVO
.
setLandingPageType
(
resourcePage
.
getLandingPageType
());
resourcePageVO
.
setTransparency
(
resourcePage
.
getTransparency
());
}
}
return
resourcePageVO
;
return
resourcePageVO
;
}
}
...
@@ -1823,6 +1826,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
...
@@ -1823,6 +1826,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageVO
.
setWatermark
(
resourcePage
.
getWatermark
());
resourcePageVO
.
setWatermark
(
resourcePage
.
getWatermark
());
resourcePageVO
.
setWatermarkStyle
(
resourcePage
.
getWatermarkStyle
());
resourcePageVO
.
setWatermarkStyle
(
resourcePage
.
getWatermarkStyle
());
resourcePageVO
.
setLandingPageType
(
resourcePage
.
getLandingPageType
());
resourcePageVO
.
setLandingPageType
(
resourcePage
.
getLandingPageType
());
resourcePageVO
.
setTransparency
(
resourcePage
.
getTransparency
());
}
}
return
resourcePageVO
;
return
resourcePageVO
;
}
}
...
...
pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePage.java
View file @
e99de4de
...
@@ -91,4 +91,8 @@ public class ResourcePage extends BaseEntity {
...
@@ -91,4 +91,8 @@ public class ResourcePage extends BaseEntity {
@ApiModelProperty
(
"RAYS码落地页类型1本书服务2企微"
)
@ApiModelProperty
(
"RAYS码落地页类型1本书服务2企微"
)
private
Integer
landingPageType
;
private
Integer
landingPageType
;
/**
* 透明度
*/
private
Integer
transparency
;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageVO.java
View file @
e99de4de
...
@@ -124,4 +124,8 @@ public class ResourcePageVO extends BaseDto {
...
@@ -124,4 +124,8 @@ public class ResourcePageVO extends BaseDto {
private
Integer
landingPageType
;
private
Integer
landingPageType
;
@ApiModelProperty
(
"企业微信落地页信息"
)
@ApiModelProperty
(
"企业微信落地页信息"
)
private
WxworkPageVO
wxworkPageVO
;
private
WxworkPageVO
wxworkPageVO
;
/**
* 透明度
*/
private
Integer
transparency
;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/UpdateResourcePageVO.java
View file @
e99de4de
...
@@ -81,5 +81,8 @@ public class UpdateResourcePageVO {
...
@@ -81,5 +81,8 @@ public class UpdateResourcePageVO {
@ApiModelProperty
(
"RAYS码落地页类型1本书服务2企微"
)
@ApiModelProperty
(
"RAYS码落地页类型1本书服务2企微"
)
private
Integer
landingPageType
;
private
Integer
landingPageType
;
/**
* 透明度 非小睿码生效
*/
private
Integer
transparency
;
}
}
pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml
View file @
e99de4de
...
@@ -25,11 +25,13 @@
...
@@ -25,11 +25,13 @@
<result
property=
"watermark"
column=
"watermark"
jdbcType=
"VARCHAR"
/>
<result
property=
"watermark"
column=
"watermark"
jdbcType=
"VARCHAR"
/>
<result
property=
"watermarkStyle"
column=
"watermark_style"
jdbcType=
"TINYINT"
/>
<result
property=
"watermarkStyle"
column=
"watermark_style"
jdbcType=
"TINYINT"
/>
<result
property=
"landingPageType"
column=
"landing_page_type"
jdbcType=
"INTEGER"
/>
<result
property=
"landingPageType"
column=
"landing_page_type"
jdbcType=
"INTEGER"
/>
<result
property=
"transparency"
column=
"transparency"
jdbcType=
"INTEGER"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id, book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user, qrcode_url, scene_id, official_scene_id,
id, book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user, qrcode_url, scene_id, official_scene_id,
book_cover, book_id, channel_id, background_img, navigation_color, navigation_format, font_color,watermark, watermark_style, landing_page_type
book_cover, book_id, channel_id, background_img, navigation_color, navigation_format, font_color,watermark, watermark_style, landing_page_type
,transparency
</sql>
</sql>
<!--查询单个-->
<!--查询单个-->
...
@@ -44,9 +46,9 @@
...
@@ -44,9 +46,9 @@
<!--新增所有列-->
<!--新增所有列-->
<insert
id=
"insert"
keyProperty=
"id"
useGeneratedKeys=
"true"
>
<insert
id=
"insert"
keyProperty=
"id"
useGeneratedKeys=
"true"
>
insert into book.resource_page(book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user,
insert into book.resource_page(book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user,
qrcode_url, scene_id, book_cover, book_id, channel_id, background_img, font_color, watermark, watermark_style, landing_page_type)
qrcode_url, scene_id, book_cover, book_id, channel_id, background_img, font_color, watermark, watermark_style, landing_page_type
, transparency
)
values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, IFNULL(#{openFood},0), now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover},
values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, IFNULL(#{openFood},0), now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover},
#{bookId}, #{channelId}, #{backgroundImg}, #{fontColor}, #{watermark}, #{watermarkStyle}, IFNULL(#{landingPageType},1))
#{bookId}, #{channelId}, #{backgroundImg}, #{fontColor}, #{watermark}, #{watermarkStyle}, IFNULL(#{landingPageType},1)
, IFNULL(#{transparency},0)
)
</insert>
</insert>
<!--通过主键修改数据-->
<!--通过主键修改数据-->
...
@@ -89,6 +91,9 @@
...
@@ -89,6 +91,9 @@
<if
test=
"landingPageType != null"
>
<if
test=
"landingPageType != null"
>
landing_page_type = #{landingPageType},
landing_page_type = #{landingPageType},
</if>
</if>
<if
test=
"transparency != null"
>
transparency = #{transparency},
</if>
</set>
</set>
where id = #{id}
where id = #{id}
</update>
</update>
...
@@ -119,7 +124,8 @@
...
@@ -119,7 +124,8 @@
p.background_img,
p.background_img,
p.navigation_color,
p.navigation_color,
p.navigation_format,
p.navigation_format,
p.font_color
p.font_color,
p.transparency
FROM
FROM
resource_page p
resource_page p
LEFT JOIN resource_page_item i ON p.id = i.resource_page_id
LEFT JOIN resource_page_item i ON p.id = i.resource_page_id
...
@@ -156,7 +162,7 @@
...
@@ -156,7 +162,7 @@
<select
id=
"getPageByOfficialScene"
parameterType=
"long"
resultMap=
"ResourcePageMap"
>
<select
id=
"getPageByOfficialScene"
parameterType=
"long"
resultMap=
"ResourcePageMap"
>
select
select
id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, scene_id, official_scene_id, book_cover
id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, scene_id, official_scene_id, book_cover
,transparency
from book.resource_page
from book.resource_page
where official_scene_id = #{officialSceneId}
where official_scene_id = #{officialSceneId}
limit 1
limit 1
...
@@ -197,7 +203,8 @@
...
@@ -197,7 +203,8 @@
p.qrcode_url,
p.qrcode_url,
p.scene_id,
p.scene_id,
p.book_cover,
p.book_cover,
p.official_scene_id
p.official_scene_id,
p.transparency
FROM
FROM
resource_page_column c
resource_page_column c
LEFT JOIN resource_page p ON c.resource_page_id = p.id
LEFT JOIN resource_page p ON c.resource_page_id = p.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