修改 bug 提交

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

@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.entity.SweetPerformanceShow;
+import com.liquidnet.service.sweet.vo.SweetPerformanceShowVo;
 
 public interface ISweetPerformanceAppService extends IService<SweetPerformanceShow> {
 
-    ResponseDto<PageInfo<SweetPerformanceShow>> getlistInTime(Integer page, Integer size);
+    ResponseDto<PageInfo<SweetPerformanceShowVo>> getlistInTime(Integer page, Integer size);
 
 }

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

@@ -3,11 +3,9 @@ package com.liquidnet.service.sweet.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 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;
+import com.liquidnet.service.sweet.vo.SweetPerformanceShowVo;
 
 public interface ISweetPerformanceService extends IService<SweetPerformanceShow> {
     ResponseDto<Boolean> add(String performanceId, String performanceName, String picOne, String picTwo, String arUrl, String timeStart, String timeEnd);
@@ -16,9 +14,9 @@ public interface ISweetPerformanceService extends IService<SweetPerformanceShow>
 
     ResponseDto<Boolean> del(String performanceId);
 
-    ResponseDto<PageInfo<SweetPerformanceShow>> getList(Integer page, Integer size, String performanceName);
+    ResponseDto<PageInfo<SweetPerformanceShowVo>> getList(Integer page, Integer size, String performanceName);
 
-    ResponseDto<SweetPerformanceShow> details(String arId);
+    ResponseDto<SweetPerformanceShowVo> details(String arId);
 
     ResponseDto<Boolean> changeStatus(String arId,Integer status);
 }

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

@@ -5,15 +5,11 @@ 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
      */
@@ -36,15 +32,6 @@ public class SweetPerformanceShowParam implements Serializable,Cloneable{
      * AR地址
      */
     private String arUrl;
-    /**
-     * 离线地址
-     */
-    private String offlineUrl;
-
-    /**
-     * 状态 1可用 0不可用
-     */
-    private Integer status;
     /**
      * 开始时间
      */

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/vo/SweetPerformanceShowVo.java

+package com.liquidnet.service.sweet.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SweetPerformanceShowVo implements Serializable,Cloneable{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键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 SweetPerformanceShowVo obj = new SweetPerformanceShowVo();
+    public static SweetPerformanceShowVo getNew() {
+        try {
+            return (SweetPerformanceShowVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetPerformanceShowVo();
+        }
+    }
+}

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.entity.SweetPerformanceShow;
 import com.liquidnet.service.sweet.service.ISweetPerformanceAppService;
+import com.liquidnet.service.sweet.vo.SweetPerformanceShowVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -22,13 +23,13 @@ public class SweetPerformanceAppController {
     private ISweetPerformanceAppService sweetPerformanceAppService;
 
     @GetMapping("listInTime")
-    @ApiOperation("ar列表-有效时间")
+    @ApiOperation("ar列表-移动端")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
     })
-    public ResponseDto<PageInfo<SweetPerformanceShow>> getlistInTime(@RequestParam() Integer page,
-                                                                     @RequestParam() Integer size) {
+    public ResponseDto<PageInfo<SweetPerformanceShowVo>> getlistInTime(@RequestParam() Integer page,
+                                                                       @RequestParam() Integer size) {
         return sweetPerformanceAppService.getlistInTime(page, size);
     }
 

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

@@ -2,9 +2,8 @@ package com.liquidnet.service.sweet.controller;
 
 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.vo.SweetPerformanceShowVo;
 import com.liquidnet.service.sweet.service.ISweetPerformanceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -13,8 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;
-
 @Api(tags = "演出AR")
 @RestController
 @RequestMapping("/sweet-ar")
@@ -30,9 +27,9 @@ public class SweetPerformanceController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "performanceName", value = "演出名", required = false),
     })
-    public ResponseDto<PageInfo<SweetPerformanceShow>> getList(@RequestParam() Integer page,
-                                                               @RequestParam() Integer size,
-                                                               @RequestParam(required = false) String performanceName) {
+    public ResponseDto<PageInfo<SweetPerformanceShowVo>> getList(@RequestParam() Integer page,
+                                                                 @RequestParam() Integer size,
+                                                                 @RequestParam(required = false) String performanceName) {
         return sweetPerformanceService.getList(page, size, performanceName);
     }
 
@@ -41,7 +38,7 @@ public class SweetPerformanceController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "arId", value = "主键id", required = true),
     })
-    public ResponseDto<SweetPerformanceShow> details(@RequestParam("arId") String arId) {
+    public ResponseDto<SweetPerformanceShowVo> details(@RequestParam("arId") String arId) {
         return sweetPerformanceService.details(arId);
     }
 

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

@@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.entity.SweetPerformanceShow;
 import com.liquidnet.service.sweet.mapper.SweetPerformanceMapper;
 import com.liquidnet.service.sweet.service.ISweetPerformanceAppService;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
+import com.liquidnet.service.sweet.vo.SweetPerformanceShowVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,27 +20,35 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
 @Service
 public class SweetPerformanceAppServiceImpl extends ServiceImpl<SweetPerformanceMapper, SweetPerformanceShow> implements ISweetPerformanceAppService {
     @Autowired
     private RedisDataUtils redisUtils;
 
     @Override
-    public ResponseDto<PageInfo<SweetPerformanceShow>> getlistInTime(Integer page, Integer size) {
-        PageInfo<SweetPerformanceShow> pageInfo = null;
+    public ResponseDto<PageInfo<SweetPerformanceShowVo>> getlistInTime(Integer page, Integer size) {
+        PageInfo<SweetPerformanceShowVo> pageInfo = null;
         try {
-            List<SweetPerformanceShow> data = new ArrayList<>();
+            size = 20;
+            List<SweetPerformanceShowVo> data = new ArrayList<>();
             PageHelper.startPage(page, size);
             LocalDateTime time = LocalDateTime.now();
             List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
             for (SweetPerformanceShow performanceShow : performanceARList) {
                 if (time.isBefore(performanceShow.getTimeEnd()) && time.isAfter(performanceShow.getTimeStart()) && performanceShow.getStatus() == 1) {
-                    data.add(performanceShow);
+                    SweetPerformanceShowVo vo = SweetPerformanceShowVo.getNew();
+                    BeanUtils.copyProperties(performanceShow, vo);
+                    vo.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(performanceShow.getTimeStart()));
+                    vo.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(performanceShow.getTimeEnd()));
+                    data.add(vo);
                 }
             }
             pageInfo = new PageInfo(data);
             return ResponseDto.success(pageInfo);
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.success(pageInfo);
         }
 

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

@@ -4,21 +4,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.constant.LnsEnum;
-import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ResponseDto;
 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.vo.SweetPerformanceShowVo;
 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;
@@ -30,14 +25,13 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
 @Service
 public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMapper, SweetPerformanceShow> implements ISweetPerformanceService {
 
@@ -88,30 +82,32 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
             String id = show.getArId();
             //修改redis
             List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
-            SweetPerformanceShow data = null;
+            SweetPerformanceShow data = SweetPerformanceShow.getNew();
             for (int i = 0; i < performanceARList.size(); i++) {
-                SweetPerformanceShow performanceShow = performanceARList.get(i);
-                if (performanceShow.getArId().equals(id)) {
+                if (performanceARList.get(i).getArId().equals(id)) {
                     //覆盖要修改的原数据
                     BeanUtils.copyProperties(show, data);
-                    data.setTimeStart(LocalDateTime.parse(show.getTimeStart()));
-                    data.setTimeEnd(LocalDateTime.parse(show.getTimeEnd()));
+                    data.setTimeStart(LocalDateTime.parse(show.getTimeStart(),DTF_YMD_HMS));
+                    data.setTimeEnd(LocalDateTime.parse(show.getTimeEnd(),DTF_YMD_HMS));
+                    data.setStatus(performanceARList.get(i).getStatus());
+                    data.setOfflineUrl(performanceARList.get(i).getOfflineUrl());
                     performanceARList.set(i, data);
                     redisUtils.setPerformanceAR(performanceARList);
                     break;
                 }
             }
-            if(data==null){
+            if (data.getArId() == null || data.getArId().equals("")) {
                 return ResponseDto.failure();
             }
             //修改 mongo数据
             Query query = Query.query(Criteria.where("arId").is(id));
-            Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(show)));
+            Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(data)));
             mongoTemplate.updateFirst(query, update, SweetPerformanceShow.class, SweetPerformanceShow.class.getSimpleName());
             //修改mysql
             sweetPerformanceMapper.update(data, Wrappers.lambdaUpdate(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, id));
             return ResponseDto.success();
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.failure();
         }
     }
@@ -135,17 +131,25 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
 
     //ar列表
     @Override
-    public ResponseDto<PageInfo<SweetPerformanceShow>> getList(Integer page, Integer size, String performanceName) {
-        PageInfo<SweetPerformanceShow> pageInfo = null;
+    public ResponseDto<PageInfo<SweetPerformanceShowVo>> getList(Integer page, Integer size, String performanceName) {
+        PageInfo<SweetPerformanceShowVo> pageInfo = null;
         try {
             List<SweetPerformanceShow> data;
             PageHelper.startPage(page, size);
+            List<SweetPerformanceShowVo> listData = new ArrayList();
             if (performanceName != null) {
                 data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class).like(SweetPerformanceShow::getPerformanceName, performanceName));
             } else {
                 data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class));
             }
-            pageInfo = new PageInfo(data);
+            for (SweetPerformanceShow entity : data) {
+                SweetPerformanceShowVo rdata = SweetPerformanceShowVo.getNew();
+                BeanUtils.copyProperties(entity, rdata);
+                rdata.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(entity.getTimeStart()));
+                rdata.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(entity.getTimeEnd()));
+                listData.add(rdata);
+            }
+            pageInfo = new PageInfo(listData);
             return ResponseDto.success(pageInfo);
         } catch (Exception e) {
             return ResponseDto.success(pageInfo);
@@ -153,8 +157,13 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
     }
 
     @Override
-    public ResponseDto<SweetPerformanceShow> details(String arId) {
-        return ResponseDto.success(sweetPerformanceMapper.selectOne(Wrappers.lambdaQuery(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, arId)));
+    public ResponseDto<SweetPerformanceShowVo> details(String arId) {
+        SweetPerformanceShow entity = sweetPerformanceMapper.selectOne(Wrappers.lambdaQuery(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, arId));
+        SweetPerformanceShowVo rdata = SweetPerformanceShowVo.getNew();
+        BeanUtils.copyProperties(entity, rdata);
+        rdata.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(entity.getTimeStart()));
+        rdata.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(entity.getTimeEnd()));
+        return ResponseDto.success(rdata);
     }
 
     @Override