연계파일 단속등록 수정

src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java

@@ -222,4 +222,4 @@ public class CmmnQuery extends QueryRequest {
 		return self();
 	}
 
-}
+}

src/main/java/cokr/xit/fims/crdn/Crdn.java

@@ -181,6 +181,15 @@ public class Crdn extends AbstractEntity {
 
 	private List<FileInfo> attachments;
 
+	public void clearAttachments() {
+		if (attachments != null) {
+			for (FileInfo attachment: attachments)
+				attachment.close();
+			attachments.clear();
+		}
+		attachments = null;
+	}
+
 	public static final String location(Object obj) {
 		if (Assert.isEmpty(obj)) return "";
 

src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java

@@ -1,8 +1,6 @@
 package cokr.xit.fims.crdn.service.bean;
 
 import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,7 +8,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 import javax.annotation.Resource;
 
@@ -18,7 +15,6 @@ import org.springframework.stereotype.Component;
 
 import cokr.xit.base.file.FileInfo;
 import cokr.xit.base.file.service.bean.FileBean;
-import cokr.xit.fims.cmmn.CmmnUtil;
 import cokr.xit.fims.cmmn.CrdnPayerAddrHstry;
 import cokr.xit.fims.cmmn.CrdnSttsHstry;
 import cokr.xit.fims.cmmn.service.bean.CrdnPayerAddrHstryBean;
@@ -66,14 +62,16 @@ public class CrdnBean extends AbstractBean {
 		TaskProcessor taskProcessor = TaskProcessor.get();
 		List<Crdn> duplicates = taskProcessor.getDuplicates(crdns), // 중복 단속목록
 				   distincts = crdns.stream().filter(crdn -> !duplicates.contains(crdn)).toList(); // 중복되지 않는 단속목록
-
 		ArrayList<DataProc> result = new ArrayList<>();
-		duplicates.forEach(crdn -> result.add(
+
-			new DataProc()
+		for (Crdn crdn: duplicates) {
-				.setTarget(crdn)
+			result.add(
-				.setSuccess(false)
+				new DataProc()
-				.setInfo("reason", "duplicate")
+					.setTarget(crdn)
-		));
+					.setSuccess(false)
+					.setInfo("reason", "duplicate")
+			);
+		}
 		if (distincts.isEmpty())
 			return result;
 
@@ -152,7 +150,12 @@ public class CrdnBean extends AbstractBean {
 			DataProc dataProc = new DataProc().setTarget(crdn);
 			String ersrRegYmd = crdn.getErsrRegYmd();
 			if (!isEmpty(ersrRegYmd)) // 말소차량
-				dataProc.setInfo("erased", new DataObject().set("vhrno", crdn.getVhrno()).set("date", DataFormat.yyyy_mm_dd(ersrRegYmd)));
+				dataProc.setInfo(
+					"erased",
+					new DataObject()
+						.set("vhrno", crdn.getVhrno())
+						.set("date", DataFormat.yyyy_mm_dd(ersrRegYmd))
+				);
 			result.add(dataProc);
 		}
 
@@ -426,20 +429,9 @@ public class CrdnBean extends AbstractBean {
 	 * @return 저장 여부
 	 */
 	public boolean removeEquipmentLinkFile(String workPath, String fileName) {
-		try (Stream<Path> walk = Files.walk(Paths.get(workPath));) {
+		try {
-			List<String> deleteFilePaths = walk.filter(Files::isRegularFile)
+			File file = Paths.get(workPath, fileName).toFile();
-				.filter(p -> p.toFile().getName().equalsIgnoreCase(fileName))
+			return file.exists() && file.delete();
-				.map(item -> item.toFile().getPath())
-				.toList();
-
-			boolean saved = false;
-			for (String deleteFilePath : deleteFilePaths)
-				saved = new File(deleteFilePath).delete();
-
-			//빈 디렉토리 삭제
-			CmmnUtil.deleteEmptyDir(new File(workPath), false);
-
-			return saved;
 		} catch (Exception e) {
 			throw runtimeException(e);
 		}

src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java

@@ -99,10 +99,13 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 		List<DataObject> divided = divideFiles(fileList);
 		resp.set("divided", divided.size());
 
-		List<DataObject> errors = divided.stream().filter(info -> info.get("metaInfo") == null).toList();
+		List<DataObject> errors = divided.stream()
+			.filter(info -> info.get("metaInfo") == null)
+			.distinct()
+			.toList();
 		divided.removeAll(errors); // 오류 항목 제외
 		resp.set("normal", divided.size())
-			  .set("malformed", errors.size());
+			.set("malformed", errors.size());
 		log().debug("Before creating Crdns: {}", resp);
 
 		Map<Crdn, DataObject> crdnMap = divided.stream()
@@ -185,14 +188,18 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 		//3.등록
 		List<DataProc> dataProcs = crdnBean.create(crdns, excludeExempted);
 		LinkedHashMap<String, List<File>> fileMap = new LinkedHashMap<>();
-		String[] strs = {"success", "duplicate"};
+		String[] strs = {"success", "duplicates"};
 		for (DataProc dataProc: dataProcs) {
 			Crdn crdn = dataProc.getTarget();
+			crdn.clearAttachments();
 			DataObject info = crdnMap.get(crdn);
 			List<DataObject> files = (List<DataObject>)info.get("files");
 			if (isEmpty(files)) continue;
 
-			List<File> extracted = files.stream().map(file -> (File)file.get("file")).toList();
+			List<File> extracted = files.stream()
+				.map(file -> (File)file.get("file"))
+				.distinct()
+				.toList();
 
 			for (String str: strs) {
 				List<File> list = fileMap.get(str);
@@ -200,33 +207,47 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 					fileMap.put(str, list = new ArrayList<>());
 				if ("success".equals(str) && dataProc.isSuccess())
 					list.addAll(extracted);
-				if ("duplicates".equals(str) && "duplicate".equals(dataProc.getInfo("reason")))
+				else if ("duplicates".equals(str) && "duplicate".equals(dataProc.getInfo("reason"))) {
 					list.addAll(extracted);
+				}
 			}
 		}
 		fileMap.put("fail", errors.stream().flatMap(info -> {
-			List<DataObject> tmp = ((List<DataObject>)info.get("files"));
+			List<DataObject> tmp = (List<DataObject>)info.get("files");
 			return tmp.stream().map(file -> (File)file.get("file"));
 		}).toList());
 		resp.set("success", dataProcs.stream().filter(DataProc::isSuccess).count())
 			.set("duplicates", dataProcs.stream().filter(dp -> "duplicate".equals(dp.getInfo("reason"))).count());
 
-		if (!isEmpty(workPath))
+		if (!cctv)
-			fileList.forEach(delInfo -> crdnBean.removeEquipmentLinkFile(workPath, delInfo.string("FILE_NAME")));
+			for (DataObject delInfo: fileList) {
-
+				crdnBean.removeEquipmentLinkFile(workPath, delInfo.string("FILE_NAME"));
-		String dir = null;
+			}
-		for (Map.Entry<String, List<File>> entry: fileMap.entrySet()) {
+		else {
-			String key = entry.getKey();
+			String dir = null;
-			List<File> files = entry.getValue();
+			for (Map.Entry<String, List<File>> entry: fileMap.entrySet()) {
-			for (File file: files) {
+				String key = entry.getKey();
-				String srcDir = file.getParentFile().getAbsolutePath(),
+				List<File> files = entry.getValue();
-				       destDir = srcDir.replace(File.separator + "work", File.separator + key);
+				for (File file: files) {
-				if (!equals(dir, destDir))
+					String srcDir = file.getParent(),
-					ensureDir(dir = destDir);
+					       destDir = srcDir.replace(File.separator + "work", File.separator + key);
-
+					if (!equals(dir, destDir))
-				file.renameTo(new File(destDir + File.separator + file.getName()));
+						ensureDir(dir = destDir);
+					String destPath = destDir + File.separator + file.getName();
+					boolean moved = file.renameTo(new File(destPath));
+					if (!moved)
+						log().debug("Failed to move {} -> {}", file.getPath(), destPath);
+/*
+					try {
+						Files.move(file.toPath(), Paths.get(destDir, file.getName()));
+					} catch (Exception e) {
+						throw runtimeException(e);
+					}
+*/
+				}
 			}
 		}
+		log().debug("process result: {}", resp);
 		return resp;
 	}
 
@@ -285,6 +306,7 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 
 				return result;
 			})
+			.distinct()
 			.collect(Collectors.toCollection(ArrayList::new));
 	}
 

src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java

@@ -17,6 +17,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
@@ -357,7 +358,7 @@ public class Crdn05Controller extends ApplicationController {
 */
 	}
 
-	@RequestMapping(name="장비업체 단속파일로 단속자료 생성", value="/020/upload.do")
+	@PostMapping(name="장비업체 단속파일로 단속자료 생성", value="/020/upload.do")
 	public ModelAndView createCrdnFromLinkFile(HttpServletRequest hreq, MultipartFile[] uploadFiles) {
 		UserInfo currentUser = currentUser();
 		String sggCd = currentUser.getOrgID(),
@@ -397,67 +398,58 @@ public class Crdn05Controller extends ApplicationController {
 				parsed.addAll(parser.parse(workPath, List.of(uploadFiles)));
 			} else { // 서버 cctv 디렉토리
 				String[] dirs = blankIfEmpty(hreq.getParameter("dirs")).split(",");
-				Stream.of(dirs)
+				for (String dir: dirs) {
-					.forEach(dir -> {
+					String srcDir = FimsConf.get().violationFileDir(dir);
-						String srcDir = FimsConf.get().violationFileDir(dir);
+					List<String> filenames = List.of(blankIfEmpty(hreq.getParameter("filenames")).split(","));
-						Path destDir = ensureDir(srcDir + File.separator + "work").toPath();
+					log().debug("{} filenames received", filenames.size());
-						try {
+					Path workDir = ensureDir(srcDir + File.separator + "work").toPath();
-							Files.list(Paths.get(srcDir))
+					try {
-								.filter(src -> {
+						// 파일들을 작업 디렉토리로 이동
-									String str = src.toString();
+						List<Path> filepaths = Files.list(Paths.get(srcDir))
-									return !str.contains("work")
+							.filter(path -> contains(path.toString(), filenames, false))
-										&& !str.contains("success")
+							.toList();
-										&& Files.isRegularFile(src);
+						log().debug("{} filepaths extracted", filepaths.size());
-								})
+						filepaths.forEach(src -> {
-								.forEach(src -> {
+							try {
-									try {
+								Files.move(src, workDir.resolve(src.getFileName()), StandardCopyOption.REPLACE_EXISTING);
-										Files.move(src, destDir.resolve(src.getFileName()), StandardCopyOption.REPLACE_EXISTING);
+							} catch (Exception e) {
-									} catch (Exception e) {
+								throw runtimeException(e);
-										throw runtimeException(e);
+							}
-									}
+						});
-								});
+
-						} catch (Exception e) {
+						List<File> files = Files.list(workDir)
-							throw runtimeException(e);
+							.filter(path -> contains(path.toString(), filenames, true))
-						}
+							.map(path -> path.toFile())
-					});
+							.toList();
-				List<File> files = Stream.of(dirs)
+						log().debug("{} files parsed", files.size());
-					.map(path -> Paths.get(FimsConf.get().violationFileDir(path) + File.separator + "work"))
+						parsed.addAll(parser.parse(files));
-					.flatMap(path -> {
+					} catch (Exception e) {
-						try {
+						throw runtimeException(e);
-							return Files.walk(path).filter(file -> Files.isRegularFile(file));
+					}
-						} catch (Exception e) {
+				}
-							throw runtimeException(e);
-						}
-					})
-					.map(Path::toFile)
-					.toList();
-				parsed.addAll(parser.parse(files));
 			}
 			nextTempGroupSeq = parser.getTempGroupSeq();
 		}
-/*
+
-		if (parsed.isEmpty())
-			return new ModelAndView("jsonView")
-				.addObject("saved", false)
-				.addObject("alertMessage", "등록할 파일을 찾지 못했습니다")
-				.addObject("failReason", "등록할 파일을 찾지 못했습니다");
-*/
 		Map<String, Object> result = importService.createCrdnByEquipmentLinkFile(processInfo, parsed);
 		return new ModelAndView("jsonView")
-				.addAllObjects(result);
+			.addAllObjects(result);
-/*
+	}
-		boolean saved = (boolean)resultMap.get("saved");
-
-		ModelAndView mav = new ModelAndView("jsonView")
-			.addObject("saved", saved);
-		if (!isEmpty(resultMap.get("alertMessage")))
-			mav.addObject("alertMessage", resultMap.get("alertMessage"));
 
-		if (!saved)
+	private boolean contains(String path, List<String> filenames, boolean inWork) {
-			mav.addObject("failReason", ifEmpty(resultMap.get("failReason"), () -> "알 수 없는 오류"));
+		if (!inWork) {
+			if (path.contains("work")
+			 || path.contains("success")
+			 || path.contains("fail")
+			 || path.contains("duplicates")
+			 ) return false;
+		}
 
-		return mav;
+		for (String filename: filenames) {
-*/
+			if (path.endsWith(filename))
+				return true;
+		}
+		return false;
 	}
 
 	/**단속자료 수기 등록 팝업화면을 반환한다.

src/main/java/cokr/xit/fims/mngt/service/bean/TaskProcessor.java

@@ -118,30 +118,34 @@ public class TaskProcessor extends AbstractBean {
 			return crdns;
 
 		ArrayList<Crdn> copies = new ArrayList<>(crdns);
-		Map<String, DataObject> duplicates = crdnStngMapper.selectDuplicateCrdns(copies).stream().collect(Collectors.toMap(
+		Map<String, DataObject> selected = crdnStngMapper.selectDuplicateCrdns(copies).stream().collect(Collectors.toMap(
-			info -> info.get("VHRNO") + "-" + info.get("CRDN_YMD"),
+				info -> info.get("VHRNO") + "-" + info.get("CRDN_YMD"),
-			info -> info
+				info -> info
-		));
+			));
-		List<Crdn> found = copies.stream()
+		List<Crdn> duplicates = copies.stream()
 			.filter(crdn -> {
 				String key = crdn.getVhrno() + "-" + crdn.getCrdnYmd();
-				DataObject info = duplicates.get(key);
+				DataObject info = selected.get(key);
 				return info != null && toInt(info.get("CRDN_CNT")) > 0;
 			})
 			.collect(Collectors.toCollection(ArrayList::new));
-		copies.removeAll(found);
+		copies.removeAll(duplicates);
-		copies.stream().collect(Collectors.groupingBy(
-			crdn -> crdn.getVhrno() + "-" + crdn.getCrdnYmd())
-		).forEach((str, items) -> {
-			int size = items.size();
-			if (size < 2) return;
 
-			for (int i = 1; i < size; ++i) {
+		copies.stream().collect(Collectors.groupingBy(
-				found.add(items.get(i));
+				crdn -> crdn.getVhrno() + "-" + crdn.getCrdnYmd())
-			}
+			).forEach((str, items) -> {
-		});
+				int size = items.size();
+				if (size < 2) return;
+
+				for (int i = 1; i < size; ++i) {
+					Crdn item = items.get(i);
+					if (!duplicates.contains(item))
+						duplicates.add(item);
+				}
+			});
 
-		return found;
+		duplicates.forEach(Crdn::clearAttachments);
+		return duplicates;
 	}
 
 	public Map<Crdn, LevyExcl> getExcluded(List<Crdn> crdns) {