档案-四性检测

1、病毒检测调整

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveExaminingReportImpl.java

@@ -307,9 +307,9 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
                 //完整性
                 if (StringUtils.isNotBlank(vo.getIntegrality()) && "1".equals(vo.getIntegrality())) {
                     Thread.sleep(5000L);
-                    if(vo.getAuthenticityList().contains("1")){}
-                    if(vo.getAuthenticityList().contains("2")){}
-                    if(vo.getAuthenticityList().contains("3")){
+                    if(vo.getIntegralityList().contains("1")){}
+                    if(vo.getIntegralityList().contains("2")){}
+                    if(vo.getIntegralityList().contains("3")){
                         //获取元数据
                         if(CollectionUtil.isEmpty(list)){
                             Map<String, String> map = new HashMap<>();
@@ -335,7 +335,7 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
                         detailService.save(new ArchiveExaminingReportDetail(vo.getProjectId(), id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
                                 ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对元数据项完整性检测",  metadataComplete, metadataComplete == 0 ? "无" : "详见附件", metadataComplete == 0 ? 0 : 1));
                     }
-                    if(vo.getAuthenticityList().contains("4")){
+                    if(vo.getIntegralityList().contains("4")){
                         //获取元数据
                         if(CollectionUtil.isEmpty(list)){
                             Map<String, String> map = new HashMap<>();
@@ -364,17 +364,17 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
                         detailService.save(new ArchiveExaminingReportDetail(vo.getProjectId(), id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
                                 ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对元数据必填项检测", metadataRequiredField, metadataRequiredField == 0 ? "无" : "详见附件", metadataRequiredField == 0 ? 0 : 1));
                     }
-                    if(vo.getAuthenticityList().contains("5")){}
-                    if(vo.getAuthenticityList().contains("6")){}
-                    if(vo.getAuthenticityList().contains("7")){}
-                    if(vo.getAuthenticityList().contains("8")){}
+                    if(vo.getIntegralityList().contains("5")){}
+                    if(vo.getIntegralityList().contains("6")){}
+                    if(vo.getIntegralityList().contains("7")){}
+                    if(vo.getIntegralityList().contains("8")){}
                     report.setReportDetailStatus(2);
                     this.updateById(report);
                 }
                 //可用性
                 if (StringUtils.isNotBlank(vo.getUsability()) && "1".equals(vo.getUsability())) {
                     Thread.sleep(5000L);
-                    if(vo.getAuthenticityList().contains("1")){
+                    if(vo.getUsabilityList().contains("1")){
                         //获取文件后缀，后缀为
                         String fileExtensionFromUrl = RemoteFileExtension.getFileExtensionFromUrl(file.getPdfFileUrl());
                         if(StringUtils.isEmpty(fileExtensionFromUrl) || !strings.contains(fileExtensionFromUrl)){
@@ -388,28 +388,27 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
                                 ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对电子文件格式检测", fileType, fileType == 0 ? "无" : "详见附件", fileType == 0 ? 0 : 1));
                     }
                     //3-2 放在最开始
-                    if(vo.getAuthenticityList().contains("3")){
+                    if(vo.getUsabilityList().contains("3")){
                         detailService.save(new ArchiveExaminingReportDetail(vo.getProjectId(), id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
                                 ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对目标数据库中的元数据可访问性检测", 0, "无", 0));
                     }
-                    if(vo.getAuthenticityList().contains("4")){
+                    if(vo.getUsabilityList().contains("4")){
                         detailService.save(new ArchiveExaminingReportDetail(vo.getProjectId(), id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
                                 ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对信息包中元数据可读性检测", 0, "无", 0));
                     }
-                    if(vo.getAuthenticityList().contains("5")){
+                    if(vo.getUsabilityList().contains("5")){
                         //TODO
                         detailService.save(new ArchiveExaminingReportDetail(vo.getProjectId(), id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
                                 ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对信息包中包含的内容数据合规性检测", 0, "无", 0));
                     }
-                    if(vo.getAuthenticityList().contains("6")){}
+                    if(vo.getUsabilityList().contains("6")){}
                     report.setReportDetailStatus(3);
                     this.updateById(report);
                 }
                 //安全性
                 if (StringUtils.isNotBlank(vo.getSecurity()) && "1".equals(vo.getSecurity())) {
-                    if(vo.getAuthenticityList().contains("1")){
-                        ClamAVClientScanner clamAVClientScanner = new ClamAVClientScanner();
-                        if(!clamAVClientScanner.checkHealth() || !ClamAVClientScanner.scanRemoteFile(file.getPdfFileUrl())){
+                    if(vo.getSecurityList().contains("1")){
+                        if(!ClamAVClientScanner.checkHealth() || !ClamAVClientScanner.scanRemoteFile(file.getPdfFileUrl())){
                             Map<String, String> map = new HashMap<>();
                             map.put("examiningItem", ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对电子文件格式检测");
                             map.put("unqualifiedObject", file.getFileName());
@@ -419,10 +418,9 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
                         detailService.save(new ArchiveExaminingReportDetail(vo.getProjectId(), id, ArchiveConstant.ARCHIVE_EXAMINING_SECURITY,
                                 ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对病毒感染检测", virusDetection, virusDetection == 0 ? "无" : "详见附件", virusDetection == 0 ? 0 : 1));
                     }
-                    if(vo.getAuthenticityList().contains("2")){}
-                    if(vo.getAuthenticityList().contains("3")){
-                        ClamAVClientScanner clamAVClientScanner = new ClamAVClientScanner();
-                        if(!clamAVClientScanner.checkHealth()){
+                    if(vo.getSecurityList().contains("2")){}
+                    if(vo.getSecurityList().contains("3")){
+                        if(!ClamAVClientScanner.checkHealth()){
                             Map<String, String> map = new HashMap<>();
                             map.put("examiningItem", ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对电子文件格式检测");
                             map.put("unqualifiedObject", file.getFileName());
@@ -432,7 +430,7 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
                         detailService.save(new ArchiveExaminingReportDetail(vo.getProjectId(), id, ArchiveConstant.ARCHIVE_EXAMINING_SECURITY,
                                 ArchiveConstant.ARCHIVE_EXAMINING_STANDARD + "对系统环境中是否安装杀毒软件检测", virusInstall, virusInstall == 0 ? "无" : "详见附件", virusInstall == 0 ? 0 : 1));
                     }
-                    if(vo.getAuthenticityList().contains("4")){}
+                    if(vo.getSecurityList().contains("4")){}
                     report.setReportDetailStatus(4);
                     this.updateById(report);
                 }

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/ClamAVClientScanner.java

@@ -12,11 +12,12 @@ import java.net.URL;
  * @author LHB
  */
 public class ClamAVClientScanner {
+    private final static String IP = "192.168.0.109";
+    private final static Integer PORT = 3310;
 
     public static boolean scanRemoteFile(String fileUrl) throws IOException {
         // 创建ClamAV客户端，默认连接本地3310端口
-        ClamavClient client = new ClamavClient("localhost", 3310);
-
+        ClamavClient client = new ClamavClient(IP, PORT);
         // 从远程URL下载文件
         URL url = new URL(fileUrl);
         try (InputStream inputStream = url.openStream()) {
@@ -34,8 +35,8 @@ public class ClamAVClientScanner {
         }
     }
 
-    public boolean checkHealth() {
-        ClamavClient client = new ClamavClient("localhost", 3310);
+    public static boolean checkHealth() {
+        ClamavClient client = new ClamavClient(IP, PORT);
         try {
             client.ping();
             System.out.println("ClamAV服务正常运行");