删除picUrl

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

@@ -21,7 +21,7 @@ public interface ISweetArtistsService extends IService<SweetArtists> {
 
     ResponseDto<SweetArtists> detail(String artistsId);
 
-    ResponseDto<Boolean> change(String artistsId,String picUrl,String name,String pinyin,String describe,String[] picArray,String[] videoArray);
+    ResponseDto<Boolean> change(String artistsId,String name,String pinyin,String describe,String[] picArray,String[] videoArray);
 
     ResponseDto<SweetArtists> del(String artistsId);
 

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

@@ -15,6 +15,6 @@ public interface ISweetPerformanceService extends IService<SweetPerformanceShow>
 
     ResponseDto<Boolean> del(String performanceId);
 
-    ResponseDto<PageInfo<SweetArtists>> getList(Integer page, Integer size, String name);
+    ResponseDto<PageInfo<SweetPerformanceShow>> getList(Integer page, Integer size, String pid);
 }
 

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetArtists.java

@@ -34,10 +34,6 @@ public class SweetArtists implements Serializable,Cloneable {
      */
     private String artistsId;
 
-    /**
-     * 图片地址
-     */
-    private String picUrl;
 
     /**
      * 艺人名称

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

@@ -74,7 +74,6 @@ public class SweetArtistsController {
     @ApiOperation("修改艺人")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人Id", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片", 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),
@@ -82,13 +81,12 @@ public class SweetArtistsController {
             @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true)
     })
     public ResponseDto<Boolean> change(@RequestParam() String artistsId,
-                                       @RequestParam() String picUrl,
                                        @RequestParam() String name,
                                        @RequestParam() String pinyin,
                                        @RequestParam() String describe,
                                        @RequestParam() String[] picArray,
                                        @RequestParam() String[] videoArray) {
-        return sweetArtistsService.change(artistsId, picUrl, name, pinyin, describe,picArray,videoArray);
+        return sweetArtistsService.change(artistsId, name, pinyin, describe,picArray,videoArray);
     }
     @GetMapping("del")
     @ApiOperation("删除艺人")

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

@@ -27,12 +27,12 @@ public class SweetPerformanceController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名 不查询从传递null", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "pid", value = "演出id", required = false),
     })
-    public ResponseDto<PageInfo<SweetArtists>> getList(@RequestParam() Integer page,
+    public ResponseDto<PageInfo<SweetPerformanceShow>> getList(@RequestParam() Integer page,
                                                        @RequestParam() Integer size,
-                                                       @RequestParam(required = false) String name) {
-        return sweetPerformanceService.getList(page, size, name);
+                                                       @RequestParam(required = false) String pid) {
+        return sweetPerformanceService.getList(page, size, pid);
     }
 
 

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

@@ -121,12 +121,11 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
     }
 
     @Override
-    public ResponseDto<Boolean> change(String artistsId, String picUrl, String name, String pinyin, String describe,String[] picArray,String[] videoArray) {
+    public ResponseDto<Boolean> change(String artistsId,  String name, String pinyin, String describe,String[] picArray,String[] videoArray) {
         try {
 
             LocalDateTime time = LocalDateTime.now();
             SweetArtists sweetArtists = SweetArtists.getNew();
-            sweetArtists.setPicUrl(picUrl);
             sweetArtists.setName(name);
             sweetArtists.setPinyin(pinyin);
             sweetArtists.setDescribes(describe);

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

@@ -2,6 +2,7 @@ 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.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.util.CurrentUtil;
@@ -114,10 +115,23 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
         return ResponseDto.success();
     }
 
+    //ar列表
     @Override
-    public ResponseDto<PageInfo<SweetArtists>> getList(Integer page, Integer size, String name) {
-
-        return null;
+    public ResponseDto<PageInfo<SweetPerformanceShow>> getList(Integer page, Integer size, String pid) {
+        PageInfo<SweetPerformanceShow> pageInfo = null;
+        try {
+            List<SweetPerformanceShow> data;
+            PageHelper.startPage(page, size);
+            if(pid!=null){
+                data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class).like(SweetPerformanceShow::getPerformanceId, pid));
+            }else {
+                data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class));
+            }
+            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

@@ -849,5 +849,14 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR.concat(performanceId + "");
         redisUtil.del(redisKey);
     }
+    public List<SweetPerformanceShow> getPerformanceList(){
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR.concat("*");
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return new ArrayList<>();
+        } else {
+            return (List<SweetPerformanceShow>) obj;
+        }
+    }
 
 }