--no commit message

app/live/src/main/java/com/zrqx/live/LiveStart.java → app/live/src/main/java/com/zrqx/LiveStart.java

-package com.zrqx.live;
+package com.zrqx
+;
 
 import javax.sql.DataSource;
 

app/live/src/main/java/com/zrqx/live/bg/controller/FilesController.java

+package com.zrqx.live.bg.controller;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.live.bg.service.FilesService;
+import com.zrqx.live.commons.model.File;
+import com.zrqx.live.commons.vo.FileVo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping("/bg/file")
+@Api(description = "文档")
+public class FilesController {
+
+	@Autowired
+	private FilesService fileService;
+	
+	@ApiOperation("创建文档")
+	@PostMapping(value="/save")
+	public CallBack<Boolean> save(@RequestBody File entity){
+		entity.setCreateTime(new Date());
+		boolean b = fileService.insert(entity);
+		return CallBack.success(b);
+	}
+	
+
+	@ApiOperation("批量删除")
+	@PostMapping(value="/batch/delete")
+	public CallBack<Boolean> delete(@RequestBody List<Integer> ids){
+		ids.forEach(id ->{
+			fileService.deleteByPrimaryKey(id);
+		});
+		return CallBack.success(true);
+	}
+	
+	@ApiOperation("修改")
+	@PostMapping(value="/update")
+	public CallBack<Boolean> update(@RequestBody File form){
+		form.setUpdateTime(new Date());
+		boolean b = fileService.updateByPrimaryKeySelective(form);
+		return CallBack.success(b);
+	}
+	
+	@ApiOperation("列表查询")
+	@GetMapping(value="/page")
+	public CallBack<PageInfo<FileVo>> page(PageParam pageParam, String fileName){
+		if(StringUtils.isBlank(pageParam.getOrderBy())){
+			pageParam.setOrderBy("createTime desc");
+		}
+		return CallBack.success(fileService.page(pageParam,fileName));
+	}
+}

app/live/src/main/java/com/zrqx/live/bg/controller/LiveController.java

+package com.zrqx.live.bg.controller;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.live.bg.service.LiveService;
+import com.zrqx.live.commons.enums.StatusEnum;
+import com.zrqx.live.commons.form.LiveForm;
+import com.zrqx.live.commons.form.LiveStatusForm;
+import com.zrqx.live.commons.model.Live;
+import com.zrqx.live.commons.vo.LiveVo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping("/bg/live")
+@Api(description = "直播")
+public class LiveController {
+
+	@Autowired
+	private LiveService liveService;
+	
+	@ApiOperation(value="创建直播")
+	@PostMapping(value="/save")
+	public CallBack<Boolean> save(@RequestBody Live entity){
+		entity.setCreateTime(new Date());
+		return CallBack.success(liveService.insert(entity));
+	}
+	
+	@ApiOperation("批量删除")
+	@PostMapping("/batch/delete")
+	public CallBack<Boolean> delete(@RequestBody List<Integer> ids){
+		ids.forEach(id ->{
+			Live live = liveService.selectByPrimaryKey(id);
+			if (live.getStatus().equals(StatusEnum.STATUS_0.getCode())) {
+				return;
+			}
+			liveService.deleteByPrimaryKey(id);
+		});
+		return CallBack.success(true);
+	}
+	
+	@ApiOperation("修改")
+	@PostMapping("/update")
+	public CallBack<Boolean> update(@RequestBody Live form){
+		form.setUpdateTime(new Date());
+		boolean b = liveService.updateByPrimaryKeySelective(form);
+		return CallBack.success(b);
+	}
+	
+	@ApiOperation("列表查询")
+	@GetMapping("/page")
+	public CallBack<PageInfo<LiveVo>> page(PageParam pageParam, LiveForm form){
+		if(StringUtils.isBlank(pageParam.getOrderBy())){
+			pageParam.setOrderBy("createTime desc");
+		}
+		return CallBack.success(liveService.page(pageParam,form));
+	}
+	
+	@ApiOperation("批量上下架")
+	@PostMapping("/batch/upOrDown")
+	public CallBack<Boolean> upOrDown(@RequestBody LiveStatusForm form){
+		form.getIds().forEach(id ->{
+			Live live = liveService.selectByPrimaryKey(id);
+			live.setStatus(form.getStatus());
+			liveService.updateByPrimaryKeySelective(live);
+		});
+		return CallBack.success(true);
+	}
+}

app/live/src/main/java/com/zrqx/live/bg/mapper/FilesMapper.java

+package com.zrqx.live.bg.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.live.commons.model.File;
+import com.zrqx.live.commons.vo.FileVo;
+
+@Mapper
+public interface FilesMapper extends BaseMapper<File> {
+
+	@Select("<script>"
+			+ " select fileName,pageNum,createTime,schedule "
+			+ " from l_file where 1=1 "
+			+ " eq(fileName,fileName)"
+			+ "</script>")
+	List<FileVo> page(@Param("fileName") String fileName);
+
+}

app/live/src/main/java/com/zrqx/live/bg/mapper/LiveMapper.java

+package com.zrqx.live.bg.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.live.commons.form.LiveForm;
+import com.zrqx.live.commons.model.Live;
+import com.zrqx.live.commons.vo.LiveVo;
+
+@Mapper
+public interface LiveMapper extends BaseMapper<Live>{
+
+	@Select("<script>"
+			+ " select id,title,sellPrice,createTime,status,liveStatus "
+			+ " from l_live where 1=1 "
+			+ " eq(form.liveStatus,liveStatus) "
+			+ " eq(form.typeName,typeName) "
+			+ " eq(form.title,title) "
+			+ "</script>")
+	List<LiveVo> page(@Param("form") LiveForm form);
+
+}

app/live/src/main/java/com/zrqx/live/bg/service/FilesServcieImpl.java

+package com.zrqx.live.bg.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.live.bg.mapper.FilesMapper;
+import com.zrqx.live.commons.model.File;
+import com.zrqx.live.commons.vo.FileVo;
+@Service
+public class FilesServcieImpl extends BaseServiceImpl<File,Integer> implements FilesService {
+
+	@Autowired
+	private FilesMapper mapper;
+	@Override
+	public BaseMapper<File> getMapper() {
+		return mapper;
+	}
+	@Override
+	public PageInfo<FileVo> page(PageParam pageParam, String fileName) {
+		startPage(pageParam);
+		List<FileVo> list = mapper.page(fileName);
+		
+		return new PageInfo<FileVo>(list);
+	}
+
+}

app/live/src/main/java/com/zrqx/live/bg/service/FilesService.java

+package com.zrqx.live.bg.service;
+
+import com.zrqx.core.service.BaseService;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.live.commons.model.File;
+import com.zrqx.live.commons.vo.FileVo;
+
+public interface FilesService extends BaseService<File, Integer> {
+
+	PageInfo<FileVo> page(PageParam pageParam, String fileName);
+
+}

app/live/src/main/java/com/zrqx/live/bg/service/LiveService.java

+package com.zrqx.live.bg.service;
+
+import com.zrqx.core.service.BaseService;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.live.commons.form.LiveForm;
+import com.zrqx.live.commons.model.Live;
+import com.zrqx.live.commons.vo.LiveVo;
+
+public interface LiveService extends BaseService<Live, Integer> {
+
+	PageInfo<LiveVo> page(PageParam pageParam, LiveForm form);
+
+}

app/live/src/main/java/com/zrqx/live/bg/service/LiveServiceImpl.java

+package com.zrqx.live.bg.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.live.bg.mapper.LiveMapper;
+import com.zrqx.live.commons.enums.LiveStatusEnum;
+import com.zrqx.live.commons.enums.StatusEnum;
+import com.zrqx.live.commons.form.LiveForm;
+import com.zrqx.live.commons.model.Live;
+import com.zrqx.live.commons.vo.LiveVo;
+
+@Service
+public class LiveServiceImpl extends BaseServiceImpl<Live,Integer> implements LiveService{
+
+	@Autowired
+	private LiveMapper mapper;
+	@Override
+	public BaseMapper<Live> getMapper() {
+		return mapper;
+	}
+	@Override
+	public PageInfo<LiveVo> page(PageParam pageParam, LiveForm form) {
+		startPage(pageParam);
+		List<LiveVo> list = mapper.page(form);
+		list.forEach(vo ->{
+			vo.setLiveStatusZh(LiveStatusEnum.getName(vo.getLiveStatus()));
+			vo.setStatusZh(StatusEnum.getName(vo.getStatus()));
+		});
+		return new PageInfo<LiveVo>(list);
+	}
+
+}

app/live/src/main/java/com/zrqx/live/commons/enums/LiveStatusEnum.java

+package com.zrqx.live.commons.enums;
+
+//直播状态  0预告 1直播中 2回放 3结束 4点播
+public enum LiveStatusEnum {
+
+	/** 预告 */
+	STATUS_0("0" ,"预告"),
+	/** 直播中 */
+	STATUS_1("1" ,"直播中"),
+	/** 回放 */
+	STATUS_2("2" ,"回放"),
+	/** 结束 */
+	STATUS_3("3" ,"结束"),
+	/** 点播 */
+	STATUS_4("4" ,"点播");
+	
+	private String code;
+	private String name;
+	
+	
+	/**
+	 * 通过code获取中文名称
+	 * @param code
+	 * @return
+	 */
+	public static String getName(String code) {
+		if (code == null) {
+			return null;
+		}
+		for (LiveStatusEnum mt : values()) {
+			if (mt.getCode().equals(code)) {
+				return mt.getName();
+			}
+		}
+		return null;
+	}
+	
+	private LiveStatusEnum(String code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+
+	public String getCode() {
+		return code;
+	}
+
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}	
+}

app/live/src/main/java/com/zrqx/live/commons/enums/SellStatusEnum.java

+package com.zrqx.live.commons.enums;
+
+//售卖方式  0免费 1付费 2密码
+public enum SellStatusEnum {
+
+	/** 免费 */
+	STATUS_0("0" ,"免费"),
+	/** 付费 */
+	STATUS_1("1" ,"付费"),
+	/** 密码 */
+	STATUS_2("2" ,"密码");
+
+	private String code;
+	private String name;
+
+	
+	
+	/**
+	 * 通过code获取中文名称
+	 * @param code
+	 * @return
+	 */
+	public static String getName(String code) {
+		if (code == null) {
+			return null;
+		}
+		for (SellStatusEnum mt : values()) {
+			if (mt.getCode().equals(code)) {
+				return mt.getName();
+			}
+		}
+		return null;
+	}
+	
+	private SellStatusEnum(String code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+
+	public String getCode() {
+		return code;
+	}
+
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}	
+}

app/live/src/main/java/com/zrqx/live/commons/enums/StatusEnum.java

+package com.zrqx.live.commons.enums;
+
+//状态  0上架 1下架
+public enum StatusEnum {
+
+	/** 上架 */
+	STATUS_0("0" ,"上架"),
+	/** 下架 */
+	STATUS_1("1" ,"下架");
+	
+	private String code;
+	private String name;
+	
+	
+	/**
+	 * 通过code获取中文名称
+	 * @param code
+	 * @return
+	 */
+	public static String getName(String code) {
+		if (code == null) {
+			return null;
+		}
+		for (StatusEnum mt : values()) {
+			if (mt.getCode().equals(code)) {
+				return mt.getName();
+			}
+		}
+		return null;
+	}
+	
+	private StatusEnum(String code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+
+	public String getCode() {
+		return code;
+	}
+
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}	
+}

app/live/src/main/java/com/zrqx/live/commons/enums/TypeNameEnum.java

+package com.zrqx.live.commons.enums;
+
+//直播类型 0视频直播 1多选题 2语音直播
+public enum TypeNameEnum {
+
+	/** 视频直播 */
+	STATUS_0("0" ,"视频直播"),
+	/** 多选题 */
+	STATUS_1("1" ,"多选题"),
+	/** 语音直播 */
+	STATUS_2("2" ,"语音直播");
+	
+	private String code;
+	private String name;
+	
+	
+	
+	/**
+	 * 通过code获取中文名称
+	 * @param code
+	 * @return
+	 */
+	public static String getName(String code) {
+		if (code == null) {
+			return null;
+		}
+		for (TypeNameEnum mt : values()) {
+			if (mt.getCode().equals(code)) {
+				return mt.getName();
+			}
+		}
+		return null;
+	}
+	
+	private TypeNameEnum(String code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+
+	public String getCode() {
+		return code;
+	}
+
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}	
+}

app/live/src/main/java/com/zrqx/live/commons/form/LiveForm.java

+package com.zrqx.live.commons.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LiveForm {
+
+	@ApiModelProperty("直播状态  0预告 1直播中 2回放 3结束")
+	private String liveStatus;
+	@ApiModelProperty("直播类型")
+	private String typeName;
+	@ApiModelProperty("直播标题")
+	private String title;
+}

app/live/src/main/java/com/zrqx/live/commons/form/LiveStatusForm.java

+package com.zrqx.live.commons.form;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LiveStatusForm {
+
+	@ApiModelProperty("id")
+	private List<Integer> ids;
+	@ApiModelProperty("status")
+	private String status;
+}

app/live/src/main/java/com/zrqx/live/commons/model/File.java

+package com.zrqx.live.commons.model;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Table(name = "l_file")
+@ApiModel(value = "File", description = "文档基础信息")
+public class File {
+
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("文档id，新增时不需填写")
+	private Integer id;
+	@ApiModelProperty(value="文件名")
+	private String fileName;
+	@ApiModelProperty(value="内容类型")
+	private String contentType;
+	@ApiModelProperty(value="页数")
+	private String pageNum;
+	@ApiModelProperty(value="后缀名")
+	private String suffixName;
+	@ApiModelProperty(value="原文件名")
+	private String originalFileName;
+	@ApiModelProperty(value="存储路径")
+	private String path;
+	@ApiModelProperty(value="文件大小")
+	private Long size;
+	@ApiModelProperty(value="文件时长")
+	private Long time;
+	@ApiModelProperty(value="创建时间")
+	private Date createTime;
+	@ApiModelProperty(value="缩略图文件名")
+	private String fileName_img;
+	@ApiModelProperty(value="修改时间")
+	private Date updateTime;
+	@ApiModelProperty(value="进度")
+	private String schedule;
+}

app/live/src/main/java/com/zrqx/live/commons/model/Live.java

+package com.zrqx.live.commons.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Table(name = "l_live")
+@ApiModel(value = "Live", description = "直播基础信息")
+public class Live {
+
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("直播id，新增时不需填写")
+	private Integer id;
+	@ApiModelProperty("直播标题")
+	private String title;
+	@ApiModelProperty("直播时间")
+	private Date liveTime;
+	@ApiModelProperty("简介")
+	private String introduction;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("直播模式")
+	private String model;
+	@ApiModelProperty("上传资源")
+	private Integer fileId;
+	@ApiModelProperty("直播类别")
+	private String type;
+	@ApiModelProperty("延时")
+	private String delay;
+	@ApiModelProperty("直播话题")
+	private String topic;
+	@ApiModelProperty("人数是否显示 0 显示 1不显示")
+	private String peopNum;
+	@ApiModelProperty("隐私是否开启 0开启 1不开启")
+	private String privacy;
+	@ApiModelProperty("活动是否推荐  0推荐 1不推荐")
+	private String activity;
+	@ApiModelProperty("扩展包是否开启 0开启 1不开启")
+	private String pack;
+	@ApiModelProperty("售卖方式  0免费 1付费 2密码")
+	private String sell;
+	
+	@ApiModelProperty("售价")
+	private BigDecimal sellPrice;
+	@ApiModelProperty("划线价格")
+	private BigDecimal linePrice;
+	@ApiModelProperty("是否试看 0是 1否")
+	private String proved;
+	@ApiModelProperty("试看时长")
+	private Integer tryTime;
+	@ApiModelProperty("密码")
+	private String password;
+	
+	@ApiModelProperty("推荐卡片 0开启 1关闭")
+	private String recommend;
+	@ApiModelProperty("回放 0开启 1关闭")
+	private String playback;
+	@ApiModelProperty("状态  0上架 1下架")
+	private String status;
+	@ApiModelProperty("直播状态  0预告 1直播中 2回放 3结束 4点播")
+	private String liveStatus;
+	@ApiModelProperty("直播类型")
+	private String typeName;
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+	
+}

app/live/src/main/java/com/zrqx/live/commons/vo/FileVo.java

+package com.zrqx.live.commons.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FileVo {
+
+	@ApiModelProperty("文档名称")
+	private String fileName;
+	@ApiModelProperty(value="创建时间")
+	private Date createTime;
+	@ApiModelProperty(value="页数")
+	private String pageNum;
+	@ApiModelProperty(value="进度")
+	private String schedule;
+}

app/live/src/main/java/com/zrqx/live/commons/vo/LiveVo.java

+package com.zrqx.live.commons.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LiveVo {
+
+	@ApiModelProperty("直播id")
+	private Integer id;
+	@ApiModelProperty("直播名称")
+	private String title;
+	@ApiModelProperty("售价")
+	private String sellPrice;
+	@ApiModelProperty("创建时间")
+	private String createTime;
+	@ApiModelProperty("状态")
+	private String status;
+	private String  statusZh;;
+	@ApiModelProperty("直播状态")
+	private String liveStatus;
+	private String  liveStatusZh;;
+}