预归档库、收集库更新

.idea/compiler.xml

@@ -19,6 +19,7 @@
       <module name="flowable-spring-boot-starter-ui-idm" target="1.8" />
       <module name="flowable-spring-boot-starter-ui-modeler" target="1.8" />
       <module name="flowable-spring-boot-starter-ui-task" target="1.8" />
+      <module name="flowable-ui" target="24" />
       <module name="flowable-ui-admin-conf" target="1.8" />
       <module name="flowable-ui-admin-frontend" target="1.8" />
       <module name="flowable-ui-admin-logic" target="1.8" />
@@ -45,6 +46,7 @@
       <module name="archives" options="-parameters" />
       <module name="common" options="-parameters" />
       <module name="flowable" options="-parameters" />
+      <module name="flowable-ui" options="-parameters" />
       <module name="logging" options="-parameters" />
       <module name="system" options="-parameters" />
       <module name="yxk_intellArchives" options="-parameters" />

.idea/misc.xml

@@ -12,7 +12,6 @@
         <option value="$PROJECT_DIR$/common/pom.xml" />
         <option value="$PROJECT_DIR$/flowable/pom.xml" />
         <option value="$PROJECT_DIR$/logging/pom.xml" />
-        <option value="$PROJECT_DIR$/flowable-ui/pom.xml" />
         <option value="$PROJECT_DIR$/archives/pom.xml" />
       </list>
     </option>

archives/src/main/java/com/intellarchives/modules/archives/controller/CollectController.java

@@ -549,7 +549,13 @@ public class CollectController {
 
     @ApiOperation("电子文件-目录上传")
     @PostMapping(value = "/catalogUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ApiResponse<Object> catalogUpload(@ApiParam(value = "文件流", required = true, allowMultiple = true) @RequestParam("file") MultipartFile file,Integer fondsId){
+    public ApiResponse<Object> catalogUpload(
+//        @ApiParam(value = "文件流", required = true, allowMultiple = true) @RequestParam("file") MultipartFile file,
+        String upfilePath,
+        Integer fondsId
+    ){
+        Map<String,List<String>> failMap = new HashMap<>();
+        File file = new File(prefixPath+upfilePath);
         //当前登录用户
         String username = SecurityUtils.getCurrentUsername();
         String descDir = prefixPath+"//"+username+"//";
@@ -560,7 +566,7 @@ public class CollectController {
         mountFile.setFondsId(fondsId);
         mountFile = collectService.editMountFile(mountFile);
         try {
-            InputStream input = file.getInputStream();
+            InputStream input = new FileInputStream(file);
             ZipInputStream zipInputStream = new ZipInputStream(input, Charset.forName("GBK"));
             ZipEntry zipEntry;
             while ((zipEntry = zipInputStream.getNextEntry()) != null) {
@@ -616,6 +622,26 @@ public class CollectController {
                     Map<String,Object> category = collectService.findCategoryById(categoryId);
                     Map<String,Object> fileCategory = collectService.findCategoryByPidAndLevel(category.get("category_level")==null ? categoryId : category.get("pid")+"",4);
 
+                    //搜索不到门类
+                    if(null == category || null == category.get("id")){
+                        File deleteFile = new File(outPath);
+                        deleteFile.delete();
+                        File deleteFoler = new File(descDir);
+                        deleteFoler(deleteFoler);
+                        deleteFoler.delete();
+                        return ApiResponse.error(500,"未识别到正确的门类数据");
+                    }
+
+                    //根据全宗号和门类id判断是否有权限
+                    if(!collectService.isPowerByFondsIdAndCategoryId(fondsId,category.get("pid")+"")){
+                        File deleteFile = new File(outPath);
+                        deleteFile.delete();
+                        File deleteFoler = new File(descDir);
+                        deleteFoler(deleteFoler);
+                        deleteFoler.delete();
+                        return ApiResponse.error(500,"当前账号暂无权限操作该档案门类数据");
+                    }
+
                     String categoryIdAs = collectService.getcategoryAllParentsId(category.get("id")+"");
                     String[] categoryIds = categoryIdAs.split(",");
                     String path = "/category/";
@@ -623,9 +649,15 @@ public class CollectController {
                         path += categoryIds[i] + "/";
                     }
 
-                    String failName = collectService.saveFileToCatalogUpload(mountFile.getId(),fileExtension,fileDpi,path,fileName,fileSize,array[array.length-2],fileCategory,filePath);
+                    String failName = collectService.saveFileToCatalogUpload(fondsId,mountFile.getId(),fileExtension,fileDpi,path,fileName,fileSize,array[array.length-2],fileCategory,filePath);
                     if(!StringUtils.isEmpty(failName)){
                         failArchives.add(failName);
+                        List<String> failFileName = failMap.get(failName);
+                        if(null == failFileName){
+                            failFileName = new ArrayList<>();
+                        }
+                        failFileName.add(fileName);
+                        failMap.put(failName,failFileName);
                     }
                     ok++;
                 }
@@ -645,7 +677,11 @@ public class CollectController {
         }
         JSONObject json = new JSONObject();
         json.put("mountFile",mountFile);
-        json.put("failArchives",failArchives);
+        List<String> returnFailArchives = new ArrayList<>();
+        for(String key : failMap.keySet()){
+            returnFailArchives.add(key + ":" + failMap.get(key));
+        }
+        json.put("failArchives",returnFailArchives);
         return ApiResponse.success(json);
     }
 
@@ -809,7 +845,8 @@ public class CollectController {
     @ApiOperation("批量挂接")
     @PostMapping(value = "/batchMount", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public ApiResponse<Object> batchMount(
-            @ApiParam(value = "文件流", required = true, allowMultiple = true) @RequestParam("file") MultipartFile file,
+//            @ApiParam(value = "文件流", required = true, allowMultiple = true) @RequestParam("file") MultipartFile file,
+            @ApiParam(value = "文件路径，必填") String upfilePath,
             @ApiParam(value = "全宗id，必填") @RequestParam(required = false) @Validated Integer fondsId,
             @ApiParam(value = "门类id，必填") @RequestParam(required = false) @Validated String categoryId,
             @ApiParam(value = "挂接方式，必填") @RequestParam(required = false) @Validated Integer mountType,
@@ -820,11 +857,15 @@ public class CollectController {
         //当前登录用户
         String username = SecurityUtils.getCurrentUsername();
         String descDir = prefixPath+"//"+username+"//";
+        File file = new File(prefixPath+upfilePath);
+        List<String> filePaths = new ArrayList<>();
+        if(!file.exists()){
+            return ApiResponse.error(500,"挂接失败，文件不存在");
+        }
         try {
-            InputStream input = file.getInputStream();
+            InputStream input = new FileInputStream(file);
             ZipInputStream zipInputStream = new ZipInputStream(input, Charset.forName("GBK"));
             ZipEntry zipEntry;
-            List<String> filePaths = new ArrayList<>();
             while ((zipEntry = zipInputStream.getNextEntry()) != null) {
                 String zipEntryNameStr = zipEntry.getName();
                 String zipEntryName = zipEntryNameStr;
@@ -850,7 +891,12 @@ public class CollectController {
 
             MountFile mountFile = collectService.batchMount(fondsId,categoryId,mountType,checkRepeatType,matchingMode,fields,filePaths);
             File deleteFile = new File(descDir);
+            try {
                 deleteFile.delete();
+                file.delete();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             return ApiResponse.success(mountFile);
         }catch(Exception e){
             e.printStackTrace();

archives/src/main/java/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.java

@@ -255,4 +255,7 @@ public interface ArchivesSummaryRepository extends JpaRepository<ArchivesSummary
 
     @Query(nativeQuery = true,value = "select archives_id from archives_summary where parent_id = ?1")
     List<String> findArchivesIdsByPid(String archivesId);
+
+    @Query(nativeQuery = true,value = "select count(1) from sys_fonds_category where fonds_id = ?1 and category_id = ?2")
+    Integer countByFondsIdAndCategoryId(Integer fondsId,String categoryId);
 }

archives/src/main/java/com/intellarchives/modules/archives/service/CollectService.java

@@ -94,7 +94,7 @@ public interface CollectService {
     List<Map<String,Object>> findDate(Map<String,Object> category,List<String >titles,List<String> archivesIds);
     //
     String catalogDownload(String categoryId,Integer categoryLevel,String initPath,String path,List<String> archivesIds);
-    String saveFileToCatalogUpload(String mountFileId,String fileExtension,String fileDpi,String path,String fileName,long fileSize,String archivesInfo,Map<String,Object> fileCategory,String filePath);
+    String saveFileToCatalogUpload(Integer fondsId,String mountFileId,String fileExtension,String fileDpi,String path,String fileName,long fileSize,String archivesInfo,Map<String,Object> fileCategory,String filePath);
     //预快速组卷
     List<String> preFastToArchives(String categoryId,String date);
 
@@ -154,6 +154,8 @@ public interface CollectService {
     Object editMarkByFileId(MarkDTO dto);
     //通过案卷id获取最大件号
     String getMaxItemNoByParentId(String archivesId);
+    //根据全宗id和门类id查看是否有权限
+    boolean isPowerByFondsIdAndCategoryId(Integer fondsId,String categoryId);
 
     void lingshi(String tableName);
 

archives/src/main/java/com/intellarchives/modules/archives/service/impl/CollectServiceImpl.java

@@ -2420,23 +2420,38 @@ public class CollectServiceImpl implements CollectService {
 
     @Override
     @Transactional
-    public String saveFileToCatalogUpload(String mountFileId,String fileExtension, String fileDpi, String path, String fileName, long fileSize, String archivesInfo, Map<String, Object> fileCategory,String filePath) {
+    public String saveFileToCatalogUpload(Integer fondsNo,String mountFileId,String fileExtension, String fileDpi, String path, String fileName, long fileSize, String archivesInfo, Map<String, Object> fileCategory,String filePath) {
+        String returnString = "";
         Map<String, Object> singCategory = categoryArchivesRepository.findCategoryByPid(fileCategory.get("pid")+"",3);
         String archiveNo = archivesInfo.split("_")[0];
-        String archiveIdSql = "select id,collect_formal,maintitle,archive_no from "+singCategory.get("en_name")+" where archive_no = '"+archiveNo+"' limit 0,1";
+        String archiveIdSql = "select id,collect_formal,maintitle,archive_no from "+singCategory.get("en_name")+" where archive_no = '"+archiveNo+"' " +
+                "and fonds_affiliation = '"+fondsNo+"' limit 0,1";
         List<Object[]> list = entityManager.createNativeQuery(archiveIdSql).getResultList();
+        if(list.size() == 0){
+            returnString = archiveNo + "搜索失败";
+            MountFileDetails details = new MountFileDetails();
+            details.setMountId(mountFileId);
+            details.setFileName(fileName);
+            details.setMountResult(2);
+            details.setReason(returnString);
+            details.setArchivesId(null);
+            details.setArchivesNo(archiveNo);
+            details.setMaintitle(null);
+            mountFileDetailsRepository.saveAndFlush(details);
+            return returnString;
+        }
         Object[] objects = list.get(0);
         String archivesId = objects[0]+"";
         Integer collectFormal = objects[1] == null ? 0 : Integer.parseInt(objects[1]+"");
-        String returnString = "";
+
         //当该文件归档时
         if(collectFormal == 2){
-            returnString = objects[2]+"（"+objects[3]+"）";
+            returnString = objects[3]+"正在归档";
             MountFileDetails details = new MountFileDetails();
             details.setMountId(mountFileId);
             details.setFileName(fileName);
             details.setMountResult(2);
-            details.setReason("该档案正在归档，无法添加电子原文");
+            details.setReason(objects[2]+"（"+objects[3]+"）正在归档，无法添加电子原文");
             details.setArchivesId(archivesId);
             details.setArchivesNo(objects[3]+"");
             details.setMaintitle(objects[2]+"");
@@ -2627,6 +2642,8 @@ public class CollectServiceImpl implements CollectService {
             sysFileList.setTotalSize(fileChunkRequest.getTotalSize());
             sysFileListService.save(sysFileList);
 
+            if(!StringUtils.isEmpty(fileChunkRequest.getArchivesId())){
+
                 //添加电子原文JSON
                 JSONArray jsons = new JSONArray(fileChunkRequest.getFileJsonString());
                 JSONObject json = (JSONObject) jsons.get(0);
@@ -2760,6 +2777,7 @@ public class CollectServiceImpl implements CollectService {
                     e.printStackTrace();
                 }
             }
+        }
         return repath;
     }
 
@@ -4045,6 +4063,16 @@ public class CollectServiceImpl implements CollectService {
         return archivesSummaryRepository.getMaxItemNoByParentId(archivesId);
     }
 
+    @Override
+    public boolean isPowerByFondsIdAndCategoryId(Integer fondsId, String categoryId) {
+        boolean isok = false;
+        Integer count = archivesSummaryRepository.countByFondsIdAndCategoryId(fondsId,categoryId);
+        if(count>0){
+            isok = true;
+        }
+        return isok;
+    }
+
     @Override
     @Transactional
     public void lingshi(String tableName) {

logging/target/generated-sources/annotations/com/intellarchives/service/mapsturct/LogErrorMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:21+0800",
+    date = "2025-04-11T08:56:00+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

logging/target/generated-sources/annotations/com/intellarchives/service/mapsturct/LogSmallMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:21+0800",
+    date = "2025-04-11T08:56:01+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesClassMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:28+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesDictionaryMapperImpl.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:28+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesNoSettingMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:29+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesScopeMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:47+0800",
+    date = "2025-04-11T08:56:28+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DeptsMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:29+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DictionaryMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:28+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DocumentDictionaryMapperImpl.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:28+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/FondsMapperImpl.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:29+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/MenuMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:28+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/MetadataMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:29+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/PostMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:28+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/RoleMapperImpl.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:29+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/RoleSmallMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:28+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/SpecialDictionaryMapperImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:29+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component

system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/UserMapperImpl.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-04-08T10:10:48+0800",
+    date = "2025-04-11T08:56:29+0800",
     comments = "version: 1.4.2.Final, compiler: javac, environment: Java 17.0.1 (Oracle Corporation)"
 )
 @Component