fix: 修复eal4 Unchecked return value 大部分bug

8 files changed, 76 insertions, 21 deletions

diff --git a/nz-admin/src/main/java/com/nis/common/utils/YamlUtil.java b/nz-admin/src/main/java/com/nis/common/utils/YamlUtil.java
index 0d4ea4f2..89717952 100644
--- a/nz-admin/src/main/java/com/nis/common/utils/YamlUtil.java
+++ b/nz-admin/src/main/java/com/nis/common/utils/YamlUtil.java
@@ -60,7 +60,12 @@ public class YamlUtil {
 		
 		//校验结束后若文件存在则删除文件
 		if (file.isFile()) {
-			file.delete();
+			boolean delete = file.delete();
+			if(delete) {
+				logger.debug("rule 临时文件删除成功");
+			}else {
+				logger.debug("rule 临时文件删除失败");
+			}
 		}
 		IOUtils.closeQuietly(reader);
 		return success;
diff --git a/nz-admin/src/main/java/com/nis/modules/asset/job/AssetPingJob.java b/nz-admin/src/main/java/com/nis/modules/asset/job/AssetPingJob.java
index e80867d8..a9d59a8f 100644
--- a/nz-admin/src/main/java/com/nis/modules/asset/job/AssetPingJob.java
+++ b/nz-admin/src/main/java/com/nis/modules/asset/job/AssetPingJob.java
@@ -182,7 +182,12 @@ public class AssetPingJob extends QuartzJobBean {
                         result.close();
                     }
                     // 删除临时文件
-                    file.delete();
+                    boolean delete = file.delete();
+                    if(delete) {
+                    	logger.debug("asset ping file deleted");
+                    }else {
+                    	logger.debug("asset ping file can not be deleted , please check");
+                    }
                 }
             }
         } else {
diff --git a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldMetaServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldMetaServiceImpl.java
index 5555ce44..48816075 100644
--- a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldMetaServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldMetaServiceImpl.java
@@ -1,13 +1,10 @@
 package com.nis.modules.asset.service.impl;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -57,12 +54,10 @@ public class AssetFieldMetaServiceImpl extends ServiceImpl<AssetFieldMetaDao,Ass
 			throw new NZException(RCode.ASSET_FIELD_META_KEY_ERROR);
 		}
 		
-		// 针对新增操作验证type是否重复
-		if(ObjectUtil.isEmpty(assetFieldMeta.getId())) {
-			List<AssetFieldMeta> list = this.list(new QueryWrapper<AssetFieldMeta>().lambda().eq(AssetFieldMeta::getMetaKey, key));
-			if(ObjectUtil.isNotEmpty(list)) {
-				throw new NZException(RCode.ASSET_FIELD_META_KEY_DUPLICATE);
-			}
+		List<AssetFieldMeta> list = this.list(new QueryWrapper<AssetFieldMeta>().lambda().eq(AssetFieldMeta::getMetaKey, key).ne(ObjectUtil.isNotEmpty(assetFieldMeta.getId()),AssetFieldMeta::getId, assetFieldMeta.getId()));
+		
+		if(ObjectUtil.isNotEmpty(list)) {
+			throw new NZException(RCode.ASSET_FIELD_META_KEY_DUPLICATE);
 		}
 		
 		if(ObjectUtil.isEmpty(assetFieldMeta.getParam())){
diff --git a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalClient.java b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalClient.java
index a15353e1..0454fa98 100644
--- a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalClient.java
+++ b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalClient.java
@@ -238,7 +238,12 @@ public class TerminalClient {
                                     terminalRecord.setEndTime((int) (System.currentTimeMillis() - terminalSessionStartTime));
                                     terminalRecordService.save(terminalRecord);
 
-                                    file.delete();
+                                    boolean delete = file.delete();
+                                    if(delete) {
+                                    	logger.debug("文件删除成功");
+                                    }else {
+                                    	logger.debug("文件删除失败");
+                                    }
                                 } catch (IOException e) {
                                     logger.error(String.format("SSH 连接已关闭，terminal record 结尾临时文件入库失，文件路径是: %s，错误信息是: %s", path.toString(), e.getMessage()), e);
                                 }
@@ -307,7 +312,12 @@ public class TerminalClient {
                 terminalRecord.setContent(Files.readAllBytes(path));
                 terminalRecordService.save(terminalRecord);
                 // 清空文件内容
-                file.delete();
+                boolean delete = file.delete();
+                if(delete) {
+                	logger.debug("文件删除成功");
+                }else {
+                	logger.debug("文件删除失败");
+                }
             } catch (IOException e) {
                 logger.error(String.format("terminal record 文件入库失败，文件路径是: %s，错误信息是: %s", path.toString(), e.getMessage()), e);
             }
@@ -424,7 +434,12 @@ public class TerminalClient {
                                     terminalRecord.setEndTime((int) (System.currentTimeMillis() - terminalSessionStartTime));
                                     terminalRecordService.save(terminalRecord);
 
-                                    file.delete();
+                                    boolean delete = file.delete();
+                                    if(delete) {
+                                    	logger.debug("文件删除成功");
+                                    }else {
+                                    	logger.debug("文件删除失败");
+                                    }
                                 } catch (IOException e) {
                                     logger.error(String.format("Telnet 连接已关闭，terminal record 结尾临时文件入库失，文件路径是: %s，错误信息是: %s", path.toString(), e.getMessage()), e);
                                 }
diff --git a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalHandler.java b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalHandler.java
index 40d3ac7f..bf6a18b7 100644
--- a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalHandler.java
+++ b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalHandler.java
@@ -671,7 +671,12 @@ public class TerminalHandler extends TextWebSocketHandler {
 			terminalRecord.setEndTime((int) (System.currentTimeMillis() - terminalSessionStartTime));
 			terminalRecord.setContent(Files.readAllBytes(path));
 			terminalRecordService.save(terminalRecord);
-			file.delete();
+			boolean delete = file.delete();
+			if(delete) {
+				logger.debug("文件删除成功");
+			}else {
+				logger.debug("文件删除失败");
+			}
 		} catch (IOException e) {
 			logger.error(String.format("terminal record 文件入库失败，文件路径是: %s，错误信息是: %s", path.toString(), e.getMessage()), e);
 		}
diff --git a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalOneProcessor.java b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalOneProcessor.java
index 0259f668..1efcbbbc 100644
--- a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalOneProcessor.java
+++ b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalOneProcessor.java
@@ -92,11 +92,21 @@ public class TerminalOneProcessor {
         	return R.error(RCode.TERMINAL_TELNET_TRANSFER);
         }
         if (!file.getParentFile().exists()) {
-            file.getParentFile().mkdirs();
+            boolean mkdirs = file.getParentFile().mkdirs();
+            if(mkdirs) {
+            	logger.debug("批量文件创建成功");
+            }else {
+            	logger.debug("批量文件创建失败");
+            }
         }
         try {
             if (!file.exists()) {
-                file.createNewFile();
+                boolean createNewFile = file.createNewFile();
+                if(createNewFile) {
+                	logger.debug("文件创建成功");
+                }else {
+                	logger.debug("文件创建失败");
+                }
             }
             if (terminalClient != null) {
                 terminalClient.upload(file.getAbsolutePath(), name, size);
diff --git a/nz-admin/src/main/java/com/nis/modules/terminal/controller/TerminalHandlerController.java b/nz-admin/src/main/java/com/nis/modules/terminal/controller/TerminalHandlerController.java
index d5d8c7b8..d709dfbc 100644
--- a/nz-admin/src/main/java/com/nis/modules/terminal/controller/TerminalHandlerController.java
+++ b/nz-admin/src/main/java/com/nis/modules/terminal/controller/TerminalHandlerController.java
@@ -89,11 +89,26 @@ public class TerminalHandlerController {
         String tmpPath=rootPath+configUploadPath;

         File uploadDir=FileUtil.file(tmpPath);

         if(!uploadDir.exists()){

-            uploadDir.mkdirs();

+            boolean mkdirs = uploadDir.mkdirs();

+            if(mkdirs) {

+            	logger.debug("批量创建成功");

+            }else {

+            	logger.debug("批量创建失败");

+            }

         }else{//存在同名文件/文件夹

             if(!uploadDir.isDirectory()){//是一个同名文件

-                uploadDir.delete();

-                uploadDir.mkdirs();

+                boolean delete = uploadDir.delete();

+                if(delete) {

+                	logger.debug("文件夹删除成功");

+                }else {

+                	logger.debug("文件夹删除失败");

+                }

+                boolean mkdirs = uploadDir.mkdirs();

+                if(mkdirs) {

+                	logger.debug("批量创建成功");

+                }else {

+                	logger.debug("批量创建失败");

+                }

             }

         }

 

diff --git a/nz-admin/src/main/java/com/nis/setup/controller/SetupController.java b/nz-admin/src/main/java/com/nis/setup/controller/SetupController.java
index 4ba15bb5..4f11c745 100644
--- a/nz-admin/src/main/java/com/nis/setup/controller/SetupController.java
+++ b/nz-admin/src/main/java/com/nis/setup/controller/SetupController.java
@@ -228,7 +228,12 @@ public class SetupController implements ApplicationContextAware, EnvironmentAwar
     public void writeTmpFile(SetupEntity setup) throws IOException{
         File file = FileUtil.file(this.tmpDir,"setup.obj");
         if (FileUtil.exist(file)){
-            file.delete();
+            boolean delete = file.delete();
+            if(delete) {
+            	log.debug("文件删除成功");
+            }else {
+            	log.debug("文件删除失败");
+            }
         }
         IoUtil.writeObj(FileUtil.getOutputStream(file),true,setup);
     }