From 7f66dd2dee66a81df6ab999fc9daea3ac60a3642 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 20 一月 2025 13:52:44 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpDataVo.java | 2 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpComResVo.java | 4 ++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeDown.java | 2 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeUp.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java | 3 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java | 2 +-
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeDown.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeDown.java
index 0520bb6..376a4ef 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeDown.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeDown.java
@@ -11,7 +11,7 @@
public @interface AnnotationCodeDown {
/**
- * 鍗忚鍚嶇О锛屽悇涓崗璁悕绉颁笉鑳芥湁閲嶅鐜拌薄
+ * 鍔熻兘鐮�
*/
String value() default ProtocolConstant.anyCode ;//鍙傛暟涓虹┖鏃讹紝琛ㄧず鏄櫎鏄庣‘娉ㄨВ鐨勫姛鑳界爜澶栫殑鍗忚鍏朵粬鍔熻兘鐮�
String[] ifAny() default{} ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeUp.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeUp.java
index c23776e..5b1b0ac 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeUp.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/AnnotationCodeUp.java
@@ -10,7 +10,7 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface AnnotationCodeUp {
/**
- * 寰楀埌瀵瑰簲鐨勫姛鑳界爜
+ * 鍔熻兘鐮�
*/
String value() default ProtocolConstant.anyCode ;//鍙傛暟涓虹┖鏃讹紝琛ㄧず鏄櫎鏄庣‘娉ㄨВ鐨勫姛鑳界爜澶栫殑鍗忚鍏朵粬鍔熻兘鐮�
String[] ifAny() default{} ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpComResVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpComResVo.java
index 0b24824..00028e0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpComResVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpComResVo.java
@@ -6,6 +6,6 @@
* @Description RTU涓婅鍛戒护搴旂瓟鏁版嵁鎺ュ彛瀹氫箟
*/
public interface UpComResVo extends UpDataVo {
- public String comLog() ;
- public String comLog(String code) ;
+ String comLog() ;
+ String comLog(String code) ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpDataVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpDataVo.java
index 0b82475..e626895 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpDataVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/UpDataVo.java
@@ -6,5 +6,5 @@
* @Description RTU涓婅鏁版嵁鎺ュ彛瀹氫箟
*/
public interface UpDataVo {
- public String toString() ;
+ String toString() ;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java
index f95592d..0510afa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java
@@ -36,7 +36,7 @@
* 鍒涘缓浜�
*/
@Schema(description = "鍒涘缓浜�", requiredMode = Schema.RequiredMode.REQUIRED)
- @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
+ @Length(message = "鍒涘缓浜轰笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
public String creator;
/**
* 澶囨敞
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java
index a3a8471..02626f9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java
@@ -3,6 +3,7 @@
import com.dy.common.util.NumUtil;
import com.dy.pipIrrWebFile.util.*;
import lombok.extern.slf4j.Slf4j;
+import org.jcodec.scale.AWTUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -159,6 +160,8 @@
}else {
//瀛樺偍鎴愬姛, 鐢熸垚缂╃暐鍥�
BufferedImage bufImg = new VideoUtils(VideoZipPicFileType, VideoZipPicFromFrame).fetchFrame(file) ;
+ // 鍚戝彸鏃嬭浆90搴�
+ // bufImg = AWTUtil.rotate90ToRight(bufImg) ;
String zipFilePath = filePath.substring(0, filePath.lastIndexOf(".")) + "_." + VideoZipPicFileType ;
Integer photoZipWidth = 400 ;
if(photoZipWidthStr != null && NumUtil.isPlusIntNumber(photoZipWidthStr)){
--
Gitblit v1.8.0