添加艺人

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

@@ -94,5 +94,5 @@ public class SweetConstant {
     public final static String REDIS_KEY_QRCODE_LIST = QRCODE.concat("list:"); //二维码实体类 :type
 
     //AR
-    public final static String REDIS_KEY_SWEET_PERFORMANCE_AR = "sweet:performance:ar:mid:";
+    public final static String REDIS_KEY_SWEET_PERFORMANCE_AR = "sweet:performance:ar";
 }

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

+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.SweetPerformanceShow;
+
+public interface ISweetPerformanceAppService extends IService<SweetPerformanceShow> {
+
+    ResponseDto<PageInfo<SweetPerformanceShow>> getlistInTime(Integer page, Integer size);
+
+}

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

@@ -17,6 +17,6 @@ public interface ISweetPerformanceService extends IService<SweetPerformanceShow>
 
     ResponseDto<PageInfo<SweetPerformanceShow>> getList(Integer page, Integer size, String pid);
 
-    ResponseDto<PageInfo<SweetPerformanceShow>> getlistInTime(Integer page, Integer size);
+
 }
 

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

@@ -75,7 +75,7 @@ public class SweetArtistsController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人Id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "艺人简介", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "艺人简介", required = true),
             @ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = true),
             @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true)
     })

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

+package com.liquidnet.service.sweet.controller;
+
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "演出AR")
+@RestController
+@RequestMapping("/sweet-App")
+public class SweetPerformanceAppController {
+    @Autowired
+    private ISweetPerformanceAppService sweetPerformanceAppService;
+
+    @GetMapping("listInTime")
+    @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) {
+        return sweetPerformanceAppService.getlistInTime(page, size);
+    }
+
+}

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

@@ -35,16 +35,6 @@ public class SweetPerformanceController {
         return sweetPerformanceService.getList(page, size, pid);
     }
 
-    @GetMapping("listInTime")
-    @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) {
-        return sweetPerformanceService.getlistInTime(page, size);
-    }
 
 
     @PostMapping("add")

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

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -73,6 +74,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
     }
 
     @Override
+    @Transactional
     public ResponseDto<Boolean> add(SweetArtistsList sweetArtistsList) {
         try {
             String mid = IDGenerator.nextSnowId();
@@ -119,6 +121,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
     }
 
     @Override
+    @Transactional
     public ResponseDto<Boolean> change(String artistsId,SweetArtistsList sweetArtistsList) {
         try {
 
@@ -156,6 +159,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
     }
 
     @Override
+    @Transactional
     public ResponseDto<SweetArtists> del(String artistsId) {
         try {
             sweetArtistsMapper.delete(Wrappers.lambdaQuery(SweetArtists.class).eq(SweetArtists::getArtistsId, artistsId));

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

+package com.liquidnet.service.sweet.service.impl;
+
+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.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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+@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;
+
+        try {
+            List<SweetPerformanceShow> data = new ArrayList<>();
+            PageHelper.startPage(page, size);
+            LocalDateTime time = LocalDateTime.now();
+           /* data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class)
+                    .le(SweetPerformanceShow::getTimeStart,time).ge(SweetPerformanceShow::getTimeEnd,time).eq(SweetPerformanceShow::getStatus,1));*/
+            List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            for (SweetPerformanceShow performanceShow : performanceARList) {
+                String timeStart =performanceShow.getTimeStart().replace("T"," ");
+                String timeEnd = performanceShow.getTimeEnd().replace("T", " ");
+                LocalDateTime startTime = LocalDateTime.parse(performanceShow.getTimeStart());
+                LocalDateTime endTime = LocalDateTime.parse(performanceShow.getTimeEnd());
+                if (startTime.isBefore(time) && endTime.isAfter(time)){
+                    data.add(performanceShow);
+                }
+            }
+            pageInfo = new PageInfo(data);
+            return ResponseDto.success(pageInfo);
+        }catch (Exception e) {
+            return ResponseDto.success(pageInfo);
+        }
+
+    }
+}

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

@@ -28,6 +28,7 @@ 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.List;
 
@@ -73,10 +74,15 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
             show.setPicTwo(picTwo);
             show.setArUrl(arUrl);
             show.setOfflineUrl(offlineUrl);
+
+
+
             show.setTimeStart(timeStart);
             show.setTimeEnd(timeEnd);
             //redis
-            redisUtils.setPerformanceAR(performanceId,show);
+            List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
+            performanceARList.add(show);
+            redisUtils.setPerformanceAR(performanceARList);
             //新增 mongo数据
             mongoTemplate.insert(show, SweetPerformanceShow.class.getSimpleName());
             //mysql
@@ -91,9 +97,17 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
     public ResponseDto<Boolean> change(SweetPerformanceShow show) {
         try {
             String performanceId = show.getPerformanceId();
-
+            String id = show.getPerformanceId();
             //修改redis
-            redisUtils.setPerformanceAR(performanceId,show);
+            List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
+            for (SweetPerformanceShow performanceShow : performanceARList) {
+                if (performanceShow.getPerformanceId().equals(id)){
+                    //删除要修改的原数据
+                    performanceARList.remove(performanceShow);
+                    performanceARList.add(show);
+                    redisUtils.setPerformanceAR(performanceARList);
+                }
+            }
             //修改 mongo数据
             Query query = Query.query(Criteria.where("performanceId").is(performanceId));
             Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(show)));
@@ -105,11 +119,18 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
             return ResponseDto.failure();
         }
     }
-
     @Override
     public ResponseDto<Boolean> del(String performanceId) {
         //删除
-        redisUtils.delPerformanceARById(performanceId);
+        List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
+        for (SweetPerformanceShow performanceShow : performanceARList) {
+            if (performanceShow.getPerformanceId().equals(performanceId)){
+                //删除要修改的原数据
+                performanceARList.remove(performanceShow);
+                redisUtils.setPerformanceAR(performanceARList);
+            }
+        }
+        //redisUtils.delPerformanceARById(performanceId);
         mongoTemplate.remove(Query.query(Criteria.where("performanceId").is(performanceId)),SweetPerformanceShow.class.getSimpleName());
         sweetPerformanceMapper.delete(Wrappers.lambdaQuery(SweetPerformanceShow.class).eq(SweetPerformanceShow::getPerformanceId, performanceId));
         return ResponseDto.success();
@@ -134,22 +155,4 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
         }
     }
 
-    @Override
-    public ResponseDto<PageInfo<SweetPerformanceShow>> getlistInTime(Integer page, Integer size) {
-        PageInfo<SweetPerformanceShow> pageInfo = null;
-        try {
-            List<SweetPerformanceShow> data;
-            PageHelper.startPage(page, size);
-            LocalDateTime time = LocalDateTime.now();
-            data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class)
-                    .le(SweetPerformanceShow::getTimeStart,time).ge(SweetPerformanceShow::getTimeEnd,time).eq(SweetPerformanceShow::getStatus,1));
-            pageInfo = new PageInfo(data);
-            return ResponseDto.success(pageInfo);
-        }catch (Exception e) {
-            return ResponseDto.success(pageInfo);
-        }
-
-    }
-
-
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -840,16 +840,27 @@ public class RedisDataUtils {
         }
     }
 
-    public void setPerformanceAR(String performanceId, SweetPerformanceShow data) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR.concat(performanceId + "");
+    public void setPerformanceAR(List<SweetPerformanceShow> data) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR;
         redisUtil.set(redisKey, data);
     }
 
+    public List<SweetPerformanceShow> getPerformanceAR() {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR;
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return new ArrayList<>();
+        } else {
+            return (List<SweetPerformanceShow>) obj;
+        }
+    }
+
     public void delPerformanceARById(String performanceId){
         String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR.concat(performanceId + "");
         redisUtil.del(redisKey);
     }
-    /*public List<SweetPerformanceShow> getPerformanceList(){
+
+    public List<SweetPerformanceShow> getPerformanceListInApp(){
         String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR.concat("*");
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
@@ -857,6 +868,6 @@ public class RedisDataUtils {
         } else {
             return (List<SweetPerformanceShow>) obj;
         }
-    }*/
+    }
 
 }