记得上下班打卡 | git大法好,push需谨慎

Commit db85b59e authored by 胡佳晨's avatar 胡佳晨

新增字段 arName

parent 83ebfd85
...@@ -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 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);
ResponseDto<Boolean> change(SweetPerformanceShowParam show); ResponseDto<Boolean> change(SweetPerformanceShowParam show);
......
...@@ -19,6 +19,8 @@ public class SweetPerformanceShow implements Serializable,Cloneable{ ...@@ -19,6 +19,8 @@ public class SweetPerformanceShow implements Serializable,Cloneable{
*/ */
private String arId; private String arId;
private String arName;
private String performanceId; private String performanceId;
/** /**
* 演出名 * 演出名
......
...@@ -15,6 +15,8 @@ public class SweetPerformanceShowParam implements Serializable,Cloneable{ ...@@ -15,6 +15,8 @@ public class SweetPerformanceShowParam implements Serializable,Cloneable{
*/ */
private String arId; private String arId;
private String arName;
private String performanceId; private String performanceId;
/** /**
* 演出名 * 演出名
......
...@@ -7,7 +7,7 @@ import lombok.Data; ...@@ -7,7 +7,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@Data @Data
public class SweetPerformanceShowVo implements Serializable,Cloneable{ public class SweetPerformanceShowVo implements Serializable, Cloneable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
...@@ -15,6 +15,8 @@ public class SweetPerformanceShowVo implements Serializable,Cloneable{ ...@@ -15,6 +15,8 @@ public class SweetPerformanceShowVo implements Serializable,Cloneable{
*/ */
private String arId; private String arId;
private String arName;
private String performanceId; private String performanceId;
/** /**
* 演出名 * 演出名
...@@ -51,6 +53,7 @@ public class SweetPerformanceShowVo implements Serializable,Cloneable{ ...@@ -51,6 +53,7 @@ public class SweetPerformanceShowVo implements Serializable,Cloneable{
private String timeEnd; private String timeEnd;
private static final SweetPerformanceShowVo obj = new SweetPerformanceShowVo(); private static final SweetPerformanceShowVo obj = new SweetPerformanceShowVo();
public static SweetPerformanceShowVo getNew() { public static SweetPerformanceShowVo getNew() {
try { try {
return (SweetPerformanceShowVo) obj.clone(); return (SweetPerformanceShowVo) obj.clone();
......
...@@ -3,6 +3,7 @@ CREATE TABLE `sweet_performance_show` ...@@ -3,6 +3,7 @@ CREATE TABLE `sweet_performance_show`
( (
`mid` bigint AUTO_INCREMENT, `mid` bigint AUTO_INCREMENT,
`ar_id` varchar(64) DEFAULT '' COMMENT '主键id', `ar_id` varchar(64) DEFAULT '' COMMENT '主键id',
`ar_name` varchar(64) DEFAULT '' COMMENT 'ar名称',
`performance_id` varchar(255) DEFAULT '' COMMENT '演出id', `performance_id` varchar(255) DEFAULT '' COMMENT '演出id',
`performance_name` varchar(255) DEFAULT '' COMMENT '演出名', `performance_name` varchar(255) DEFAULT '' COMMENT '演出名',
`pic_one` varchar(255) DEFAULT '' COMMENT '图片1', `pic_one` varchar(255) DEFAULT '' COMMENT '图片1',
......
...@@ -61,7 +61,8 @@ public class SweetPerformanceController { ...@@ -61,7 +61,8 @@ public class SweetPerformanceController {
@ApiImplicitParam(type = "query", dataType = "String", name = "picTwo", value = "图片2", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "picTwo", value = "图片2", required = true),
@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)
}) })
public ResponseDto<Boolean> add(@RequestParam() String performanceId, public ResponseDto<Boolean> add(@RequestParam() String performanceId,
@RequestParam() String performanceName, @RequestParam() String performanceName,
...@@ -69,8 +70,9 @@ public class SweetPerformanceController { ...@@ -69,8 +70,9 @@ public class SweetPerformanceController {
@RequestParam() String picTwo, @RequestParam() String picTwo,
@RequestParam() String arUrl, @RequestParam() String arUrl,
@RequestParam() String timeStart, @RequestParam() String timeStart,
@RequestParam() String timeEnd) { @RequestParam() String timeEnd,
return sweetPerformanceService.add(performanceId, performanceName, picOne, picTwo, arUrl, timeStart, timeEnd); @RequestParam() String arName) {
return sweetPerformanceService.add(performanceId, performanceName, arName, picOne, picTwo, arUrl, timeStart, timeEnd);
} }
@PostMapping("change") @PostMapping("change")
......
...@@ -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 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) {
try { try {
String offlineUrl = goblinUrl + "/goblin/inner/ar/data"; //离线地址 String offlineUrl = goblinUrl + "/goblin/inner/ar/data"; //离线地址
SweetPerformanceShow show = SweetPerformanceShow.getNew(); SweetPerformanceShow show = SweetPerformanceShow.getNew();
...@@ -59,6 +59,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap ...@@ -59,6 +59,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
show.setPicOne(picOne); show.setPicOne(picOne);
show.setPicTwo(picTwo); show.setPicTwo(picTwo);
show.setArUrl(arUrl); show.setArUrl(arUrl);
show.setArName(arName);
show.setOfflineUrl(offlineUrl); show.setOfflineUrl(offlineUrl);
show.setTimeStart(LocalDateTime.parse(timeStart)); show.setTimeStart(LocalDateTime.parse(timeStart));
show.setTimeEnd(LocalDateTime.parse(timeEnd)); show.setTimeEnd(LocalDateTime.parse(timeEnd));
...@@ -87,8 +88,8 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap ...@@ -87,8 +88,8 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
if (performanceARList.get(i).getArId().equals(id)) { if (performanceARList.get(i).getArId().equals(id)) {
//覆盖要修改的原数据 //覆盖要修改的原数据
BeanUtils.copyProperties(show, data); BeanUtils.copyProperties(show, data);
data.setTimeStart(LocalDateTime.parse(show.getTimeStart(),DTF_YMD_HMS)); data.setTimeStart(LocalDateTime.parse(show.getTimeStart(), DTF_YMD_HMS));
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());
performanceARList.set(i, data); performanceARList.set(i, data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment