diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 07a6f29..8f14e97 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -19,6 +19,7 @@ + @@ -45,6 +46,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 9573836..e215378 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -12,7 +12,6 @@ diff --git a/archives/src/main/java/com/intellarchives/modules/archives/controller/CollectController.java b/archives/src/main/java/com/intellarchives/modules/archives/controller/CollectController.java index cc91bb0..ec11078 100644 --- a/archives/src/main/java/com/intellarchives/modules/archives/controller/CollectController.java +++ b/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 catalogUpload(@ApiParam(value = "文件流", required = true, allowMultiple = true) @RequestParam("file") MultipartFile file,Integer fondsId){ + public ApiResponse catalogUpload( +// @ApiParam(value = "文件流", required = true, allowMultiple = true) @RequestParam("file") MultipartFile file, + String upfilePath, + Integer fondsId + ){ + Map> 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 category = collectService.findCategoryById(categoryId); Map 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 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 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 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 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 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); - deleteFile.delete(); + try { + deleteFile.delete(); + file.delete(); + } catch (Exception e) { + e.printStackTrace(); + } return ApiResponse.success(mountFile); }catch(Exception e){ e.printStackTrace(); diff --git a/archives/src/main/java/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.java b/archives/src/main/java/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.java index 71ffaf4..d2f952c 100644 --- a/archives/src/main/java/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.java +++ b/archives/src/main/java/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.java @@ -255,4 +255,7 @@ public interface ArchivesSummaryRepository extends JpaRepository 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); } diff --git a/archives/src/main/java/com/intellarchives/modules/archives/service/CollectService.java b/archives/src/main/java/com/intellarchives/modules/archives/service/CollectService.java index 29fbc4c..06e323c 100644 --- a/archives/src/main/java/com/intellarchives/modules/archives/service/CollectService.java +++ b/archives/src/main/java/com/intellarchives/modules/archives/service/CollectService.java @@ -94,7 +94,7 @@ public interface CollectService { List> findDate(Map category,Listtitles,List archivesIds); // String catalogDownload(String categoryId,Integer categoryLevel,String initPath,String path,List archivesIds); - String saveFileToCatalogUpload(String mountFileId,String fileExtension,String fileDpi,String path,String fileName,long fileSize,String archivesInfo,Map fileCategory,String filePath); + String saveFileToCatalogUpload(Integer fondsId,String mountFileId,String fileExtension,String fileDpi,String path,String fileName,long fileSize,String archivesInfo,Map fileCategory,String filePath); //预快速组卷 List 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); diff --git a/archives/src/main/java/com/intellarchives/modules/archives/service/impl/CollectServiceImpl.java b/archives/src/main/java/com/intellarchives/modules/archives/service/impl/CollectServiceImpl.java index d5c2f23..800e763 100644 --- a/archives/src/main/java/com/intellarchives/modules/archives/service/impl/CollectServiceImpl.java +++ b/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 fileCategory,String filePath) { + public String saveFileToCatalogUpload(Integer fondsNo,String mountFileId,String fileExtension, String fileDpi, String path, String fileName, long fileSize, String archivesInfo, Map fileCategory,String filePath) { + String returnString = ""; Map 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 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,137 +2642,140 @@ public class CollectServiceImpl implements CollectService { sysFileList.setTotalSize(fileChunkRequest.getTotalSize()); sysFileListService.save(sysFileList); - //添加电子原文JSON - JSONArray jsons = new JSONArray(fileChunkRequest.getFileJsonString()); - JSONObject json = (JSONObject) jsons.get(0); - json.put("file_path",repath); - json.put("archive_id",fileChunkRequest.getArchivesId()); - json.put("last_modified",mergeFile.lastModified()); - json.put("is_analysis",-1); - json.put("is_mark",0); - - try{ - //获取电子原文表门类信息 - Map pcategory = categoryArchivesRepository.findCategoryByPid(categoryId,3); - Set keys = new HashSet<>(json.keySet()); - keys.add("digital_summary"); - keys.add("public_key"); - keys.add("private_key"); - - KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); - keyPairGenerator.initialize(2048); - KeyPair keyPair = keyPairGenerator.generateKeyPair(); - String publicKey = org.apache.commons.codec.binary.Base64.encodeBase64String(keyPair.getPublic().getEncoded()); - String privateKey = Base64.encodeBase64String(keyPair.getPrivate().getEncoded()); - String digitalSummary = null; + if(!StringUtils.isEmpty(fileChunkRequest.getArchivesId())){ - String insertKey = "id,"; - String insertValue = "'"+insertId+"',"; - for(String key:keys){ - insertKey += key+","; + //添加电子原文JSON + JSONArray jsons = new JSONArray(fileChunkRequest.getFileJsonString()); + JSONObject json = (JSONObject) jsons.get(0); + json.put("file_path",repath); + json.put("archive_id",fileChunkRequest.getArchivesId()); + json.put("last_modified",mergeFile.lastModified()); + json.put("is_analysis",-1); + json.put("is_mark",0); - if("digital_summary".equals(key)){ - digitalSummary = FourFileUtils.getDigitalSummary(new File(location+json.get("file_path"))); - insertValue += StringUtils.isEmpty(digitalSummary) ? "null," : "'"+digitalSummary+"',"; - }else if("public_key".equals(key)) { - insertValue += StringUtils.isEmpty(publicKey) ? "null," : "'"+publicKey+"',"; - }else if("private_key".equals(key)) { - insertValue += StringUtils.isEmpty(privateKey) ? "null," : "'"+privateKey+"',"; - }else{ - insertValue += json.get(key) == null ? null +",":"'"+json.get(key)+"',"; + try{ + //获取电子原文表门类信息 + Map pcategory = categoryArchivesRepository.findCategoryByPid(categoryId,3); + Set keys = new HashSet<>(json.keySet()); + keys.add("digital_summary"); + keys.add("public_key"); + keys.add("private_key"); + + KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(2048); + KeyPair keyPair = keyPairGenerator.generateKeyPair(); + String publicKey = org.apache.commons.codec.binary.Base64.encodeBase64String(keyPair.getPublic().getEncoded()); + String privateKey = Base64.encodeBase64String(keyPair.getPrivate().getEncoded()); + String digitalSummary = null; + + String insertKey = "id,"; + String insertValue = "'"+insertId+"',"; + for(String key:keys){ + insertKey += key+","; + + if("digital_summary".equals(key)){ + digitalSummary = FourFileUtils.getDigitalSummary(new File(location+json.get("file_path"))); + insertValue += StringUtils.isEmpty(digitalSummary) ? "null," : "'"+digitalSummary+"',"; + }else if("public_key".equals(key)) { + insertValue += StringUtils.isEmpty(publicKey) ? "null," : "'"+publicKey+"',"; + }else if("private_key".equals(key)) { + insertValue += StringUtils.isEmpty(privateKey) ? "null," : "'"+privateKey+"',"; + }else{ + insertValue += json.get(key) == null ? null +",":"'"+json.get(key)+"',"; + } } - } - insertKey = insertKey.substring(0,insertKey.length()-1); - insertValue = insertValue.substring(0,insertValue.length()-1); - String sql = "insert into " + toCategory.get("en_name") + "("+insertKey+") values ("+insertValue+")"; - int result = entityManager.createNativeQuery(sql).executeUpdate(); + insertKey = insertKey.substring(0,insertKey.length()-1); + insertValue = insertValue.substring(0,insertValue.length()-1); + String sql = "insert into " + toCategory.get("en_name") + "("+insertKey+") values ("+insertValue+")"; + int result = entityManager.createNativeQuery(sql).executeUpdate(); - //添加总表 - ArchivesSummaryFile asFile = new ArchivesSummaryFile(); - asFile.setFileId(insertId); - asFile.setArchiveId(json.get("archive_id") == null ? null : json.get("archive_id")+""); - asFile.setFileType(json.get("file_type") == null ? null : json.get("file_type")+""); - asFile.setFileDpi(json.get("file_dpi") == null ? null : json.get("file_dpi")+""); - asFile.setFilePath(json.get("file_path") == null ? null : json.get("file_path")+""); - asFile.setFileName(json.get("file_name") == null ? null : json.get("file_name")+""); - asFile.setFileSize(json.get("file_size") == null ? null : Integer.parseInt(json.get("file_size")+"")); - asFile.setLastModified(json.get("last_modified")==null ?null:json.get("last_modified")+""); - asFile.setDigitalSummary(StringUtils.isEmpty(digitalSummary) ? null : digitalSummary); - asFile.setPublicKey(StringUtils.isEmpty(publicKey) ? null : publicKey); - asFile.setPrivateKey(StringUtils.isEmpty(privateKey) ? null : privateKey); - asFile.setCategoryId(toCategory.get("id")+""); - asFile.setCategoryPid(toCategory.get("pid")+""); - asFile.setCreateTime(new Timestamp(System.currentTimeMillis())); - asFile.setIsAnalysis(-1); - asFile.setIsMark(0); + //添加总表 + ArchivesSummaryFile asFile = new ArchivesSummaryFile(); + asFile.setFileId(insertId); + asFile.setArchiveId(json.get("archive_id") == null ? null : json.get("archive_id")+""); + asFile.setFileType(json.get("file_type") == null ? null : json.get("file_type")+""); + asFile.setFileDpi(json.get("file_dpi") == null ? null : json.get("file_dpi")+""); + asFile.setFilePath(json.get("file_path") == null ? null : json.get("file_path")+""); + asFile.setFileName(json.get("file_name") == null ? null : json.get("file_name")+""); + asFile.setFileSize(json.get("file_size") == null ? null : Integer.parseInt(json.get("file_size")+"")); + asFile.setLastModified(json.get("last_modified")==null ?null:json.get("last_modified")+""); + asFile.setDigitalSummary(StringUtils.isEmpty(digitalSummary) ? null : digitalSummary); + asFile.setPublicKey(StringUtils.isEmpty(publicKey) ? null : publicKey); + asFile.setPrivateKey(StringUtils.isEmpty(privateKey) ? null : privateKey); + asFile.setCategoryId(toCategory.get("id")+""); + asFile.setCategoryPid(toCategory.get("pid")+""); + asFile.setCreateTime(new Timestamp(System.currentTimeMillis())); + asFile.setIsAnalysis(-1); + asFile.setIsMark(0); - //解析电子原文 - String fondsCode = this.findFondsCodeByUsername(username); - JSONObject josnPOST = new JSONObject(); - josnPOST.put("id",insertId); - josnPOST.put("code",fondsCode); - josnPOST.put("type","uploadFile"); - josnPOST.put("keywords",""); - String savePath = asFile.getFilePath(); - savePath = savePath.substring(0,savePath.lastIndexOf("/")); - savePath = savePath.replaceAll("category","file_analysis"); - josnPOST.put("save_path",prefixPath + savePath); - List passPath = new ArrayList<>(); - passPath.add(prefixPath + asFile.getFilePath()); - josnPOST.put("path",passPath.toArray()); + //解析电子原文 + String fondsCode = this.findFondsCodeByUsername(username); + JSONObject josnPOST = new JSONObject(); + josnPOST.put("id",insertId); + josnPOST.put("code",fondsCode); + josnPOST.put("type","uploadFile"); + josnPOST.put("keywords",""); + String savePath = asFile.getFilePath(); + savePath = savePath.substring(0,savePath.lastIndexOf("/")); + savePath = savePath.replaceAll("category","file_analysis"); + josnPOST.put("save_path",prefixPath + savePath); + List passPath = new ArrayList<>(); + passPath.add(prefixPath + asFile.getFilePath()); + josnPOST.put("path",passPath.toArray()); - try { - URL requestURL = new URL(pythonURL+":5051/file_upload"); - HttpURLConnection conn = (HttpURLConnection) requestURL.openConnection(); - conn.setRequestMethod("POST"); - conn.setDoOutput(true); + try { + URL requestURL = new URL(pythonURL+":5051/file_upload"); + HttpURLConnection conn = (HttpURLConnection) requestURL.openConnection(); + conn.setRequestMethod("POST"); + conn.setDoOutput(true); - // 设置请求头，指定内容类型和长度 - conn.setRequestProperty("Content-Type", "application/json"); - String jsonInputString = josnPOST.toString(); - byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8); - conn.setRequestProperty("Content-Length", Integer.toString(input.length)); + // 设置请求头，指定内容类型和长度 + conn.setRequestProperty("Content-Type", "application/json"); + String jsonInputString = josnPOST.toString(); + byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8); + conn.setRequestProperty("Content-Length", Integer.toString(input.length)); - // 发送请求参数 - try(OutputStream os = conn.getOutputStream()) { - os.write(input); - } + // 发送请求参数 + try(OutputStream os = conn.getOutputStream()) { + os.write(input); + } - // 获取服务器响应代码 - int responseCode = conn.getResponseCode(); + // 获取服务器响应代码 + int responseCode = conn.getResponseCode(); - // 读取服务器响应内容（如果有的话） - if (responseCode == HttpURLConnection.HTTP_OK) { - java.util.Scanner s = new java.util.Scanner(conn.getInputStream()).useDelimiter("\\A"); - String response = s.hasNext() ? s.next() : ""; - JSONObject returnJSON = new JSONObject(response); - String returnStatus = returnJSON.getStr("status"); - if("200".equals(returnStatus)){ - String updateSql = "update " + toCategory.get("en_name") + " set is_analysis = 0 where id = '"+insertId+"'"; - entityManager.createNativeQuery(updateSql).executeUpdate(); - asFile.setIsAnalysis(0); + // 读取服务器响应内容（如果有的话） + if (responseCode == HttpURLConnection.HTTP_OK) { + java.util.Scanner s = new java.util.Scanner(conn.getInputStream()).useDelimiter("\\A"); + String response = s.hasNext() ? s.next() : ""; + JSONObject returnJSON = new JSONObject(response); + String returnStatus = returnJSON.getStr("status"); + if("200".equals(returnStatus)){ + String updateSql = "update " + toCategory.get("en_name") + " set is_analysis = 0 where id = '"+insertId+"'"; + entityManager.createNativeQuery(updateSql).executeUpdate(); + asFile.setIsAnalysis(0); + } + }else{ + //盘点服务器连接超时 } - }else{ - //盘点服务器连接超时 + }catch (Exception e){ + e.printStackTrace(); } - }catch (Exception e){ - e.printStackTrace(); - } - asFile = archivesSummaryFileRepository.save(asFile); + asFile = archivesSummaryFileRepository.save(asFile); - //档案操作日志 - ArchivesOperateLog log = new ArchivesOperateLog(); - log.setArchivesId(asFile.getArchiveId()); - log.setOperateType(17); - log.setRemarks("大文件上传【"+asFile.getFileName()+"】"); - archivesOperateLogRepository.save(log); + //档案操作日志 + ArchivesOperateLog log = new ArchivesOperateLog(); + log.setArchivesId(asFile.getArchiveId()); + log.setOperateType(17); + log.setRemarks("大文件上传【"+asFile.getFileName()+"】"); + archivesOperateLogRepository.save(log); - if(null != json.get("archive_id")){ - this.arrangePatentChild(toCategory,pcategory,json.get("archive_id")+""); + if(null != json.get("archive_id")){ + this.arrangePatentChild(toCategory,pcategory,json.get("archive_id")+""); + } + }catch (Exception e){ + e.printStackTrace(); } - }catch (Exception e){ - 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) { diff --git a/archives/target/archives-1.0.jar b/archives/target/archives-1.0.jar index 2a98a05..a2944b2 100644 Binary files a/archives/target/archives-1.0.jar and b/archives/target/archives-1.0.jar differ diff --git a/archives/target/classes/com/intellarchives/modules/archives/controller/CollectController$1.class b/archives/target/classes/com/intellarchives/modules/archives/controller/CollectController$1.class index 5f303b1..bf6a501 100644 Binary files a/archives/target/classes/com/intellarchives/modules/archives/controller/CollectController$1.class and b/archives/target/classes/com/intellarchives/modules/archives/controller/CollectController$1.class differ diff --git a/archives/target/classes/com/intellarchives/modules/archives/controller/CollectController.class b/archives/target/classes/com/intellarchives/modules/archives/controller/CollectController.class index f7a61cd..805d6c2 100644 Binary files a/archives/target/classes/com/intellarchives/modules/archives/controller/CollectController.class and b/archives/target/classes/com/intellarchives/modules/archives/controller/CollectController.class differ diff --git a/archives/target/classes/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.class b/archives/target/classes/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.class index 4a2fcdb..a56963d 100644 Binary files a/archives/target/classes/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.class and b/archives/target/classes/com/intellarchives/modules/archives/repository/ArchivesSummaryRepository.class differ diff --git a/archives/target/classes/com/intellarchives/modules/archives/service/CollectService.class b/archives/target/classes/com/intellarchives/modules/archives/service/CollectService.class index 2611ce4..d692084 100644 Binary files a/archives/target/classes/com/intellarchives/modules/archives/service/CollectService.class and b/archives/target/classes/com/intellarchives/modules/archives/service/CollectService.class differ diff --git a/archives/target/classes/com/intellarchives/modules/archives/service/impl/CollectServiceImpl.class b/archives/target/classes/com/intellarchives/modules/archives/service/impl/CollectServiceImpl.class index 895b6d7..2da5eee 100644 Binary files a/archives/target/classes/com/intellarchives/modules/archives/service/impl/CollectServiceImpl.class and b/archives/target/classes/com/intellarchives/modules/archives/service/impl/CollectServiceImpl.class differ diff --git a/common/target/common-1.0.jar b/common/target/common-1.0.jar index 5a49390..5378859 100644 Binary files a/common/target/common-1.0.jar and b/common/target/common-1.0.jar differ diff --git a/flowable/target/flowable-1.0.jar b/flowable/target/flowable-1.0.jar index a0ed974..8214bbf 100644 Binary files a/flowable/target/flowable-1.0.jar and b/flowable/target/flowable-1.0.jar differ diff --git a/logging/target/generated-sources/annotations/com/intellarchives/service/mapsturct/LogErrorMapperImpl.java b/logging/target/generated-sources/annotations/com/intellarchives/service/mapsturct/LogErrorMapperImpl.java index f5c2434..d517460 100644 --- a/logging/target/generated-sources/annotations/com/intellarchives/service/mapsturct/LogErrorMapperImpl.java +++ b/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 diff --git a/logging/target/generated-sources/annotations/com/intellarchives/service/mapsturct/LogSmallMapperImpl.java b/logging/target/generated-sources/annotations/com/intellarchives/service/mapsturct/LogSmallMapperImpl.java index 4b673cd..8532e09 100644 --- a/logging/target/generated-sources/annotations/com/intellarchives/service/mapsturct/LogSmallMapperImpl.java +++ b/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 diff --git a/logging/target/logging-1.0.jar b/logging/target/logging-1.0.jar index b8a2f6e..802d19b 100644 Binary files a/logging/target/logging-1.0.jar and b/logging/target/logging-1.0.jar differ diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesClassMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesClassMapperImpl.java index 6dec5c1..255c0cd 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesClassMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesDictionaryMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesDictionaryMapperImpl.java index 7335730..570a271 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesDictionaryMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesNoSettingMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesNoSettingMapperImpl.java index 7641cc1..c998f40 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesNoSettingMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesScopeMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesScopeMapperImpl.java index edba9c9..5f4bec1 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/ArchivesScopeMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DeptsMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DeptsMapperImpl.java index e200df1..8720224 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DeptsMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DictionaryMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DictionaryMapperImpl.java index bd165b8..5e325cb 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DictionaryMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DocumentDictionaryMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DocumentDictionaryMapperImpl.java index cb5784b..05f20c6 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/DocumentDictionaryMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/FondsMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/FondsMapperImpl.java index 4d41536..c9b0b8a 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/FondsMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/MenuMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/MenuMapperImpl.java index 62f0685..3de6c22 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/MenuMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/MetadataMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/MetadataMapperImpl.java index ffd0c19..7e34274 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/MetadataMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/PostMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/PostMapperImpl.java index b3f525a..a09b371 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/PostMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/RoleMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/RoleMapperImpl.java index 6371bd9..ce01be3 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/RoleMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/RoleSmallMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/RoleSmallMapperImpl.java index 30c8f53..f1f3e02 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/RoleSmallMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/SpecialDictionaryMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/SpecialDictionaryMapperImpl.java index 51e4a58..945a3b7 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/SpecialDictionaryMapperImpl.java +++ b/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 diff --git a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/UserMapperImpl.java b/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/UserMapperImpl.java index 6724830..7439207 100644 --- a/system/target/generated-sources/annotations/com/intellarchives/modules/system/mapstruct/UserMapperImpl.java +++ b/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 diff --git a/system/target/intellArchives.jar b/system/target/intellArchives.jar index 2ead29a..2bbda07 100644 Binary files a/system/target/intellArchives.jar and b/system/target/intellArchives.jar differ diff --git a/system/target/intellArchives.jar.original b/system/target/intellArchives.jar.original index 8a6bd8a..8108ef7 100644 Binary files a/system/target/intellArchives.jar.original and b/system/target/intellArchives.jar.original differ