From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
index 08fed09..5d00701 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/dyFile/FileOperate.java
@@ -79,44 +79,44 @@
/**
* 閫氳繃鐓х墖璺緞锛屽緱鍒板搴旂缉鐣ュ浘鐨勮矾寰�
- * @param imgPath
+ * @param filePath
* @return
*/
- public String getImgFileZipPath(String imgPath){
+ public String getFileZipPath(String filePath){
String path_ = null ;
String prePath = null ;
String tailPath = null ;
- if(imgPath != null && !imgPath.trim().equals("")) {
- int lastDotIndex = imgPath.lastIndexOf('.');
+ if(filePath != null && !filePath.trim().equals("")) {
+ int lastDotIndex = filePath.lastIndexOf('.');
if (lastDotIndex >= 0) {
- prePath = imgPath.substring(0, lastDotIndex);
- tailPath = imgPath.substring(lastDotIndex);
+ prePath = filePath.substring(0, lastDotIndex);
+ tailPath = filePath.substring(lastDotIndex);
path_ = prePath + "_" + tailPath ;
}
}
if(path_ == null){
- path_ = imgPath ;
+ path_ = filePath;
}
return path_ ;
}
/**
* 閫氳繃瑙嗛璺緞锛屽緱鍒板搴旂缉鐣ュ浘鐨勮矾寰�
- * @param videoPath
+ * @param filePath
* @return
*/
- public String getVideoFileZipPath(String videoPath, String extName){
+ public String getFileZipPath(String filePath, String extName){
String path_ = null ;
String prePath = null ;
- if(videoPath != null && !videoPath.trim().equals("")) {
- int lastDotIndex = videoPath.lastIndexOf('.');
+ if(filePath != null && !filePath.trim().equals("")) {
+ int lastDotIndex = filePath.lastIndexOf('.');
if (lastDotIndex >= 0) {
- prePath = videoPath.substring(0, lastDotIndex);
+ prePath = filePath.substring(0, lastDotIndex);
path_ = prePath + "_." + extName ;
}
}
if(path_ == null){
- path_ = videoPath ;
+ path_ = filePath;
}
return path_ ;
}
--
Gitblit v1.8.0