记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 74b5e1e2 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

巡演 提交

parent e75a1030
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 48 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CreateRoadShowParam.java
View file @ 74b5e1e2
......@@ -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
View file @ 74b5e1e2
......@@ -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
View file @ 74b5e1e2
......@@ -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
View file @ 74b5e1e2
......@@ -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
View file @ 74b5e1e2
......@@ -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
View file @ 74b5e1e2
......@@ -9,18 +9,18 @@ drop TABLE if exists `kylin_banners`;
CREATE TABLE `kylin_banners`
(
`mid` int NOT NULL AUTO_INCREMENT,
`banners_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'banners_id',
`banners_name` varchar(255) NOT NULL DEFAULT '' COMMENT '标题',
`cover_img` varchar(255) NOT NULL DEFAULT '' COMMENT '封面图',
`target_type` smallint NOT NULL DEFAULT 0 COMMENT '跳转类型(由接口提供)',
`target_obj` varchar(255) NOT NULL DEFAULT '' COMMENT '跳转目标 id/url等',
`is_online` tinyint NOT NULL DEFAULT 0 COMMENT '是否上线展示 0下线 1上线',
`banners_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'banners_id',
`banners_name` varchar(255) NOT NULL DEFAULT '' COMMENT '标题',
`cover_img` varchar(255) NOT NULL DEFAULT '' COMMENT '封面图',
`target_type` smallint NOT NULL DEFAULT 0 COMMENT '跳转类型(由接口提供)',
`target_obj` varchar(255) NOT NULL DEFAULT '' COMMENT '跳转目标 id/url等',
`is_online` tinyint NOT NULL DEFAULT 0 COMMENT '是否上线展示 0下线 1上线',
`online_start_time` timestamp NULL DEFAULT NULL COMMENT '上线开始时间',
`online_end_time` timestamp NULL DEFAULT NULL COMMENT '上线结束时间',
`promotion_type` tinyint NOT NULL DEFAULT 1 COMMENT '推广类型 1全国 2省份',
`banners_sort` int NOT NULL DEFAULT 0 COMMENT '排序 越大越靠前',
`remarks` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
`is_deleted` tinyint NOT NULL DEFAULT 1 COMMENT '是否删除 0已删除 1正常',
`promotion_type` tinyint NOT NULL DEFAULT 1 COMMENT '推广类型 1全国 2省份',
`banners_sort` int NOT NULL DEFAULT 0 COMMENT '排序 越大越靠前',
`remarks` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
`is_deleted` tinyint NOT NULL DEFAULT 1 COMMENT '是否删除 0已删除 1正常',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_banners_banners_id_index` (`banners_id`),
......@@ -32,13 +32,13 @@ CREATE TABLE `kylin_banners`
drop TABLE if exists `kylin_banners_relations`;
CREATE TABLE `kylin_banners_relations`
(
`mid` int NOT NULL AUTO_INCREMENT,
`banners_relations_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'banners_relations_id',
`banners_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'banners_id',
`field_id` int NOT NULL DEFAULT 0 COMMENT '展示位置id/推广省份code',
`field_id_type` tinyint NOT NULL DEFAULT 1 COMMENT '关联字段类型 1展示位置(由接口提供) 2推广省份(由接口提供)',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
`mid` int NOT NULL AUTO_INCREMENT,
`banners_relations_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'banners_relations_id',
`banners_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'banners_id',
`field_id` int NOT NULL DEFAULT 0 COMMENT '展示位置id/推广省份code',
`field_id_type` tinyint NOT NULL DEFAULT 1 COMMENT '关联字段类型 1展示位置(由接口提供) 2推广省份(由接口提供)',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_banners_relations_banners_relations_id_index` (`banners_relations_id`),
KEY `kylin_banners_relations_banners_id_index` (`banners_id`),
PRIMARY KEY (`mid`)
......@@ -113,7 +113,7 @@ CREATE TABLE `kylin_performances`
`mid` int(11) NOT NULL AUTO_INCREMENT,
`performances_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'performances_id',
`title` varchar(255) NOT NULL DEFAULT '' COMMENT '演出名称',
`type` tinyint NOT NULL DEFAULT 3 COMMENT '1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演',
`type` tinyint NOT NULL DEFAULT 3 COMMENT '1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演',
`img_poster` varchar(255) NOT NULL DEFAULT '' COMMENT '演出海报',
`province_id` varchar(255) NOT NULL DEFAULT '' COMMENT '省id',
`province_name` varchar(255) NOT NULL DEFAULT '' COMMENT '省名称',
......@@ -128,12 +128,12 @@ CREATE TABLE `kylin_performances`
`sponsor` varchar(255) NOT NULL DEFAULT '' COMMENT '主办方',
`contacts` varchar(255) NOT NULL DEFAULT '' COMMENT '联系人',
`mobile` varchar(255) NOT NULL DEFAULT '' COMMENT '联系电话',
`describes` varchar(255) NOT NULL DEFAULT '' COMMENT '演出简介',
`describes` varchar(255) NOT NULL DEFAULT '' COMMENT '演出简介',
`details` longtext DEFAULT NULL COMMENT '演出详情',
`notice_image` text DEFAULT NULL COMMENT '购票须知',
`time_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '演出开始时间',
`time_end` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '演出结束时间',
`audit_time` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '提审时间',
`audit_time` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '提审时间',
`reject_txt` varchar(255) NOT NULL DEFAULT '' COMMENT '拒绝理由',
`sort` int(11) NOT NULL DEFAULT 0 COMMENT '权重 高则在上',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
......@@ -214,8 +214,8 @@ CREATE TABLE `kylin_ticket_times`
`title` varchar(255) NOT NULL DEFAULT '' COMMENT '标题',
`type` tinyint NOT NULL DEFAULT 1 COMMENT '状态 1单日票 2通票',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '状态 0不可用 1可用',
`use_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
`use_end` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
`use_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
`use_end` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
......@@ -251,7 +251,7 @@ CREATE TABLE `kylin_tickets`
`price_express` decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '快递费',
`price_discount_member` decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '会员优惠价格',
`price_discount` decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '优惠价格',
`describes` varchar(500) NOT NULL DEFAULT '' COMMENT '票种描述',
`describes` varchar(500) NOT NULL DEFAULT '' COMMENT '票种描述',
`describe_express` varchar(500) NOT NULL DEFAULT '' COMMENT '快递票类型说明',
`describe_electronic` varchar(500) NOT NULL DEFAULT '' COMMENT '电子票票类型说明',
`advance_minute_member` int(11) NOT NULL DEFAULT 5 COMMENT '会员提前购买分钟数',
......@@ -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
View file @ 74b5e1e2
......@@ -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
View file @ 74b5e1e2
......@@ -190,13 +190,17 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override
public List<PerformanceTitleDao> getListByRoadShowId(String roadShowId) {
List<PerformanceTitleDao> voList = performancesMapper.misTitleByRoadShowIdList(roadShowId);
return voList;
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
View file @ 74b5e1e2
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment