记得上下班打卡 | 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
f48d45b9
Commit
f48d45b9
authored
Oct 26, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
detail
parent
f82c3e49
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
8 deletions
+25
-8
SweetConstant.java
...a/com/liquidnet/service/sweet/constant/SweetConstant.java
+1
-0
IntegralActivityVo.java
...om/liquidnet/service/sweet/dto/vo/IntegralActivityVo.java
+2
-1
SweetIntegralActivityServiceImpl.java
.../sweet/service/impl/SweetIntegralActivityServiceImpl.java
+15
-4
SweetRedisAdminUtils.java
...ient/admin/zhengzai/sweet/utils/SweetRedisAdminUtils.java
+4
-0
SweetIntegralActivityServiceImpl.java
.../sweet/service/impl/SweetIntegralActivityServiceImpl.java
+1
-1
RedisDataUtils.java
...ava/com/liquidnet/service/sweet/utils/RedisDataUtils.java
+2
-2
No files found.
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java
View file @
f48d45b9
...
@@ -82,4 +82,5 @@ public class SweetConstant {
...
@@ -82,4 +82,5 @@ public class SweetConstant {
public
final
static
String
REDIS_KEY_SWEET_MDSK_ARTISTS_DETAILS
=
"sweet:mdsk:artists:details:"
;
public
final
static
String
REDIS_KEY_SWEET_MDSK_ARTISTS_DETAILS
=
"sweet:mdsk:artists:details:"
;
public
final
static
String
REDIS_KEY_SWEET_MDSK_SHOP
=
"sweet:mdsk:artists:shop:manual:"
;
public
final
static
String
REDIS_KEY_SWEET_MDSK_SHOP
=
"sweet:mdsk:artists:shop:manual:"
;
public
static
final
String
REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST
=
"sweet:integralActivity:list"
;
public
static
final
String
REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST
=
"sweet:integralActivity:list"
;
public
static
final
String
REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO
=
"sweet:integralActivity:integralActivityId:"
;
}
}
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityVo.java
View file @
f48d45b9
package
com
.
liquidnet
.
service
.
sweet
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
sweet
.
dto
.
vo
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivity
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivity
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -53,7 +54,7 @@ public class IntegralActivityVo implements Serializable, Cloneable {
...
@@ -53,7 +54,7 @@ public class IntegralActivityVo implements Serializable, Cloneable {
private
LocalDateTime
updatedAt
;
private
LocalDateTime
updatedAt
;
@ApiModelProperty
(
value
=
"奖品列表"
)
@ApiModelProperty
(
value
=
"奖品列表"
)
private
List
<
IntegralActivityVo
>
prizeList
;
private
List
<
SweetIntegralActivityPrize
>
prizeList
;
private
static
final
IntegralActivityVo
obj
=
new
IntegralActivityVo
();
private
static
final
IntegralActivityVo
obj
=
new
IntegralActivityVo
();
public
static
IntegralActivityVo
getNew
()
{
public
static
IntegralActivityVo
getNew
()
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityServiceImpl.java
View file @
f48d45b9
...
@@ -71,7 +71,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
...
@@ -71,7 +71,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
}
}
}
}
// TODO: 2021/10/20 增加redis处理
// TODO: 2021/10/20 增加redis处理
this
.
integralActivityList
();
this
.
integralActivityList
(
integralActivityId
);
return
insert
;
return
insert
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"创建活动失败 [e:{}]"
,
e
);
log
.
error
(
"创建活动失败 [e:{}]"
,
e
);
...
@@ -102,7 +102,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
...
@@ -102,7 +102,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
}
}
}
}
// TODO: 2021/10/20 增加redis处理
// TODO: 2021/10/20 增加redis处理
this
.
integralActivityList
();
this
.
integralActivityList
(
integralActivityId
);
return
update
;
return
update
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"编辑活动失败 [e:{}]"
,
e
);
log
.
error
(
"编辑活动失败 [e:{}]"
,
e
);
...
@@ -120,7 +120,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
...
@@ -120,7 +120,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
Wrappers
.
lambdaUpdate
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIntegralActivityId
,
integralActivityId
)
Wrappers
.
lambdaUpdate
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIntegralActivityId
,
integralActivityId
)
);
);
// TODO: 2021/10/20 更新缓存
// TODO: 2021/10/20 更新缓存
this
.
integralActivityList
();
this
.
integralActivityList
(
integralActivityId
);
return
update
;
return
update
;
}
}
...
@@ -156,7 +156,8 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
...
@@ -156,7 +156,8 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
return
new
PageInfo
(
voList
);
return
new
PageInfo
(
voList
);
}
}
private
void
integralActivityList
()
{
private
void
integralActivityList
(
String
integralActivityId
)
{
// 活动列表
LambdaQueryWrapper
<
SweetIntegralActivity
>
queryWrapper
=
Wrappers
.
lambdaQuery
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIsOnline
,
2
);
LambdaQueryWrapper
<
SweetIntegralActivity
>
queryWrapper
=
Wrappers
.
lambdaQuery
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIsOnline
,
2
);
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
queryWrapper
.
eq
(
SweetIntegralActivity:
:
getTimeType
,
1
).
or
().
eq
(
SweetIntegralActivity:
:
getTimeType
,
2
).
lt
(
SweetIntegralActivity:
:
getEndTime
,
now
).
gt
(
SweetIntegralActivity:
:
getStartTime
,
now
);
queryWrapper
.
eq
(
SweetIntegralActivity:
:
getTimeType
,
1
).
or
().
eq
(
SweetIntegralActivity:
:
getTimeType
,
2
).
lt
(
SweetIntegralActivity:
:
getEndTime
,
now
).
gt
(
SweetIntegralActivity:
:
getStartTime
,
now
);
...
@@ -167,6 +168,16 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
...
@@ -167,6 +168,16 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
voList
.
add
(
copy
);
voList
.
add
(
copy
);
});
});
sweetRedisAdminUtils
.
setIntegralActivityList
(
voList
);
sweetRedisAdminUtils
.
setIntegralActivityList
(
voList
);
// 活动详情
SweetIntegralActivity
sweetIntegralActivity
=
sweetIntegralActivityMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
SweetIntegralActivity
.
class
).
eq
(
SweetIntegralActivity:
:
getIntegralActivityId
,
integralActivityId
)
);
IntegralActivityVo
integralActivityVo
=
IntegralActivityVo
.
getNew
().
copy
(
sweetIntegralActivity
);
List
<
SweetIntegralActivityPrize
>
sweetIntegralActivityPrizes
=
sweetIntegralActivityPrizeMapper
.
selectList
(
Wrappers
.
lambdaQuery
(
SweetIntegralActivityPrize
.
class
).
eq
(
SweetIntegralActivityPrize:
:
getIntegralActivityId
,
integralActivityId
)
);
integralActivityVo
.
setPrizeList
(
sweetIntegralActivityPrizes
);
sweetRedisAdminUtils
.
setIntegralActivityInfo
(
integralActivityVo
);
}
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/utils/SweetRedisAdminUtils.java
View file @
f48d45b9
...
@@ -21,5 +21,9 @@ public class SweetRedisAdminUtils {
...
@@ -21,5 +21,9 @@ public class SweetRedisAdminUtils {
String
redisKey
=
SweetConstant
.
REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST
;
String
redisKey
=
SweetConstant
.
REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST
;
boolean
set
=
redisUtil
.
set
(
redisKey
,
voList
,
15
);
boolean
set
=
redisUtil
.
set
(
redisKey
,
voList
,
15
);
}
}
public
void
setIntegralActivityInfo
(
IntegralActivityVo
integralActivityVo
)
{
String
redisKey
=
SweetConstant
.
REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO
.
concat
(
integralActivityVo
.
getIntegralActivityId
());
boolean
set
=
redisUtil
.
set
(
redisKey
,
integralActivityVo
,
15
);
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityServiceImpl.java
View file @
f48d45b9
...
@@ -56,7 +56,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
...
@@ -56,7 +56,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
@Override
@Override
public
ResponseDto
<
IntegralActivityVo
>
detail
(
String
integralActivityId
)
{
public
ResponseDto
<
IntegralActivityVo
>
detail
(
String
integralActivityId
)
{
IntegralActivityVo
integralActivity
=
redisDataUtils
.
getIntegralActivityInfo
();
IntegralActivityVo
integralActivity
=
redisDataUtils
.
getIntegralActivityInfo
(
integralActivityId
);
return
ResponseDto
.
success
(
integralActivity
);
return
ResponseDto
.
success
(
integralActivity
);
}
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java
View file @
f48d45b9
...
@@ -610,8 +610,8 @@ public class RedisDataUtils {
...
@@ -610,8 +610,8 @@ public class RedisDataUtils {
}
}
}
}
public
IntegralActivityVo
getIntegralActivityInfo
()
{
public
IntegralActivityVo
getIntegralActivityInfo
(
String
integralActivityId
)
{
String
redisKey
=
SweetConstant
.
REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO
;
String
redisKey
=
SweetConstant
.
REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO
.
concat
(
integralActivityId
)
;
Object
obj
=
redisUtil
.
get
(
redisKey
);
Object
obj
=
redisUtil
.
get
(
redisKey
);
if
(
null
==
obj
)
{
if
(
null
==
obj
)
{
return
null
;
return
null
;
...
...
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