提交doc

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetPerformanceService.java

@@ -5,13 +5,14 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.entity.SweetArtists;
 import com.liquidnet.service.sweet.entity.SweetPerformanceShow;
+import com.liquidnet.service.sweet.param.SweetPerformanceShowParam;
 
 import java.time.LocalDateTime;
 
 public interface ISweetPerformanceService extends IService<SweetPerformanceShow> {
-    ResponseDto<Boolean> add(String performanceId, String performanceName, String picOne, String picTwo, String arUrl, LocalDateTime timeStart, LocalDateTime timeEnd);
+    ResponseDto<Boolean> add(String performanceId, String performanceName, String picOne, String picTwo, String arUrl, String timeStart, String timeEnd);
 
-    ResponseDto<Boolean> change(SweetPerformanceShow show);
+    ResponseDto<Boolean> change(SweetPerformanceShowParam show);
 
     ResponseDto<Boolean> del(String performanceId);
 

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/param/SweetPerformanceShowParam.java

+package com.liquidnet.service.sweet.param;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class SweetPerformanceShowParam implements Serializable,Cloneable{
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * 主键id
+     */
+    private String arId;
+
+    private String performanceId;
+    /**
+     * 演出名
+     */
+    private String performanceName;
+    /**
+     * 图片地址1
+     */
+    private String picOne;
+    /**
+     * 图片地址2
+     */
+    private String picTwo;
+    /**
+     * AR地址
+     */
+    private String arUrl;
+    /**
+     * 离线地址
+     */
+    private String offlineUrl;
+
+    /**
+     * 状态 1可用 0不可用
+     */
+    private Integer status;
+    /**
+     * 开始时间
+     */
+    private String timeStart;
+    /**
+     * 结束时间
+     */
+    private String timeEnd;
+
+    private static final SweetPerformanceShowParam obj = new SweetPerformanceShowParam();
+    public static SweetPerformanceShowParam getNew() {
+        try {
+            return (SweetPerformanceShowParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetPerformanceShowParam();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetPerformanceController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.entity.SweetArtists;
 import com.liquidnet.service.sweet.entity.SweetPerformanceShow;
+import com.liquidnet.service.sweet.param.SweetPerformanceShowParam;
 import com.liquidnet.service.sweet.service.ISweetPerformanceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -62,16 +63,16 @@ public class SweetPerformanceController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "picOne", value = "图片1", 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 = "LocalDateTime", name = "timeStart", value = "开始时间", required = true),
-            @ApiImplicitParam(type = "query", dataType = "LocalDateTime", name = "timeEnd", value = "结束时间", required = true)
+            @ApiImplicitParam(type = "query", dataType = "String", name = "timeStart", value = "开始时间", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "timeEnd", value = "结束时间", required = true)
     })
     public ResponseDto<Boolean> add(@RequestParam() String performanceId,
                                     @RequestParam() String performanceName,
                                     @RequestParam() String picOne,
                                     @RequestParam() String picTwo,
                                     @RequestParam() String arUrl,
-                                    @RequestParam() LocalDateTime timeStart,
-                                    @RequestParam() LocalDateTime timeEnd) {
+                                    @RequestParam() String timeStart,
+                                    @RequestParam() String timeEnd) {
         return sweetPerformanceService.add(performanceId, performanceName, picOne, picTwo, arUrl, timeStart, timeEnd);
     }
 
@@ -85,7 +86,7 @@ public class SweetPerformanceController {
             @ApiImplicitParam(type = "query", dataType = "LocalDateTime", name = "timeStart", value = "开始时间", required = true),
             @ApiImplicitParam(type = "query", dataType = "LocalDateTime", name = "timeEnd", value = "结束时间", required = true)
     })
-    public ResponseDto<Boolean> change(SweetPerformanceShow show) {
+    public ResponseDto<Boolean> change(SweetPerformanceShowParam show) {
         return sweetPerformanceService.change(show);
     }
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetPerformanceServiceImpl.java

@@ -14,11 +14,13 @@ import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.sweet.entity.SweetArtists;
 import com.liquidnet.service.sweet.entity.SweetPerformanceShow;
 import com.liquidnet.service.sweet.mapper.SweetPerformanceMapper;
+import com.liquidnet.service.sweet.param.SweetPerformanceShowParam;
 import com.liquidnet.service.sweet.service.ISweetPerformanceService;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import org.bson.Document;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -53,7 +55,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
     Environment environment;
 
     @Override
-    public ResponseDto<Boolean> add(String performanceId, String performanceName, String picOne, String picTwo, String arUrl, LocalDateTime timeStart, LocalDateTime timeEnd) {
+    public ResponseDto<Boolean> add(String performanceId, String performanceName, String picOne, String picTwo, String arUrl, String timeStart, String timeEnd) {
         try {
             String offlineUrl = goblinUrl + "/goblin/inner/ar/data"; //离线地址
             SweetPerformanceShow show = SweetPerformanceShow.getNew();
@@ -64,8 +66,8 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
             show.setPicTwo(picTwo);
             show.setArUrl(arUrl);
             show.setOfflineUrl(offlineUrl);
-            show.setTimeStart(timeStart);
-            show.setTimeEnd(timeEnd);
+            show.setTimeStart(LocalDateTime.parse(timeStart));
+            show.setTimeEnd(LocalDateTime.parse(timeEnd));
             //redis
             List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
             performanceARList.add(show);
@@ -81,26 +83,33 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
     }
 
     @Override
-    public ResponseDto<Boolean> change(SweetPerformanceShow show) {
+    public ResponseDto<Boolean> change(SweetPerformanceShowParam show) {
         try {
             String id = show.getArId();
             //修改redis
             List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
+            SweetPerformanceShow data = null;
             for (int i = 0; i < performanceARList.size(); i++) {
                 SweetPerformanceShow performanceShow = performanceARList.get(i);
                 if (performanceShow.getArId().equals(id)) {
                     //覆盖要修改的原数据
-                    performanceARList.set(i, show);
+                    BeanUtils.copyProperties(show, data);
+                    data.setTimeStart(LocalDateTime.parse(show.getTimeStart()));
+                    data.setTimeEnd(LocalDateTime.parse(show.getTimeEnd()));
+                    performanceARList.set(i, data);
                     redisUtils.setPerformanceAR(performanceARList);
                     break;
                 }
             }
+            if(data==null){
+                return ResponseDto.failure();
+            }
             //修改 mongo数据
             Query query = Query.query(Criteria.where("arId").is(id));
             Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(show)));
             mongoTemplate.updateFirst(query, update, SweetPerformanceShow.class, SweetPerformanceShow.class.getSimpleName());
             //修改mysql
-            sweetPerformanceMapper.update(show, Wrappers.lambdaUpdate(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, id));
+            sweetPerformanceMapper.update(data, Wrappers.lambdaUpdate(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, id));
             return ResponseDto.success();
         } catch (Exception e) {
             return ResponseDto.failure();