From 9377dda0b3a5401f09465f75f07f73e70bd4bc25 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 06 十二月 2023 13:57:03 +0800
Subject: [PATCH] 本地日志修改限制只能单个下载
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 4 +++-
Source/UBCS-WEB/src/views/monitor/log/localLog.vue | 2 +-
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java | 5 ++++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
index d4c1d7b..f294431 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
@@ -25,7 +25,7 @@
type="text"
:loading="downloadLoading"
@click="downLoadLogFile(scope.row)"
- v-if="permissionList.downLoadBtn"
+ v-if="permissionList.downLoadBtn && scope.row.hasChildren!=1"
>涓嬭浇
</el-button>
</template>
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
index 38e4eb7..c818d09 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
@@ -4,6 +4,7 @@
import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
+import com.vci.ubcs.resource.bo.FileObjectBO;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
@@ -61,7 +62,9 @@
if(StringUtils.isBlank(msg)){
msg = "鏈煡閿欒";
}
- ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
+ FileObjectBO fileObjectBO = new FileObjectBO();
+ fileObjectBO.setName(msg.getBytes(StandardCharsets.UTF_8).toString());
+ FileDownloadUtil.downloadFileLocal(response, fileObjectBO,true);
}
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
index 0a2e420..8efad2f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
@@ -265,7 +265,6 @@
if(!logFile.exists() || !logFile.isFile()){
throw new VciBaseException("鏈湴鏃ュ織鏂囦欢璺緞"+item.getPath()+"涓湭鎵惧埌鏃ュ織");
}
-
try(OutputStream os = new FileOutputStream(file);
InputStream ins = new FileInputStream(logFile);
){
@@ -277,10 +276,13 @@
String zipName = new File(tempFolder).getPath() + File.separator + getLogFileName(logFullPaths) + "绛�"+file1.length + "涓枃浠�.zip";
zipUtil.folderToZipFile(tempFolder,zipName);
fileObjectBO.setFileLocalPath(zipName);
+ fileObjectBO.setName(zipName);
fileObjectBO.setFileExtension(".log");
if(log.isDebugEnabled()){
log.debug("涓嬭浇鏂囦欢鐨勪俊鎭�,",zipName);
}
+ }else{
+ throw new ServerException("璇ョ洰褰曚笅涓嶅瓨鍦ㄦ棩蹇楁枃浠讹紒");
}
}
return fileObjectBO;
--
Gitblit v1.9.3