From 9157a7cd26d7a82a065e7afdc9b1ddfc6a62250b Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 15:00:55 +0800
Subject: [PATCH] 播放计划列表
---
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java | 22 +++++++---
dao/src/main/java/com/sandu/ximon/dao/domain/LedSFile.java | 14 +++++-
dao/src/main/resources/mapper/LedSFileMapper.xml | 8 ---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java | 20 +++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 4 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java | 8 ++-
dao/src/main/resources/mapper/LEDProgramFileMapper.xml | 30 ++++++---------
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 11 +++--
8 files changed, 64 insertions(+), 53 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java
index fd3a4ff..f8e3601 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java
+++ b/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;
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LedSFile.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LedSFile.java
index d2d7a59..95c96e3 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LedSFile.java
+++ b/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;
diff --git a/dao/src/main/resources/mapper/LEDProgramFileMapper.xml b/dao/src/main/resources/mapper/LEDProgramFileMapper.xml
index 46d9c50..5af66fe 100644
--- a/dao/src/main/resources/mapper/LEDProgramFileMapper.xml
+++ b/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>
diff --git a/dao/src/main/resources/mapper/LedSFileMapper.xml b/dao/src/main/resources/mapper/LedSFileMapper.xml
index 741e915..30303cc 100644
--- a/dao/src/main/resources/mapper/LedSFileMapper.xml
+++ b/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>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
index 621da8e..94c9996 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
+++ b/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));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
index d5043af..a3cbbae 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
+++ b/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())){
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
index 7047ab3..2168ff7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
+++ b/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;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
index b33654a..a7c9027 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
+++ b/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;
}
--
Gitblit v1.9.3