巡演 提交

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CreateRoadShowParam.java

@@ -9,12 +9,14 @@ import java.time.LocalDateTime;
 @Data
 public class CreateRoadShowParam implements Serializable {
 
-    @ApiModelProperty(value = "巡演主键", example = "测试场地")
+    @ApiModelProperty(value = "巡演主键", example = "")
     private String roadShowsId;
+    @ApiModelProperty(value = "标题", example = "")
+    private String title;
 //    @ApiModelProperty(value = "场地主键", example = "测试场地")
 //    private String imgPoster;
     @ApiModelProperty(value = "状态 0停用 1启用", example = "1",hidden = true)
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "创建时间", example = "" , hidden = true)
     private LocalDateTime createdAt;
     @ApiModelProperty(value = "更新时间", example = "" , hidden = true)

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/RoadShowAdminVo.java

@@ -9,7 +9,9 @@ import lombok.Data;
 public class RoadShowAdminVo {
 
     @ApiModelProperty(value = "巡演id")
-    private int roadShowId;
+    private String roadShowId;
+    @ApiModelProperty(value = "标题")
+    private String title;
     @ApiModelProperty(value = "状态")
     private int status;
 }

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

@@ -18,7 +18,7 @@ import com.liquidnet.service.kylin.entity.KylinRoadShows;
  */
 public interface IKylinRoadShowsAdminService extends IService<KylinRoadShows> {
 
-    boolean createRoadShow(CreateRoadShowParam createRoadShowParam);
+    String  createRoadShow(CreateRoadShowParam createRoadShowParam);
 
     boolean updateRoadShow(CreateRoadShowParam createRoadShowParam);
 

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

@@ -197,7 +197,7 @@
                  LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
                  LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
         WHERE (ps.status = 3 or ps.status = 6 or ps.status = 7)
-          AND pr.road_show_id = #{roadShowId}
+          AND pr.road_show_id = ${roadShowId}
 
     </select>
     <!-- Mis 根据巡演查询演出列表 -->
@@ -207,6 +207,6 @@
         FROM kylin_performances AS p
                  LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
                  LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
-        WHERE ps.status = #{roadShowId}
+        WHERE ps.status = ${roadShowId}
     </select>
 </mapper>

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

@@ -10,19 +10,19 @@
     </resultMap>
 
     <select id="misRoadShowList" parameterType="java.util.Map" resultMap="misRoadShowListResult">
-        SELECT rs.road_shows_id,
-        rs.title,
-        count(pr.road_show_id) as 'performance_count',
+        SELECT
+        rs.road_shows_id ,
+        rs.title ,
+        count(pr.road_show_id) AS 'performance_count' ,
         rs.created_at
         FROM kylin_road_shows AS rs
         LEFT JOIN kylin_performance_relations AS pr ON pr.road_show_id = rs.road_shows_id
-        LEFT JOIN kylin_performance_status AS ps ON pr.performance_id = ps.performance_id
         <where>
             <if test="title!=''">
-                AND title LIKE LIKE concat('%', #{title}, '%')
+                AND rs.title LIKE concat('%', #{title}, '%')
             </if>
-            AND ps.status = 6 or ps.status = 3
         </where>
+        GROUP BY rs.road_shows_id
     </select>
 
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -322,6 +322,7 @@ CREATE TABLE `kylin_road_shows`
 (
     `mid`           int(11)      NOT NULL AUTO_INCREMENT,
     `road_shows_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'road_shows_id',
+    `title`         varchar(255) NOT NULL DEFAULT '' COMMENT '封面图',
     `img_poster`    varchar(255) NOT NULL DEFAULT '' COMMENT '巡演封面图',
     `status`        tinyint      NOT NULL DEFAULT 1 COMMENT '状态 0停用 1启用',
     `comment`       varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',

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

@@ -50,9 +50,9 @@ public class KylinRoadShowsAdminController {
     @ApiOperation(value = "创建")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<String> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
-        boolean result = roadShowsService.createRoadShow(createRoadShowParam);
-        if (result) {
-            return ResponseDto.success("创建成功");
+        String result = roadShowsService.createRoadShow(createRoadShowParam);
+        if (!result.isEmpty()) {
+            return ResponseDto.success(result);
         } else {
             return ResponseDto.failure("创建失败");
         }
@@ -73,7 +73,7 @@ public class KylinRoadShowsAdminController {
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除")
     @ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> performanceDetails(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
+    public ResponseDto<String> deleteRoadShow(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
         boolean result = roadShowsService.deleteRoadShow(roadShowId, status);
         if (result) {
             return ResponseDto.success("操作成功");
@@ -85,7 +85,7 @@ public class KylinRoadShowsAdminController {
     @GetMapping(value = "details")
     @ApiOperation(value = "详情")
     @ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<RoadShowAdminVo> performanceDetails(@RequestParam("roadShowId") String roadShowId) {
+    public ResponseDto<RoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
         RoadShowAdminVo result = null;
         result = roadShowsService.detailsRoadShow(roadShowId);
         if (result != null) {

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

@@ -190,13 +190,17 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 
     @Override
     public List<PerformanceTitleDao> getListByRoadShowId(String roadShowId) {
+        try {
             List<PerformanceTitleDao> voList = performancesMapper.misTitleByRoadShowIdList(roadShowId);
             return voList;
+        }catch (Exception e){
+            return new ArrayList<>();
+        }
     }
 
     @Override
     public List<PerformanceTitleDao> getListByStatus(String status) {
-        List<PerformanceTitleDao> voList = performancesMapper.misTitleByRoadShowIdList(status);
+        List<PerformanceTitleDao> voList = performancesMapper.misTitleByStatusList(status);
         return voList;
     }
 }

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

@@ -49,10 +49,11 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
     private KylinRoadShowsMapper kylinRoadShowsMapper;
 
     @Override
-    public boolean createRoadShow(CreateRoadShowParam createRoadShowParam) {
+    public String createRoadShow(CreateRoadShowParam createRoadShowParam) {
         try {
+            String roadShowId = IDGenerator.nextSnowId().toString();
             createRoadShowParam.setStatus(1);
-            createRoadShowParam.setRoadShowsId(IDGenerator.nextSnowId().toString());
+            createRoadShowParam.setRoadShowsId(roadShowId);
             createRoadShowParam.setCreatedAt(LocalDateTime.now());
             KylinRoadShows roadShows = new KylinRoadShows();
             BeanUtils.copyProperties(createRoadShowParam, roadShows);
@@ -60,9 +61,9 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
             RoadShowVo roadShowVo = new RoadShowVo();
             BeanUtils.copyProperties(createRoadShowParam, roadShowVo);
             mongoTemplate.insert(roadShows, RoadShowVo.class.getSimpleName());
-            return true;
+            return roadShowId;
         } catch (Exception e) {
-            return false;
+            return "";
         }
     }
 
@@ -71,6 +72,7 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
         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()));
             RoadShowVo roadShowVo = new RoadShowVo();
@@ -106,7 +108,9 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
     public RoadShowAdminVo detailsRoadShow(String roadShowId) {
         KylinRoadShows data = kylinRoadShowsMapper.selectOne(new UpdateWrapper<KylinRoadShows>().eq("road_shows_id", roadShowId));
         RoadShowAdminVo vo = new RoadShowAdminVo();
-        BeanUtils.copyProperties(data,vo);
+        vo.setTitle(data.getTitle());
+        vo.setRoadShowId(data.getRoadShowsId());
+        vo.setStatus(data.getStatus());
         return vo;
     }