2021与蓝度共同重构项目,服务端
zhanzhiqin
2022-04-18 9157a7cd26d7a82a065e7afdc9b1ddfc6a62250b
播放计划列表
已修改8个文件
117 ■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/LedSFile.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/LEDProgramFileMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/LedSFileMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java
@@ -4,30 +4,38 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
/**
 * LED节目表
 *
 * @TableName led_program_file
 */
@TableName(value ="led_program_file")
@TableName(value = "led_program_file")
@Data
public class LEDProgramFile implements Serializable {
    /**
     *
     *
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     *
     *
     */
    private Long userId;
    /**
     *
     *
     */
    private Long clientId;
    /**
     *
     */
    private String userName;
@@ -52,12 +60,12 @@
    private String fileUrl;
    /**
     *
     *
     */
    private String screenShot;
    /**
     *
     *
     */
    private String md5;
@@ -67,7 +75,7 @@
    private Integer kind;
    /**
     *
     *
     */
    private LocalDateTime createTime;
dao/src/main/java/com/sandu/ximon/dao/domain/LedSFile.java
@@ -4,25 +4,33 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
/**
 * led熙讯文件表
 *
 * @TableName led_s_file
 */
@TableName(value ="led_s_file")
@TableName(value = "led_s_file")
@Data
public class LedSFile implements Serializable {
    /**
     *
     *
     */
    @TableId(type = IdType.AUTO)
    private Long fileId;
    /**
     * 客户ID
     */
    private Long userId;
    /**
     * 上级客户ID
     */
    private Long cilentId;
@@ -73,7 +81,7 @@
    private Integer width;
    /**
     *
     *
     */
    private LocalDateTime createTime;
dao/src/main/resources/mapper/LEDProgramFileMapper.xml
@@ -5,23 +5,17 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LEDProgramFileMapper">
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LEDProgramFile">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
            <result property="name" column="name" jdbcType="VARCHAR"/>
            <result property="size" column="size" jdbcType="VARCHAR"/>
            <result property="fileType" column="file_type" jdbcType="VARCHAR"/>
            <result property="fileUrl" column="file_url" jdbcType="VARCHAR"/>
            <result property="screenShot" column="screen_shot" jdbcType="VARCHAR"/>
            <result property="md5" column="md5" jdbcType="VARCHAR"/>
            <result property="kind" column="kind" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="clientId" column="client_id" jdbcType="BIGINT"/>
        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="size" column="size" jdbcType="VARCHAR"/>
        <result property="fileType" column="file_type" jdbcType="VARCHAR"/>
        <result property="fileUrl" column="file_url" jdbcType="VARCHAR"/>
        <result property="screenShot" column="screen_shot" jdbcType="VARCHAR"/>
        <result property="md5" column="md5" jdbcType="VARCHAR"/>
        <result property="kind" column="kind" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,user_id,user_name,
        name,size,file_type,
        file_url,screen_shot,md5,
        kind,create_time
    </sql>
</mapper>
dao/src/main/resources/mapper/LedSFileMapper.xml
@@ -6,6 +6,7 @@
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LedSFile">
        <id property="fileId" column="file_id" jdbcType="BIGINT"/>
        <result property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="cilentId" column="cilent_id" jdbcType="BIGINT"/>
        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
        <result property="originName" column="origin_name" jdbcType="VARCHAR"/>
@@ -19,11 +20,4 @@
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
        file_id
        ,cilent_id,user_name,
        origin_name,file_url,file_type,
        file_size,height,width,
        create_time
    </sql>
</mapper>
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
@@ -44,11 +44,13 @@
        if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
        if(null!=keyword){
            wrapper.like(LEDProgramFile::getName,keyword);
        if (!keyword.isEmpty()) {
            wrapper.like(LEDProgramFile::getName, keyword);
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.successPage(ledProgramFileService.list(wrapper));
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -52,19 +52,20 @@
        if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
        if (null != keyword) {
        if (!keyword.isEmpty()) {
            wrapper.like(LedSFile::getOriginName, keyword);
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.success(ledProgramFileService.list(wrapper));
    }
    @PostMapping("/uploading/{dateType}")
    public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file,@PathVariable Integer dateType) {
    public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file, @PathVariable Integer dateType) {
        FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
        if("mp4".equals(fileUploadDto.getFileType())){
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
        if ("mp4".equals(fileUploadDto.getFileType())) {
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
        }
        FileOperationRecord fileOperationRecord = new FileOperationRecord();
//        if("mp4".equals(fileUploadDto.getFileType())){
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
@@ -43,7 +43,9 @@
    public LambdaQueryWrapper<LEDProgramFile> listFile() {
        LambdaQueryWrapper<LEDProgramFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
        if (SecurityUtils.getClientId() != null) {
            return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId, SecurityUtils.getUserId());
            return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId, SecurityUtils.getUserId()).or(w -> {
                w.eq(LEDProgramFile::getClientId, SecurityUtils.getUserId());
            });
        } else {
            return ledProgramFileLambdaQueryWrapper;
        }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
@@ -29,12 +29,12 @@
    public boolean addProgramFile(MultipartFile file) {
        FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
        if("mp4".equals(fileUploadDto.getFileType())){
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
        if ("mp4".equals(fileUploadDto.getFileType())) {
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
        }
        FileOperationRecord fileOperationRecord=new FileOperationRecord();
        if("mp4".equals(fileUploadDto.getFileType())){
            fileOperationRecord.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
        FileOperationRecord fileOperationRecord = new FileOperationRecord();
        if ("mp4".equals(fileUploadDto.getFileType())) {
            fileOperationRecord.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
        }
        BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
        fileOperationRecordService.save(fileOperationRecord);
@@ -57,11 +57,13 @@
        return removeById(id);
    }
    public LambdaQueryWrapper<LedSFile> listFile(){
    public LambdaQueryWrapper<LedSFile> listFile() {
        LambdaQueryWrapper<LedSFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LedSFile.class);
        if(SecurityUtils.getClientId()!=null){
            return ledProgramFileLambdaQueryWrapper.eq(LedSFile::getCilentId,SecurityUtils.getUserId());
        }else {
        if (SecurityUtils.getClientId() != null) {
            return ledProgramFileLambdaQueryWrapper.eq(LedSFile::getCilentId, SecurityUtils.getUserId()).or(w -> {
                w.eq(LedSFile::getUserId, SecurityUtils.getUserId());
            });
        } else {
            return ledProgramFileLambdaQueryWrapper;
        }