Commit @84e89c9910715cf73fc74090c98360de8b6aeb81

방선주 03-14

250314 방선주 Main, menu 코드 개선

@84e89c9910715cf73fc74090c98360de8b6aeb81

71d0555

84e89c9

src/main/java/com/takensoft/cms/main/web/MainController.java

--- src/main/java/com/takensoft/cms/main/web/MainController.java

+++ src/main/java/com/takensoft/cms/main/web/MainController.java


             }
             responseData.setStatus(HttpStatus.OK.value());
             responseData.setStatusText(HttpStatus.OK);
-            responseData.setMessage("정상적으로 처리되었습니다.");
+            responseData.setMessage("캐시가 초기화 되었습니다.");
             return new ResponseEntity<>(responseData, headers, HttpStatus.OK);
         } catch (Exception e) {
             responseData.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());

             responseData.setMessage("캐시 초기화에 실패했습니다.");
             return new ResponseEntity<>(responseData, headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-    }
-
-    /**
-     * @param
-     * @return ResponseEntity - 기업상담신청 알람 응답 객체
-     *
-     * 관리자 메인페이지 기업상담신청 알람
-     */
-    @PostMapping("/findAplyToastsProc.json")
-    public ResponseEntity<?> findAplyToastsProc(){
-        List<HashMap<String, Object>> result = mainService.findAplyToasts();
-
-        // 응답 처리
-        return resUtil.successRes(result, MessageCode.COMMON_SUCCESS);
     }
 }

71d0555

84e89c9

src/main/java/com/takensoft/cms/menu/service/Impl/MenuServiceImpl.java

--- src/main/java/com/takensoft/cms/menu/service/Impl/MenuServiceImpl.java

+++ src/main/java/com/takensoft/cms/menu/service/Impl/MenuServiceImpl.java


  * 팝업 관련 서비스 구현체
  */
 
-@Service("menuServiceImpl")
+@Service("menuService")
 @RequiredArgsConstructor
 public class MenuServiceImpl extends EgovAbstractServiceImpl implements MenuService {
     private final MenuDAO menuDAO;

             }
             // 메뉴 등록
             int result = menuDAO.save(menuVO);
+            if(result == 0) {
+                throw new CustomInsertFailException("메뉴 등록에 실패했습니다.");
+            }
 
             // 메뉴별 권한 등록
             if (result > 0 && menuVO.getMenuGrd() != 0) {

                 }
                 if (oriMenuId.equals("MENU_000000000000001")) {
                     MenuAuthorVO menuAuthor = saveMenuAuthor(menuId, "ROLE_ADMIN");
-                    result += menuAuthorDAO.menuAuthrtSave(menuAuthor);
+                    int subResult = menuAuthorDAO.menuAuthrtSave(menuAuthor);
+                    if (subResult == 0) {
+                        throw new CustomInsertFailException("메뉴 권한 등록에 실패했습니다.");
+                    }
                 } else {
-                    result += menuAuthorService.menuAuthrtSave(menuId, "menu");
+                    int subResult = menuAuthorService.menuAuthrtSave(menuId, "menu");
                 }
             }
             return result;
-        } catch (CustomInsertFailException cife){
+        } catch (CustomInsertFailException cife) {
             throw cife;
-        } catch (DataAccessException dae) {
+        } catch(DataAccessException dae) {
             throw dae;
         } catch (NullPointerException ne) {
             throw ne;

         try{
             // 토큰정보에서 사용자 아이디 조회 후 등록
             menuVO.setMdfr(jwtUtil.getWriter());
-            return menuDAO.update(menuVO);
-        } catch (CustomUpdateFailException cufe){
-            throw cufe;
-        } catch (DataAccessException dae) {
-            throw dae;
+            int updateResult = menuDAO.update(menuVO);
+            if(updateResult == 0) {
+                throw new CustomUpdateFailException("메뉴 수정에 실패했습니다.");
+            }
+            return updateResult;
         } catch (NullPointerException ne) {
             throw ne;
         } catch (Exception e) {

     @Override
     public List<HierachyVO> findByTopNode() {
         try {
+            // 최상위 부서 조회
             List<HierachyVO> topDeptList = menuDAO.findByTopNode();
             for (HierachyVO vo : topDeptList) {
                 List<HierachyVO> child = findChildNode(vo.getId());

     public int menuDelete(MenuVO menuVO) {
         try {
             menuVO.setMdfr(jwtUtil.getWriter());
-            return menuDAO.deleteMenu(menuVO);
-        } catch (CustomUpdateFailException cufe){
-            throw cufe;
-        } catch (DataAccessException dae) {
+            // 삭제에 대한 결과
+            int deleteResult = menuDAO.deleteMenu(menuVO);
+            if(deleteResult == 0) {
+                throw new CustomDeleteFailException("메뉴 삭제에 실패했습니다.");
+            }
+            return deleteResult;
+        }  catch (DataAccessException dae) {
             throw dae;
         } catch (Exception e) {
             throw new RuntimeException(e);

                     vo.setMenuGrd(0);
                     vo.setMenuSn(sn);
                     vo.setMdfr(writer);
-                    result += menuDAO.menuUpdateByHierachy(vo);
+                    // 최상이 노드 수정 결과
+                    int highUpdateResult = menuDAO.menuUpdateByHierachy(vo);
+                    if(highUpdateResult == 0) {
+                        throw new CustomUpdateFailException("메뉴 수정에 실패했습니다.");
+                    }
+                    result += highUpdateResult;
 
                     // 하위 노드 수정
                     if (hierachyVO.getChildList() != null && hierachyVO.getChildList().size() > 0) {
-                        result += updateChildNode(hierachyVO.getChildList(), vo);
+                        int updateResult = updateChildNode(hierachyVO.getChildList(), vo);
+                        if(updateResult == 0) {
+                            throw new CustomUpdateFailException("메뉴 수정에 실패했습니다.");
+                        }
+                        result += updateResult;
                     }
                     sn++;
                 }
             }
             return result;
-        } catch (CustomUpdateFailException cufe){
-            throw cufe;
         } catch (DataAccessException dae) {
             throw dae;
         } catch (NullPointerException ne) {

      */
     @Override
     @CacheEvict(value = "findByMenuWithRouter", allEntries = true)
+    @Transactional
     public int updateChildNode(List<HierachyVO> childList, MenuVO upMenuVO) {
         int result = 0;
         try {

                 vo.setMenuGrd(grd);
                 vo.setMenuSn(sn);
                 vo.setMdfr(mdfr);
-                result += menuDAO.menuUpdateByHierachy(vo);
+
+                result =  menuDAO.menuUpdateByHierachy(vo);
+                if(result == 0) {
+                    throw new CustomUpdateFailException("메뉴 수정에 실패했습니다.");
+                }
 
                 // 하위 노드 수정
                 if (hierachyVO.getChildList() != null && hierachyVO.getChildList().size() > 0) {
-                    result += updateChildNode(hierachyVO.getChildList(), vo);
+                    // 하위 노드 수정결과
+                    int childResult = updateChildNode(hierachyVO.getChildList(), vo);
+                    if(childResult == 0) {
+                        throw new CustomUpdateFailException("하위 메뉴 수정에 실패했습니다.");
+                    }
                 }
                 sn++;
             }

     @CacheEvict(value = "findByMenuWithRouter", allEntries = true)
     public int bbsMngMenuDelete(MenuVO menuVO) {
         try {
-            return menuDAO.bbsMngMenuDelete(menuVO);
-        } catch (CustomUpdateFailException cufe){
-            throw cufe;
+            // 게시판 삭제에 대한 결과
+            int result = menuDAO.bbsMngMenuDelete(menuVO);
+            if(result == 0) {
+                throw new CustomUpdateFailException("게시판 메뉴 삭제에 실패했습니다.");
+            }
+            return result;
         } catch (DataAccessException dae) {
             throw dae;
         } catch (NullPointerException ne) {

71d0555

84e89c9

src/main/java/com/takensoft/cms/menu/web/MenuController.java

--- src/main/java/com/takensoft/cms/menu/web/MenuController.java

+++ src/main/java/com/takensoft/cms/menu/web/MenuController.java


     public ResponseEntity<?> SaveProc(@RequestBody MenuVO menuVO) {
         // 메뉴 등록
         int result = menuService.menuSave(menuVO);
-
         // 응답 처리
-        if(result > 0) {
-            return resUtil.successRes(result, MessageCode.COMMON_SUCCESS);
-        } else {
-            return resUtil.errorRes(MessageCode.COMMON_INSERT_FAIL);
-        }
+        return resUtil.successRes(result, MessageCode.COMMON_SUCCESS);
     }
 
     /**

Add a comment

Open 0
Closed 0

List

...	...	@@ -67,7 +67,7 @@
67	67	}
68	68	responseData.setStatus(HttpStatus.OK.value());
69	69	responseData.setStatusText(HttpStatus.OK);
70		- responseData.setMessage("정상적으로 처리되었습니다.");
	70	+ responseData.setMessage("캐시가 초기화 되었습니다.");
71	71	return new ResponseEntity<>(responseData, headers, HttpStatus.OK);
72	72	} catch (Exception e) {
73	73	responseData.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
...	...	@@ -75,19 +75,5 @@
75	75	responseData.setMessage("캐시 초기화에 실패했습니다.");
76	76	return new ResponseEntity<>(responseData, headers, HttpStatus.INTERNAL_SERVER_ERROR);
77	77	}
78		- }
79		-
80		- /**
81		- * @param
82		- * @return ResponseEntity - 기업상담신청 알람 응답 객체
83		- *
84		- * 관리자 메인페이지 기업상담신청 알람
85		- */
86		- @PostMapping("/findAplyToastsProc.json")
87		- public ResponseEntity<?> findAplyToastsProc(){
88		- List<HashMap<String, Object>> result = mainService.findAplyToasts();
89		-
90		- // 응답 처리
91		- return resUtil.successRes(result, MessageCode.COMMON_SUCCESS);
92	78	}
93	79	} (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -46,7 +46,7 @@
46	46	* 팝업 관련 서비스 구현체
47	47	*/
48	48
49		-@Service("menuServiceImpl")
	49	+@Service("menuService")
50	50	@RequiredArgsConstructor
51	51	public class MenuServiceImpl extends EgovAbstractServiceImpl implements MenuService {
52	52	private final MenuDAO menuDAO;
...	...	@@ -114,6 +114,9 @@
114	114	}
115	115	// 메뉴 등록
116	116	int result = menuDAO.save(menuVO);
	117	+ if(result == 0) {
	118	+ throw new CustomInsertFailException("메뉴 등록에 실패했습니다.");
	119	+ }
117	120
118	121	// 메뉴별 권한 등록
119	122	if (result > 0 && menuVO.getMenuGrd() != 0) {
...	...	@@ -123,15 +126,18 @@
123	126	}
124	127	if (oriMenuId.equals("MENU_000000000000001")) {
125	128	MenuAuthorVO menuAuthor = saveMenuAuthor(menuId, "ROLE_ADMIN");
126		- result += menuAuthorDAO.menuAuthrtSave(menuAuthor);
	129	+ int subResult = menuAuthorDAO.menuAuthrtSave(menuAuthor);
	130	+ if (subResult == 0) {
	131	+ throw new CustomInsertFailException("메뉴 권한 등록에 실패했습니다.");
	132	+ }
127	133	} else {
128		- result += menuAuthorService.menuAuthrtSave(menuId, "menu");
	134	+ int subResult = menuAuthorService.menuAuthrtSave(menuId, "menu");
129	135	}
130	136	}
131	137	return result;
132		- } catch (CustomInsertFailException cife){
	138	+ } catch (CustomInsertFailException cife) {
133	139	throw cife;
134		- } catch (DataAccessException dae) {
	140	+ } catch(DataAccessException dae) {
135	141	throw dae;
136	142	} catch (NullPointerException ne) {
137	143	throw ne;
...	...	@@ -227,11 +233,11 @@
227	233	try{
228	234	// 토큰정보에서 사용자 아이디 조회 후 등록
229	235	menuVO.setMdfr(jwtUtil.getWriter());
230		- return menuDAO.update(menuVO);
231		- } catch (CustomUpdateFailException cufe){
232		- throw cufe;
233		- } catch (DataAccessException dae) {
234		- throw dae;
	236	+ int updateResult = menuDAO.update(menuVO);
	237	+ if(updateResult == 0) {
	238	+ throw new CustomUpdateFailException("메뉴 수정에 실패했습니다.");
	239	+ }
	240	+ return updateResult;
235	241	} catch (NullPointerException ne) {
236	242	throw ne;
237	243	} catch (Exception e) {
...	...	@@ -251,6 +257,7 @@
251	257	@Override
252	258	public List<HierachyVO> findByTopNode() {
253	259	try {
	260	+ // 최상위 부서 조회
254	261	List<HierachyVO> topDeptList = menuDAO.findByTopNode();
255	262	for (HierachyVO vo : topDeptList) {
256	263	List<HierachyVO> child = findChildNode(vo.getId());
...	...	@@ -303,10 +310,13 @@
303	310	public int menuDelete(MenuVO menuVO) {
304	311	try {
305	312	menuVO.setMdfr(jwtUtil.getWriter());
306		- return menuDAO.deleteMenu(menuVO);
307		- } catch (CustomUpdateFailException cufe){
308		- throw cufe;
309		- } catch (DataAccessException dae) {
	313	+ // 삭제에 대한 결과
	314	+ int deleteResult = menuDAO.deleteMenu(menuVO);
	315	+ if(deleteResult == 0) {
	316	+ throw new CustomDeleteFailException("메뉴 삭제에 실패했습니다.");
	317	+ }
	318	+ return deleteResult;
	319	+ } catch (DataAccessException dae) {
310	320	throw dae;
311	321	} catch (Exception e) {
312	322	throw new RuntimeException(e);
...	...	@@ -377,18 +387,25 @@
377	387	vo.setMenuGrd(0);
378	388	vo.setMenuSn(sn);
379	389	vo.setMdfr(writer);
380		- result += menuDAO.menuUpdateByHierachy(vo);
	390	+ // 최상이 노드 수정 결과
	391	+ int highUpdateResult = menuDAO.menuUpdateByHierachy(vo);
	392	+ if(highUpdateResult == 0) {
	393	+ throw new CustomUpdateFailException("메뉴 수정에 실패했습니다.");
	394	+ }
	395	+ result += highUpdateResult;
381	396
382	397	// 하위 노드 수정
383	398	if (hierachyVO.getChildList() != null && hierachyVO.getChildList().size() > 0) {
384		- result += updateChildNode(hierachyVO.getChildList(), vo);
	399	+ int updateResult = updateChildNode(hierachyVO.getChildList(), vo);
	400	+ if(updateResult == 0) {
	401	+ throw new CustomUpdateFailException("메뉴 수정에 실패했습니다.");
	402	+ }
	403	+ result += updateResult;
385	404	}
386	405	sn++;
387	406	}
388	407	}
389	408	return result;
390		- } catch (CustomUpdateFailException cufe){
391		- throw cufe;
392	409	} catch (DataAccessException dae) {
393	410	throw dae;
394	411	} catch (NullPointerException ne) {
...	...	@@ -409,6 +426,7 @@
409	426	*/
410	427	@Override
411	428	@CacheEvict(value = "findByMenuWithRouter", allEntries = true)
	429	+ @Transactional
412	430	public int updateChildNode(List<HierachyVO> childList, MenuVO upMenuVO) {
413	431	int result = 0;
414	432	try {
...	...	@@ -424,11 +442,19 @@
424	442	vo.setMenuGrd(grd);
425	443	vo.setMenuSn(sn);
426	444	vo.setMdfr(mdfr);
427		- result += menuDAO.menuUpdateByHierachy(vo);
	445	+
	446	+ result = menuDAO.menuUpdateByHierachy(vo);
	447	+ if(result == 0) {
	448	+ throw new CustomUpdateFailException("메뉴 수정에 실패했습니다.");
	449	+ }
428	450
429	451	// 하위 노드 수정
430	452	if (hierachyVO.getChildList() != null && hierachyVO.getChildList().size() > 0) {
431		- result += updateChildNode(hierachyVO.getChildList(), vo);
	453	+ // 하위 노드 수정결과
	454	+ int childResult = updateChildNode(hierachyVO.getChildList(), vo);
	455	+ if(childResult == 0) {
	456	+ throw new CustomUpdateFailException("하위 메뉴 수정에 실패했습니다.");
	457	+ }
432	458	}
433	459	sn++;
434	460	}
...	...	@@ -457,9 +483,12 @@
457	483	@CacheEvict(value = "findByMenuWithRouter", allEntries = true)
458	484	public int bbsMngMenuDelete(MenuVO menuVO) {
459	485	try {
460		- return menuDAO.bbsMngMenuDelete(menuVO);
461		- } catch (CustomUpdateFailException cufe){
462		- throw cufe;
	486	+ // 게시판 삭제에 대한 결과
	487	+ int result = menuDAO.bbsMngMenuDelete(menuVO);
	488	+ if(result == 0) {
	489	+ throw new CustomUpdateFailException("게시판 메뉴 삭제에 실패했습니다.");
	490	+ }
	491	+ return result;
463	492	} catch (DataAccessException dae) {
464	493	throw dae;
465	494	} catch (NullPointerException ne) {

...	...	@@ -55,13 +55,8 @@
55	55	public ResponseEntity<?> SaveProc(@RequestBody MenuVO menuVO) {
56	56	// 메뉴 등록
57	57	int result = menuService.menuSave(menuVO);
58		-
59	58	// 응답 처리
60		- if(result > 0) {
61		- return resUtil.successRes(result, MessageCode.COMMON_SUCCESS);
62		- } else {
63		- return resUtil.errorRes(MessageCode.COMMON_INSERT_FAIL);
64		- }
	59	+ return resUtil.successRes(result, MessageCode.COMMON_SUCCESS);
65	60	}
66	61
67	62	/**

Delete comment