From 860833edc66eb9918ebb82f2b7f7469aa34ce610 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 15 四月 2022 09:58:45 +0800
Subject: [PATCH] 诺瓦更改
---
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java | 16 ++++++++++------
dao/src/main/java/com/sandu/ximon/dao/domain/LedSFile.java | 5 +++++
dao/src/main/resources/mapper/LedSFileMapper.xml | 1 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramFileParam.java | 4 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 8 ++++----
dao/src/main/resources/mapper/LEDProgramFileMapper.xml | 7 ++++---
7 files changed, 29 insertions(+), 14 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 e1ad603..fd3a4ff 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
@@ -46,18 +46,22 @@
*/
private String fileType;
-
- /**
- * 缂╃暐鍥�
- */
- private String screenShot;
-
/**
* 閾炬帴
*/
private String fileUrl;
/**
+ *
+ */
+ private String screenShot;
+
+ /**
+ *
+ */
+ private String md5;
+
+ /**
* 閫傜敤鍨嬪彿 0:N 1:S
*/
private Integer kind;
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 5d6761d..d2d7a59 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
@@ -58,6 +58,11 @@
private String screenShot;
/**
+ * md5
+ */
+ private String md5;
+
+ /**
* 鍥剧墖楂樺害
*/
private Integer height;
diff --git a/dao/src/main/resources/mapper/LEDProgramFileMapper.xml b/dao/src/main/resources/mapper/LEDProgramFileMapper.xml
index d4edc66..46d9c50 100644
--- a/dao/src/main/resources/mapper/LEDProgramFileMapper.xml
+++ b/dao/src/main/resources/mapper/LEDProgramFileMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sandu.ximon.dao .mapper.LEDProgramFileMapper">
+<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"/>
@@ -13,6 +13,7 @@
<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>
@@ -20,7 +21,7 @@
<sql id="Base_Column_List">
id,user_id,user_name,
name,size,file_type,
- file_url,screen_shot,kind,
- create_time
+ 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 cf94bb7..741e915 100644
--- a/dao/src/main/resources/mapper/LedSFileMapper.xml
+++ b/dao/src/main/resources/mapper/LedSFileMapper.xml
@@ -12,6 +12,7 @@
<result property="fileUrl" column="file_url" jdbcType="VARCHAR"/>
<result property="screenShot" column="screen_shot" jdbcType="VARCHAR"/>
<result property="fileType" column="file_type" jdbcType="VARCHAR"/>
+ <result property="md5" column="md5" jdbcType="VARCHAR"/>
<result property="fileSize" column="file_size" jdbcType="BIGINT"/>
<result property="height" column="height" jdbcType="INTEGER"/>
<result property="width" column="width" jdbcType="INTEGER"/>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramFileParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramFileParam.java
index b203706..2e12869 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramFileParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramFileParam.java
@@ -36,5 +36,9 @@
*/
private String screenShot;
+ /**
+ * md5
+ */
+ private String md5;
}
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 f8da784..7047ab3 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
@@ -40,11 +40,11 @@
return removeById(id);
}
- public LambdaQueryWrapper<LEDProgramFile> listFile(){
+ public LambdaQueryWrapper<LEDProgramFile> listFile() {
LambdaQueryWrapper<LEDProgramFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
- if(SecurityUtils.getClientId()!=null){
- return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId,SecurityUtils.getUserId());
- }else {
+ if (SecurityUtils.getClientId() != null) {
+ return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId, 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 1eb36b8..b33654a 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
@@ -34,7 +34,7 @@
}
FileOperationRecord fileOperationRecord=new FileOperationRecord();
if("mp4".equals(fileUploadDto.getFileType())){
- fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+ fileOperationRecord.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
}
BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
fileOperationRecordService.save(fileOperationRecord);
--
Gitblit v1.9.3