Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cust-api
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
李伟
cust-api
Commits
20de9857
Commit
20de9857
authored
Jan 07, 2025
by
liwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拼path路径,改为直接查url
parent
6059d7c2
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
14 additions
and
86 deletions
+14
-86
CmsActivity.java
.../org/rcisoft/business/cmsActivity/entity/CmsActivity.java
+2
-1
CmsActivityServiceImpl.java
...ness/cmsActivity/service/impl/CmsActivityServiceImpl.java
+0
-8
CmsBanner.java
...java/org/rcisoft/business/cmsBanner/entity/CmsBanner.java
+1
-1
CmsBannerServiceImpl.java
...business/cmsBanner/service/impl/CmsBannerServiceImpl.java
+0
-8
CmsNotice.java
...java/org/rcisoft/business/cmsNotice/entity/CmsNotice.java
+2
-1
CmsNoticeServiceImpl.java
...business/cmsNotice/service/impl/CmsNoticeServiceImpl.java
+0
-8
OpmTopic.java
...n/java/org/rcisoft/business/opmTopic/entity/OpmTopic.java
+2
-44
OpmTopicServiceImpl.java
...t/business/opmTopic/service/impl/OpmTopicServiceImpl.java
+0
-8
CmsActivityMapper.xml
.../mapper/business/cmsActivity.mapper/CmsActivityMapper.xml
+3
-3
CmsNoticeMapper.xml
...rces/mapper/business/cmsNotice.mapper/CmsNoticeMapper.xml
+1
-1
CmsBannerMapper.xml
...rces/mapper/business/cmsbanner/mapper/CmsBannerMapper.xml
+2
-2
OpmTopicMapper.xml
...ources/mapper/business/opmTopic.mapper/OpmTopicMapper.xml
+1
-1
No files found.
src/main/java/org/rcisoft/business/cmsActivity/entity/CmsActivity.java
View file @
20de9857
...
...
@@ -260,8 +260,9 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
@TableField
(
exist
=
false
)
private
String
nickName
;
@TableField
(
exist
=
false
)
private
String
path
;
private
String
url
;
...
...
src/main/java/org/rcisoft/business/cmsActivity/service/impl/CmsActivityServiceImpl.java
View file @
20de9857
...
...
@@ -119,9 +119,6 @@ public class CmsActivityServiceImpl extends ServiceImpl<CmsActivityRepository, C
@Override
public
CmsActivity
findById
(
Integer
id
)
{
CmsActivity
cmsActivity
=
baseMapper
.
selectById
(
id
);
if
(
cmsActivity
.
getPath
()
!=
null
)
{
cmsActivity
.
setPath
(
global
.
getBase_Discovery
()
+
cmsActivity
.
getPath
());
}
return
cmsActivity
;
}
...
...
@@ -136,11 +133,6 @@ public class CmsActivityServiceImpl extends ServiceImpl<CmsActivityRepository, C
CmsActivity
cmsActivity
)
{
IPage
<
CmsActivity
>
cmsActivityIPage
=
baseMapper
.
queryCmsActivityPaged
(
paginationUtility
,
cmsActivity
);
List
<
CmsActivity
>
newsInformation
=
cmsActivityIPage
.
getRecords
();
for
(
CmsActivity
news
:
newsInformation
)
{
if
(
news
.
getPath
()
!=
null
)
{
news
.
setPath
(
global
.
getBase_Discovery
()
+
news
.
getPath
());
}
}
cmsActivityIPage
.
setRecords
(
newsInformation
);
return
cmsActivityIPage
;
...
...
src/main/java/org/rcisoft/business/cmsBanner/entity/CmsBanner.java
View file @
20de9857
...
...
@@ -51,7 +51,7 @@ public class CmsBanner extends CyIdIncreEntity<CmsBanner> {
* 图片地址
*/
@TableField
(
exist
=
false
)
private
String
path
;
private
String
url
;
}
...
...
src/main/java/org/rcisoft/business/cmsBanner/service/impl/CmsBannerServiceImpl.java
View file @
20de9857
...
...
@@ -94,9 +94,6 @@ public class CmsBannerServiceImpl extends ServiceImpl<CmsBannerRepository, CmsBa
@Override
public
CmsBanner
findById
(
String
id
){
CmsBanner
banner
=
baseMapper
.
selectByIdWithUrl
(
id
);
if
(
banner
.
getPath
()!=
null
){
banner
.
setPath
(
global
.
getBase_Discovery
()+
banner
.
getPath
());
}
return
banner
;
}
...
...
@@ -110,11 +107,6 @@ public class CmsBannerServiceImpl extends ServiceImpl<CmsBannerRepository, CmsBa
CmsBanner
cmsBanner
){
IPage
<
CmsBanner
>
result
=
baseMapper
.
queryCmsBannersPaged
(
paginationUtility
,
cmsBanner
);
List
<
CmsBanner
>
cmsBannerList
=
result
.
getRecords
();
for
(
CmsBanner
banner
:
cmsBannerList
){
if
(
banner
.
getPath
()!=
null
){
banner
.
setPath
(
global
.
getBase_Discovery
()+
banner
.
getPath
());
}
}
return
result
;
}
...
...
src/main/java/org/rcisoft/business/cmsNotice/entity/CmsNotice.java
View file @
20de9857
...
...
@@ -171,8 +171,9 @@ public class CmsNotice extends CyIdIncreEntity<CmsNotice> {
@TableField
(
exist
=
false
)
private
String
nickName
;
@TableField
(
exist
=
false
)
private
String
path
;
private
String
url
;
}
...
...
src/main/java/org/rcisoft/business/cmsNotice/service/impl/CmsNoticeServiceImpl.java
View file @
20de9857
...
...
@@ -104,9 +104,6 @@ public class CmsNoticeServiceImpl extends ServiceImpl<CmsNoticeRepository, CmsNo
@Override
public
CmsNotice
findById
(
Integer
id
)
{
CmsNotice
cmsNotice
=
baseMapper
.
selectById
(
id
);
if
(
cmsNotice
.
getPath
()
!=
null
)
{
cmsNotice
.
setPath
(
global
.
getBase_Discovery
()
+
cmsNotice
.
getPath
());
}
return
cmsNotice
;
}
...
...
@@ -121,11 +118,6 @@ public class CmsNoticeServiceImpl extends ServiceImpl<CmsNoticeRepository, CmsNo
CmsNotice
cmsNotice
)
{
IPage
<
CmsNotice
>
cmsNoticeIPage
=
baseMapper
.
queryCmsNoticePaged
(
paginationUtility
,
cmsNotice
);
List
<
CmsNotice
>
newsInformation
=
cmsNoticeIPage
.
getRecords
();
for
(
CmsNotice
news
:
newsInformation
)
{
if
(
news
.
getPath
()
!=
null
)
{
news
.
setPath
(
global
.
getBase_Discovery
()
+
news
.
getPath
());
}
}
cmsNoticeIPage
.
setRecords
(
newsInformation
);
return
cmsNoticeIPage
;
...
...
src/main/java/org/rcisoft/business/opmTopic/entity/OpmTopic.java
View file @
20de9857
...
...
@@ -20,44 +20,6 @@ import java.util.Date;
@TableName
(
"opm_topic"
)
public
class
OpmTopic
extends
CyIdIncreEntity
<
OpmTopic
>
{
/**
* @desc 创建人
* @column create_by
* @default
*/
// @Excel(name = "创建人")
// @TableField("create_by")
// private String createBy;
/**
* @desc 创建时间
* @column create_date
* @default
*/
// @Excel(name = "创建时间")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
// @TableField("create_date")
// private Date createDate;
/**
* @desc 更新人
* @column update_by
* @default
*/
// @Excel(name = "更新人")
// @TableField("update_by")
// private String updateBy;
/**
* @desc 更新时间
* @column update_date
* @default
*/
// @Excel(name = "更新时间")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
// @TableField("update_date")
// private Date updateDate;
/**
* @desc 备注
...
...
@@ -107,8 +69,6 @@ public class OpmTopic extends CyIdIncreEntity<OpmTopic> {
/**
* @desc 排序
* @column weight
...
...
@@ -127,9 +87,6 @@ public class OpmTopic extends CyIdIncreEntity<OpmTopic> {
private
Integer
articleCount
;
/**
* 开始时间
*/
...
...
@@ -146,8 +103,9 @@ public class OpmTopic extends CyIdIncreEntity<OpmTopic> {
@TableField
(
exist
=
false
)
private
String
nickName
;
@TableField
(
exist
=
false
)
private
String
path
;
private
String
url
;
}
...
...
src/main/java/org/rcisoft/business/opmTopic/service/impl/OpmTopicServiceImpl.java
View file @
20de9857
...
...
@@ -103,9 +103,6 @@ public class OpmTopicServiceImpl extends ServiceImpl<OpmTopicRepository, OpmTopi
@Override
public
OpmTopic
findById
(
Integer
id
)
{
OpmTopic
opmTopic
=
baseMapper
.
selectById
(
id
);
if
(
opmTopic
.
getPath
()
!=
null
)
{
opmTopic
.
setPath
(
global
.
getBase_Discovery
()
+
opmTopic
.
getPath
());
}
return
opmTopic
;
}
...
...
@@ -120,11 +117,6 @@ public class OpmTopicServiceImpl extends ServiceImpl<OpmTopicRepository, OpmTopi
OpmTopic
opmTopic
)
{
IPage
<
OpmTopic
>
opmTopicIPage
=
baseMapper
.
queryOpmTopicPaged
(
paginationUtility
,
opmTopic
);
List
<
OpmTopic
>
newsInformation
=
opmTopicIPage
.
getRecords
();
for
(
OpmTopic
news
:
newsInformation
)
{
if
(
news
.
getPath
()
!=
null
)
{
news
.
setPath
(
global
.
getBase_Discovery
()
+
news
.
getPath
());
}
}
opmTopicIPage
.
setRecords
(
newsInformation
);
return
opmTopicIPage
;
...
...
src/main/resources/mapper/business/cmsActivity.mapper/CmsActivityMapper.xml
View file @
20de9857
...
...
@@ -119,7 +119,7 @@
ca.summary,
ca.max_application_count,
su.nick_name as nickName,
oi.
path
oi.
url
FROM cms_activity ca
LEFT JOIN
(SELECT
...
...
@@ -207,8 +207,8 @@
</update>
<select
id=
"selectById"
resultMap=
"BaseResultMap"
parameterType=
"java.lang.Integer"
>
select ca.*,
oi.
path
from cms_activity ca
oi.
url
from cms_activity ca
left join oss_info oi on oi.business_id = ca.picture_id
where ca.business_id = #{businessId}
</select>
...
...
src/main/resources/mapper/business/cmsNotice.mapper/CmsNoticeMapper.xml
View file @
20de9857
...
...
@@ -82,7 +82,7 @@
cn.is_recommended,
cn.is_top,
su.nick_name as nickName,
oi.
path
oi.
url
FROM cms_notice cn
LEFT JOIN oss_info oi on cn.picture_id = oi.business_id
LEFT JOIN sys_user su on su.business_id = cn.create_by
...
...
src/main/resources/mapper/business/cmsbanner/mapper/CmsBannerMapper.xml
View file @
20de9857
...
...
@@ -42,7 +42,7 @@
</select>
<select
id=
"queryCmsBannersPaged"
resultMap=
"BaseResultMap"
>
select smb.*,oi.
path
from cms_banner smb
select smb.*,oi.
url
from cms_banner smb
left join oss_info oi on smb.picture_id = oi.business_id
where 1=1
and smb.del_flag = '0'
...
...
@@ -65,7 +65,7 @@
</select>
<select
id=
"selectByIdWithUrl"
resultType=
"org.rcisoft.business.cmsBanner.entity.CmsBanner"
>
SELECT smb.*,
oi.
path
oi.
url
FROM cms_banner smb
LEFT JOIN oss_info oi ON oi.business_id = smb.picture_id
where 1 = 1
...
...
src/main/resources/mapper/business/opmTopic.mapper/OpmTopicMapper.xml
View file @
20de9857
...
...
@@ -132,7 +132,7 @@
</update>
<select
id=
"selectById"
resultMap=
"BaseResultMap"
parameterType=
"java.lang.Integer"
>
select cn.*
from opm_topic cn
from opm_topic cn
where cn.business_id = #{businessId}
</select>
<select
id=
"checkWeight"
resultMap=
"BaseResultMap"
parameterType=
"java.lang.Integer"
>
...
...
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