记得上下班打卡 | 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
4b49e993
Commit
4b49e993
authored
Mar 04, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加Ar演出艺人时间表接口 判断空
parent
53c23bb8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
24 deletions
+31
-24
SweetAppletController.java
...idnet/service/sweet/controller/SweetAppletController.java
+3
-0
RedisArDataUtils.java
...a/com/liquidnet/service/sweet/utils/RedisArDataUtils.java
+28
-24
No files found.
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java
View file @
4b49e993
...
@@ -19,6 +19,7 @@ import io.swagger.annotations.Api;
...
@@ -19,6 +19,7 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -27,6 +28,7 @@ import java.util.List;
...
@@ -27,6 +28,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
@Api
(
tags
=
"小程序"
)
@Api
(
tags
=
"小程序"
)
@Slf4j
@RestController
@RestController
@RequestMapping
(
"/sweet-applet"
)
@RequestMapping
(
"/sweet-applet"
)
public
class
SweetAppletController
{
public
class
SweetAppletController
{
...
@@ -198,6 +200,7 @@ public class SweetAppletController {
...
@@ -198,6 +200,7 @@ public class SweetAppletController {
List
<
SweetPerformArtistTimeListDto
>
artistTimeList
=
arDataUtils
.
getArtistTimeList
(
performanceId
);
List
<
SweetPerformArtistTimeListDto
>
artistTimeList
=
arDataUtils
.
getArtistTimeList
(
performanceId
);
return
ResponseDto
.
success
(
artistTimeList
);
return
ResponseDto
.
success
(
artistTimeList
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"演出艺人时间表EX [e:{}]"
,
e
);
return
ResponseDto
.
failure
(
"获取失败"
);
return
ResponseDto
.
failure
(
"获取失败"
);
}
}
}
}
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisArDataUtils.java
View file @
4b49e993
package
com
.
liquidnet
.
service
.
sweet
.
utils
;
package
com
.
liquidnet
.
service
.
sweet
.
utils
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.sweet.constant.SweetConstant
;
import
com.liquidnet.service.sweet.constant.SweetConstant
;
import
com.liquidnet.service.sweet.dto.*
;
import
com.liquidnet.service.sweet.dto.*
;
...
@@ -37,6 +38,7 @@ public class RedisArDataUtils {
...
@@ -37,6 +38,7 @@ public class RedisArDataUtils {
List
<
SweetPerformArtistTimeListDto
>
performArtistTimeList
=
new
ArrayList
<>();
List
<
SweetPerformArtistTimeListDto
>
performArtistTimeList
=
new
ArrayList
<>();
// 演出日期
// 演出日期
List
<
SweetManualAppletArDto
>
performTime
=
sweetManualMapper
.
getManualAppletArDto
(
performanceId
);
List
<
SweetManualAppletArDto
>
performTime
=
sweetManualMapper
.
getManualAppletArDto
(
performanceId
);
if
(!
CollectionUtil
.
isEmpty
(
performTime
))
{
Date
dateEnd
=
DateUtil
.
parse
(
performTime
.
get
(
0
).
getTimeEnd
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateEnd
=
DateUtil
.
parse
(
performTime
.
get
(
0
).
getTimeEnd
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateStart
=
DateUtil
.
parse
(
performTime
.
get
(
0
).
getTimeStart
(),
DateUtil
.
DATE_SMALL_STR
);
Date
dateStart
=
DateUtil
.
parse
(
performTime
.
get
(
0
).
getTimeStart
(),
DateUtil
.
DATE_SMALL_STR
);
int
intervalDay
=
(
int
)
DateUtil
.
intervalDays
(
dateStart
,
dateEnd
);
int
intervalDay
=
(
int
)
DateUtil
.
intervalDays
(
dateStart
,
dateEnd
);
...
@@ -66,6 +68,8 @@ public class RedisArDataUtils {
...
@@ -66,6 +68,8 @@ public class RedisArDataUtils {
performArtistTimeList
.
add
(
performArtistTimeListDto
);
performArtistTimeList
.
add
(
performArtistTimeListDto
);
}
}
redisUtil
.
set
(
redisKey
,
performArtistTimeList
);
redisUtil
.
set
(
redisKey
,
performArtistTimeList
);
}
return
performArtistTimeList
;
return
performArtistTimeList
;
}
else
{
}
else
{
return
(
List
<
SweetPerformArtistTimeListDto
>)
obj
;
return
(
List
<
SweetPerformArtistTimeListDto
>)
obj
;
...
...
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