Commit @ae110264a5cf76591bd3f5a3d4a2f7df1f0c6927

2d84431

ae11026

server/main/java/kr/co/takensoft/crosswalk/data/service/DataCenterService.java

--- server/main/java/kr/co/takensoft/crosswalk/data/service/DataCenterService.java

+++ server/main/java/kr/co/takensoft/crosswalk/data/service/DataCenterService.java


             eqpmnTrobl(detailList, node_id, crslk_az, timestamp);
         } else {
             // 장애발생정보가 없기 때문에 모든 데이터 복구여부 'Y'로 바꾸기!
-            HashMap<String, Object> recoveryOne = new HashMap<>();
+            ErrorListComparison errorListComparison = new ErrorListComparison();
+            if(errorListComparison.containsKey(node_id + "_" + crslk_az)) {
+                HashMap<String, Object> recoveryOne = new HashMap<>();
+                recoveryOne.put("node_id", node_id);
+                recoveryOne.put("crslk_az", crslk_az);
 
-            recoveryOne.put("nodeID", node_id);
-            recoveryOne.put("bearingCode", crslk_az);
-            recoveryOne.put("timestamp", timestamp);
-
-            int result = dataCenterDAO.crslkDeleteRecoveryUpdate(recoveryOne);
-
-            if( result > 0 ) {
-                ErrorListComparison errorListComparison = new ErrorListComparison();
-                errorListComparison.removeCrosswalk(node_id + "_" + crslk_az);
+                int result = dataCenterDAO.crslkDeleteRecoveryUpdate(recoveryOne);
+                if( result > 0 ) {
+                    errorListComparison.removeCrosswalk(node_id + "_" + crslk_az);
+                }
             }
+
+
         }
     }
     /**

2d84431

ae11026

server/main/java/kr/co/takensoft/crosswalk/data/service/ErrorListComparison.java

--- server/main/java/kr/co/takensoft/crosswalk/data/service/ErrorListComparison.java

+++ server/main/java/kr/co/takensoft/crosswalk/data/service/ErrorListComparison.java


         errorOldList.remove(key);
     }
 
+    //해당키가 존재하는지 검사
+    public boolean containsKey(String key) {
+        System.out.println("errorOldList.containsKey(key) = " + errorOldList.containsKey(key));
+        return errorOldList.containsKey(key);
+    }
+
     // 비교 후 에러 DB에 수정 및 등록
     public HashMap<String, List<HashMap<String, Object>>> comparison (List<HashMap<String, Object>> newData, String node_id, String crslk_az) {
         // errorOldList가 비어있거나, 등록된 횡단보도가 아닐 경우 등록

2d84431

ae11026

server/main/java/kr/co/takensoft/crosswalk/management/service/CrosswalkService.java

--- server/main/java/kr/co/takensoft/crosswalk/management/service/CrosswalkService.java

+++ server/main/java/kr/co/takensoft/crosswalk/management/service/CrosswalkService.java


     public int crslkDelete(HashMap<String, Object> params) throws Exception {
         String key = params.get("node_id") + "_" + params.get("crslk_az");
         ErrorListComparison errorListComparison = new ErrorListComparison();
-        errorListComparison.removeCrosswalk(key);
 
-        dataCenterDAO.crslkDeleteRecoveryUpdate(params);
+        if(errorListComparison.containsKey(key)) {
+            int result = dataCenterDAO.crslkDeleteRecoveryUpdate(params);
+            if( result > 0 ) {
+                errorListComparison.removeCrosswalk(key);
+            }
+        }
 
         return crosswalkDAO.crslkDelete(params);
     }

...	...	@@ -99,18 +99,19 @@
99	99	eqpmnTrobl(detailList, node_id, crslk_az, timestamp);
100	100	} else {
101	101	// 장애발생정보가 없기 때문에 모든 데이터 복구여부 'Y'로 바꾸기!
102		- HashMap<String, Object> recoveryOne = new HashMap<>();
	102	+ ErrorListComparison errorListComparison = new ErrorListComparison();
	103	+ if(errorListComparison.containsKey(node_id + "_" + crslk_az)) {
	104	+ HashMap<String, Object> recoveryOne = new HashMap<>();
	105	+ recoveryOne.put("node_id", node_id);
	106	+ recoveryOne.put("crslk_az", crslk_az);
103	107
104		- recoveryOne.put("nodeID", node_id);
105		- recoveryOne.put("bearingCode", crslk_az);
106		- recoveryOne.put("timestamp", timestamp);
107		-
108		- int result = dataCenterDAO.crslkDeleteRecoveryUpdate(recoveryOne);
109		-
110		- if( result > 0 ) {
111		- ErrorListComparison errorListComparison = new ErrorListComparison();
112		- errorListComparison.removeCrosswalk(node_id + "_" + crslk_az);
	108	+ int result = dataCenterDAO.crslkDeleteRecoveryUpdate(recoveryOne);
	109	+ if( result > 0 ) {
	110	+ errorListComparison.removeCrosswalk(node_id + "_" + crslk_az);
	111	+ }
113	112	}
	113	+
	114	+
114	115	}
115	116	}
116	117	/**

...	...	@@ -41,6 +41,12 @@
41	41	errorOldList.remove(key);
42	42	}
43	43
	44	+ //해당키가 존재하는지 검사
	45	+ public boolean containsKey(String key) {
	46	+ System.out.println("errorOldList.containsKey(key) = " + errorOldList.containsKey(key));
	47	+ return errorOldList.containsKey(key);
	48	+ }
	49	+
44	50	// 비교 후 에러 DB에 수정 및 등록
45	51	public HashMap<String, List<HashMap<String, Object>>> comparison (List<HashMap<String, Object>> newData, String node_id, String crslk_az) {
46	52	// errorOldList가 비어있거나, 등록된 횡단보도가 아닐 경우 등록

...	...	@@ -508,9 +508,13 @@
508	508	public int crslkDelete(HashMap<String, Object> params) throws Exception {
509	509	String key = params.get("node_id") + "_" + params.get("crslk_az");
510	510	ErrorListComparison errorListComparison = new ErrorListComparison();
511		- errorListComparison.removeCrosswalk(key);
512	511
513		- dataCenterDAO.crslkDeleteRecoveryUpdate(params);
	512	+ if(errorListComparison.containsKey(key)) {
	513	+ int result = dataCenterDAO.crslkDeleteRecoveryUpdate(params);
	514	+ if( result > 0 ) {
	515	+ errorListComparison.removeCrosswalk(key);
	516	+ }
	517	+ }
514	518
515	519	return crosswalkDAO.crslkDelete(params);
516	520	}

Delete comment