Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -84,6 +84,14 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      */
     boolean setRecommend(List<PerformanceRecommendAdminParam> performancesId);
 
+    /**
+     * 设置 演出推荐 关联
+     *
+     * @param performancesId 相关参数
+     * @return boolean
+     */
+    Integer setIsShow(String performancesId,Integer isShow);
+
     /**
      * 查询 推荐演出列表
      *

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
@@ -22,8 +23,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Controller
 @RequestMapping("/kylin/performances")
-public class KylinPerformancesController extends BaseController
-{
+public class KylinPerformancesController extends BaseController {
     private String prefix = "zhengzai/kylin/performances";
 
     @Autowired
@@ -31,8 +31,7 @@ public class KylinPerformancesController extends BaseController
 
     @RequiresPermissions("kylin:performances:view")
     @GetMapping()
-    public String performances()
-    {
+    public String performances() {
         return prefix + "/performances";
     }
 
@@ -42,8 +41,7 @@ public class KylinPerformancesController extends BaseController
     @RequiresPermissions("kylin:performances:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam)
-    {
+    public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) {
         startPage();/**/
         PageInfo<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
         return getDataTable(result.getList());
@@ -56,12 +54,13 @@ public class KylinPerformancesController extends BaseController
         result = kylinPerformancesService.performanceDetails(performancesId);
         mmap.put("kylinPerformanceMisVo", result);
         return prefix + "/details";
-//        if (null != result) {
-//            return ResponseDto.success(result);
-//        } else {
-//            return ResponseDto.failure("获取演出详情失败");
-//        }
+    }
 
+    @RequiresPermissions("kylin:performances:change")
+    @PostMapping(value = "/isShow")
+    @ResponseBody
+    public AjaxResult setIsShow(String performancesId, Integer isShow) {
+        return toAjax(kylinPerformancesService.setIsShow(performancesId,isShow));
     }
 
 //

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-client-admin-web.yml

@@ -91,7 +91,7 @@ spring:
 # MyBatis
 mybatis:
   # 搜索指定包别名
-  typeAliasesPackage: com.liquidnet.service.kylin.entity,com.liquidnet.client.admin.**.domain
+  typeAliasesPackage: com.liquidnet.service.kylin.**.entity,com.liquidnet.client.admin.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath:com.liquidnet.service.kylin.mapper/*Mapper.xml,classpath:com.liquidnet.service.adam.mapper/*Mapper.xml
   # 加载全局的配置文件

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -52,7 +52,6 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -13,6 +13,7 @@ import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceMemberHistoryVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancePartnerListVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.*;
@@ -204,7 +205,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             PageHelper.startPage(performanceAdminListParam.getPageNum(), performanceAdminListParam.getPageSize());
             List<PerformanceAdminListDao> newList = new ArrayList();
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(BeanUtil.convertBeanToMap(performanceAdminListParam));
-            for (PerformanceAdminListDao item:voList){
+            for (PerformanceAdminListDao item : voList) {
                 item.setStatus(item.getStatus());
                 newList.add(item);
             }
@@ -290,6 +291,34 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         }
     }
 
+    @Override
+    public Integer setIsShow(String performancesId, Integer isShow) {
+        try {
+            Integer resultInt = 0;
+            if (isShow == 0) {
+                resultInt=performanceStatusMapper.hideIsShow(performancesId);
+            } else {
+                resultInt=performanceStatusMapper.showIsShow(performancesId);
+            }
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("isShow", isShow);
+            BasicDBObject object = new BasicDBObject("$set", map);
+            mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateMany(
+                    Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                    object
+            );
+
+            mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateMany(
+                    Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                    object
+            );
+            return 1;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
     @Override
     public PageInfo<PerformanceRecommendAdminDao> listRecommend() {
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java

@@ -35,7 +35,7 @@ public class KylinPerformanceStatus implements Serializable {
     private String performanceId;
 
     /**
-     * 是否显示 0全部用户可见 1白名单可见 2任何不显示
+     * 是否显示 0全部用户不可见 1全部可见 2白名单可见
      */
     private Integer isShow;
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformanceStatusMapper.java

@@ -13,4 +13,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface KylinPerformanceStatusMapper extends BaseMapper<KylinPerformanceStatus> {
 
+    Integer hideIsShow(String performancesId);
+
+    Integer showIsShow(String performancesId);
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformanceStatusMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.KylinPerformanceStatusMapper">
+
+    <select id="hideIsShow" resultType="java.lang.Boolean" parameterType="java.lang.String">
+        UPDATE kylin_performance_status
+        SET is_show = 0
+        WHERE performance_id = ${performancesId}
+    </select>
+    <select id="showIsShow" resultType="java.lang.Integer" parameterType="java.lang.String">
+        UPDATE kylin_performance_status
+        SET is_show = 1
+        WHERE performance_id = ${performancesId}
+    </select>
+
+</mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinRoadShowsAdminController.java

@@ -6,7 +6,6 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
-import com.liquidnet.service.kylin.service.impl.admin.KylinRoadShowsAdminServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -29,72 +28,72 @@ import java.util.Map;
 @RequestMapping("/admin/roadshow")
 public class KylinRoadShowsAdminController {
 
-    @Autowired
-    private KylinRoadShowsAdminServiceImpl roadShowsService;
-
-    @GetMapping(value = "list")
-    @ApiOperation(value = "获取列表",position = 1)
-    @ApiResponse(response = RoadShowAdminListDao.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<RoadShowAdminListDao>> listRoadShow(@RequestParam(value = "title",required = false) String title,
-                                                                          @RequestParam(value = "page") int page,
-                                                                          @RequestParam(value = "size") int size) {
-        PageInfo<RoadShowAdminListDao> result = null;
-        result = roadShowsService.listRoadShow(title, page, size);
-        if (null != result) {
-            return ResponseDto.success(result);
-        } else {
-            return ResponseDto.failure("获取演出详情失败");
-        }
-    }
-
-    @PostMapping(value = "")
-    @ApiOperation(value = "创建",position = 2)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<Map<String,String>> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
-        String result = roadShowsService.createRoadShow(createRoadShowParam);
-        if (!result.isEmpty()) {
-            Map<String,String> map = new HashMap<>();
-            map.put("roadShowId",result);
-            return ResponseDto.success(map);
-        } else {
-            return ResponseDto.failure("创建失败");
-        }
-    }
-
-    @PutMapping(value = "")
-    @ApiOperation(value = "修改",position = 3)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> updateRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
-        boolean result = roadShowsService.updateRoadShow(createRoadShowParam);
-        if (result) {
-            return ResponseDto.success("修改成功");
-        } else {
-            return ResponseDto.failure("修改失败");
-        }
-    }
-
-    @DeleteMapping(value = "")
-    @ApiOperation(value = "删除",position = 4)
-    @ApiResponse( code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> deleteRoadShow(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
-        boolean result = roadShowsService.deleteRoadShow(roadShowId, status);
-        if (result) {
-            return ResponseDto.success("操作成功");
-        } else {
-            return ResponseDto.failure("操作失败");
-        }
-    }
-
-    @GetMapping(value = "details")
-    @ApiOperation(value = "详情",position = 5)
-    @ApiResponse(response = KylinRoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinRoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
-        KylinRoadShowAdminVo result = null;
-        result = roadShowsService.detailsRoadShow(roadShowId);
-        if (result != null) {
-            return ResponseDto.success(result);
-        } else {
-            return ResponseDto.failure("操作失败");
-        }
-    }
+//    @Autowired
+//    private KylinRoadShowsAdminServiceImpl roadShowsService;
+//
+//    @GetMapping(value = "list")
+//    @ApiOperation(value = "获取列表",position = 1)
+//    @ApiResponse(response = RoadShowAdminListDao.class, code = 200, message = "接口返回对象参数")
+//    public ResponseDto<PageInfo<RoadShowAdminListDao>> listRoadShow(@RequestParam(value = "title",required = false) String title,
+//                                                                          @RequestParam(value = "page") int page,
+//                                                                          @RequestParam(value = "size") int size) {
+//        PageInfo<RoadShowAdminListDao> result = null;
+//        result = roadShowsService.listRoadShow(title, page, size);
+//        if (null != result) {
+//            return ResponseDto.success(result);
+//        } else {
+//            return ResponseDto.failure("获取演出详情失败");
+//        }
+//    }
+//
+//    @PostMapping(value = "")
+//    @ApiOperation(value = "创建",position = 2)
+//    @ApiResponse(code = 200, message = "接口返回对象参数")
+//    public ResponseDto<Map<String,String>> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
+//        String result = roadShowsService.createRoadShow(createRoadShowParam);
+//        if (!result.isEmpty()) {
+//            Map<String,String> map = new HashMap<>();
+//            map.put("roadShowId",result);
+//            return ResponseDto.success(map);
+//        } else {
+//            return ResponseDto.failure("创建失败");
+//        }
+//    }
+//
+//    @PutMapping(value = "")
+//    @ApiOperation(value = "修改",position = 3)
+//    @ApiResponse(code = 200, message = "接口返回对象参数")
+//    public ResponseDto<String> updateRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
+//        boolean result = roadShowsService.updateRoadShow(createRoadShowParam);
+//        if (result) {
+//            return ResponseDto.success("修改成功");
+//        } else {
+//            return ResponseDto.failure("修改失败");
+//        }
+//    }
+//
+//    @DeleteMapping(value = "")
+//    @ApiOperation(value = "删除",position = 4)
+//    @ApiResponse( code = 200, message = "接口返回对象参数")
+//    public ResponseDto<String> deleteRoadShow(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
+//        boolean result = roadShowsService.deleteRoadShow(roadShowId, status);
+//        if (result) {
+//            return ResponseDto.success("操作成功");
+//        } else {
+//            return ResponseDto.failure("操作失败");
+//        }
+//    }
+//
+//    @GetMapping(value = "details")
+//    @ApiOperation(value = "详情",position = 5)
+//    @ApiResponse(response = KylinRoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
+//    public ResponseDto<KylinRoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
+//        KylinRoadShowAdminVo result = null;
+//        result = roadShowsService.detailsRoadShow(roadShowId);
+//        if (result != null) {
+//            return ResponseDto.success(result);
+//        } else {
+//            return ResponseDto.failure("操作失败");
+//        }
+//    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRoadShowsAdminServiceImpl.java

-package com.liquidnet.service.kylin.service.impl.admin;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
-import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
-import com.liquidnet.service.kylin.dto.vo.KylinRoadShowVo;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
-import com.liquidnet.service.kylin.entity.KylinRoadShows;
-import com.liquidnet.service.kylin.mapper.KylinRoadShowsMapper;
-import com.liquidnet.service.kylin.service.admin.IKylinRoadShowsAdminService;
-import com.mongodb.BasicDBObject;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- * 巡演 服务实现类
- * </p>
- *
- * @author liquidnet
- * @since 2021-05-11
- */
-@Service
-public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMapper, KylinRoadShows> implements IKylinRoadShowsAdminService {
-
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    private MongoConverter mongoConverter;
-
-    @Autowired
-    private KylinRoadShowsMapper kylinRoadShowsMapper;
-
-    @Override
-    public String createRoadShow(CreateRoadShowParam createRoadShowParam) {
-        try {
-            String roadShowId = IDGenerator.nextSnowId().toString();
-            createRoadShowParam.setStatus(1);
-            createRoadShowParam.setRoadShowsId(roadShowId);
-            createRoadShowParam.setCreatedAt(LocalDateTime.now());
-            KylinRoadShows roadShows = new KylinRoadShows();
-            BeanUtils.copyProperties(createRoadShowParam, roadShows);
-            kylinRoadShowsMapper.insert(roadShows);
-            KylinRoadShowVo kylinRoadShowVo = new KylinRoadShowVo();
-            BeanUtils.copyProperties(createRoadShowParam, kylinRoadShowVo);
-            mongoTemplate.insert(roadShows, KylinRoadShowVo.class.getSimpleName());
-            return roadShowId;
-        } catch (Exception e) {
-            return "";
-        }
-    }
-
-    @Override
-    public boolean updateRoadShow(CreateRoadShowParam createRoadShowParam) {
-        try {
-            KylinRoadShows roadShows = new KylinRoadShows();
-            createRoadShowParam.setUpdatedAt(LocalDateTime.now());
-            createRoadShowParam.setStatus(null);
-            BeanUtils.copyProperties(createRoadShowParam, roadShows);
-            kylinRoadShowsMapper.update(roadShows, new UpdateWrapper<KylinRoadShows>().eq("road_shows_id", createRoadShowParam.getRoadShowsId()));
-            KylinRoadShowVo kylinRoadShowVo = new KylinRoadShowVo();
-            BeanUtils.copyProperties(createRoadShowParam, kylinRoadShowVo);
-
-            BasicDBObject objectRoadShowVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(roadShows));
-            mongoTemplate.getCollection(KylinRoadShows.class.getSimpleName()).updateOne(
-                    Query.query(Criteria.where("roadShowsId").is(createRoadShowParam.getRoadShowsId())).getQueryObject(),
-                    objectRoadShowVo);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean deleteRoadShow(String roadShowId, int status) {
-
-        KylinRoadShows roadShows = new KylinRoadShows();
-        roadShows.setStatus(status);
-        roadShows.setUpdatedAt(LocalDateTime.now());
-        kylinRoadShowsMapper.update(roadShows, new UpdateWrapper<KylinRoadShows>().eq("road_shows_id", roadShowId));
-
-        BasicDBObject objectRoadShowVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(roadShows));
-        mongoTemplate.getCollection(KylinRoadShows.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("roadShowsId").is(roadShowId)).getQueryObject(),
-                objectRoadShowVo);
-
-        return false;
-    }
-
-    @Override
-    public KylinRoadShowAdminVo detailsRoadShow(String roadShowId) {
-        KylinRoadShows data = kylinRoadShowsMapper.selectOne(new UpdateWrapper<KylinRoadShows>().eq("road_shows_id", roadShowId));
-        KylinRoadShowAdminVo vo = new KylinRoadShowAdminVo();
-        vo.setTitle(data.getTitle());
-        vo.setRoadShowId(data.getRoadShowsId());
-        vo.setStatus(data.getStatus());
-        return vo;
-    }
-
-    @Override
-    public PageInfo<RoadShowAdminListDao> listRoadShow(String title, int page, int size) {
-        PageInfo<RoadShowAdminListDao> pageInfoTmp = null;
-        try {
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("title", title);
-            PageHelper.startPage(page, size);
-            List<RoadShowAdminListDao> voList = kylinRoadShowsMapper.misRoadShowList(map);
-            pageInfoTmp = new PageInfo(voList);
-        } catch (Exception e) {
-            return null;
-        }
-        return pageInfoTmp;
-    }
-}