记得上下班打卡 | 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
7a1d7f18
Commit
7a1d7f18
authored
Mar 04, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加 ar字段 ar文件大小
parent
e1fc933f
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
34 additions
and
11 deletions
+34
-11
ISweetPerformanceService.java
...idnet/service/sweet/service/ISweetPerformanceService.java
+1
-1
SweetPerformanceShow.java
.../liquidnet/service/sweet/entity/SweetPerformanceShow.java
+6
-0
SweetPerformanceShowParam.java
...uidnet/service/sweet/param/SweetPerformanceShowParam.java
+3
-0
SweetArtistsVo.java
...n/java/com/liquidnet/service/sweet/vo/SweetArtistsVo.java
+4
-1
SweetPerformanceShowVo.java
...om/liquidnet/service/sweet/vo/SweetPerformanceShowVo.java
+6
-0
GoblinCouponController.java
...net/service/goblin/controller/GoblinCouponController.java
+5
-5
db_performance_ar.sql
...ervice/liquidnet-service-sweet/docu/db_performance_ar.sql
+1
-0
SweetPerformanceController.java
.../service/sweet/controller/SweetPerformanceController.java
+5
-3
SweetPerformanceServiceImpl.java
...rvice/sweet/service/impl/SweetPerformanceServiceImpl.java
+3
-1
No files found.
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetPerformanceService.java
View file @
7a1d7f18
...
@@ -8,7 +8,7 @@ import com.liquidnet.service.sweet.param.SweetPerformanceShowParam;
...
@@ -8,7 +8,7 @@ import com.liquidnet.service.sweet.param.SweetPerformanceShowParam;
import
com.liquidnet.service.sweet.vo.SweetPerformanceShowVo
;
import
com.liquidnet.service.sweet.vo.SweetPerformanceShowVo
;
public
interface
ISweetPerformanceService
extends
IService
<
SweetPerformanceShow
>
{
public
interface
ISweetPerformanceService
extends
IService
<
SweetPerformanceShow
>
{
ResponseDto
<
Boolean
>
add
(
String
performanceId
,
String
performanceName
,
String
arName
,
String
picOne
,
String
picTwo
,
String
arUrl
,
String
timeStart
,
String
timeEnd
);
ResponseDto
<
Boolean
>
add
(
String
performanceId
,
String
performanceName
,
String
arName
,
String
picOne
,
String
picTwo
,
String
arUrl
,
String
timeStart
,
String
timeEnd
,
String
fileSize
);
ResponseDto
<
Boolean
>
change
(
SweetPerformanceShowParam
show
);
ResponseDto
<
Boolean
>
change
(
SweetPerformanceShowParam
show
);
...
...
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetPerformanceShow.java
View file @
7a1d7f18
...
@@ -38,6 +38,12 @@ public class SweetPerformanceShow implements Serializable,Cloneable{
...
@@ -38,6 +38,12 @@ public class SweetPerformanceShow implements Serializable,Cloneable{
* AR地址
* AR地址
*/
*/
private
String
arUrl
;
private
String
arUrl
;
/**
* 文件大小
*/
private
String
fileSize
;
/**
/**
* 离线地址
* 离线地址
*/
*/
...
...
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/param/SweetPerformanceShowParam.java
View file @
7a1d7f18
...
@@ -34,6 +34,9 @@ public class SweetPerformanceShowParam implements Serializable,Cloneable{
...
@@ -34,6 +34,9 @@ public class SweetPerformanceShowParam implements Serializable,Cloneable{
* AR地址
* AR地址
*/
*/
private
String
arUrl
;
private
String
arUrl
;
private
String
fileSize
;
/**
/**
* 开始时间
* 开始时间
*/
*/
...
...
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/vo/SweetArtistsVo.java
View file @
7a1d7f18
...
@@ -20,7 +20,7 @@ import java.util.List;
...
@@ -20,7 +20,7 @@ import java.util.List;
*/
*/
@Data
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
SweetArtistsVo
implements
Serializable
,
Cloneable
{
public
class
SweetArtistsVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -38,6 +38,8 @@ public class SweetArtistsVo implements Serializable,Cloneable {
...
@@ -38,6 +38,8 @@ public class SweetArtistsVo implements Serializable,Cloneable {
*/
*/
private
String
name
;
private
String
name
;
private
String
picUrl
;
/**
/**
* 拼音
* 拼音
*/
*/
...
@@ -66,6 +68,7 @@ public class SweetArtistsVo implements Serializable,Cloneable {
...
@@ -66,6 +68,7 @@ public class SweetArtistsVo implements Serializable,Cloneable {
private
List
<
SweetArtistsUrl
>
sweetArtistsUrl
;
private
List
<
SweetArtistsUrl
>
sweetArtistsUrl
;
private
static
final
SweetArtistsVo
obj
=
new
SweetArtistsVo
();
private
static
final
SweetArtistsVo
obj
=
new
SweetArtistsVo
();
public
static
SweetArtistsVo
getNew
()
{
public
static
SweetArtistsVo
getNew
()
{
try
{
try
{
return
(
SweetArtistsVo
)
obj
.
clone
();
return
(
SweetArtistsVo
)
obj
.
clone
();
...
...
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/vo/SweetPerformanceShowVo.java
View file @
7a1d7f18
...
@@ -34,6 +34,12 @@ public class SweetPerformanceShowVo implements Serializable, Cloneable {
...
@@ -34,6 +34,12 @@ public class SweetPerformanceShowVo implements Serializable, Cloneable {
* AR地址
* AR地址
*/
*/
private
String
arUrl
;
private
String
arUrl
;
/**
* AR地址
*/
private
String
fileSize
;
/**
/**
* 离线地址
* 离线地址
*/
*/
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinCouponController.java
View file @
7a1d7f18
...
@@ -124,8 +124,8 @@ public class GoblinCouponController {
...
@@ -124,8 +124,8 @@ public class GoblinCouponController {
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"uid"
,
value
=
"用户id"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"uid"
,
value
=
"用户id"
),
})
})
public
ResponseDto
<
GoblinUserCouponVo
>
canUse
(
@RequestParam
(
"totalPrice"
)
@Valid
BigDecimal
totalPrice
,
public
ResponseDto
<
GoblinUserCouponVo
>
canUse
(
@RequestParam
(
"totalPrice"
)
@Valid
BigDecimal
totalPrice
,
@RequestParam
(
"spuId"
)
@Valid
String
spuId
,
@RequestParam
(
"spuId"
)
@Valid
String
spuId
,
@RequestParam
(
value
=
"uid"
,
required
=
false
)
@Valid
String
uid
)
{
@RequestParam
(
value
=
"uid"
,
required
=
false
)
@Valid
String
uid
)
{
if
(
uid
==
null
)
{
if
(
uid
==
null
)
{
uid
=
CurrentUtil
.
getCurrentUid
();
uid
=
CurrentUtil
.
getCurrentUid
();
}
}
...
@@ -136,13 +136,13 @@ public class GoblinCouponController {
...
@@ -136,13 +136,13 @@ public class GoblinCouponController {
@ApiOperation
(
"可用券列表"
)
@ApiOperation
(
"可用券列表"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"Number"
,
name
=
"totalPrice"
,
value
=
"
spuId
"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"Number"
,
name
=
"totalPrice"
,
value
=
"
应付价格
"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"spuId"
,
value
=
"逗号隔开"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"spuId"
,
value
=
"逗号隔开"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
tru
e
,
dataType
=
"String"
,
name
=
"uid"
,
value
=
"用户id"
)
@ApiImplicitParam
(
type
=
"form"
,
required
=
fals
e
,
dataType
=
"String"
,
name
=
"uid"
,
value
=
"用户id"
)
})
})
public
ResponseDto
<
List
<
GoblinUserCouponVo
>>
useList
(
@RequestParam
(
"totalPrice"
)
@Valid
BigDecimal
totalPrice
,
public
ResponseDto
<
List
<
GoblinUserCouponVo
>>
useList
(
@RequestParam
(
"totalPrice"
)
@Valid
BigDecimal
totalPrice
,
@RequestParam
(
"spuId"
)
@Valid
String
spuId
,
@RequestParam
(
"spuId"
)
@Valid
String
spuId
,
@RequestParam
(
value
=
"uid"
,
required
=
false
)
@Valid
String
uid
)
{
@RequestParam
(
value
=
"uid"
,
required
=
false
)
String
uid
)
{
if
(
uid
==
null
)
{
if
(
uid
==
null
)
{
uid
=
CurrentUtil
.
getCurrentUid
();
uid
=
CurrentUtil
.
getCurrentUid
();
}
}
...
...
liquidnet-bus-service/liquidnet-service-sweet/docu/db_performance_ar.sql
View file @
7a1d7f18
...
@@ -9,6 +9,7 @@ CREATE TABLE `sweet_performance_show`
...
@@ -9,6 +9,7 @@ CREATE TABLE `sweet_performance_show`
`pic_one`
varchar
(
255
)
DEFAULT
''
COMMENT
'图片1'
,
`pic_one`
varchar
(
255
)
DEFAULT
''
COMMENT
'图片1'
,
`pic_two`
varchar
(
255
)
DEFAULT
''
COMMENT
'图片2'
,
`pic_two`
varchar
(
255
)
DEFAULT
''
COMMENT
'图片2'
,
`ar_url`
varchar
(
255
)
DEFAULT
''
COMMENT
'AR地址'
,
`ar_url`
varchar
(
255
)
DEFAULT
''
COMMENT
'AR地址'
,
`file_size`
varchar
(
255
)
DEFAULT
''
COMMENT
'AR大小'
,
`offline_url`
varchar
(
255
)
DEFAULT
''
COMMENT
'离线地址'
,
`offline_url`
varchar
(
255
)
DEFAULT
''
COMMENT
'离线地址'
,
`time_start`
datetime
DEFAULT
NULL
COMMENT
'开始时间'
,
`time_start`
datetime
DEFAULT
NULL
COMMENT
'开始时间'
,
`time_end`
datetime
DEFAULT
NULL
COMMENT
'结束时间'
,
`time_end`
datetime
DEFAULT
NULL
COMMENT
'结束时间'
,
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetPerformanceController.java
View file @
7a1d7f18
...
@@ -62,7 +62,8 @@ public class SweetPerformanceController {
...
@@ -62,7 +62,8 @@ public class SweetPerformanceController {
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"arUrl"
,
value
=
"AR地址"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"arUrl"
,
value
=
"AR地址"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"timeStart"
,
value
=
"开始时间"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"timeStart"
,
value
=
"开始时间"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"timeEnd"
,
value
=
"结束时间"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"timeEnd"
,
value
=
"结束时间"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"arName"
,
value
=
"ar名称"
,
required
=
true
)
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"arName"
,
value
=
"ar名称"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"fileSize"
,
value
=
"ar离线文件大小"
,
required
=
true
)
})
})
public
ResponseDto
<
Boolean
>
add
(
@RequestParam
()
String
performanceId
,
public
ResponseDto
<
Boolean
>
add
(
@RequestParam
()
String
performanceId
,
@RequestParam
()
String
performanceName
,
@RequestParam
()
String
performanceName
,
...
@@ -71,8 +72,9 @@ public class SweetPerformanceController {
...
@@ -71,8 +72,9 @@ public class SweetPerformanceController {
@RequestParam
()
String
arUrl
,
@RequestParam
()
String
arUrl
,
@RequestParam
()
String
timeStart
,
@RequestParam
()
String
timeStart
,
@RequestParam
()
String
timeEnd
,
@RequestParam
()
String
timeEnd
,
@RequestParam
()
String
arName
)
{
@RequestParam
()
String
arName
,
return
sweetPerformanceService
.
add
(
performanceId
,
performanceName
,
arName
,
picOne
,
picTwo
,
arUrl
,
timeStart
,
timeEnd
);
@RequestParam
()
String
fileSize
)
{
return
sweetPerformanceService
.
add
(
performanceId
,
performanceName
,
arName
,
picOne
,
picTwo
,
arUrl
,
timeStart
,
timeEnd
,
fileSize
);
}
}
@PostMapping
(
"change"
)
@PostMapping
(
"change"
)
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetPerformanceServiceImpl.java
View file @
7a1d7f18
...
@@ -49,7 +49,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
...
@@ -49,7 +49,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
Environment
environment
;
Environment
environment
;
@Override
@Override
public
ResponseDto
<
Boolean
>
add
(
String
performanceId
,
String
performanceName
,
String
arName
,
String
picOne
,
String
picTwo
,
String
arUrl
,
String
timeStart
,
String
timeEnd
)
{
public
ResponseDto
<
Boolean
>
add
(
String
performanceId
,
String
performanceName
,
String
arName
,
String
picOne
,
String
picTwo
,
String
arUrl
,
String
timeStart
,
String
timeEnd
,
String
fileSize
)
{
try
{
try
{
String
offlineUrl
=
goblinUrl
+
"/goblin/inner/ar/data"
;
//离线地址
String
offlineUrl
=
goblinUrl
+
"/goblin/inner/ar/data"
;
//离线地址
SweetPerformanceShow
show
=
SweetPerformanceShow
.
getNew
();
SweetPerformanceShow
show
=
SweetPerformanceShow
.
getNew
();
...
@@ -61,6 +61,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
...
@@ -61,6 +61,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
show
.
setArUrl
(
arUrl
);
show
.
setArUrl
(
arUrl
);
show
.
setArName
(
arName
);
show
.
setArName
(
arName
);
show
.
setOfflineUrl
(
offlineUrl
);
show
.
setOfflineUrl
(
offlineUrl
);
show
.
setFileSize
(
fileSize
);
show
.
setTimeStart
(
LocalDateTime
.
parse
(
timeStart
,
DTF_YMD_HMS
));
show
.
setTimeStart
(
LocalDateTime
.
parse
(
timeStart
,
DTF_YMD_HMS
));
show
.
setTimeEnd
(
LocalDateTime
.
parse
(
timeEnd
,
DTF_YMD_HMS
));
show
.
setTimeEnd
(
LocalDateTime
.
parse
(
timeEnd
,
DTF_YMD_HMS
));
//redis
//redis
...
@@ -92,6 +93,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
...
@@ -92,6 +93,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
data
.
setTimeEnd
(
LocalDateTime
.
parse
(
show
.
getTimeEnd
(),
DTF_YMD_HMS
));
data
.
setTimeEnd
(
LocalDateTime
.
parse
(
show
.
getTimeEnd
(),
DTF_YMD_HMS
));
data
.
setStatus
(
performanceARList
.
get
(
i
).
getStatus
());
data
.
setStatus
(
performanceARList
.
get
(
i
).
getStatus
());
data
.
setOfflineUrl
(
performanceARList
.
get
(
i
).
getOfflineUrl
());
data
.
setOfflineUrl
(
performanceARList
.
get
(
i
).
getOfflineUrl
());
data
.
setFileSize
(
show
.
getFileSize
());
performanceARList
.
set
(
i
,
data
);
performanceARList
.
set
(
i
,
data
);
redisUtils
.
setPerformanceAR
(
performanceARList
);
redisUtils
.
setPerformanceAR
(
performanceARList
);
break
;
break
;
...
...
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