记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
bdbf520a
Commit
bdbf520a
authored
Jul 29, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
banner
parent
b0d60088
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
69 additions
and
85 deletions
+69
-85
KylinRedisConst.java
...com/liquidnet/service/kylin/constant/KylinRedisConst.java
+4
-0
KylinBannersServiceImpl.java
.../zhengzai/kylin/service/impl/KylinBannersServiceImpl.java
+21
-44
KylinBannersController.java
...dnet/service/kylin/controller/KylinBannersController.java
+3
-2
BannersServiceImpl.java
...uidnet/service/kylin/service/impl/BannersServiceImpl.java
+41
-39
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @
bdbf520a
...
@@ -45,4 +45,8 @@ public class KylinRedisConst {
...
@@ -45,4 +45,8 @@ public class KylinRedisConst {
public
static
final
String
ZHENGZAI_APP_VERSIONS_CHECK_ANDROID
=
"basicServices:zhengzaiCheckAppVersionsAndroid"
;
public
static
final
String
ZHENGZAI_APP_VERSIONS_CHECK_ANDROID
=
"basicServices:zhengzaiCheckAppVersionsAndroid"
;
public
static
final
String
ZHENGZAI_APP_VERSIONS_CHECK_IOS
=
"basicServices:zhengzaiCheckAppVersionsIos"
;
public
static
final
String
ZHENGZAI_APP_VERSIONS_CHECK_IOS
=
"basicServices:zhengzaiCheckAppVersionsIos"
;
public
static
final
String
ADMIN_UPUSH_LIST
=
"basicServices:upushList"
;
public
static
final
String
ADMIN_BANNER_LIST
=
"kylin:bannerList"
;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java
View file @
bdbf520a
...
@@ -2,19 +2,19 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
...
@@ -2,19 +2,19 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.client.admin.common.enums.BannersTargetType
;
import
com.liquidnet.client.admin.common.enums.BannersTargetType
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.BeanUtil
;
import
com.liquidnet.commons.lang.util.*
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.kylin.constant.KylinRedisConst
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.kylin.dao.BannerDetailsListDao
;
import
com.liquidnet.service.kylin.dao.BannerDetailsListDao
;
import
com.liquidnet.service.kylin.dto.param.BannersParam
;
import
com.liquidnet.service.kylin.dto.param.BannersParam
;
import
com.liquidnet.service.kylin.dto.param.BannersSearchParam
;
import
com.liquidnet.service.kylin.dto.param.BannersSearchParam
;
import
com.liquidnet.service.kylin.dto.vo.KylinBannersVo
;
import
com.liquidnet.service.kylin.dto.vo.KylinBannersVo
;
import
com.liquidnet.service.kylin.entity.AdminUpush
;
import
com.liquidnet.service.kylin.entity.KylinBanners
;
import
com.liquidnet.service.kylin.entity.KylinBanners
;
import
com.liquidnet.service.kylin.entity.KylinBannersRelations
;
import
com.liquidnet.service.kylin.entity.KylinBannersRelations
;
import
com.liquidnet.service.kylin.mapper.KylinBannersMapper
;
import
com.liquidnet.service.kylin.mapper.KylinBannersMapper
;
...
@@ -36,7 +36,9 @@ import org.springframework.util.CollectionUtils;
...
@@ -36,7 +36,9 @@ import org.springframework.util.CollectionUtils;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -106,27 +108,11 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
...
@@ -106,27 +108,11 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
}
}
// 处理缓存数据
// 处理缓存数据
KylinBannersVo
kylinBannersVo
=
new
KylinBannersVo
();
List
<
KylinBanners
>
bannerList
=
bannersMapper
.
selectList
(
BeanUtils
.
copyProperties
(
bannersParam
,
kylinBannersVo
);
Wrappers
.
lambdaQuery
(
KylinBanners
.
class
).
eq
(
KylinBanners:
:
getIsOnline
,
1
)
kylinBannersVo
.
setBannersId
(
bannersId
);
.
eq
(
KylinBanners:
:
getIsDeleted
,
1
)
kylinBannersVo
.
setCreatedAt
(
createdAtString
);
);
// 处理基础数据 防止缓存中无字段
redisUtil
.
set
(
KylinRedisConst
.
ADMIN_BANNER_LIST
,
bannerList
);
kylinBannersVo
.
setIsDeleted
(
1
);
kylinBannersVo
.
setUpdatedAt
(
""
);
if
(
StringUtils
.
isEmpty
(
bannersParam
.
getTargetObj
()))
{
kylinBannersVo
.
setTargetObj
(
""
);
}
if
(
StringUtils
.
isEmpty
(
bannersParam
.
getOnlineStartTime
()))
{
kylinBannersVo
.
setOnlineStartTime
(
""
);
}
if
(
StringUtils
.
isEmpty
(
bannersParam
.
getOnlineEndTime
()))
{
kylinBannersVo
.
setOnlineEndTime
(
""
);
}
if
(
null
==
bannersParam
.
getBannersSort
())
{
kylinBannersVo
.
setBannersSort
(
0
);
}
// 入缓存
mongoTemplate
.
insert
(
kylinBannersVo
,
KylinBannersVo
.
class
.
getSimpleName
());
return
true
;
return
true
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -183,18 +169,13 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
...
@@ -183,18 +169,13 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
}
}
}
}
}
}
// 处理缓存数据
// 处理缓存数据
KylinBannersVo
kylinBannersVo
=
new
KylinBannersVo
();
List
<
KylinBanners
>
bannerList
=
bannersMapper
.
selectList
(
BeanUtils
.
copyProperties
(
bannersParam
,
kylinBannersVo
);
Wrappers
.
lambdaQuery
(
KylinBanners
.
class
).
eq
(
KylinBanners:
:
getIsOnline
,
1
)
kylinBannersVo
.
setBannersId
(
bannersId
);
.
eq
(
KylinBanners:
:
getIsDeleted
,
1
)
kylinBannersVo
.
setUpdatedAt
(
updatedAtString
);
// 修改缓存
BasicDBObject
object
=
new
BasicDBObject
(
"$set"
,
JSON
.
parse
(
JsonUtils
.
toJson
(
kylinBannersVo
)));
Document
doc
=
mongoTemplate
.
getCollection
(
KylinBannersVo
.
class
.
getSimpleName
()).
findOneAndUpdate
(
Query
.
query
(
Criteria
.
where
(
"bannersId"
).
is
(
bannersId
)).
getQueryObject
(),
object
,
new
FindOneAndUpdateOptions
().
returnDocument
(
ReturnDocument
.
AFTER
)
);
);
redisUtil
.
set
(
KylinRedisConst
.
ADMIN_BANNER_LIST
,
bannerList
);
return
true
;
return
true
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -256,16 +237,12 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
...
@@ -256,16 +237,12 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
,
new
UpdateWrapper
<
KylinBanners
>().
in
(
"banners_id"
,
bannersId
)
,
new
UpdateWrapper
<
KylinBanners
>().
in
(
"banners_id"
,
bannersId
)
);
);
// mongo 操作
// 处理缓存数据
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
List
<
KylinBanners
>
bannerList
=
bannersMapper
.
selectList
(
map
.
put
(
"updatedAt"
,
updatedAtString
);
Wrappers
.
lambdaQuery
(
KylinBanners
.
class
).
eq
(
KylinBanners:
:
getIsOnline
,
1
)
map
.
put
(
"isDeleted"
,
0
);
.
eq
(
KylinBanners:
:
getIsDeleted
,
1
)
BasicDBObject
object
=
new
BasicDBObject
(
"$set"
,
mongoConverter
.
convertToMongoType
(
map
));
Document
doc
=
mongoTemplate
.
getCollection
(
KylinBannersVo
.
class
.
getSimpleName
()).
findOneAndUpdate
(
Query
.
query
(
Criteria
.
where
(
"bannersId"
).
in
(
bannersId
)).
getQueryObject
(),
object
,
new
FindOneAndUpdateOptions
().
returnDocument
(
ReturnDocument
.
AFTER
)
);
);
redisUtil
.
set
(
KylinRedisConst
.
ADMIN_BANNER_LIST
,
bannerList
);
return
true
;
return
true
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinBannersController.java
View file @
bdbf520a
...
@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.controller;
...
@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.controller;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.kylin.dto.vo.KylinBannersVo
;
import
com.liquidnet.service.kylin.dto.vo.KylinBannersVo
;
import
com.liquidnet.service.kylin.entity.KylinBanners
;
import
com.liquidnet.service.kylin.service.impl.BannersServiceImpl
;
import
com.liquidnet.service.kylin.service.impl.BannersServiceImpl
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
...
@@ -36,11 +37,11 @@ public class KylinBannersController {
...
@@ -36,11 +37,11 @@ public class KylinBannersController {
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"position"
,
value
=
"展示位置 1首页 3周边 5积分商城 6YB 8视频"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"position"
,
value
=
"展示位置 1首页 3周边 5积分商城 6YB 8视频"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"provinceName"
,
value
=
"城市名称"
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"provinceName"
,
value
=
"城市名称"
),
})
})
public
ResponseDto
<
List
<
KylinBanners
Vo
>>
blist
(
public
ResponseDto
<
List
<
KylinBanners
>>
blist
(
@RequestParam
()
String
position
,
@RequestParam
()
String
position
,
@RequestParam
(
defaultValue
=
""
)
String
provinceName
@RequestParam
(
defaultValue
=
""
)
String
provinceName
)
{
)
{
List
<
KylinBanners
Vo
>
result
=
bannersServiceImpl
.
blist
(
position
,
provinceName
);
List
<
KylinBanners
>
result
=
bannersServiceImpl
.
blist
(
position
,
provinceName
);
return
ResponseDto
.
success
(
result
);
return
ResponseDto
.
success
(
result
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/BannersServiceImpl.java
View file @
bdbf520a
...
@@ -2,7 +2,9 @@ package com.liquidnet.service.kylin.service.impl;
...
@@ -2,7 +2,9 @@ package com.liquidnet.service.kylin.service.impl;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.kylin.constant.KylinRedisConst
;
import
com.liquidnet.service.kylin.dto.vo.KylinBannersVo
;
import
com.liquidnet.service.kylin.dto.vo.KylinBannersVo
;
import
com.liquidnet.service.kylin.entity.KylinBanners
;
import
com.liquidnet.service.kylin.service.admin.IKylinBannersService
;
import
com.liquidnet.service.kylin.service.admin.IKylinBannersService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
...
@@ -34,51 +36,51 @@ public class BannersServiceImpl implements IKylinBannersService {
...
@@ -34,51 +36,51 @@ public class BannersServiceImpl implements IKylinBannersService {
@Autowired
@Autowired
RedisUtil
redisUtil
;
RedisUtil
redisUtil
;
public
List
<
KylinBannersVo
>
blist
(
String
position
,
String
provinceName
)
{
public
List
<
KylinBanners
>
blist
(
String
position
,
String
provinceName
)
{
Query
query
=
new
Query
();
String
nowTime
=
DateUtil
.
getNowTime
();
query
.
addCriteria
(
List
<
KylinBanners
>
list
=
(
List
<
KylinBanners
>)
redisUtil
.
get
(
KylinRedisConst
.
ADMIN_BANNER_LIST
);
Criteria
.
where
(
"isOnline"
).
is
(
1
).
and
(
"isDeleted"
).
is
(
1
)
for
(
KylinBanners
info
:
list
)
{
);
// 时间
String
StartTime
=
info
.
getOnlineStartTime
();
String
endTime
=
info
.
getOnlineEndTime
();
if
(!
StartTime
.
isEmpty
()
&&
!
endTime
.
isEmpty
())
{
if
(
DateUtil
.
compareStrDay
(
nowTime
,
StartTime
)
<
0
)
{
// 当前时间小雨开始时间 还未开始呢
list
.
remove
(
info
);
}
if
(
DateUtil
.
compareStrDay
(
endTime
,
nowTime
)
>
0
)
{
// 解释时间大于当前时间 已过期
list
.
remove
(
info
);
}
}
LocalDateTime
nowTime
=
LocalDateTime
.
now
();
// list
String
nowTimeStr
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
nowTime
);
if
(
info
.
getPromotionType
()
!=
1
)
{
Criteria
onlineTimeBetween
=
Criteria
.
where
(
"onlineStartTime"
).
lte
(
nowTimeStr
).
and
(
"onlineEndTime"
).
gte
(
nowTimeStr
);
List
<
String
>
pList
=
info
.
getPositionList
();
Criteria
onlineTimeGt
=
Criteria
.
where
(
"onlineStartTime"
).
lte
(
nowTimeStr
).
and
(
"onlineEndTime"
).
is
(
""
);
Boolean
pis
=
false
;
Criteria
onlineTimeLt
=
Criteria
.
where
(
"onlineStartTime"
).
is
(
""
).
and
(
"onlineEndTime"
).
gte
(
nowTimeStr
);
for
(
String
positionName
:
pList
)
{
Criteria
onlineTimeEmpty
=
Criteria
.
where
(
"onlineStartTime"
).
is
(
""
).
and
(
"onlineEndTime"
).
is
(
""
);
if
(
positionName
.
equals
(
position
))
{
Criteria
mergeCriteriaTime
=
new
Criteria
();
pis
=
true
;
mergeCriteriaTime
.
orOperator
(
onlineTimeBetween
,
onlineTimeGt
,
onlineTimeLt
,
onlineTimeEmpty
);
}
}
if
(!
pis
)
{
list
.
remove
(
info
);
}
if
(!
position
.
isEmpty
())
{
List
<
String
>
proList
=
info
.
getProvincesList
();
query
.
addCriteria
(
Boolean
prois
=
false
;
Criteria
.
where
(
"positionList"
).
in
(
position
)
for
(
String
proName
:
proList
)
{
);
if
(
proName
.
equals
(
provinceName
))
{
}
prois
=
true
;
}
Criteria
mergeCriteriaPromotion
=
new
Criteria
();
}
if
(!
provinceName
.
isEmpty
())
{
if
(!
prois
)
{
Criteria
promotionCity
=
Criteria
.
where
(
"provincesNameList"
).
in
(
provinceName
);
list
.
remove
(
info
);
Criteria
promotionAll
=
Criteria
.
where
(
"promotionType"
).
is
(
1
);
}
mergeCriteriaPromotion
.
orOperator
(
promotionCity
,
promotionAll
);
}
}
Criteria
criteria
=
new
Criteria
();
query
.
addCriteria
(
criteria
.
andOperator
(
mergeCriteriaTime
,
mergeCriteriaPromotion
)
);
List
<
KylinBannersVo
>
bannerList
=
mongoTemplate
.
find
(
query
,
KylinBannersVo
.
class
,
KylinBannersVo
.
class
.
getSimpleName
()
);
for
(
KylinBannersVo
info
:
bannerList
)
{
String
setCoverImg
=
imgUrl
+
info
.
getCoverImg
();
String
setCoverImg
=
imgUrl
+
info
.
getCoverImg
();
info
.
setCoverImg
(
setCoverImg
);
info
.
setCoverImg
(
setCoverImg
);
}
}
return
list
;
return
bannerList
;
}
}
}
}
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