diff --git a/src/main/java/com/madeu/config/WebConfig.java b/src/main/java/com/madeu/config/WebConfig.java index 742c90e..1083d56 100644 --- a/src/main/java/com/madeu/config/WebConfig.java +++ b/src/main/java/com/madeu/config/WebConfig.java @@ -21,9 +21,23 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - // ProcedureReview 전체 통제 + // 전체 URL에 로그인 인터셉터 적용 registry.addInterceptor(webLoginInterceptor) - .addPathPatterns("/procedureReview/**"); + .addPathPatterns("/**") + .excludePathPatterns( + // 로그인/로그아웃 + "/weblogin/**", + "/web/login/**", + // 모바일 API + "/mobile/**", + // 외부 연동 API + "/api/**", + // 정적 리소스 + "/css/**", "/js/**", "/image/**", + "/cdn/**", "/bootstrap/**", + "/favicon.ico", + // 에러 페이지 + "/error/**"); } @Value("${file.upload-path}") diff --git a/src/main/java/com/madeu/controller/web/webappboard/WebAppBoardController.java b/src/main/java/com/madeu/controller/web/webappboard/WebAppBoardController.java index 9c3c226..739689a 100644 --- a/src/main/java/com/madeu/controller/web/webappboard/WebAppBoardController.java +++ b/src/main/java/com/madeu/controller/web/webappboard/WebAppBoardController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webappboard; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappboard.WebAppBoardService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebAppBoardController extends ManagerDraftAction { +public class WebAppBoardController { @Autowired private WebAppBoardService webAppBoardService; @@ -44,19 +43,14 @@ public class WebAppBoardController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppBoardService.selectListAppBoardIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppBoardService.selectListAppBoardIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -80,13 +74,8 @@ public class WebAppBoardController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppBoardService.selectListAppBoard(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppBoardService.selectListAppBoard(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -123,19 +112,14 @@ public class WebAppBoardController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppBoardService.insertAppBoardIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppBoardService.insertAppBoardIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -160,19 +144,14 @@ public class WebAppBoardController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppBoardService.updateAppBoardIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppBoardService.updateAppBoardIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -197,13 +176,8 @@ public class WebAppBoardController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppBoardService.selectAppBoard(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppBoardService.selectAppBoard(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -242,15 +216,10 @@ public class WebAppBoardController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppBoardService.insertAppBoard(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppBoardService.insertAppBoard(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -291,15 +260,10 @@ public class WebAppBoardController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppBoardService.updateAppBoard(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppBoardService.updateAppBoard(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -341,15 +305,10 @@ public class WebAppBoardController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppBoardService.deleteAppBoard(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppBoardService.deleteAppBoard(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webappcontents/WebAppContentsController.java b/src/main/java/com/madeu/controller/web/webappcontents/WebAppContentsController.java index 3058409..73b39a3 100644 --- a/src/main/java/com/madeu/controller/web/webappcontents/WebAppContentsController.java +++ b/src/main/java/com/madeu/controller/web/webappcontents/WebAppContentsController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webappcontents; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappcontents.WebAppContentsService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -20,7 +19,7 @@ import org.springframework.web.servlet.ModelAndView; import java.util.HashMap; @Slf4j @Controller -public class WebAppContentsController extends ManagerDraftAction { +public class WebAppContentsController { @Autowired private WebAppContentsService webAppContentsService; @@ -43,19 +42,14 @@ public class WebAppContentsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.selectListAppContentsIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.selectListAppContentsIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -80,13 +74,8 @@ public class WebAppContentsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.selectListAppContents(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.selectListAppContents(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -123,19 +112,14 @@ public class WebAppContentsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.insertAppContentsIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.insertAppContentsIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -160,19 +144,14 @@ public class WebAppContentsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.updateAppContentsIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.updateAppContentsIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -197,13 +176,8 @@ public class WebAppContentsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.selectAppContents(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.selectAppContents(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -242,15 +216,10 @@ public class WebAppContentsController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -290,15 +259,10 @@ public class WebAppContentsController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.insertAppContents(paramMap,file, file2); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.insertAppContents(paramMap,file, file2); } catch (Exception e) { e.printStackTrace(); @@ -339,15 +303,10 @@ public class WebAppContentsController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.updateAppContents(paramMap,file, file2); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.updateAppContents(paramMap,file, file2); } catch (Exception e) { e.printStackTrace(); @@ -389,15 +348,10 @@ public class WebAppContentsController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppContentsService.deleteAppContents(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppContentsService.deleteAppContents(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webappevent/WebAppEventController.java b/src/main/java/com/madeu/controller/web/webappevent/WebAppEventController.java index 80858dd..e587433 100644 --- a/src/main/java/com/madeu/controller/web/webappevent/WebAppEventController.java +++ b/src/main/java/com/madeu/controller/web/webappevent/WebAppEventController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webappevent; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappevent.WebAppEventService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -22,7 +21,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebAppEventController extends ManagerDraftAction { +public class WebAppEventController { @Autowired private WebAppEventService webAppEventService; @@ -45,13 +44,8 @@ public class WebAppEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.selectListAppEventOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.selectListAppEventOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -88,19 +82,14 @@ public class WebAppEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.selectListAppEventIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.selectListAppEventIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -125,13 +114,8 @@ public class WebAppEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.selectListAppEvent(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.selectListAppEvent(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -168,13 +152,8 @@ public class WebAppEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.selectAppEvent(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.selectAppEvent(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -211,19 +190,14 @@ public class WebAppEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.insertAppEventIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.insertAppEventIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -250,15 +224,10 @@ public class WebAppEventController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.insertAppEvent(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.insertAppEvent(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -297,19 +266,14 @@ public class WebAppEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.updateAppEventIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.updateAppEventIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -336,15 +300,10 @@ public class WebAppEventController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.updateAppEvent(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.updateAppEvent(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -386,15 +345,10 @@ public class WebAppEventController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppEventService.deleteAppEvent(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppEventService.deleteAppEvent(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webappnotice/WebAppNoticeController.java b/src/main/java/com/madeu/controller/web/webappnotice/WebAppNoticeController.java index 23cde1d..09a19da 100644 --- a/src/main/java/com/madeu/controller/web/webappnotice/WebAppNoticeController.java +++ b/src/main/java/com/madeu/controller/web/webappnotice/WebAppNoticeController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webappnotice; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappnotice.WebAppNoticeService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -20,7 +19,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebAppNoticeController extends ManagerDraftAction { +public class WebAppNoticeController { @Autowired private WebAppNoticeService webAppNoticeService; @@ -43,19 +42,14 @@ public class WebAppNoticeController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppNoticeService.selectListAppNoticeIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppNoticeService.selectListAppNoticeIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -80,13 +74,8 @@ public class WebAppNoticeController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppNoticeService.selectListAppNotice(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppNoticeService.selectListAppNotice(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -123,13 +112,8 @@ public class WebAppNoticeController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppNoticeService.selectAppNotice(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppNoticeService.selectAppNotice(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -168,15 +152,10 @@ public class WebAppNoticeController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppNoticeService.insertAppNotice(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppNoticeService.insertAppNotice(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -217,15 +196,10 @@ public class WebAppNoticeController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppNoticeService.updateAppNotice(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppNoticeService.updateAppNotice(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -267,15 +241,10 @@ public class WebAppNoticeController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppNoticeService.deleteAppNotice(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppNoticeService.deleteAppNotice(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webappuser/WebAppUserController.java b/src/main/java/com/madeu/controller/web/webappuser/WebAppUserController.java index 4a687cd..2680857 100644 --- a/src/main/java/com/madeu/controller/web/webappuser/WebAppUserController.java +++ b/src/main/java/com/madeu/controller/web/webappuser/WebAppUserController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webappuser; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappuser.WebAppUserService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -26,7 +25,7 @@ import java.util.Map; @Slf4j @Controller -public class WebAppUserController extends ManagerDraftAction{ +public class WebAppUserController{ @Autowired private WebAppUserService webAppUserService; @@ -49,19 +48,14 @@ public class WebAppUserController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppUserService.selectListAppUserIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppUserService.selectListAppUserIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -86,13 +80,8 @@ public class WebAppUserController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAppUserService.selectListAppUser(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAppUserService.selectListAppUser(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -133,15 +122,10 @@ public class WebAppUserController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webAppUserService.selectListAppUserExcel(paramMap); - map.put("selectListAppUser", selectListReport); - map.put("name", "AppUser"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webAppUserService.selectListAppUserExcel(paramMap); + map.put("selectListAppUser", selectListReport); + map.put("name", "AppUser"); } catch(Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webattendance/WebAttendanceController.java b/src/main/java/com/madeu/controller/web/webattendance/WebAttendanceController.java index 69109a4..85ee79b 100644 --- a/src/main/java/com/madeu/controller/web/webattendance/WebAttendanceController.java +++ b/src/main/java/com/madeu/controller/web/webattendance/WebAttendanceController.java @@ -13,7 +13,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webattendance.WebAttendanceService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -27,7 +26,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebAttendanceController extends ManagerDraftAction{ +public class WebAttendanceController{ @Autowired private WebAttendanceService webAttendanceService; @@ -50,19 +49,14 @@ public class WebAttendanceController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.selectListAttendanceIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.selectListAttendanceIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -87,13 +81,8 @@ public class WebAttendanceController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.selectListAttendance(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.selectListAttendance(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -134,15 +123,10 @@ public class WebAttendanceController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webAttendanceService.selectListAttendanceExcel(paramMap); - map.put("selectListAttendance", selectListReport); - map.put("name", "attendance"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webAttendanceService.selectListAttendanceExcel(paramMap); + map.put("selectListAttendance", selectListReport); + map.put("name", "attendance"); } catch(Exception e){ e.printStackTrace(); @@ -169,13 +153,8 @@ public class WebAttendanceController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.selectListTodayAttendance(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.selectListTodayAttendance(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -214,15 +193,10 @@ public class WebAttendanceController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.insertAttendance(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.insertAttendance(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -262,13 +236,8 @@ public class WebAttendanceController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.selectAttendanceCommute(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.selectAttendanceCommute(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -307,15 +276,10 @@ public class WebAttendanceController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.updateAttendanceCommute(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.updateAttendanceCommute(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -354,13 +318,8 @@ public class WebAttendanceController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.selectAttendanceVacation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.selectAttendanceVacation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -399,15 +358,10 @@ public class WebAttendanceController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.insertAttendanceVacation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.insertAttendanceVacation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -448,15 +402,10 @@ public class WebAttendanceController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.updateAttendanceVacation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.updateAttendanceVacation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -497,15 +446,10 @@ public class WebAttendanceController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAttendanceService.updateAttendanceVacationCancel(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAttendanceService.updateAttendanceVacationCancel(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webauth/WebAuthController.java b/src/main/java/com/madeu/controller/web/webauth/WebAuthController.java index ef5388b..74cf5fc 100644 --- a/src/main/java/com/madeu/controller/web/webauth/WebAuthController.java +++ b/src/main/java/com/madeu/controller/web/webauth/WebAuthController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webauth.WebAuthService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebAuthController extends ManagerDraftAction{ +public class WebAuthController{ @Autowired private WebAuthService webAuthService; @@ -46,13 +45,8 @@ public class WebAuthController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthService.selectListAuthOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthService.selectListAuthOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -89,13 +83,8 @@ public class WebAuthController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthService.selectListAuth(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthService.selectListAuth(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -132,13 +121,8 @@ public class WebAuthController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthService.selectAuth(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthService.selectAuth(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -175,13 +159,8 @@ public class WebAuthController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthService.selectHeaderRelation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthService.selectHeaderRelation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -220,15 +199,10 @@ public class WebAuthController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthService.updateAuth(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthService.updateAuth(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -269,15 +243,10 @@ public class WebAuthController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthService.insertAuth(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthService.insertAuth(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -319,15 +288,10 @@ public class WebAuthController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthService.deleteAuth(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthService.deleteAuth(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webauthmenurelation/WebAuthMenuRelationController.java b/src/main/java/com/madeu/controller/web/webauthmenurelation/WebAuthMenuRelationController.java index 0282ea8..b59f66c 100644 --- a/src/main/java/com/madeu/controller/web/webauthmenurelation/WebAuthMenuRelationController.java +++ b/src/main/java/com/madeu/controller/web/webauthmenurelation/WebAuthMenuRelationController.java @@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webauthmenurelation.WebAuthMenuRelationService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebAuthMenuRelationController extends ManagerDraftAction{ +public class WebAuthMenuRelationController{ @Autowired private WebAuthMenuRelationService webAuthMenuRelationService; @@ -45,13 +44,8 @@ public class WebAuthMenuRelationController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthMenuRelationService.selectListAuthMenuRelation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthMenuRelationService.selectListAuthMenuRelation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -90,15 +84,10 @@ public class WebAuthMenuRelationController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webAuthMenuRelationService.updateAuthMenuRelation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webAuthMenuRelationService.updateAuthMenuRelation(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webcategory/WebCategoryController.java b/src/main/java/com/madeu/controller/web/webcategory/WebCategoryController.java index 9bd1619..438fbb8 100644 --- a/src/main/java/com/madeu/controller/web/webcategory/WebCategoryController.java +++ b/src/main/java/com/madeu/controller/web/webcategory/WebCategoryController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webcategory; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webcategory.WebCategoryService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -20,7 +19,7 @@ import org.springframework.web.servlet.ModelAndView; import java.util.HashMap; @Slf4j @Controller -public class WebCategoryController extends ManagerDraftAction { +public class WebCategoryController { @Autowired private WebCategoryService webCategoryService; @@ -43,19 +42,14 @@ public class WebCategoryController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCategoryService.selectCategoryListIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCategoryService.selectCategoryListIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -80,13 +74,8 @@ public class WebCategoryController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCategoryService.selectCategoryList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCategoryService.selectCategoryList(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -124,13 +113,8 @@ public class WebCategoryController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCategoryService.selectCategoryItemList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCategoryService.selectCategoryItemList(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -168,13 +152,8 @@ public class WebCategoryController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCategoryService.selectCategoryItem(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCategoryService.selectCategoryItem(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -214,16 +193,11 @@ public class WebCategoryController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("file",file); - map = webCategoryService.insertHospitalOther(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("file",file); + map = webCategoryService.insertHospitalOther(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -263,16 +237,11 @@ public class WebCategoryController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("file",file); - map = webCategoryService.updateHospitalOther(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("file",file); + map = webCategoryService.updateHospitalOther(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -312,15 +281,10 @@ public class WebCategoryController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCategoryService.deleteHospitalOther(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCategoryService.deleteHospitalOther(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webcompany/WebCompanyController.java b/src/main/java/com/madeu/controller/web/webcompany/WebCompanyController.java index 665aede..5b6cc97 100644 --- a/src/main/java/com/madeu/controller/web/webcompany/WebCompanyController.java +++ b/src/main/java/com/madeu/controller/web/webcompany/WebCompanyController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webcompany.WebCompanyService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebCompanyController extends ManagerDraftAction{ +public class WebCompanyController{ @Autowired private WebCompanyService webCompanyService; @@ -47,13 +46,8 @@ public class WebCompanyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.selectListCompanyOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.selectListCompanyOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -90,19 +84,14 @@ public class WebCompanyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.selectListCompanyIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.selectListCompanyIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -128,13 +117,8 @@ public class WebCompanyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.selectListCompany(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.selectListCompany(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -172,13 +156,8 @@ public class WebCompanyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.selectCompany(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.selectCompany(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -218,15 +197,10 @@ public class WebCompanyController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.insertCompany(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.insertCompany(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -266,19 +240,14 @@ public class WebCompanyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.selectCompanyIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.selectCompanyIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -306,15 +275,10 @@ public class WebCompanyController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.updateCompany(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.updateCompany(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -357,15 +321,10 @@ public class WebCompanyController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.deleteCompany(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.deleteCompany(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -405,13 +364,8 @@ public class WebCompanyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webCompanyService.selectCompanyProduct(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webCompanyService.selectCompanyProduct(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webcontentsboard/WebContentsBoardController.java b/src/main/java/com/madeu/controller/web/webcontentsboard/WebContentsBoardController.java index 24bf8fe..9b78415 100644 --- a/src/main/java/com/madeu/controller/web/webcontentsboard/WebContentsBoardController.java +++ b/src/main/java/com/madeu/controller/web/webcontentsboard/WebContentsBoardController.java @@ -1,6 +1,5 @@ package com.madeu.controller.web.webcontentsboard; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webcontentsboard.WebContentsBoardService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -17,7 +16,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebContentsBoardController extends ManagerDraftAction { +public class WebContentsBoardController { @Autowired private WebContentsBoardService webContentsBoardService; @@ -40,19 +39,14 @@ public class WebContentsBoardController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webContentsBoardService.selectListContentsBoardIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webContentsBoardService.selectListContentsBoardIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webduty/WebDutyController.java b/src/main/java/com/madeu/controller/web/webduty/WebDutyController.java index b68b9b9..0eea8a3 100644 --- a/src/main/java/com/madeu/controller/web/webduty/WebDutyController.java +++ b/src/main/java/com/madeu/controller/web/webduty/WebDutyController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webduty.WebDutyService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebDutyController extends ManagerDraftAction{ +public class WebDutyController{ @Autowired private WebDutyService webDutyService; @@ -46,13 +45,8 @@ public class WebDutyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webDutyService.selectListDutyOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webDutyService.selectListDutyOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -90,13 +84,8 @@ public class WebDutyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webDutyService.selectListDuty(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webDutyService.selectListDuty(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -134,13 +123,8 @@ public class WebDutyController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webDutyService.selectDuty(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webDutyService.selectDuty(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -180,15 +164,10 @@ public class WebDutyController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webDutyService.insertDuty(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webDutyService.insertDuty(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -230,15 +209,10 @@ public class WebDutyController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webDutyService.updateDuty(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webDutyService.updateDuty(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -281,15 +255,10 @@ public class WebDutyController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webDutyService.deleteDuty(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webDutyService.deleteDuty(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webevent/WebEventController.java b/src/main/java/com/madeu/controller/web/webevent/WebEventController.java index 048d003..d194342 100644 --- a/src/main/java/com/madeu/controller/web/webevent/WebEventController.java +++ b/src/main/java/com/madeu/controller/web/webevent/WebEventController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webevent; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webevent.WebEventService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebEventController extends ManagerDraftAction { +public class WebEventController { @Autowired private WebEventService webEventService; @@ -44,19 +43,14 @@ public class WebEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.selectListWebEventIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.selectListWebEventIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -81,13 +75,8 @@ public class WebEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.selectListWebEvent(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.selectListWebEvent(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -124,13 +113,8 @@ public class WebEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.selectWebEvent(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.selectWebEvent(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -169,15 +153,10 @@ public class WebEventController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -216,19 +195,14 @@ public class WebEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.insertWebEventIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.insertWebEventIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -255,15 +229,10 @@ public class WebEventController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.insertWebEvent(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.insertWebEvent(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -302,19 +271,14 @@ public class WebEventController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.updateWebEventIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.updateWebEventIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -341,15 +305,10 @@ public class WebEventController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.updateWebEvent(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.updateWebEvent(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -391,15 +350,10 @@ public class WebEventController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventService.deleteWebEvent(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventService.deleteWebEvent(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webeventdiet/WebEventDietController.java b/src/main/java/com/madeu/controller/web/webeventdiet/WebEventDietController.java index a54b08b..92757e0 100644 --- a/src/main/java/com/madeu/controller/web/webeventdiet/WebEventDietController.java +++ b/src/main/java/com/madeu/controller/web/webeventdiet/WebEventDietController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webeventdiet; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webeventdiet.WebEventDietService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebEventDietController extends ManagerDraftAction { +public class WebEventDietController { @Autowired private WebEventDietService webEventDietService; @@ -44,19 +43,14 @@ public class WebEventDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.selectListWebEventDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.selectListWebEventDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -81,13 +75,8 @@ public class WebEventDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.selectListWebEventDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.selectListWebEventDiet(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -124,13 +113,8 @@ public class WebEventDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.selectWebEventDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.selectWebEventDiet(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -169,15 +153,10 @@ public class WebEventDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -216,20 +195,15 @@ public class WebEventDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.insertWebEventDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.insertWebEventDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -256,15 +230,10 @@ public class WebEventDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.insertWebEventDiet(paramMap,file,content_file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.insertWebEventDiet(paramMap,file,content_file); } catch (Exception e) { e.printStackTrace(); @@ -303,20 +272,15 @@ public class WebEventDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.updateWebEventDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.updateWebEventDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -343,15 +307,10 @@ public class WebEventDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.updateWebEventDiet(paramMap, file, content_file ); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.updateWebEventDiet(paramMap, file, content_file ); } catch (Exception e) { e.printStackTrace(); @@ -393,15 +352,10 @@ public class WebEventDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.deleteWebEventDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.deleteWebEventDiet(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -440,12 +394,8 @@ public class WebEventDietController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventDietService.selectListEventOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventDietService.selectListEventOption(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webeventpetit/WebEventPetitController.java b/src/main/java/com/madeu/controller/web/webeventpetit/WebEventPetitController.java index 806908a..44b5601 100644 --- a/src/main/java/com/madeu/controller/web/webeventpetit/WebEventPetitController.java +++ b/src/main/java/com/madeu/controller/web/webeventpetit/WebEventPetitController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webeventpetit; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webeventpetit.WebEventPetitService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebEventPetitController extends ManagerDraftAction { +public class WebEventPetitController { @Autowired private WebEventPetitService webEventPetitService; @@ -44,19 +43,14 @@ public class WebEventPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.selectListWebEventPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.selectListWebEventPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -81,13 +75,8 @@ public class WebEventPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.selectListWebEventPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.selectListWebEventPetit(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -124,13 +113,8 @@ public class WebEventPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.selectWebEventPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.selectWebEventPetit(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -169,15 +153,10 @@ public class WebEventPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -216,20 +195,15 @@ public class WebEventPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.insertWebEventPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.insertWebEventPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -256,15 +230,10 @@ public class WebEventPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.insertWebEventPetit(paramMap,file,content_file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.insertWebEventPetit(paramMap,file,content_file); } catch (Exception e) { e.printStackTrace(); @@ -303,20 +272,15 @@ public class WebEventPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.updateWebEventPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.updateWebEventPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -343,15 +307,10 @@ public class WebEventPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.updateWebEventPetit(paramMap, file, content_file ); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.updateWebEventPetit(paramMap, file, content_file ); } catch (Exception e) { e.printStackTrace(); @@ -393,15 +352,10 @@ public class WebEventPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.deleteWebEventPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.deleteWebEventPetit(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -440,12 +394,8 @@ public class WebEventPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webEventPetitService.selectListEventOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webEventPetitService.selectListEventOption(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webgroup/WebGroupController.java b/src/main/java/com/madeu/controller/web/webgroup/WebGroupController.java index 9835c26..7d0c78f 100644 --- a/src/main/java/com/madeu/controller/web/webgroup/WebGroupController.java +++ b/src/main/java/com/madeu/controller/web/webgroup/WebGroupController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webgroup.WebGroupService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebGroupController extends ManagerDraftAction{ +public class WebGroupController{ @Autowired private WebGroupService webGroupService; @@ -46,13 +45,8 @@ public class WebGroupController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webGroupService.selectListGroupOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webGroupService.selectListGroupOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -89,19 +83,14 @@ public class WebGroupController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webGroupService.selectListGroupIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webGroupService.selectListGroupIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -127,13 +116,8 @@ public class WebGroupController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webGroupService.selectListGroup(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webGroupService.selectListGroup(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -171,13 +155,8 @@ public class WebGroupController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webGroupService.selectGroup(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webGroupService.selectGroup(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -217,15 +196,10 @@ public class WebGroupController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webGroupService.insertGroup(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webGroupService.insertGroup(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -267,15 +241,10 @@ public class WebGroupController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webGroupService.updateGroup(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webGroupService.updateGroup(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -318,15 +287,10 @@ public class WebGroupController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webGroupService.deleteGroup(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webGroupService.deleteGroup(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webholidaymanagement/WebHolidayManagementController.java b/src/main/java/com/madeu/controller/web/webholidaymanagement/WebHolidayManagementController.java index 066b54f..eb09a9c 100644 --- a/src/main/java/com/madeu/controller/web/webholidaymanagement/WebHolidayManagementController.java +++ b/src/main/java/com/madeu/controller/web/webholidaymanagement/WebHolidayManagementController.java @@ -15,7 +15,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webholidaymanagement.WebHolidayManagementService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -29,7 +28,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebHolidayManagementController extends ManagerDraftAction{ +public class WebHolidayManagementController{ @Autowired private WebHolidayManagementService webHolidayManagementService; @@ -52,13 +51,8 @@ public class WebHolidayManagementController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHolidayManagementService.selectListHolidayManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHolidayManagementService.selectListHolidayManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -99,15 +93,10 @@ public class WebHolidayManagementController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webHolidayManagementService.selectListHolidayManagementExcel(paramMap); - map.put("selectListHolidayManagement", selectListReport); - map.put("name", "holidayManagement"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webHolidayManagementService.selectListHolidayManagementExcel(paramMap); + map.put("selectListHolidayManagement", selectListReport); + map.put("name", "holidayManagement"); } catch(Exception e){ e.printStackTrace(); @@ -132,13 +121,8 @@ public class WebHolidayManagementController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHolidayManagementService.selectHolidayManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHolidayManagementService.selectHolidayManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -177,15 +161,10 @@ public class WebHolidayManagementController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHolidayManagementService.insertHolidayManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHolidayManagementService.insertHolidayManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -226,15 +205,10 @@ public class WebHolidayManagementController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHolidayManagementService.updateHolidayManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHolidayManagementService.updateHolidayManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -275,15 +249,10 @@ public class WebHolidayManagementController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHolidayManagementService.updateHolidayManagementCancel(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHolidayManagementService.updateHolidayManagementCancel(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -325,15 +294,10 @@ public class WebHolidayManagementController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHolidayManagementService.deleteHolidayManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHolidayManagementService.deleteHolidayManagement(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webhome/WebHomeController.java b/src/main/java/com/madeu/controller/web/webhome/WebHomeController.java index 64094ab..48713b1 100644 --- a/src/main/java/com/madeu/controller/web/webhome/WebHomeController.java +++ b/src/main/java/com/madeu/controller/web/webhome/WebHomeController.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; -import com.madeu.init.ManagerDraftAction; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -22,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebHomeController extends ManagerDraftAction{ +public class WebHomeController{ @Autowired private WebHomeService webHomeService; @@ -43,30 +42,25 @@ public class WebHomeController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/login"; - } - else{ - // 접속 로그 저장 - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - visitLogParamMap.put("regId", "SYSTEM"); - visitLogParamMap.put("modId", "SYSTEM"); - visitLogParamMap.put("workType", "home"); + // 접속 로그 저장 + HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); + visitLogParamMap.put("regId", "SYSTEM"); + visitLogParamMap.put("modId", "SYSTEM"); + visitLogParamMap.put("workType", "home"); // visitLogService.insertVisitLog(visitLogParamMap); - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - HashMap menuData = new HashMap<>(); - menuData.put("menuName","예약현황"); - paramMap.put("menuClass",webMenuService.selectMenuCode(menuData).get("menuCode")); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + HashMap menuData = new HashMap<>(); + menuData.put("menuName","예약현황"); + paramMap.put("menuClass",webMenuService.selectMenuCode(menuData).get("menuCode")); - map = webHomeService.selectListHomeIntro(paramMap); - model.addAttribute("menuClass", map.get("menuClass")); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + map = webHomeService.selectListHomeIntro(paramMap); + model.addAttribute("menuClass", map.get("menuClass")); + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -90,25 +84,20 @@ public class WebHomeController extends ManagerDraftAction{ HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/login"; - } - else{ - // 접속 로그 저장 - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - visitLogParamMap.put("regId", "SYSTEM"); - visitLogParamMap.put("modId", "SYSTEM"); - visitLogParamMap.put("workType", "home"); + // 접속 로그 저장 + HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); + visitLogParamMap.put("regId", "SYSTEM"); + visitLogParamMap.put("modId", "SYSTEM"); + visitLogParamMap.put("workType", "home"); // visitLogService.insertVisitLog(visitLogParamMap); - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHomeService.selectListHomeIntro(paramMap); - model.addAttribute("menuClass", map.get("menuClass")); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHomeService.selectListHomeIntro(paramMap); + model.addAttribute("menuClass", map.get("menuClass")); + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webhospital/WebHospitalController.java b/src/main/java/com/madeu/controller/web/webhospital/WebHospitalController.java index d9283f7..639c8a9 100644 --- a/src/main/java/com/madeu/controller/web/webhospital/WebHospitalController.java +++ b/src/main/java/com/madeu/controller/web/webhospital/WebHospitalController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webhospital.WebHospitalService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebHospitalController extends ManagerDraftAction { +public class WebHospitalController { @Autowired private WebHospitalService webHospitalService; @@ -47,18 +46,14 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.selectHospitalIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.selectHospitalIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -83,12 +78,8 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.selectHospital(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.selectHospital(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -123,12 +114,8 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.selectWorkTime(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.selectWorkTime(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -163,12 +150,8 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.selectHospitalHolidayList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.selectHospitalHolidayList(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -207,14 +190,10 @@ public class WebHospitalController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.updateHospital(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.updateHospital(paramMap); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -246,12 +225,8 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.selectHospitalScheduleDetail(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.selectHospitalScheduleDetail(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -279,14 +254,10 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.saveHospitalSchedule(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.saveHospitalSchedule(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -314,13 +285,9 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.deleteHospitalSchedule(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.deleteHospitalSchedule(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -348,14 +315,10 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.saveHospitalHoliday(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.saveHospitalHoliday(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -383,13 +346,9 @@ public class WebHospitalController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webHospitalService.deleteHospitalHolidays(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webHospitalService.deleteHospitalHolidays(paramMap); } catch (Exception e) { e.printStackTrace(); return null; diff --git a/src/main/java/com/madeu/controller/web/webkakao/WebKakaoController.java b/src/main/java/com/madeu/controller/web/webkakao/WebKakaoController.java index d8bbf81..a3f580e 100644 --- a/src/main/java/com/madeu/controller/web/webkakao/WebKakaoController.java +++ b/src/main/java/com/madeu/controller/web/webkakao/WebKakaoController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webkakao; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webkakao.WebKakaoService; import com.madeu.util.HttpUtil; @@ -20,7 +19,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebKakaoController extends ManagerDraftAction{ +public class WebKakaoController{ @Autowired private WebKakaoService webKakaoService; @@ -43,13 +42,8 @@ public class WebKakaoController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webKakaoService.selectListKakao(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webKakaoService.selectListKakao(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -88,15 +82,10 @@ public class WebKakaoController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webKakaoService.insertKakao(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webKakaoService.insertKakao(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webkakaotemplate/WebKakaoTemplateController.java b/src/main/java/com/madeu/controller/web/webkakaotemplate/WebKakaoTemplateController.java index 965957a..86ca7c3 100644 --- a/src/main/java/com/madeu/controller/web/webkakaotemplate/WebKakaoTemplateController.java +++ b/src/main/java/com/madeu/controller/web/webkakaotemplate/WebKakaoTemplateController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webkakaotemplate; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webkakaotemplate.WebKakaoTemplateService; import com.madeu.util.HttpUtil; import jakarta.servlet.http.HttpServletRequest; @@ -17,7 +16,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebKakaoTemplateController extends ManagerDraftAction { +public class WebKakaoTemplateController { @Autowired private WebKakaoTemplateService webKakaoTemplateService; @@ -38,13 +37,8 @@ public class WebKakaoTemplateController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webKakaoTemplateService.selectListKakaoTemplateOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webKakaoTemplateService.selectListKakaoTemplateOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -82,13 +76,8 @@ public class WebKakaoTemplateController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webKakaoTemplateService.selectKakaoTemplate(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webKakaoTemplateService.selectKakaoTemplate(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webmainbanner/WebMainBannerController.java b/src/main/java/com/madeu/controller/web/webmainbanner/WebMainBannerController.java index dca9a2f..7513741 100644 --- a/src/main/java/com/madeu/controller/web/webmainbanner/WebMainBannerController.java +++ b/src/main/java/com/madeu/controller/web/webmainbanner/WebMainBannerController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webmainbanner; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmainbanner.WebMainBannerService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebMainBannerController extends ManagerDraftAction { +public class WebMainBannerController { @Autowired private WebMainBannerService webMainBannerService; @@ -44,19 +43,14 @@ public class WebMainBannerController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.selectListWebMainBannerIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.selectListWebMainBannerIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -81,13 +75,8 @@ public class WebMainBannerController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.selectListWebMainBanner(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.selectListWebMainBanner(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -124,13 +113,8 @@ public class WebMainBannerController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.selectWebMainBanner(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.selectWebMainBanner(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -169,15 +153,10 @@ public class WebMainBannerController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -216,19 +195,14 @@ public class WebMainBannerController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.insertWebMainBannerIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.insertWebMainBannerIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -255,15 +229,10 @@ public class WebMainBannerController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.insertWebMainBanner(paramMap,file, file2); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.insertWebMainBanner(paramMap,file, file2); } catch (Exception e) { e.printStackTrace(); @@ -302,19 +271,14 @@ public class WebMainBannerController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.updateWebMainBannerIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.updateWebMainBannerIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -341,15 +305,10 @@ public class WebMainBannerController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.updateWebMainBanner(paramMap,file, file2); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.updateWebMainBanner(paramMap,file, file2); } catch (Exception e) { e.printStackTrace(); @@ -391,15 +350,10 @@ public class WebMainBannerController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMainBannerService.deleteWebMainBanner(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMainBannerService.deleteWebMainBanner(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webmarketing/WebMarketingController.java b/src/main/java/com/madeu/controller/web/webmarketing/WebMarketingController.java index 7f99d8e..52ee773 100644 --- a/src/main/java/com/madeu/controller/web/webmarketing/WebMarketingController.java +++ b/src/main/java/com/madeu/controller/web/webmarketing/WebMarketingController.java @@ -1,6 +1,5 @@ package com.madeu.controller.web.webmarketing; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmember.WebMemberService; import com.madeu.util.HttpUtil; @@ -27,7 +26,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebMarketingController extends ManagerDraftAction{ +public class WebMarketingController{ @Autowired private WebMemberService webMemberService; @@ -50,19 +49,14 @@ public class WebMarketingController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -88,19 +82,14 @@ public class WebMarketingController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -125,19 +114,14 @@ public class WebMarketingController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -162,19 +146,14 @@ public class WebMarketingController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -199,19 +178,14 @@ public class WebMarketingController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -237,19 +211,14 @@ public class WebMarketingController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webmedicine/WebMedicineController.java b/src/main/java/com/madeu/controller/web/webmedicine/WebMedicineController.java index 31d50f6..a7435a0 100644 --- a/src/main/java/com/madeu/controller/web/webmedicine/WebMedicineController.java +++ b/src/main/java/com/madeu/controller/web/webmedicine/WebMedicineController.java @@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmedicine.WebMedicineService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebMedicineController extends ManagerDraftAction{ +public class WebMedicineController{ @Autowired private WebMedicineService webMedicineService; @@ -44,13 +43,8 @@ public class WebMedicineController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMedicineService.selectListMedicineOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMedicineService.selectListMedicineOption(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webmember/WebMemberController.java b/src/main/java/com/madeu/controller/web/webmember/WebMemberController.java index 95ca8c7..a13a273 100644 --- a/src/main/java/com/madeu/controller/web/webmember/WebMemberController.java +++ b/src/main/java/com/madeu/controller/web/webmember/WebMemberController.java @@ -15,7 +15,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmember.WebMemberService; import com.madeu.util.HttpUtil; @@ -29,7 +28,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebMemberController extends ManagerDraftAction{ +public class WebMemberController{ @Autowired private WebMemberService webMemberService; @@ -53,12 +52,7 @@ public class WebMemberController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - map = webMemberService.selectMemberId(paramMap); - } + map = webMemberService.selectMemberId(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -94,13 +88,8 @@ public class WebMemberController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberDoctorOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberDoctorOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -137,13 +126,8 @@ public class WebMemberController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberDoctorConsultingOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberDoctorConsultingOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -180,19 +164,14 @@ public class WebMemberController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMemberIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMemberIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -218,13 +197,8 @@ public class WebMemberController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectListMember(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectListMember(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -265,15 +239,10 @@ public class WebMemberController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webMemberService.selectListMemberExcel(paramMap); - map.put("selectListMember", selectListReport); - map.put("name", "member"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webMemberService.selectListMemberExcel(paramMap); + map.put("selectListMember", selectListReport); + map.put("name", "member"); } catch(Exception e){ e.printStackTrace(); @@ -298,13 +267,8 @@ public class WebMemberController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.selectMember(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.selectMember(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -343,15 +307,10 @@ public class WebMemberController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.insertMember(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.insertMember(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -390,19 +349,14 @@ public class WebMemberController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.updateMemberIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.updateMemberIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -429,15 +383,10 @@ public class WebMemberController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.updateMember(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.updateMember(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -478,15 +427,10 @@ public class WebMemberController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.updateMemberStatus(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.updateMemberStatus(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -527,15 +471,10 @@ public class WebMemberController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.updateMemberPassword(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.updateMemberPassword(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -577,15 +516,10 @@ public class WebMemberController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMemberService.deleteMember(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMemberService.deleteMember(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webmembership/WebMembershipController.java b/src/main/java/com/madeu/controller/web/webmembership/WebMembershipController.java index 336647d..c610a1a 100644 --- a/src/main/java/com/madeu/controller/web/webmembership/WebMembershipController.java +++ b/src/main/java/com/madeu/controller/web/webmembership/WebMembershipController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webmembership; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmembership.WebMembershipService; import com.madeu.util.HttpUtil; @@ -29,7 +28,7 @@ import java.util.Map; @Slf4j @Controller -public class WebMembershipController extends ManagerDraftAction { +public class WebMembershipController { @Autowired private WebMembershipService webMembershipService; @@ -51,19 +50,14 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectListMembershipIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectListMembershipIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -89,13 +83,8 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectListMembershipProcedure(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectListMembershipProcedure(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -132,13 +121,8 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectListMembership(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectListMembership(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -179,15 +163,10 @@ public class WebMembershipController extends ManagerDraftAction { Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webMembershipService.downloadMembershipExcel(paramMap); - map.put("selectListMembership", selectListReport); - map.put("name", "membership"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webMembershipService.downloadMembershipExcel(paramMap); + map.put("selectListMembership", selectListReport); + map.put("name", "membership"); } catch(Exception e){ e.printStackTrace(); @@ -212,19 +191,14 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.updateMembershipIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.updateMembershipIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -256,13 +230,8 @@ public class WebMembershipController extends ManagerDraftAction { try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectListMembershipHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectListMembershipHistory(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -301,13 +270,8 @@ public class WebMembershipController extends ManagerDraftAction { try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectMembershipBalance(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectMembershipBalance(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -345,13 +309,8 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectToTransferUser(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectToTransferUser(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -392,15 +351,10 @@ public class WebMembershipController extends ManagerDraftAction { Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webMembershipService.downloadMembershipHistoryExcel(paramMap); - map.put("selectListMembershipHistory", selectListReport); - map.put("name", "membershipHistory"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webMembershipService.downloadMembershipHistoryExcel(paramMap); + map.put("selectListMembershipHistory", selectListReport); + map.put("name", "membershipHistory"); } catch(Exception e){ e.printStackTrace(); @@ -425,13 +379,8 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectMembershipTransfer(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectMembershipTransfer(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -469,16 +418,11 @@ public class WebMembershipController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.updateTransferMembership(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.updateTransferMembership(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -519,16 +463,11 @@ public class WebMembershipController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.insertMembership(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.insertMembership(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -568,16 +507,11 @@ public class WebMembershipController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.insertMembershipPoint(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.insertMembershipPoint(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -617,16 +551,11 @@ public class WebMembershipController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.insertMembershipProcedure(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.insertMembershipProcedure(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -665,19 +594,14 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectListUseMembershipIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectListUseMembershipIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -701,19 +625,14 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectListMembershipProcedureIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectListMembershipProcedureIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -738,13 +657,8 @@ public class WebMembershipController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.selectUseMembershipList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.selectUseMembershipList(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -785,15 +699,10 @@ public class WebMembershipController extends ManagerDraftAction { Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webMembershipService.selectUseMembershipExcel(paramMap); - map.put("selectUseMembershipList", selectListReport); - map.put("name", "useMembershipList"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webMembershipService.selectUseMembershipExcel(paramMap); + map.put("selectUseMembershipList", selectListReport); + map.put("name", "useMembershipList"); } catch(Exception e){ e.printStackTrace(); @@ -819,15 +728,10 @@ public class WebMembershipController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMembershipService.deleteMembershipProcedure(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMembershipService.deleteMembershipProcedure(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webmenu/WebMenuController.java b/src/main/java/com/madeu/controller/web/webmenu/WebMenuController.java index 6bc163a..edbef49 100644 --- a/src/main/java/com/madeu/controller/web/webmenu/WebMenuController.java +++ b/src/main/java/com/madeu/controller/web/webmenu/WebMenuController.java @@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmenu.WebMenuService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebMenuController extends ManagerDraftAction{ +public class WebMenuController{ @Autowired private WebMenuService webMenuService; @@ -44,13 +43,8 @@ public class WebMenuController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMenuService.selectListMenu(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMenuService.selectListMenu(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -86,13 +80,8 @@ public class WebMenuController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webMenuService.selectMenuCode(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webMenuService.selectMenuCode(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webnotice/WebNoticeController.java b/src/main/java/com/madeu/controller/web/webnotice/WebNoticeController.java index 11ae48f..bea6133 100644 --- a/src/main/java/com/madeu/controller/web/webnotice/WebNoticeController.java +++ b/src/main/java/com/madeu/controller/web/webnotice/WebNoticeController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webnotice.WebNoticeService; import com.madeu.util.HttpUtil; @@ -20,251 +19,207 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; import lombok.extern.slf4j.Slf4j; - @Slf4j @Controller -public class WebNoticeController extends ManagerDraftAction{ +public class WebNoticeController { @Autowired private WebNoticeService webNoticeService; - + @Autowired private LogHistoryService logHistoryService; - + /** * 공지사항 정보 리스트 화면으로 이동. * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/selectListNoticeIntro.do") - public String selectListNoticeIntro(HttpSession session,HttpServletRequest request, HttpServletResponse response, Model model) { + @RequestMapping(value = "/webnotice/selectListNoticeIntro.do") + public String selectListNoticeIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response, + Model model) { log.debug("WebNoticeController selectListNoticeIntro START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - - try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webNoticeService.selectListNoticeIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } - } - catch (Exception e) { + + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webNoticeService.selectListNoticeIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; } log.debug("WebNoticeController selectListNoticeIntro END"); return "/web/notice/noticeSelectList"; } - + /** * 공지사항 정보 리스트 조회 * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/selectListNotice.do") - public ModelAndView selectListNotice(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = "/webnotice/selectListNotice.do") + public ModelAndView selectListNotice(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { log.debug("WebNoticeController selectListNotice START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - - try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webNoticeService.selectListNotice(paramMap); - } - } - catch (Exception e) { + + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webNoticeService.selectListNotice(paramMap); + } catch (Exception e) { e.printStackTrace(); return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } log.debug("WebNoticeController selectListNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); } - + /** * 공지사항 정보 상세 조회 * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/selectNotice.do") - public ModelAndView selectNotice(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = "/webnotice/selectNotice.do") + public ModelAndView selectNotice(HttpSession session, HttpServletRequest request, HttpServletResponse response) { log.debug("WebNoticeController selectNotice START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - - try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webNoticeService.selectNotice(paramMap); - } - } - catch (Exception e) { + + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webNoticeService.selectNotice(paramMap); + } catch (Exception e) { e.printStackTrace(); return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } log.debug("WebNoticeController selectNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); } - + /** * 금앨 공지사항 리스트 정보 조회 (List) * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/selectListTodayNotice.do") - public ModelAndView selectListTodayNotice(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = "/webnotice/selectListTodayNotice.do") + public ModelAndView selectListTodayNotice(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { log.debug("WebNoticeController selectListTodayNotice START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - - try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webNoticeService.selectListTodayNotice(paramMap); - } - } - catch (Exception e) { + + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webNoticeService.selectListTodayNotice(paramMap); + } catch (Exception e) { e.printStackTrace(); return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } log.debug("WebNoticeController selectListTodayNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); } - + /** * 공지사항 정보 등록 화면으로 이동. * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/insertNoticeIntro.do") - public String insertNoticeIntro(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = "/webnotice/insertNoticeIntro.do") + public String insertNoticeIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response) { log.debug("WebNoticeController insertNoticeIntro START"); - - try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - } - catch (Exception e) { - e.printStackTrace(); - return "/web/login/logout"; - } + log.debug("WebNoticeController insertNoticeIntro END"); return "/web/notice/noticeInsert"; } - /** + /** * 공지사항 정보 등록 * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/insertNotice.do") - public ModelAndView insertNotice(HttpSession session,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { + @RequestMapping(value = "/webnotice/insertNotice.do") + public ModelAndView insertNotice(HttpSession session, HttpServletRequest request, HttpServletResponse response, + MultipartHttpServletRequest file) { log.debug("WebNoticeController insertNotice START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); StringBuffer errorMsg = new StringBuffer(); - try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webNoticeService.insertNotice(paramMap); - } - } - catch (Exception e) { + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webNoticeService.insertNotice(paramMap); + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } - logHistoryService.save("공지사항 등록", "공지사항 등록", paramMap, map, String.valueOf(errorMsg)); + logHistoryService.save("공지사항 등록", "공지사항 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebNoticeController insertNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -274,24 +229,18 @@ public class WebNoticeController extends ManagerDraftAction{ * 공지사항 정보 수정 화면으로 이동. * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/updateNoticeIntro.do") - public String updateNoticeIntro(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = "/webnotice/updateNoticeIntro.do") + public String updateNoticeIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response) { log.debug("WebNoticeController updateNoticeIntro START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); - - try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else{ - log.debug("paramMap : "+paramMap); - } - } - catch (Exception e) { + + try { + log.debug("paramMap : " + paramMap); + } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; } @@ -303,99 +252,83 @@ public class WebNoticeController extends ManagerDraftAction{ * 공지사항 정보 수정 * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/updateNotice.do") - public ModelAndView updateNotice(HttpSession session,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { + @RequestMapping(value = "/webnotice/updateNotice.do") + public ModelAndView updateNotice(HttpSession session, HttpServletRequest request, HttpServletResponse response, + MultipartHttpServletRequest file) { log.debug("WebNoticeController updateNotice START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); StringBuffer errorMsg = new StringBuffer(); - - try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webNoticeService.updateNotice(paramMap); - } - } - catch (Exception e) { + + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webNoticeService.updateNotice(paramMap); + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } - - logHistoryService.save("공지사항 수정", "공지사항 수정", paramMap, map, String.valueOf(errorMsg)); + + logHistoryService.save("공지사항 수정", "공지사항 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebNoticeController updateNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); } - /** * 공지사항 정보 삭제 * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/webnotice/deleteNotice.do") - public ModelAndView deleteNotice(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = "/webnotice/deleteNotice.do") + public ModelAndView deleteNotice(HttpSession session, HttpServletRequest request, HttpServletResponse response) { log.debug("WebNoticeController deleteNotice START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); StringBuffer errorMsg = new StringBuffer(); - - try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webNoticeService.deleteNotice(paramMap); - } - } - catch (Exception e) { + + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webNoticeService.deleteNotice(paramMap); + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } - - logHistoryService.save("공지사항 삭제", "공지사항 삭제", paramMap, map, String.valueOf(errorMsg)); + + logHistoryService.save("공지사항 삭제", "공지사항 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebNoticeController deleteNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); } - + } diff --git a/src/main/java/com/madeu/controller/web/webpayment/WebPaymentController.java b/src/main/java/com/madeu/controller/web/webpayment/WebPaymentController.java index a5d6346..da04175 100644 --- a/src/main/java/com/madeu/controller/web/webpayment/WebPaymentController.java +++ b/src/main/java/com/madeu/controller/web/webpayment/WebPaymentController.java @@ -24,7 +24,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webpayment.WebPaymentService; import com.madeu.util.HttpUtil; @@ -38,7 +37,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebPaymentController extends ManagerDraftAction { +public class WebPaymentController { @Autowired private WebPaymentService webPaymentService; @@ -61,19 +60,14 @@ public class WebPaymentController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.selectListPaymentIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.selectListPaymentIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -97,13 +91,8 @@ public class WebPaymentController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.selectListPayment(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.selectListPayment(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -144,15 +133,11 @@ public class WebPaymentController extends ManagerDraftAction { Map map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webPaymentService.selectPaymentListExcel(paramMap); - map.put("selectListPayment", selectListReport); - map.put("name", "payment"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webPaymentService.selectPaymentListExcel(paramMap); + map.put("selectListPayment", selectListReport); + map.put("name", "payment"); } catch (Exception e) { e.printStackTrace(); @@ -178,13 +163,8 @@ public class WebPaymentController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); map = webPaymentService.selectListPaymentUser(paramMap); - } } catch (Exception e) { e.printStackTrace(); @@ -221,19 +201,14 @@ public class WebPaymentController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.selectListPaymentUser2Intro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.selectListPaymentUser2Intro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -258,13 +233,8 @@ public class WebPaymentController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.selectListPaymentUser2(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.selectListPaymentUser2(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -305,15 +275,11 @@ public class WebPaymentController extends ManagerDraftAction { Map map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webPaymentService.selectListPaymentUser2Excel(paramMap); - map.put("selectListPaymentUser", selectListReport); - map.put("name", "userpayment"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webPaymentService.selectListPaymentUser2Excel(paramMap); + map.put("selectListPaymentUser", selectListReport); + map.put("name", "userpayment"); } catch (Exception e) { e.printStackTrace(); @@ -339,16 +305,11 @@ public class WebPaymentController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.insertPayment(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.insertPayment(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -388,16 +349,11 @@ public class WebPaymentController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.insertPaymentRequestHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.insertPaymentRequestHistory(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -437,16 +393,11 @@ public class WebPaymentController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.insertPaymentResponseHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.insertPaymentResponseHistory(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -486,16 +437,11 @@ public class WebPaymentController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.paymentCancellation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.paymentCancellation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -535,16 +481,11 @@ public class WebPaymentController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPaymentService.paymentCancellationPay(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPaymentService.paymentCancellationPay(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webphotodiet/WebPhotoDietController.java b/src/main/java/com/madeu/controller/web/webphotodiet/WebPhotoDietController.java index aa8cba7..9d2fe72 100644 --- a/src/main/java/com/madeu/controller/web/webphotodiet/WebPhotoDietController.java +++ b/src/main/java/com/madeu/controller/web/webphotodiet/WebPhotoDietController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webphotodiet; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webphotodiet.WebPhotoDietService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -24,7 +23,7 @@ import java.util.ArrayList; @Slf4j @Controller -public class WebPhotoDietController extends ManagerDraftAction { +public class WebPhotoDietController { @Autowired private WebPhotoDietService webPhotoDietService; @@ -48,18 +47,14 @@ public class WebPhotoDietController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoDietService.selectListWebPhotoDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoDietService.selectListWebPhotoDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -84,12 +79,8 @@ public class WebPhotoDietController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoDietService.selectListWebPhotoDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoDietService.selectListWebPhotoDiet(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -124,12 +115,8 @@ public class WebPhotoDietController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoDietService.selectWebPhotoDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoDietService.selectWebPhotoDiet(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -163,11 +150,7 @@ public class WebPhotoDietController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - map = webPhotoDietService.getCategoryList(paramMap); - } + map = webPhotoDietService.getCategoryList(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -204,14 +187,10 @@ public class WebPhotoDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoDietService.uploadFile(paramMap, file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoDietService.uploadFile(paramMap, file); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -248,19 +227,15 @@ public class WebPhotoDietController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoDietService.insertWebPhotoDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoDietService.insertWebPhotoDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -289,17 +264,13 @@ public class WebPhotoDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - List files = new ArrayList<>(); - files.add(beforeFile); - files.add(afterFile); - map = ((WebPhotoDietService) webPhotoDietService).insertWebPhotoDiet(paramMap, files); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + List files = new ArrayList<>(); + files.add(beforeFile); + files.add(afterFile); + map = ((WebPhotoDietService) webPhotoDietService).insertWebPhotoDiet(paramMap, files); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -336,19 +307,15 @@ public class WebPhotoDietController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoDietService.updateWebPhotoDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoDietService.updateWebPhotoDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -377,17 +344,13 @@ public class WebPhotoDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - List files = new java.util.ArrayList<>(); - files.add(beforeFile); - files.add(afterFile); - map = webPhotoDietService.updateWebPhotoDiet(paramMap, files); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + List files = new java.util.ArrayList<>(); + files.add(beforeFile); + files.add(afterFile); + map = webPhotoDietService.updateWebPhotoDiet(paramMap, files); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -426,14 +389,10 @@ public class WebPhotoDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoDietService.deleteWebPhotoDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoDietService.deleteWebPhotoDiet(paramMap); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); diff --git a/src/main/java/com/madeu/controller/web/webphotopetit/WebPhotoPetitController.java b/src/main/java/com/madeu/controller/web/webphotopetit/WebPhotoPetitController.java index e351184..7dcbb21 100644 --- a/src/main/java/com/madeu/controller/web/webphotopetit/WebPhotoPetitController.java +++ b/src/main/java/com/madeu/controller/web/webphotopetit/WebPhotoPetitController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webphotopetit; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webphotopetit.WebPhotoPetitService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import java.util.ArrayList; @Slf4j @Controller -public class WebPhotoPetitController extends ManagerDraftAction { +public class WebPhotoPetitController { @Autowired private WebPhotoPetitService webPhotoPetitService; @@ -46,19 +45,14 @@ public class WebPhotoPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoPetitService.selectListWebPhotoPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoPetitService.selectListWebPhotoPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -83,13 +77,8 @@ public class WebPhotoPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoPetitService.selectListWebPhotoPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoPetitService.selectListWebPhotoPetit(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -126,13 +115,8 @@ public class WebPhotoPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoPetitService.selectWebPhotoPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoPetitService.selectWebPhotoPetit(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -171,15 +155,10 @@ public class WebPhotoPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoPetitService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoPetitService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -218,20 +197,15 @@ public class WebPhotoPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoPetitService.insertWebPhotoPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoPetitService.insertWebPhotoPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -260,18 +234,13 @@ public class WebPhotoPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - List files = new ArrayList<>(); - files.add(beforeFile); - files.add(afterFile); - map = ((WebPhotoPetitService)webPhotoPetitService).insertWebPhotoPetit(paramMap, files); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + List files = new ArrayList<>(); + files.add(beforeFile); + files.add(afterFile); + map = ((WebPhotoPetitService)webPhotoPetitService).insertWebPhotoPetit(paramMap, files); } catch (Exception e) { e.printStackTrace(); @@ -310,20 +279,15 @@ public class WebPhotoPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoPetitService.updateWebPhotoPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoPetitService.updateWebPhotoPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -352,18 +316,13 @@ public class WebPhotoPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - List files = new java.util.ArrayList<>(); - files.add(beforeFile); - files.add(afterFile); - map = webPhotoPetitService.updateWebPhotoPetit(paramMap, files); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + List files = new java.util.ArrayList<>(); + files.add(beforeFile); + files.add(afterFile); + map = webPhotoPetitService.updateWebPhotoPetit(paramMap, files); } catch (Exception e) { e.printStackTrace(); @@ -405,15 +364,10 @@ public class WebPhotoPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPhotoPetitService.deleteWebPhotoPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPhotoPetitService.deleteWebPhotoPetit(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webpopbillpoint/WebPopbillPointController.java b/src/main/java/com/madeu/controller/web/webpopbillpoint/WebPopbillPointController.java index 228abae..4c98671 100644 --- a/src/main/java/com/madeu/controller/web/webpopbillpoint/WebPopbillPointController.java +++ b/src/main/java/com/madeu/controller/web/webpopbillpoint/WebPopbillPointController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webpopbillpoint; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webpopbillpoint.WebPopbillPointService; import com.madeu.util.HttpUtil; @@ -18,7 +17,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebPopbillPointController extends ManagerDraftAction{ +public class WebPopbillPointController{ @Autowired private WebPopbillPointService webPopbillPointService; @@ -45,14 +44,10 @@ public class WebPopbillPointController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - }else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopbillPointService.selectPopbillPoint(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopbillPointService.selectPopbillPoint(paramMap); }catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -95,14 +90,10 @@ public class WebPopbillPointController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - }else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopbillPointService.chargePopbillPointIntro(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopbillPointService.chargePopbillPointIntro(paramMap); }catch (Exception e) { e.printStackTrace(); errorMsg.append(e); diff --git a/src/main/java/com/madeu/controller/web/webpopup/WebPopupController.java b/src/main/java/com/madeu/controller/web/webpopup/WebPopupController.java index 7678683..5d18ea5 100644 --- a/src/main/java/com/madeu/controller/web/webpopup/WebPopupController.java +++ b/src/main/java/com/madeu/controller/web/webpopup/WebPopupController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webpopup; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webpopup.WebPopupService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebPopupController extends ManagerDraftAction { +public class WebPopupController { @Autowired private WebPopupService webPopupService; @@ -44,19 +43,14 @@ public class WebPopupController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.selectListWebPopupIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.selectListWebPopupIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -81,13 +75,8 @@ public class WebPopupController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.selectListWebPopup(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.selectListWebPopup(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -124,13 +113,8 @@ public class WebPopupController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.selectWebPopup(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.selectWebPopup(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -169,15 +153,10 @@ public class WebPopupController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -216,19 +195,14 @@ public class WebPopupController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.insertWebPopupIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.insertWebPopupIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -255,15 +229,10 @@ public class WebPopupController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.insertWebPopup(paramMap,file, file2); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.insertWebPopup(paramMap,file, file2); } catch (Exception e) { e.printStackTrace(); @@ -302,19 +271,14 @@ public class WebPopupController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.updateWebPopupIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.updateWebPopupIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -341,15 +305,10 @@ public class WebPopupController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.updateWebPopup(paramMap,file, file2); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.updateWebPopup(paramMap,file, file2); } catch (Exception e) { e.printStackTrace(); @@ -391,15 +350,10 @@ public class WebPopupController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPopupService.deleteWebPopup(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPopupService.deleteWebPopup(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webproduct/WebProductController.java b/src/main/java/com/madeu/controller/web/webproduct/WebProductController.java index 9314681..647d5c9 100644 --- a/src/main/java/com/madeu/controller/web/webproduct/WebProductController.java +++ b/src/main/java/com/madeu/controller/web/webproduct/WebProductController.java @@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webproduct.WebProductService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebProductController extends ManagerDraftAction{ +public class WebProductController{ @Autowired private WebProductService webProductService; @@ -44,13 +43,8 @@ public class WebProductController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webProductService.selectListProductOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webProductService.selectListProductOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -87,13 +81,8 @@ public class WebProductController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webProductService.selectListProduct(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webProductService.selectListProduct(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webpush/WebPushController.java b/src/main/java/com/madeu/controller/web/webpush/WebPushController.java index e1c47c9..6bb40f5 100644 --- a/src/main/java/com/madeu/controller/web/webpush/WebPushController.java +++ b/src/main/java/com/madeu/controller/web/webpush/WebPushController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webpush; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webpush.WebPushService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -20,7 +19,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebPushController extends ManagerDraftAction{ +public class WebPushController{ @Autowired private WebPushService webPushService; @@ -43,13 +42,8 @@ public class WebPushController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPushService.selectListPush(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPushService.selectListPush(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -88,15 +82,10 @@ public class WebPushController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webPushService.insertPush(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webPushService.insertPush(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webreserve/WebReserveController.java b/src/main/java/com/madeu/controller/web/webreserve/WebReserveController.java index 6905862..ede33de 100644 --- a/src/main/java/com/madeu/controller/web/webreserve/WebReserveController.java +++ b/src/main/java/com/madeu/controller/web/webreserve/WebReserveController.java @@ -20,7 +20,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webreserve.WebReserveService; import com.madeu.util.HttpUtil; @@ -35,7 +34,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebReserveController extends ManagerDraftAction{ +public class WebReserveController{ @Autowired private WebReserveService webReserveService; @@ -61,13 +60,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectListReserveUserOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectListReserveUserOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -104,13 +98,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectTotalReserveStatusCount(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectTotalReserveStatusCount(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -147,13 +136,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectListReserve(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectListReserve(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -189,13 +173,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectHospitalHoliday(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectHospitalHoliday(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -232,13 +211,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectListReserveStatus(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectListReserveStatus(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -275,13 +249,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectReserve(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectReserve(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -318,13 +287,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectReserveUser(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectReserveUser(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -361,13 +325,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectListReserveUserNoPayment(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectListReserveUserNoPayment(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -404,19 +363,15 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectListReserveUserHistoryIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muMemberId", paramMap.get("loginMemberId")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectListReserveUserHistoryIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("muMemberId", paramMap.get("loginMemberId")); } catch (Exception e) { e.printStackTrace(); @@ -441,13 +396,8 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.selectListReserveUserHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.selectListReserveUserHistory(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -488,15 +438,10 @@ public class WebReserveController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webReserveService.selectListReserveUserHistoryExcel(paramMap); - map.put("selectListReserveUserHistory", selectListReport); - map.put("name", "reserveUserHistory"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webReserveService.selectListReserveUserHistoryExcel(paramMap); + map.put("selectListReserveUserHistory", selectListReport); + map.put("name", "reserveUserHistory"); } catch(Exception e){ e.printStackTrace(); @@ -523,15 +468,10 @@ public class WebReserveController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.insertReserve(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.insertReserve(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -572,15 +512,10 @@ public class WebReserveController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.insertReserveSimple(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.insertReserveSimple(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -621,15 +556,10 @@ public class WebReserveController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.insertReserveReady(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.insertReserveReady(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -670,15 +600,10 @@ public class WebReserveController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.updateReserve(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.updateReserve(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -719,15 +644,10 @@ public class WebReserveController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.updateReserveStatus(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.updateReserveStatus(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -768,15 +688,10 @@ public class WebReserveController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.updateReserveStatus2(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.updateReserveStatus2(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -817,15 +732,10 @@ public class WebReserveController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.deleteReserve(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.deleteReserve(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -867,14 +777,10 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - }else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webReserveService.uploadReserveExcel(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webReserveService.uploadReserveExcel(paramMap,file); }catch (Exception e) { e.printStackTrace(); } @@ -901,24 +807,20 @@ public class WebReserveController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - - }else{ - String fileName = String.valueOf(paramMap.get("fileName")); - - Resource resource = resourceLoader.getResource("classpath:static/sample/"+ fileName); - File file = resource.getFile(); - - byte[] fileByte = FileUtils.readFileToByteArray(file); + String fileName = String.valueOf(paramMap.get("fileName")); + + Resource resource = resourceLoader.getResource("classpath:static/sample/"+ fileName); + File file = resource.getFile(); + + byte[] fileByte = FileUtils.readFileToByteArray(file); - response.setContentType("application/octet-stream"); - response.setHeader("Content-Disposition", "attachment; fileName=\"" + URLEncoder.encode(fileName, "UTF-8")+"\";"); - response.setHeader("Content-Transfer-Encoding", "binary"); + response.setContentType("application/octet-stream"); + response.setHeader("Content-Disposition", "attachment; fileName=\"" + URLEncoder.encode(fileName, "UTF-8")+"\";"); + response.setHeader("Content-Transfer-Encoding", "binary"); - response.getOutputStream().write(fileByte); - response.getOutputStream().flush(); - response.getOutputStream().close(); - } + response.getOutputStream().write(fileByte); + response.getOutputStream().flush(); + response.getOutputStream().close(); }catch (Exception e) { e.printStackTrace(); } @@ -944,15 +846,10 @@ public class WebReserveController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webReserveService.selectListReserveColumnExcel(paramMap); - map.put("selectListReserveColumn", selectListReport); - map.put("name", "reserveColumn"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webReserveService.selectListReserveColumnExcel(paramMap); + map.put("selectListReserveColumn", selectListReport); + map.put("name", "reserveColumn"); } catch(Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/websms/WebSmsController.java b/src/main/java/com/madeu/controller/web/websms/WebSmsController.java index 011b2fd..ba86715 100644 --- a/src/main/java/com/madeu/controller/web/websms/WebSmsController.java +++ b/src/main/java/com/madeu/controller/web/websms/WebSmsController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.websms; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.websms.WebSmsService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -20,7 +19,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebSmsController extends ManagerDraftAction{ +public class WebSmsController{ @Autowired private WebSmsService webSmsService; @@ -43,13 +42,8 @@ public class WebSmsController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webSmsService.selectListSms(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webSmsService.selectListSms(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -86,13 +80,8 @@ public class WebSmsController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webSmsService.selectSms(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webSmsService.selectSms(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -131,15 +120,10 @@ public class WebSmsController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webSmsService.insertSms(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webSmsService.insertSms(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -180,15 +164,10 @@ public class WebSmsController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webSmsService.insertSmsHome(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webSmsService.insertSmsHome(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -229,15 +208,10 @@ public class WebSmsController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webSmsService.insertSmsConsultingChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webSmsService.insertSmsConsultingChart(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstatistics/WebStatisticsController.java b/src/main/java/com/madeu/controller/web/webstatistics/WebStatisticsController.java index b089457..58384c1 100644 --- a/src/main/java/com/madeu/controller/web/webstatistics/WebStatisticsController.java +++ b/src/main/java/com/madeu/controller/web/webstatistics/WebStatisticsController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webstatistics; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstatistics.WebStatisticsService; import com.madeu.util.HttpUtil; @@ -26,7 +25,7 @@ import java.util.Map; @Slf4j @Controller -public class WebStatisticsController extends ManagerDraftAction { +public class WebStatisticsController { @Autowired private WebStatisticsService webStatisticsService; @@ -52,19 +51,15 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectStatisticsIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectStatisticsIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muMemberId", paramMap.get("loginMemberId")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("muMemberId", paramMap.get("loginMemberId")); } catch (Exception e) { e.printStackTrace(); @@ -88,13 +83,8 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectStatistics(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectStatistics(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -130,19 +120,15 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectPaymentStatisticsIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectPaymentStatisticsIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muMemberId", paramMap.get("loginMemberId")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("muMemberId", paramMap.get("loginMemberId")); } catch (Exception e) { e.printStackTrace(); @@ -166,13 +152,8 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectStatisticsPayment(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectStatisticsPayment(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -213,14 +194,10 @@ public class WebStatisticsController extends ManagerDraftAction { Map map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStatisticsService.selectListStatisticsPaymentExcel(paramMap); - map.put("selectListStatisticsPayment", selectListReport); - map.put("name", "statisticsPayment"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStatisticsService.selectListStatisticsPaymentExcel(paramMap); + map.put("selectListStatisticsPayment", selectListReport); + map.put("name", "statisticsPayment"); } catch (Exception e) { e.printStackTrace(); @@ -245,19 +222,15 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectClinicStatisticsIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectClinicStatisticsIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muMemberId", paramMap.get("loginMemberId")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("muMemberId", paramMap.get("loginMemberId")); } catch (Exception e) { e.printStackTrace(); @@ -281,13 +254,8 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectStatisticsClinic(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectStatisticsClinic(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -328,14 +296,10 @@ public class WebStatisticsController extends ManagerDraftAction { Map map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStatisticsService.downloadStatisticsClinicExcel(paramMap); - map.put("selectListStatisticsClinic", selectListReport); - map.put("name", "statisticsClinic"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStatisticsService.downloadStatisticsClinicExcel(paramMap); + map.put("selectListStatisticsClinic", selectListReport); + map.put("name", "statisticsClinic"); } catch (Exception e) { e.printStackTrace(); @@ -360,19 +324,15 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectUserStatisticsIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectUserStatisticsIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muMemberId", paramMap.get("loginMemberId")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("muMemberId", paramMap.get("loginMemberId")); } catch (Exception e) { e.printStackTrace(); @@ -396,13 +356,8 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectStatisticsUser(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectStatisticsUser(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -443,14 +398,10 @@ public class WebStatisticsController extends ManagerDraftAction { Map map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStatisticsService.downloadStatisticsUserExcel(paramMap); - map.put("selectListStatisticsUser", selectListReport); - map.put("name", "statisticsUser"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStatisticsService.downloadStatisticsUserExcel(paramMap); + map.put("selectListStatisticsUser", selectListReport); + map.put("name", "statisticsUser"); } catch (Exception e) { e.printStackTrace(); @@ -475,19 +426,15 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectPushStatisticsIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectPushStatisticsIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muMemberId", paramMap.get("loginMemberId")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("muMemberId", paramMap.get("loginMemberId")); } catch (Exception e) { e.printStackTrace(); @@ -511,13 +458,8 @@ public class WebStatisticsController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStatisticsService.selectStatisticsPush(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStatisticsService.selectStatisticsPush(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -558,14 +500,10 @@ public class WebStatisticsController extends ManagerDraftAction { Map map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStatisticsService.downloadStatisticsPushExcel(paramMap); - map.put("selectListStatisticsPush", selectListReport); - map.put("name", "statisticsPush"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStatisticsService.downloadStatisticsPushExcel(paramMap); + map.put("selectListStatisticsPush", selectListReport); + map.put("name", "statisticsPush"); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstockclose/WebStockCloseController.java b/src/main/java/com/madeu/controller/web/webstockclose/WebStockCloseController.java index f0092ce..e54e7c2 100644 --- a/src/main/java/com/madeu/controller/web/webstockclose/WebStockCloseController.java +++ b/src/main/java/com/madeu/controller/web/webstockclose/WebStockCloseController.java @@ -13,7 +13,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstockclose.WebStockCloseService; import com.madeu.util.HttpUtil; @@ -27,7 +26,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebStockCloseController extends ManagerDraftAction{ +public class WebStockCloseController{ @Autowired private WebStockCloseService webStockCloseService; @@ -50,19 +49,14 @@ public class WebStockCloseController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockCloseService.selectListStockCloseIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockCloseService.selectListStockCloseIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -87,13 +81,8 @@ public class WebStockCloseController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockCloseService.selectListStockClose(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockCloseService.selectListStockClose(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -134,15 +123,10 @@ public class WebStockCloseController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStockCloseService.selectListStockCloseExcel(paramMap); - map.put("selectListStockClose", selectListReport); - map.put("name", "stockclose"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStockCloseService.selectListStockCloseExcel(paramMap); + map.put("selectListStockClose", selectListReport); + map.put("name", "stockclose"); } catch(Exception e){ e.printStackTrace(); @@ -169,15 +153,10 @@ public class WebStockCloseController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockCloseService.insertStockClose(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockCloseService.insertStockClose(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstockclosedetail/WebStockCloseDetailController.java b/src/main/java/com/madeu/controller/web/webstockclosedetail/WebStockCloseDetailController.java index 271278f..97bd337 100644 --- a/src/main/java/com/madeu/controller/web/webstockclosedetail/WebStockCloseDetailController.java +++ b/src/main/java/com/madeu/controller/web/webstockclosedetail/WebStockCloseDetailController.java @@ -12,7 +12,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstockclosedetail.WebStockCloseDetailService; import com.madeu.util.HttpUtil; @@ -26,7 +25,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebStockCloseDetailController extends ManagerDraftAction{ +public class WebStockCloseDetailController{ @Autowired private WebStockCloseDetailService webStockCloseDetailService; @@ -49,19 +48,14 @@ public class WebStockCloseDetailController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockCloseDetailService.selectListStockCloseDetailIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockCloseDetailService.selectListStockCloseDetailIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -86,13 +80,8 @@ public class WebStockCloseDetailController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockCloseDetailService.selectListStockCloseDetail(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockCloseDetailService.selectListStockCloseDetail(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -133,15 +122,10 @@ public class WebStockCloseDetailController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStockCloseDetailService.selectListStockCloseDetailExcel(paramMap); - map.put("selectListStockCloseDetail", selectListReport); - map.put("name", "stockclosedetail"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStockCloseDetailService.selectListStockCloseDetailExcel(paramMap); + map.put("selectListStockCloseDetail", selectListReport); + map.put("name", "stockclosedetail"); } catch(Exception e){ e.printStackTrace(); @@ -165,13 +149,8 @@ public class WebStockCloseDetailController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockCloseDetailService.selectTotalStockCloseDetail(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockCloseDetailService.selectTotalStockCloseDetail(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstockhistory/WebStockHistoryController.java b/src/main/java/com/madeu/controller/web/webstockhistory/WebStockHistoryController.java index 70270cd..d683a81 100644 --- a/src/main/java/com/madeu/controller/web/webstockhistory/WebStockHistoryController.java +++ b/src/main/java/com/madeu/controller/web/webstockhistory/WebStockHistoryController.java @@ -19,7 +19,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstockhistory.WebStockHistoryService; import com.madeu.util.HttpUtil; @@ -33,7 +32,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebStockHistoryController extends ManagerDraftAction{ +public class WebStockHistoryController{ @Autowired private WebStockHistoryService webStockHistoryService; @@ -60,19 +59,14 @@ public class WebStockHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockHistoryService.selectListStockHistoryIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockHistoryService.selectListStockHistoryIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -98,13 +92,8 @@ public class WebStockHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockHistoryService.selectListStockHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockHistoryService.selectListStockHistory(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -143,26 +132,22 @@ public class WebStockHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - - }else{ - String fileName = String.valueOf(paramMap.get("fileName")); + String fileName = String.valueOf(paramMap.get("fileName")); File file = new File(uploadUrl+fileName); if (!file.exists()) { response.sendError(HttpServletResponse.SC_NOT_FOUND, "File not found"); return; } - byte[] fileByte = FileUtils.readFileToByteArray(file); + byte[] fileByte = FileUtils.readFileToByteArray(file); - response.setContentType("application/octet-stream"); - response.setHeader("Content-Disposition", "attachment; fileName=\"" + URLEncoder.encode(file.getName(), "UTF-8")+"\";"); - response.setHeader("Content-Transfer-Encoding", "binary"); + response.setContentType("application/octet-stream"); + response.setHeader("Content-Disposition", "attachment; fileName=\"" + URLEncoder.encode(file.getName(), "UTF-8")+"\";"); + response.setHeader("Content-Transfer-Encoding", "binary"); - response.getOutputStream().write(fileByte); - response.getOutputStream().flush(); - response.getOutputStream().close(); - } + response.getOutputStream().write(fileByte); + response.getOutputStream().flush(); + response.getOutputStream().close(); }catch (Exception e) { e.printStackTrace(); response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); @@ -189,15 +174,10 @@ public class WebStockHistoryController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStockHistoryService.selectListStockHistoryExcel(paramMap); - map.put("selectListStockHistory", selectListReport); - map.put("name", "stockhistory"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStockHistoryService.selectListStockHistoryExcel(paramMap); + map.put("selectListStockHistory", selectListReport); + map.put("name", "stockhistory"); } catch(Exception e){ e.printStackTrace(); @@ -222,13 +202,8 @@ public class WebStockHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockHistoryService.selectStockHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockHistoryService.selectStockHistory(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -268,16 +243,11 @@ public class WebStockHistoryController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("file",file); - map = webStockHistoryService.insertStockHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("file",file); + map = webStockHistoryService.insertStockHistory(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstockstatus/WebStockStatusController.java b/src/main/java/com/madeu/controller/web/webstockstatus/WebStockStatusController.java index 470ba01..b9a1fff 100644 --- a/src/main/java/com/madeu/controller/web/webstockstatus/WebStockStatusController.java +++ b/src/main/java/com/madeu/controller/web/webstockstatus/WebStockStatusController.java @@ -12,7 +12,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstockstatus.WebStockStatusService; import com.madeu.util.HttpUtil; @@ -26,7 +25,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebStockStatusController extends ManagerDraftAction{ +public class WebStockStatusController{ @Autowired private WebStockStatusService webStockStatusService; @@ -49,19 +48,14 @@ public class WebStockStatusController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockStatusService.selectListStockStatusIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockStatusService.selectListStockStatusIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -88,13 +82,8 @@ public class WebStockStatusController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockStatusService.selectTotalStockStatus(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockStatusService.selectTotalStockStatus(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -131,13 +120,8 @@ public class WebStockStatusController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockStatusService.selectListStockStatus(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockStatusService.selectListStockStatus(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -178,15 +162,10 @@ public class WebStockStatusController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStockStatusService.selectListStockStatusExcel(paramMap); - map.put("selectListStockStatus", selectListReport); - map.put("name", "stockstatus"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStockStatusService.selectListStockStatusExcel(paramMap); + map.put("selectListStockStatus", selectListReport); + map.put("name", "stockstatus"); } catch(Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstocksum/WebStockSumController.java b/src/main/java/com/madeu/controller/web/webstocksum/WebStockSumController.java index 641f509..bfdcef5 100644 --- a/src/main/java/com/madeu/controller/web/webstocksum/WebStockSumController.java +++ b/src/main/java/com/madeu/controller/web/webstocksum/WebStockSumController.java @@ -21,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstocksum.WebStockSumService; import com.madeu.util.HttpUtil; @@ -35,7 +34,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebStockSumController extends ManagerDraftAction{ +public class WebStockSumController{ @Autowired private WebStockSumService webStockSumService; @@ -58,19 +57,14 @@ public class WebStockSumController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumService.selectListStockSumCompanyIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumService.selectListStockSumCompanyIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -97,13 +91,8 @@ public class WebStockSumController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumService.selectTotalStockSumCompany(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumService.selectTotalStockSumCompany(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -140,13 +129,8 @@ public class WebStockSumController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumService.selectListStockSumCompany(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumService.selectListStockSumCompany(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -187,15 +171,10 @@ public class WebStockSumController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStockSumService.selectListStockSumCompanyExcel(paramMap); - map.put("selectListStockSumCompany", selectListReport); - map.put("name", "stocksum"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStockSumService.selectListStockSumCompanyExcel(paramMap); + map.put("selectListStockSumCompany", selectListReport); + map.put("name", "stocksum"); } catch(Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstocksumadjustment/WebStockSumAdjustmentController.java b/src/main/java/com/madeu/controller/web/webstocksumadjustment/WebStockSumAdjustmentController.java index d1a4a20..503a838 100644 --- a/src/main/java/com/madeu/controller/web/webstocksumadjustment/WebStockSumAdjustmentController.java +++ b/src/main/java/com/madeu/controller/web/webstocksumadjustment/WebStockSumAdjustmentController.java @@ -21,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstocksumadjustment.WebStockSumAdjustmentService; import com.madeu.util.HttpUtil; @@ -35,7 +34,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebStockSumAdjustmentController extends ManagerDraftAction{ +public class WebStockSumAdjustmentController{ @Autowired private WebStockSumAdjustmentService webStockSumAdjustmentService; @@ -55,19 +54,14 @@ public class WebStockSumAdjustmentController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumAdjustmentService.selectListStockSumAdjustmentIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumAdjustmentService.selectListStockSumAdjustmentIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -92,13 +86,8 @@ public class WebStockSumAdjustmentController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumAdjustmentService.selectListStockSumAdjustment(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumAdjustmentService.selectListStockSumAdjustment(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -139,15 +128,10 @@ public class WebStockSumAdjustmentController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webStockSumAdjustmentService.selectListStockSumAdjustmentExcel(paramMap); - map.put("selectListStockSumAdjustment", selectListReport); - map.put("name", "stocksumadjustment"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webStockSumAdjustmentService.selectListStockSumAdjustmentExcel(paramMap); + map.put("selectListStockSumAdjustment", selectListReport); + map.put("name", "stocksumadjustment"); } catch(Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstocksumadjustmentdetail/WebStockSumAdjustmentDetailController.java b/src/main/java/com/madeu/controller/web/webstocksumadjustmentdetail/WebStockSumAdjustmentDetailController.java index c07ad67..6627914 100644 --- a/src/main/java/com/madeu/controller/web/webstocksumadjustmentdetail/WebStockSumAdjustmentDetailController.java +++ b/src/main/java/com/madeu/controller/web/webstocksumadjustmentdetail/WebStockSumAdjustmentDetailController.java @@ -9,7 +9,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstocksumadjustmentdetail.WebStockSumAdjustmentDetailService; import com.madeu.util.HttpUtil; @@ -22,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebStockSumAdjustmentDetailController extends ManagerDraftAction{ +public class WebStockSumAdjustmentDetailController{ @Autowired private WebStockSumAdjustmentDetailService webStockSumAdjustmentDetailService; @@ -46,13 +45,8 @@ public class WebStockSumAdjustmentDetailController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumAdjustmentDetailService.selectListStockSumAdjustmentDetail(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumAdjustmentDetailService.selectListStockSumAdjustmentDetail(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -91,15 +85,10 @@ public class WebStockSumAdjustmentDetailController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumAdjustmentDetailService.insertStockAdjustmentDetail(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumAdjustmentDetailService.insertStockAdjustmentDetail(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webstocksumhistory/WebStockSumHistoryController.java b/src/main/java/com/madeu/controller/web/webstocksumhistory/WebStockSumHistoryController.java index 173e2da..a5772e2 100644 --- a/src/main/java/com/madeu/controller/web/webstocksumhistory/WebStockSumHistoryController.java +++ b/src/main/java/com/madeu/controller/web/webstocksumhistory/WebStockSumHistoryController.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstocksumhistory.WebStockSumHistoryService; import com.madeu.util.HttpUtil; @@ -22,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebStockSumHistoryController extends ManagerDraftAction{ +public class WebStockSumHistoryController{ @Autowired private WebStockSumHistoryService webStockSumHistoryService; @@ -45,19 +44,14 @@ public class WebStockSumHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumHistoryService.selectListStockSumCompanyHistoryIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumHistoryService.selectListStockSumCompanyHistoryIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -84,13 +78,8 @@ public class WebStockSumHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumHistoryService.selectTotalStockSumCompanyHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumHistoryService.selectTotalStockSumCompanyHistory(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -127,13 +116,8 @@ public class WebStockSumHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webStockSumHistoryService.selectListStockSumCompanyHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webStockSumHistoryService.selectListStockSumCompanyHistory(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webtreatment/WebTreatmentController.java b/src/main/java/com/madeu/controller/web/webtreatment/WebTreatmentController.java index b8866f6..2ce5b7d 100644 --- a/src/main/java/com/madeu/controller/web/webtreatment/WebTreatmentController.java +++ b/src/main/java/com/madeu/controller/web/webtreatment/WebTreatmentController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webtreatment.WebTreatmentService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebTreatmentController extends ManagerDraftAction{ +public class WebTreatmentController{ @Autowired private WebTreatmentService webTreatmentService; @@ -46,13 +45,8 @@ public class WebTreatmentController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentService.selectListTreatmentOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentService.selectListTreatmentOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -88,13 +82,8 @@ public class WebTreatmentController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentService.selectMembershipOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentService.selectMembershipOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -131,19 +120,14 @@ public class WebTreatmentController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentService.selectListTreatmentIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentService.selectListTreatmentIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -168,13 +152,8 @@ public class WebTreatmentController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentService.selectListTreatment(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentService.selectListTreatment(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -213,15 +192,10 @@ public class WebTreatmentController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentService.insertTreatment(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentService.insertTreatment(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -262,15 +236,10 @@ public class WebTreatmentController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentService.deleteTreatment(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentService.deleteTreatment(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webtreatmentdiet/WebTreatmentDietController.java b/src/main/java/com/madeu/controller/web/webtreatmentdiet/WebTreatmentDietController.java index 8aa0e76..c1549a8 100644 --- a/src/main/java/com/madeu/controller/web/webtreatmentdiet/WebTreatmentDietController.java +++ b/src/main/java/com/madeu/controller/web/webtreatmentdiet/WebTreatmentDietController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webtreatmentdiet; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webtreatmentdiet.WebTreatmentDietService; import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebTreatmentDietController extends ManagerDraftAction { +public class WebTreatmentDietController { @Autowired private WebTreatmentDietService webTreatmentDietService; @@ -44,19 +43,14 @@ public class WebTreatmentDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.selectListWebTreatmentDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.selectListWebTreatmentDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -81,13 +75,8 @@ public class WebTreatmentDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.selectListWebTreatmentDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.selectListWebTreatmentDiet(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -124,13 +113,8 @@ public class WebTreatmentDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.selectWebTreatmentDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.selectWebTreatmentDiet(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -169,15 +153,10 @@ public class WebTreatmentDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -216,20 +195,15 @@ public class WebTreatmentDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.insertWebTreatmentDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.insertWebTreatmentDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -256,15 +230,10 @@ public class WebTreatmentDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.insertWebTreatmentDiet(paramMap,file,content_file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.insertWebTreatmentDiet(paramMap,file,content_file); } catch (Exception e) { e.printStackTrace(); @@ -303,20 +272,15 @@ public class WebTreatmentDietController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.updateWebTreatmentDietIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.updateWebTreatmentDietIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -343,15 +307,10 @@ public class WebTreatmentDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.updateWebTreatmentDiet(paramMap, file, content_file ); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.updateWebTreatmentDiet(paramMap, file, content_file ); } catch (Exception e) { e.printStackTrace(); @@ -393,15 +352,10 @@ public class WebTreatmentDietController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.deleteWebTreatmentDiet(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.deleteWebTreatmentDiet(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -440,12 +394,8 @@ public class WebTreatmentDietController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentDietService.selectListTreatmentOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentDietService.selectListTreatmentOption(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webtreatmentpetit/WebTreatmentPetitController.java b/src/main/java/com/madeu/controller/web/webtreatmentpetit/WebTreatmentPetitController.java index 33ef2c9..2cee3ac 100644 --- a/src/main/java/com/madeu/controller/web/webtreatmentpetit/WebTreatmentPetitController.java +++ b/src/main/java/com/madeu/controller/web/webtreatmentpetit/WebTreatmentPetitController.java @@ -14,7 +14,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webtreatmentpetit.WebTreatmentPetitService; import com.madeu.util.HttpUtil; @@ -26,7 +25,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebTreatmentPetitController extends ManagerDraftAction { +public class WebTreatmentPetitController { @Autowired private WebTreatmentPetitService webTreatmentPetitService; @@ -49,19 +48,14 @@ public class WebTreatmentPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.selectListWebTreatmentPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.selectListWebTreatmentPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -86,13 +80,8 @@ public class WebTreatmentPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.selectListWebTreatmentPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.selectListWebTreatmentPetit(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -129,13 +118,8 @@ public class WebTreatmentPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.selectWebTreatmentPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.selectWebTreatmentPetit(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -174,15 +158,10 @@ public class WebTreatmentPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.uploadFile(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.uploadFile(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -221,20 +200,15 @@ public class WebTreatmentPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.insertWebTreatmentPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.insertWebTreatmentPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); @@ -261,15 +235,10 @@ public class WebTreatmentPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.insertWebTreatmentPetit(paramMap,file,content_file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.insertWebTreatmentPetit(paramMap,file,content_file); } catch (Exception e) { e.printStackTrace(); @@ -308,20 +277,15 @@ public class WebTreatmentPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.updateWebTreatmentPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.updateWebTreatmentPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("category", map.get("category")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("category", map.get("category")); } catch (Exception e) { e.printStackTrace(); @@ -348,15 +312,10 @@ public class WebTreatmentPetitController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.updateWebTreatmentPetit(paramMap, file, content_file ); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.updateWebTreatmentPetit(paramMap, file, content_file ); } catch (Exception e) { e.printStackTrace(); @@ -400,15 +359,10 @@ public class WebTreatmentPetitController extends ManagerDraftAction { try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.deleteWebTreatmentPetit(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.deleteWebTreatmentPetit(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -447,12 +401,8 @@ public class WebTreatmentPetitController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentPetitService.selectListTreatmentOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentPetitService.selectListTreatmentOption(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webtreatmentprocedure/WebTreatmentProcedureController.java b/src/main/java/com/madeu/controller/web/webtreatmentprocedure/WebTreatmentProcedureController.java index b327514..4eed729 100644 --- a/src/main/java/com/madeu/controller/web/webtreatmentprocedure/WebTreatmentProcedureController.java +++ b/src/main/java/com/madeu/controller/web/webtreatmentprocedure/WebTreatmentProcedureController.java @@ -9,7 +9,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webtreatmentprocedure.WebTreatmentProcedureService; import com.madeu.util.HttpUtil; @@ -22,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebTreatmentProcedureController extends ManagerDraftAction{ +public class WebTreatmentProcedureController{ @Autowired private WebTreatmentProcedureService webTreatmentProcedureService; @@ -45,13 +44,8 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentProcedureService.selectListTreatmentProcedureOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentProcedureService.selectListTreatmentProcedureOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -88,13 +82,8 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentProcedureService.selectListTreatmentProcedureOption2(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentProcedureService.selectListTreatmentProcedureOption2(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -131,13 +120,8 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentProcedureService.selectListTreatmentProcedure(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentProcedureService.selectListTreatmentProcedure(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -174,13 +158,8 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentProcedureService.selectTreatmentProcedure(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentProcedureService.selectTreatmentProcedure(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -219,15 +198,10 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentProcedureService.insertTreatmentProcedure(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentProcedureService.insertTreatmentProcedure(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -268,15 +242,10 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentProcedureService.updateTreatmentProcedure(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentProcedureService.updateTreatmentProcedure(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -318,15 +287,10 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentProcedureService.updateTreatmentProcedureEnableYn(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentProcedureService.updateTreatmentProcedureEnableYn(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -368,15 +332,10 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webTreatmentProcedureService.updateTreatmentProcedureTreatmentId(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webTreatmentProcedureService.updateTreatmentProcedureTreatmentId(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webuser/WebUserController.java b/src/main/java/com/madeu/controller/web/webuser/WebUserController.java index df68f15..378b9a2 100644 --- a/src/main/java/com/madeu/controller/web/webuser/WebUserController.java +++ b/src/main/java/com/madeu/controller/web/webuser/WebUserController.java @@ -16,7 +16,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuser.WebUserService; import com.madeu.util.HttpUtil; @@ -32,13 +31,13 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebUserController extends ManagerDraftAction { +public class WebUserController { @Autowired private WebUserService webUserService; @Autowired - private LogHistoryService logHistoryService; + private LogHistoryService logHistoryService; /** * 고객 정보 리스트 화면으로 이동. @@ -48,27 +47,23 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/selectListUserIntro.do") - public String selectListUserIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response, Model model) { + public String selectListUserIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response, + Model model) { log.debug("WebUserController selectListUserIntro START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectListUserIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectListUserIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } - } - catch (Exception e) { + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; } @@ -76,6 +71,41 @@ public class WebUserController extends ManagerDraftAction { return "/web/user/userSelectList"; } + /** + * 고객 정보 리스트 조회 (AJAX) + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/webuser/selectListUser.do") + public ModelAndView selectListUser(HttpSession session, HttpServletRequest request, HttpServletResponse response) { + log.debug("WebUserController selectListUser START"); + + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectListUser(paramMap); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + log.debug("WebUserController selectListUser END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + /** * 고객 등록. * @@ -84,7 +114,8 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/insertUser.do") - public ModelAndView insertUser(HttpSession session, HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { + public ModelAndView insertUser(HttpSession session, HttpServletRequest request, HttpServletResponse response, + MultipartHttpServletRequest file) { log.debug("WebUserController insertUser START"); @@ -94,14 +125,10 @@ public class WebUserController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.insertUser(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.insertUser(paramMap); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -116,7 +143,7 @@ public class WebUserController extends ManagerDraftAction { } } - logHistoryService.save("고객 등록", "고객 등록", paramMap, map, String.valueOf(errorMsg)); + logHistoryService.save("고객 등록", "고객 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController updateUser END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -130,7 +157,8 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/updateUser2.do") - public ModelAndView updateUser2(HttpSession session, HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { + public ModelAndView updateUser2(HttpSession session, HttpServletRequest request, HttpServletResponse response, + MultipartHttpServletRequest file) { log.debug("WebMemberController updateUser2 START"); @@ -140,17 +168,12 @@ public class WebUserController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.updateUser2(paramMap); - } - } - catch (Exception e) { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.updateUser2(paramMap); + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); } finally { @@ -164,11 +187,13 @@ public class WebUserController extends ManagerDraftAction { } } - logHistoryService.save("고객 정보 수정2 (간편예약고객 -> 신환등록)", "고객 정보 수정2 (간편예약고객 -> 신환등록)", paramMap, map, String.valueOf(errorMsg)); + logHistoryService.save("고객 정보 수정2 (간편예약고객 -> 신환등록)", "고객 정보 수정2 (간편예약고객 -> 신환등록)", paramMap, map, + String.valueOf(errorMsg)); } log.debug("WebUserController updateUser2 END"); return HttpUtil.makeHashToJsonModelAndView(map); } + /** * 고객 신체 정보 리스트 화면으로 이동. * @@ -177,29 +202,25 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/selectListUserPhysicalIntro.do") - public String selectListUserPhysicalIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response, Model model) { + public String selectListUserPhysicalIntro(HttpSession session, HttpServletRequest request, + HttpServletResponse response, Model model) { log.debug("WebUserController selectListUserPhysicalIntro START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectListUserPhysicalIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectListUserPhysicalIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muMemberId", paramMap.get("loginMemberId")); + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("muMemberId", paramMap.get("loginMemberId")); - } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; } @@ -215,7 +236,8 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/insertPhysical.do") - public ModelAndView insertPhysical(HttpSession session, HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { + public ModelAndView insertPhysical(HttpSession session, HttpServletRequest request, HttpServletResponse response, + MultipartHttpServletRequest file) { log.debug("WebUserController insertPhysical START"); @@ -225,17 +247,12 @@ public class WebUserController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.insertPhysical(paramMap); - } - } - catch (Exception e) { + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.insertPhysical(paramMap); + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); } finally { @@ -249,12 +266,12 @@ public class WebUserController extends ManagerDraftAction { } } - logHistoryService.save("고객 신체정보 등록", "고객 신체정보 등록", paramMap, map, String.valueOf(errorMsg)); + logHistoryService.save("고객 신체정보 등록", "고객 신체정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController updateUserPhysical END"); return HttpUtil.makeHashToJsonModelAndView(map); } - + /** * 고객 신체정보 불러오기 (인바디 정보 불러오기, api 연동) * @@ -263,7 +280,8 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/insertUserPhysicalInbodyApi.do") - public ModelAndView insertUserPhysicalInbodyApi(HttpSession session, HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { + public ModelAndView insertUserPhysicalInbodyApi(HttpSession session, HttpServletRequest request, + HttpServletResponse response, MultipartHttpServletRequest file) { log.debug("WebUserController insertUserPhysicalInbodyApi START"); @@ -273,17 +291,12 @@ public class WebUserController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.insertUserPhysicalInbodyApi(paramMap); - } - } - catch (Exception e) { + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.insertUserPhysicalInbodyApi(paramMap); + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); } finally { @@ -302,7 +315,7 @@ public class WebUserController extends ManagerDraftAction { log.debug("WebUserController insertUserPhysicalInbodyApi END"); return HttpUtil.makeHashToJsonModelAndView(map); } - + /** * 고객 동의서 리스트 화면으로 이동. * @@ -311,34 +324,31 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/selectListUserAgreementIntro.do") - public String selectListUserAgreementIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response, Model model) { + public String selectListUserAgreementIntro(HttpSession session, HttpServletRequest request, + HttpServletResponse response, Model model) { log.debug("WebUserController selectListUserAgreementIntro START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectListUserAgreementIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectListUserAgreementIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muMemberId", paramMap.get("loginMemberId")); - } - } - catch (Exception e) { + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("muMemberId", paramMap.get("loginMemberId")); + } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; } log.debug("WebMemberController selectListUserAgreementIntro END"); return "/web/user/userAgreementList"; } + /** * 고객 동의서 등록. * @@ -347,7 +357,8 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/insertUserAgreement.do") - public ModelAndView insertUserAgreement(HttpSession session, HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "file", required = false) MultipartFile file) { + public ModelAndView insertUserAgreement(HttpSession session, HttpServletRequest request, + HttpServletResponse response, @RequestParam(value = "file", required = false) MultipartFile file) { log.debug("WebUserController insertUserAgreement START"); @@ -357,16 +368,11 @@ public class WebUserController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.insertUserAgreement(paramMap, file); - } - } - catch (Exception e) { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.insertUserAgreement(paramMap, file); + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); } finally { @@ -394,22 +400,18 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/selectUserAgreementList.do") - public ModelAndView selectUserAgreementList(HttpSession session, HttpServletRequest request, HttpServletResponse response) { + public ModelAndView selectUserAgreementList(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { log.debug("WebCustomerController selectUserAgreementList START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectUserAgreementList(paramMap); - } - } - catch (Exception e) { + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectUserAgreementList(paramMap); + } catch (Exception e) { e.printStackTrace(); return null; } finally { @@ -438,7 +440,9 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/downloadAgreementExcel.do") - public ModelAndView downloadAgreementExcel(HttpSession session, HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "file", required = false) MultipartFile file, Model model) { + public ModelAndView downloadAgreementExcel(HttpSession session, HttpServletRequest request, + HttpServletResponse response, @RequestParam(value = "file", required = false) MultipartFile file, + Model model) { log.debug("WebUserController downloadAgreementExcel START"); HashMap paramMap = HttpUtil.getParameterMap(request); @@ -446,16 +450,11 @@ public class WebUserController extends ManagerDraftAction { Map map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webUserService.selectUserAgreementListExcel(paramMap); - map.put("selectListUserAgreement", selectListReport); - map.put("name", "useragreement"); - } - } - catch (Exception e) { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webUserService.selectUserAgreementListExcel(paramMap); + map.put("selectListUserAgreement", selectListReport); + map.put("name", "useragreement"); + } catch (Exception e) { e.printStackTrace(); return null; } @@ -471,22 +470,18 @@ public class WebUserController extends ManagerDraftAction { * @return */ @RequestMapping(value = "/webuser/selectUserAgreement.do") - public ModelAndView selectUserAgreement(HttpSession session, HttpServletRequest request, HttpServletResponse response) { + public ModelAndView selectUserAgreement(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { log.debug("WebUserController selectUserAgreement START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectUserAgreement(paramMap); - } - } - catch (Exception e) { + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectUserAgreement(paramMap); + } catch (Exception e) { e.printStackTrace(); return null; } finally { @@ -503,4 +498,344 @@ public class WebUserController extends ManagerDraftAction { log.debug("WebUserController selectUserAgreement END"); return HttpUtil.makeHashToJsonModelAndView(map); } + + /** + * 고객 정보 수정 화면으로 이동. + */ + @RequestMapping(value = "/webuser/updateUserIntro.do") + public String updateUserIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response, + Model model) { + log.debug("WebUserController updateUserIntro START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.updateUserIntro(paramMap); + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + } catch (Exception e) { + e.printStackTrace(); + return "/web/login/logout"; + } + log.debug("WebUserController updateUserIntro END"); + return "/web/user/userUpdate"; + } + + /** + * 고객 상세 조회 (AJAX) + */ + @RequestMapping(value = "/webuser/selectUser.do") + public ModelAndView selectUser(HttpSession session, HttpServletRequest request, HttpServletResponse response) { + log.debug("WebUserController selectUser START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectUser(paramMap); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + log.debug("WebUserController selectUser END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 정보 수정 (AJAX) + */ + @RequestMapping(value = "/webuser/updateUser.do") + public ModelAndView updateUser(HttpSession session, HttpServletRequest request, HttpServletResponse response, + MultipartHttpServletRequest file) { + log.debug("WebUserController updateUser START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + StringBuffer errorMsg = new StringBuffer(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.updateUser(paramMap); + } catch (Exception e) { + e.printStackTrace(); + errorMsg.append(e); + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + logHistoryService.save("고객 정보 수정", "고객 정보 수정", paramMap, map, String.valueOf(errorMsg)); + } + log.debug("WebUserController updateUser END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 검색 (AJAX) + */ + @RequestMapping(value = "/webuser/selectUserSearch.do") + public ModelAndView selectUserSearch(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { + log.debug("WebUserController selectUserSearch START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectUserSearch(paramMap); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + log.debug("WebUserController selectUserSearch END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 리스트 조회 - 옵션 (AJAX) + */ + @RequestMapping(value = "/webuser/selectListUserOption.do") + public ModelAndView selectListUserOption(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { + log.debug("WebUserController selectListUserOption START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectListUserOption(paramMap); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + log.debug("WebUserController selectListUserOption END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 리스트 조회 - 마케팅 (AJAX) + */ + @RequestMapping(value = "/webuser/selectListUserMarketing.do") + public ModelAndView selectListUserMarketing(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { + log.debug("WebUserController selectListUserMarketing START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectListUserMarketing(paramMap); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + log.debug("WebUserController selectListUserMarketing END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 리스트 조회 - 마케팅 푸시 (AJAX) + */ + @RequestMapping(value = "/webuser/selectListUserMarketingPush.do") + public ModelAndView selectListUserMarketingPush(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { + log.debug("WebUserController selectListUserMarketingPush START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectListUserMarketingPush(paramMap); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + log.debug("WebUserController selectListUserMarketingPush END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 엑셀 다운로드 + */ + @RequestMapping(value = "/webuser/downloadUserExcel.do") + public ModelAndView downloadUserExcel(HttpSession session, HttpServletRequest request, HttpServletResponse response, + @RequestParam(value = "file", required = false) MultipartFile file, Model model) { + log.debug("WebUserController downloadUserExcel START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + List> selectListReport = new ArrayList>(); + Map map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webUserService.selectListUserExcel(paramMap); + map.put("selectListUser", selectListReport); + map.put("name", "user"); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + log.debug("WebUserController downloadUserExcel END"); + return new ModelAndView(new WebUserView(), "map", map); + } + + /** + * 고객 신체정보 리스트 조회 (AJAX) + */ + @RequestMapping(value = "/webuser/selectUserPhysicalList.do") + public ModelAndView selectUserPhysicalList(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { + log.debug("WebUserController selectUserPhysicalList START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectUserPhysicalList(paramMap); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + log.debug("WebUserController selectUserPhysicalList END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 신체정보 상세 조회 (AJAX) + */ + @RequestMapping(value = "/webuser/selectUserPhysical.do") + public ModelAndView selectUserPhysical(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { + log.debug("WebUserController selectUserPhysical START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.selectUserPhysical(paramMap); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + } + log.debug("WebUserController selectUserPhysical END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 신체정보 수정 (AJAX) + */ + @RequestMapping(value = "/webuser/updateUserPhysical.do") + public ModelAndView updateUserPhysical(HttpSession session, HttpServletRequest request, + HttpServletResponse response, MultipartHttpServletRequest file) { + log.debug("WebUserController updateUserPhysical START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + HashMap map = new HashMap(); + StringBuffer errorMsg = new StringBuffer(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserService.updateUserPhysical(paramMap); + } catch (Exception e) { + e.printStackTrace(); + errorMsg.append(e); + } finally { + if (Constants.OK == map.get("msgCode")) { + } else { + map.put("msgCode", Constants.FAIL); + map.put("success", false); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + } + } + logHistoryService.save("고객 신체정보 수정", "고객 신체정보 수정", paramMap, map, String.valueOf(errorMsg)); + } + log.debug("WebUserController updateUserPhysical END"); + return HttpUtil.makeHashToJsonModelAndView(map); + } + + /** + * 고객 신체정보 엑셀 다운로드 + */ + @RequestMapping(value = "/webuser/downloadPhysicalExcel.do") + public ModelAndView downloadPhysicalExcel(HttpSession session, HttpServletRequest request, + HttpServletResponse response, @RequestParam(value = "file", required = false) MultipartFile file, + Model model) { + log.debug("WebUserController downloadPhysicalExcel START"); + HashMap paramMap = HttpUtil.getParameterMap(request); + List> selectListReport = new ArrayList>(); + Map map = new HashMap(); + try { + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webUserService.selectUserPhysicalListExcel(paramMap); + map.put("selectListUserPhysical", selectListReport); + map.put("name", "userPhysical"); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + log.debug("WebUserController downloadPhysicalExcel END"); + return new ModelAndView(new WebUserPhysicalView(), "map", map); + } } diff --git a/src/main/java/com/madeu/controller/web/webuserconsultingchart/WebUserConsultingChartController.java b/src/main/java/com/madeu/controller/web/webuserconsultingchart/WebUserConsultingChartController.java index 845c443..27fc500 100644 --- a/src/main/java/com/madeu/controller/web/webuserconsultingchart/WebUserConsultingChartController.java +++ b/src/main/java/com/madeu/controller/web/webuserconsultingchart/WebUserConsultingChartController.java @@ -15,7 +15,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuserconsultingchart.WebUserConsultingChartService; import com.madeu.util.HttpUtil; @@ -29,7 +28,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebUserConsultingChartController extends ManagerDraftAction{ +public class WebUserConsultingChartController{ @Autowired private WebUserConsultingChartService webUserConsultingChartService; @@ -52,19 +51,14 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserConsultingChartService.selectListUserConsultingChartIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserConsultingChartService.selectListUserConsultingChartIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -89,13 +83,8 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserConsultingChartService.selectListUserConsultingChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserConsultingChartService.selectListUserConsultingChart(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -131,13 +120,8 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserConsultingChartService.selectUserConsultingChartList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserConsultingChartService.selectUserConsultingChartList(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -179,15 +163,10 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webUserConsultingChartService.selectListUserConsultingChartExcel(paramMap); - map.put("selectListUserConsultingChart", selectListReport); - map.put("name", "userConsultingChart"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webUserConsultingChartService.selectListUserConsultingChartExcel(paramMap); + map.put("selectListUserConsultingChart", selectListReport); + map.put("name", "userConsultingChart"); } catch(Exception e){ e.printStackTrace(); @@ -212,13 +191,8 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserConsultingChartService.selectUserConsultingChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserConsultingChartService.selectUserConsultingChart(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -255,19 +229,14 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserConsultingChartService.updateUserConsultingChartIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserConsultingChartService.updateUserConsultingChartIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -294,15 +263,10 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserConsultingChartService.updateUserConsultingChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserConsultingChartService.updateUserConsultingChart(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webuserinquiry/WebUserInquiryController.java b/src/main/java/com/madeu/controller/web/webuserinquiry/WebUserInquiryController.java index da928db..eb2146e 100644 --- a/src/main/java/com/madeu/controller/web/webuserinquiry/WebUserInquiryController.java +++ b/src/main/java/com/madeu/controller/web/webuserinquiry/WebUserInquiryController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webuserinquiry; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuserinquiry.WebUserInquiryService; import com.madeu.util.HttpUtil; @@ -20,7 +19,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebUserInquiryController extends ManagerDraftAction { +public class WebUserInquiryController { @Autowired private WebUserInquiryService webUserInquiryService; @@ -43,19 +42,14 @@ public class WebUserInquiryController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserInquiryService.selectListUserInquiryIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserInquiryService.selectListUserInquiryIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -86,13 +80,8 @@ public class WebUserInquiryController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserInquiryService.selectListAppUserInquiry(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserInquiryService.selectListAppUserInquiry(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -129,13 +118,8 @@ public class WebUserInquiryController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserInquiryService.selectAppUserInquiry(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserInquiryService.selectAppUserInquiry(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -174,15 +158,10 @@ public class WebUserInquiryController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserInquiryService.insertAppUserInquiry(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserInquiryService.insertAppUserInquiry(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -223,16 +202,11 @@ public class WebUserInquiryController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserInquiryService.updateAppUserInquiry(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserInquiryService.updateAppUserInquiry(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webusermedicalchart/WebUserMedicalChartController.java b/src/main/java/com/madeu/controller/web/webusermedicalchart/WebUserMedicalChartController.java index 174eeec..b34c65a 100644 --- a/src/main/java/com/madeu/controller/web/webusermedicalchart/WebUserMedicalChartController.java +++ b/src/main/java/com/madeu/controller/web/webusermedicalchart/WebUserMedicalChartController.java @@ -15,7 +15,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webusermedicalchart.WebUserMedicalChartService; import com.madeu.util.HttpUtil; @@ -29,7 +28,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebUserMedicalChartController extends ManagerDraftAction{ +public class WebUserMedicalChartController{ @Autowired private WebUserMedicalChartService webUserMedicalChartService; @@ -52,19 +51,14 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserMedicalChartService.selectListUserMedicalChartIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserMedicalChartService.selectListUserMedicalChartIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -89,13 +83,8 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserMedicalChartService.selectListUserMedicalChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserMedicalChartService.selectListUserMedicalChart(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -136,15 +125,10 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webUserMedicalChartService.selectListUserMedicalChartExcel(paramMap); - map.put("selectListUserMedicalChart", selectListReport); - map.put("name", "userMedicalChart"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webUserMedicalChartService.selectListUserMedicalChartExcel(paramMap); + map.put("selectListUserMedicalChart", selectListReport); + map.put("name", "userMedicalChart"); } catch(Exception e){ e.printStackTrace(); @@ -169,13 +153,8 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserMedicalChartService.selectUserMedicalChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserMedicalChartService.selectUserMedicalChart(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -211,13 +190,8 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserMedicalChartService.selectUserMedicalChartList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserMedicalChartService.selectUserMedicalChartList(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -254,19 +228,14 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserMedicalChartService.selectListUserMedicalChartIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserMedicalChartService.selectListUserMedicalChartIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -293,15 +262,10 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserMedicalChartService.updateUserMedicalChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserMedicalChartService.updateUserMedicalChart(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webuseroriginalchart/WebUserOriginalChartController.java b/src/main/java/com/madeu/controller/web/webuseroriginalchart/WebUserOriginalChartController.java index ff2cd66..c672d42 100644 --- a/src/main/java/com/madeu/controller/web/webuseroriginalchart/WebUserOriginalChartController.java +++ b/src/main/java/com/madeu/controller/web/webuseroriginalchart/WebUserOriginalChartController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webuseroriginalchart; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuseroriginalchart.WebUserOriginalChartService; import com.madeu.util.HttpUtil; @@ -27,7 +26,7 @@ import java.util.Map; @Slf4j @Controller -public class WebUserOriginalChartController extends ManagerDraftAction{ +public class WebUserOriginalChartController{ @Autowired private WebUserOriginalChartService webUserOriginalChartService; @@ -50,19 +49,14 @@ public class WebUserOriginalChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserOriginalChartService.selectListUserOriginalChartIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserOriginalChartService.selectListUserOriginalChartIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -87,13 +81,8 @@ public class WebUserOriginalChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserOriginalChartService.selectListUserOriginalChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserOriginalChartService.selectListUserOriginalChart(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -130,13 +119,8 @@ public class WebUserOriginalChartController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserOriginalChartService.selectUserOriginalChart(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserOriginalChartService.selectUserOriginalChart(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webuserpushhistory/WebUserPushHistoryController.java b/src/main/java/com/madeu/controller/web/webuserpushhistory/WebUserPushHistoryController.java index 0b95978..0d442c0 100644 --- a/src/main/java/com/madeu/controller/web/webuserpushhistory/WebUserPushHistoryController.java +++ b/src/main/java/com/madeu/controller/web/webuserpushhistory/WebUserPushHistoryController.java @@ -14,7 +14,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuserpushhistory.WebUserPushHistoryService; import com.madeu.util.HttpUtil; @@ -28,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebUserPushHistoryController extends ManagerDraftAction{ +public class WebUserPushHistoryController{ @Autowired private WebUserPushHistoryService webUserPushHistoryService; @@ -51,19 +50,14 @@ public class WebUserPushHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserPushHistoryService.selectListUserPushHistoryIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserPushHistoryService.selectListUserPushHistoryIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -88,13 +82,8 @@ public class WebUserPushHistoryController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserPushHistoryService.selectListUserPushHistory(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webUserPushHistoryService.selectListUserPushHistory(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -134,15 +123,10 @@ public class WebUserPushHistoryController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webUserPushHistoryService.selectListUserPushHistoryExcel(paramMap); - map.put("selectListUserPushHistory", selectListReport); - map.put("name", "userpushhistory"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webUserPushHistoryService.selectListUserPushHistoryExcel(paramMap); + map.put("selectListUserPushHistory", selectListReport); + map.put("name", "userpushhistory"); } catch(Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webvacation/WebVacationController.java b/src/main/java/com/madeu/controller/web/webvacation/WebVacationController.java index 0778982..f5f0ae7 100644 --- a/src/main/java/com/madeu/controller/web/webvacation/WebVacationController.java +++ b/src/main/java/com/madeu/controller/web/webvacation/WebVacationController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webvacation.WebVacationService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebVacationController extends ManagerDraftAction{ +public class WebVacationController{ @Autowired private WebVacationService webVacationService; @@ -46,13 +45,8 @@ public class WebVacationController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationService.selectListVacationOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationService.selectListVacationOption(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -89,13 +83,8 @@ public class WebVacationController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationService.selectListVacation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationService.selectListVacation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -132,13 +121,8 @@ public class WebVacationController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationService.selectVacation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationService.selectVacation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -177,15 +161,10 @@ public class WebVacationController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationService.insertVacation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationService.insertVacation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -226,15 +205,10 @@ public class WebVacationController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationService.updateVacation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationService.updateVacation(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -276,15 +250,10 @@ public class WebVacationController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationService.deleteVacation(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationService.deleteVacation(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webvacationmanagement/WebVacationManagementController.java b/src/main/java/com/madeu/controller/web/webvacationmanagement/WebVacationManagementController.java index aea6181..26bc22f 100644 --- a/src/main/java/com/madeu/controller/web/webvacationmanagement/WebVacationManagementController.java +++ b/src/main/java/com/madeu/controller/web/webvacationmanagement/WebVacationManagementController.java @@ -22,7 +22,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webvacationmanagement.WebVacationManagementService; import com.madeu.util.HttpUtil; @@ -36,7 +35,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebVacationManagementController extends ManagerDraftAction{ +public class WebVacationManagementController{ @Autowired ResourceLoader resourceLoader; @@ -62,13 +61,8 @@ public class WebVacationManagementController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.selectListVacationManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.selectListVacationManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -109,15 +103,10 @@ public class WebVacationManagementController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webVacationManagementService.selectListVacationManagementExcel(paramMap); - map.put("selectListVacationManagement", selectListReport); - map.put("name", "vacationManagement"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webVacationManagementService.selectListVacationManagementExcel(paramMap); + map.put("selectListVacationManagement", selectListReport); + map.put("name", "vacationManagement"); } catch(Exception e){ e.printStackTrace(); @@ -146,20 +135,15 @@ public class WebVacationManagementController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - additionalList = webVacationManagementService.selectListMemberExcel(paramMap); - String fileName = String.valueOf(paramMap.get("fileName")); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + additionalList = webVacationManagementService.selectListMemberExcel(paramMap); + String fileName = String.valueOf(paramMap.get("fileName")); - Resource resource = resourceLoader.getResource("classpath:static/sample/"+ fileName); - File file = resource.getFile(); - map.put("additionalList", additionalList); - map.put("file", file); - map.put("name", "vacationManagementInsertForm"); - } + Resource resource = resourceLoader.getResource("classpath:static/sample/"+ fileName); + File file = resource.getFile(); + map.put("additionalList", additionalList); + map.put("file", file); + map.put("name", "vacationManagementInsertForm"); } catch(Exception e){ e.printStackTrace(); @@ -184,19 +168,14 @@ public class WebVacationManagementController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.updateVacationManagementIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.updateVacationManagementIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -221,13 +200,8 @@ public class WebVacationManagementController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.selectVacationManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.selectVacationManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -264,13 +238,8 @@ public class WebVacationManagementController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.selectVacationManagementLeftDays(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.selectVacationManagementLeftDays(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -306,13 +275,8 @@ public class WebVacationManagementController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.selectVacationManagementDays(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.selectVacationManagementDays(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -351,15 +315,10 @@ public class WebVacationManagementController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.insertVacationManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.insertVacationManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -400,15 +359,10 @@ public class WebVacationManagementController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.insertVacationManagementExcel(paramMap,file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.insertVacationManagementExcel(paramMap,file); } catch (Exception e) { e.printStackTrace(); @@ -449,15 +403,10 @@ public class WebVacationManagementController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.updateVacationManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.updateVacationManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -497,15 +446,10 @@ public class WebVacationManagementController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webVacationManagementService.deleteVacationManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webVacationManagementService.deleteVacationManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -547,15 +491,10 @@ public class WebVacationManagementController extends ManagerDraftAction{ Map map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webVacationManagementService.downloadVacationManagementDetailExcel(paramMap); - map.put("selectListVacationManagement", selectListReport); - map.put("name", "vacationManagement"); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + selectListReport = webVacationManagementService.downloadVacationManagementDetailExcel(paramMap); + map.put("selectListVacationManagement", selectListReport); + map.put("name", "vacationManagement"); } catch(Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webwork/WebWorkController.java b/src/main/java/com/madeu/controller/web/webwork/WebWorkController.java index 426ed84..d982646 100644 --- a/src/main/java/com/madeu/controller/web/webwork/WebWorkController.java +++ b/src/main/java/com/madeu/controller/web/webwork/WebWorkController.java @@ -10,7 +10,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webwork.WebWorkService; import com.madeu.util.HttpUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class WebWorkController extends ManagerDraftAction{ +public class WebWorkController{ @Autowired private WebWorkService webWorkService; @@ -46,19 +45,14 @@ public class WebWorkController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webWorkService.selectListWorkIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webWorkService.selectListWorkIntro(paramMap); + + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -83,13 +77,8 @@ public class WebWorkController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webWorkService.selectListWork(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webWorkService.selectListWork(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -126,13 +115,8 @@ public class WebWorkController extends ManagerDraftAction{ HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webWorkService.selectWork(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webWorkService.selectWork(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -171,15 +155,10 @@ public class WebWorkController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webWorkService.insertWork(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webWorkService.insertWork(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -220,15 +199,10 @@ public class WebWorkController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webWorkService.updateWork(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webWorkService.updateWork(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -270,15 +244,10 @@ public class WebWorkController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webWorkService.deleteWork(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webWorkService.deleteWork(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/controller/web/webyoutube/WebYouTubeController.java b/src/main/java/com/madeu/controller/web/webyoutube/WebYouTubeController.java index 0c8a76a..be3bb9e 100644 --- a/src/main/java/com/madeu/controller/web/webyoutube/WebYouTubeController.java +++ b/src/main/java/com/madeu/controller/web/webyoutube/WebYouTubeController.java @@ -1,7 +1,6 @@ package com.madeu.controller.web.webyoutube; import com.madeu.constants.Constants; -import com.madeu.init.ManagerDraftAction; import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webyoutube.WebYouTubeService; import com.madeu.util.HttpUtil; @@ -21,7 +20,7 @@ import java.util.HashMap; @Slf4j @Controller -public class WebYouTubeController extends ManagerDraftAction { +public class WebYouTubeController { @Autowired private WebYouTubeService webYouTubeService; @@ -44,19 +43,14 @@ public class WebYouTubeController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webYouTubeService.selectListWebYouTubeIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webYouTubeService.selectListWebYouTubeIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -81,13 +75,8 @@ public class WebYouTubeController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webYouTubeService.selectListWebYouTube(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webYouTubeService.selectListWebYouTube(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -124,13 +113,8 @@ public class WebYouTubeController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webYouTubeService.selectWebYouTube(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webYouTubeService.selectWebYouTube(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -167,19 +151,14 @@ public class WebYouTubeController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webYouTubeService.insertWebYouTubeIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webYouTubeService.insertWebYouTubeIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -206,15 +185,10 @@ public class WebYouTubeController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webYouTubeService.insertWebYouTube(paramMap,file, file2); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webYouTubeService.insertWebYouTube(paramMap,file, file2); } catch (Exception e) { e.printStackTrace(); @@ -253,19 +227,14 @@ public class WebYouTubeController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webYouTubeService.updateWebYouTubeIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webYouTubeService.updateWebYouTubeIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -292,15 +261,10 @@ public class WebYouTubeController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webYouTubeService.updateWebYouTube(paramMap,file, file2); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webYouTubeService.updateWebYouTube(paramMap,file, file2); } catch (Exception e) { e.printStackTrace(); @@ -342,15 +306,10 @@ public class WebYouTubeController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webYouTubeService.deleteWebYouTube(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = webYouTubeService.deleteWebYouTube(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/crm/appointment/ctrl/AppointmentController.java b/src/main/java/com/madeu/crm/appointment/ctrl/AppointmentController.java index 144af1f..f6704e0 100644 --- a/src/main/java/com/madeu/crm/appointment/ctrl/AppointmentController.java +++ b/src/main/java/com/madeu/crm/appointment/ctrl/AppointmentController.java @@ -12,7 +12,6 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.crm.appointment.service.AppointmentService; import com.madeu.crm.contentsBbs.service.ContentsBbsService; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webloghistory.WebLogHistoryService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -24,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class AppointmentController extends ManagerDraftAction { +public class AppointmentController { @Autowired private AppointmentService appointmentService; @@ -47,18 +46,13 @@ public class AppointmentController extends ManagerDraftAction { HashMap map = null; try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = appointmentService.moveAppointmentList(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = appointmentService.moveAppointmentList(paramMap); + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -83,13 +77,8 @@ public class AppointmentController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = appointmentService.getAppointmentList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = appointmentService.getAppointmentList(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/crm/callLog/ctrl/CallLogController.java b/src/main/java/com/madeu/crm/callLog/ctrl/CallLogController.java index 602b79a..0b16dc6 100644 --- a/src/main/java/com/madeu/crm/callLog/ctrl/CallLogController.java +++ b/src/main/java/com/madeu/crm/callLog/ctrl/CallLogController.java @@ -14,7 +14,6 @@ import com.madeu.crm.callLog.dto.CallLogSearchDTO; import com.madeu.crm.callLog.dto.CallMemoDTO; import com.madeu.crm.callLog.service.CallLogService; import com.madeu.crm.callLog.service.GoodArsService; -import com.madeu.init.ManagerDraftAction; import com.madeu.util.HttpUtil; import jakarta.servlet.http.HttpServletRequest; @@ -25,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller @RequestMapping("/callLog") -public class CallLogController extends ManagerDraftAction { +public class CallLogController { @Autowired private CallLogService callLogService; @@ -45,17 +44,13 @@ public class CallLogController extends ManagerDraftAction { HashMap map = null; try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = callLogService.moveCallLogList(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = callLogService.moveCallLogList(paramMap); + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -76,12 +71,8 @@ public class CallLogController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - searchDTO.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); - map = callLogService.getCallLogList(searchDTO); - } + searchDTO.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + map = callLogService.getCallLogList(searchDTO); } catch (Exception e) { e.printStackTrace(); map.put("msgCode", Constants.FAIL); @@ -110,12 +101,8 @@ public class CallLogController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - memoDTO.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); - map = callLogService.saveCallMemo(memoDTO); - } + memoDTO.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + map = callLogService.saveCallMemo(memoDTO); } catch (Exception e) { e.printStackTrace(); map.put("msgCode", Constants.FAIL); @@ -137,15 +124,11 @@ public class CallLogController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - String loginCid = String.valueOf(paramMap.get("loginCid")); - String sendCid = String.valueOf(paramMap.get("sendCid")); - String userCid = String.valueOf(paramMap.get("userCid")); + String loginCid = String.valueOf(paramMap.get("loginCid")); + String sendCid = String.valueOf(paramMap.get("sendCid")); + String userCid = String.valueOf(paramMap.get("userCid")); - map = goodArsService.makeOutboundCall(loginCid, sendCid, userCid); - } + map = goodArsService.makeOutboundCall(loginCid, sendCid, userCid); } catch (Exception e) { e.printStackTrace(); map.put("success", false); @@ -167,14 +150,10 @@ public class CallLogController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - String loginCid = String.valueOf(paramMap.get("loginCid")); - String pushCid = String.valueOf(paramMap.get("pushCid")); + String loginCid = String.valueOf(paramMap.get("loginCid")); + String pushCid = String.valueOf(paramMap.get("pushCid")); - map = goodArsService.pushCall(loginCid, pushCid); - } + map = goodArsService.pushCall(loginCid, pushCid); } catch (Exception e) { e.printStackTrace(); map.put("success", false); @@ -196,14 +175,10 @@ public class CallLogController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - String recordNo = String.valueOf(paramMap.get("recordNo")); - String url = goodArsService.getRecordFileUrl(recordNo); - map.put("success", true); - map.put("recordUrl", url); - } + String recordNo = String.valueOf(paramMap.get("recordNo")); + String url = goodArsService.getRecordFileUrl(recordNo); + map.put("success", true); + map.put("recordUrl", url); } catch (Exception e) { e.printStackTrace(); map.put("success", false); diff --git a/src/main/java/com/madeu/crm/categoryManagement/ctrl/CategoryManagementController.java b/src/main/java/com/madeu/crm/categoryManagement/ctrl/CategoryManagementController.java index 74c04fe..1d2cfcb 100644 --- a/src/main/java/com/madeu/crm/categoryManagement/ctrl/CategoryManagementController.java +++ b/src/main/java/com/madeu/crm/categoryManagement/ctrl/CategoryManagementController.java @@ -11,7 +11,6 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.crm.categoryManagement.service.CategoryManagementService; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webloghistory.WebLogHistoryService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class CategoryManagementController extends ManagerDraftAction { +public class CategoryManagementController { @Autowired private CategoryManagementService categoryManagementService; @@ -46,19 +45,14 @@ public class CategoryManagementController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = categoryManagementService.moveCategoryManagementList(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = categoryManagementService.moveCategoryManagementList(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -85,13 +79,8 @@ public class CategoryManagementController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = categoryManagementService.getCategoryManagementList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = categoryManagementService.getCategoryManagementList(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -127,13 +116,8 @@ public class CategoryManagementController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = categoryManagementService.getCategoryManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = categoryManagementService.getCategoryManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -170,15 +154,10 @@ public class CategoryManagementController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = categoryManagementService.putCategoryManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = categoryManagementService.putCategoryManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -245,15 +224,10 @@ public class CategoryManagementController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = categoryManagementService.modCategoryManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = categoryManagementService.modCategoryManagement(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -319,14 +293,9 @@ public class CategoryManagementController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = categoryManagementService.delCategoryManagement(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = categoryManagementService.delCategoryManagement(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/crm/contentsBbs/ctrl/ContentsBbsController.java b/src/main/java/com/madeu/crm/contentsBbs/ctrl/ContentsBbsController.java index 3d74b30..d94cef7 100644 --- a/src/main/java/com/madeu/crm/contentsBbs/ctrl/ContentsBbsController.java +++ b/src/main/java/com/madeu/crm/contentsBbs/ctrl/ContentsBbsController.java @@ -11,7 +11,6 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.crm.contentsBbs.service.ContentsBbsService; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webloghistory.WebLogHistoryService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class ContentsBbsController extends ManagerDraftAction { +public class ContentsBbsController { @Autowired private ContentsBbsService contentsBbsService; @@ -47,18 +46,14 @@ public class ContentsBbsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.selectListWebTreatmentPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.selectListWebTreatmentPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -86,12 +81,8 @@ public class ContentsBbsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.getContentsBbsList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.getContentsBbsList(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -125,11 +116,7 @@ public class ContentsBbsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - map = contentsBbsService.getCategoryList(paramMap); - } + map = contentsBbsService.getCategoryList(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -163,12 +150,8 @@ public class ContentsBbsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.getContentsBbs(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.getContentsBbs(paramMap); } catch (Exception e) { e.printStackTrace(); return null; @@ -203,19 +186,15 @@ public class ContentsBbsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.insertWebTreatmentPetitIntro(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.insertWebTreatmentPetitIntro(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categorylist", map.get("categorylist")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -246,14 +225,10 @@ public class ContentsBbsController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.putContentsBbs(paramMap, file, content_file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.putContentsBbs(paramMap, file, content_file); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -314,20 +289,16 @@ public class ContentsBbsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.moveContentsBbs(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.moveContentsBbs(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categoryDivCd", paramMap.get("categoryDivCd")); - model.addAttribute("category", map.get("category")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); + model.addAttribute("categoryDivCd", paramMap.get("categoryDivCd")); + model.addAttribute("category", map.get("category")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -358,14 +329,10 @@ public class ContentsBbsController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.modContentsBbs(paramMap, file, content_file); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.modContentsBbs(paramMap, file, content_file); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -428,14 +395,10 @@ public class ContentsBbsController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.delContentsBbs(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.delContentsBbs(paramMap); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -499,13 +462,9 @@ public class ContentsBbsController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.updateContentsBbsOrdNo(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.updateContentsBbsOrdNo(paramMap); } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); @@ -567,12 +526,8 @@ public class ContentsBbsController extends ManagerDraftAction { HashMap map = new HashMap(); try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = contentsBbsService.selectListTreatmentOption(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = contentsBbsService.selectListTreatmentOption(paramMap); } catch (Exception e) { e.printStackTrace(); return null; diff --git a/src/main/java/com/madeu/crm/feedbackReception/ctrl/FeedbackReceptionController.java b/src/main/java/com/madeu/crm/feedbackReception/ctrl/FeedbackReceptionController.java index a7ccdb6..eac13ad 100644 --- a/src/main/java/com/madeu/crm/feedbackReception/ctrl/FeedbackReceptionController.java +++ b/src/main/java/com/madeu/crm/feedbackReception/ctrl/FeedbackReceptionController.java @@ -11,7 +11,6 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.crm.feedbackReception.service.FeedbackReceptionService; -import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webloghistory.WebLogHistoryService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -23,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller -public class FeedbackReceptionController extends ManagerDraftAction { +public class FeedbackReceptionController { @Autowired private FeedbackReceptionService feedbackReceptionService; @@ -46,19 +45,14 @@ public class FeedbackReceptionController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return "/web/login/logout"; - } - else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = feedbackReceptionService.moveFeedbackReceptionList(paramMap); + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = feedbackReceptionService.moveFeedbackReceptionList(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); @@ -85,13 +79,8 @@ public class FeedbackReceptionController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = feedbackReceptionService.getFeedbackReceptionList(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = feedbackReceptionService.getFeedbackReceptionList(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -127,13 +116,8 @@ public class FeedbackReceptionController extends ManagerDraftAction { HashMap map = new HashMap(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = feedbackReceptionService.getFeedbackReception(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = feedbackReceptionService.getFeedbackReception(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -170,15 +154,10 @@ public class FeedbackReceptionController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = feedbackReceptionService.putFeedbackReception(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = feedbackReceptionService.putFeedbackReception(paramMap); } catch (Exception e) { e.printStackTrace(); @@ -245,15 +224,10 @@ public class FeedbackReceptionController extends ManagerDraftAction { StringBuffer errorMsg = new StringBuffer(); try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = feedbackReceptionService.modFeedbackReception(paramMap); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); + paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); + map = feedbackReceptionService.modFeedbackReception(paramMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/madeu/crm/settings/markdown/ctrl/MarkdownViewerController.java b/src/main/java/com/madeu/crm/settings/markdown/ctrl/MarkdownViewerController.java new file mode 100644 index 0000000..4a2ee0c --- /dev/null +++ b/src/main/java/com/madeu/crm/settings/markdown/ctrl/MarkdownViewerController.java @@ -0,0 +1,16 @@ +package com.madeu.crm.settings.markdown.ctrl; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +@Slf4j +@RestController +public class MarkdownViewerController { + + @RequestMapping(value = "/markdown/moveMarkdownViewer.do") + public ModelAndView moveMarkdownViewer() throws Exception { + return new ModelAndView("/crm/settings/markdown/markdownViewer"); + } +} diff --git a/src/main/java/com/madeu/crm/smsTemplate/ctrl/SmsTemplateController.java b/src/main/java/com/madeu/crm/smsTemplate/ctrl/SmsTemplateController.java index d15a787..07e2bf7 100644 --- a/src/main/java/com/madeu/crm/smsTemplate/ctrl/SmsTemplateController.java +++ b/src/main/java/com/madeu/crm/smsTemplate/ctrl/SmsTemplateController.java @@ -13,7 +13,6 @@ import com.madeu.constants.Constants; import com.madeu.crm.smsTemplate.dto.SmsTemplateDTO; import com.madeu.crm.smsTemplate.dto.SmsTemplateSearchDTO; import com.madeu.crm.smsTemplate.service.SmsTemplateService; -import com.madeu.init.ManagerDraftAction; import com.madeu.util.HttpUtil; import jakarta.servlet.http.HttpServletRequest; @@ -24,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Controller @RequestMapping("/smsTemplate") -public class SmsTemplateController extends ManagerDraftAction { +public class SmsTemplateController { @Autowired private SmsTemplateService smsTemplateService; @@ -41,17 +40,13 @@ public class SmsTemplateController extends ManagerDraftAction { HashMap map = null; try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = smsTemplateService.moveSmsTemplateList(paramMap); - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } + paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); + map = smsTemplateService.moveSmsTemplateList(paramMap); + model.addAttribute("selectUseYn", map.get("selectUseYn")); + model.addAttribute("insertUseYn", map.get("insertUseYn")); + model.addAttribute("updateUseYn", map.get("updateUseYn")); + model.addAttribute("deleteUseYn", map.get("deleteUseYn")); + model.addAttribute("downloadUseYn", map.get("downloadUseYn")); } catch (Exception e) { e.printStackTrace(); return "/web/login/logout"; @@ -72,12 +67,8 @@ public class SmsTemplateController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - searchDTO.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); - map = smsTemplateService.getSmsTemplateList(searchDTO); - } + searchDTO.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + map = smsTemplateService.getSmsTemplateList(searchDTO); } catch (Exception e) { e.printStackTrace(); map.put("msgCode", Constants.FAIL); @@ -106,12 +97,8 @@ public class SmsTemplateController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); - map = smsTemplateService.getSmsTemplate(dto); - } + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + map = smsTemplateService.getSmsTemplate(dto); } catch (Exception e) { e.printStackTrace(); map.put("msgCode", Constants.FAIL); @@ -132,12 +119,8 @@ public class SmsTemplateController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); - map = smsTemplateService.putSmsTemplate(dto); - } + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + map = smsTemplateService.putSmsTemplate(dto); } catch (Exception e) { e.printStackTrace(); map.put("msgCode", Constants.FAIL); @@ -158,12 +141,8 @@ public class SmsTemplateController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); - map = smsTemplateService.modSmsTemplate(dto); - } + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + map = smsTemplateService.modSmsTemplate(dto); } catch (Exception e) { e.printStackTrace(); map.put("msgCode", Constants.FAIL); @@ -184,12 +163,8 @@ public class SmsTemplateController extends ManagerDraftAction { HashMap map = new HashMap<>(); try { - if (!webCheckLogin(session)) { - return null; - } else { - dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); - map = smsTemplateService.delSmsTemplate(dto); - } + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + map = smsTemplateService.delSmsTemplate(dto); } catch (Exception e) { e.printStackTrace(); map.put("msgCode", Constants.FAIL); diff --git a/src/main/java/com/madeu/interceptor/WebLoginInterceptor.java b/src/main/java/com/madeu/interceptor/WebLoginInterceptor.java index eb4302f..567b25d 100644 --- a/src/main/java/com/madeu/interceptor/WebLoginInterceptor.java +++ b/src/main/java/com/madeu/interceptor/WebLoginInterceptor.java @@ -33,8 +33,7 @@ public class WebLoginInterceptor implements HandlerInterceptor { HttpSession session = request.getSession(false); if (session == null) { - response.sendRedirect("/web/login/logout"); - return false; + return handleSessionExpired(request, response); } String loginMemberId = (String) session.getAttribute("loginMemberId"); @@ -48,8 +47,7 @@ public class WebLoginInterceptor implements HandlerInterceptor { log.debug("======================== USER CHECKLOGIN END ==========================="); if (loginMemberId == null || loginMemberId.isEmpty()) { - response.sendRedirect("/web/login/logout"); - return false; + return handleSessionExpired(request, response); } // 권한 체크 시작 @@ -108,6 +106,39 @@ public class WebLoginInterceptor implements HandlerInterceptor { return true; } + /** + * 세션 만료 시 AJAX / 페이지 요청을 구분하여 처리 + */ + private boolean handleSessionExpired(HttpServletRequest request, + HttpServletResponse response) throws Exception { + if (isAjaxRequest(request)) { + // AJAX 요청 → 401 + JSON 응답 + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.setContentType("application/json;charset=UTF-8"); + response.getWriter().write( + "{\"msgCode\":\"SESSION_EXPIRED\"," + + "\"msgDesc\":\"세션이 만료되었습니다. 다시 로그인해주세요.\"," + + "\"success\":false}"); + } else { + // 일반 페이지 요청 → 로그인 페이지로 리다이렉트 + response.sendRedirect("/web/login/logout"); + } + return false; + } + + /** + * AJAX 요청 여부 판별 + */ + private boolean isAjaxRequest(HttpServletRequest request) { + String xRequestedWith = request.getHeader("X-Requested-With"); + String contentType = request.getContentType(); + String accept = request.getHeader("Accept"); + + return "XMLHttpRequest".equals(xRequestedWith) + || (contentType != null && contentType.contains("application/json")) + || (accept != null && accept.contains("application/json")); + } + @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { diff --git a/src/main/resources/templates/crm/settings/markdown/markdownViewer.html b/src/main/resources/templates/crm/settings/markdown/markdownViewer.html new file mode 100644 index 0000000..4b4ab0e --- /dev/null +++ b/src/main/resources/templates/crm/settings/markdown/markdownViewer.html @@ -0,0 +1,473 @@ + + + + + + + + + + + + + +
+

Markdown 뷰어

+ + +
+
📄
+
Markdown 파일을 여기에 드래그 하거나 클릭하세요
+
.md 파일만 지원됩니다
+ +
+ + +
+
+ 📄 + - + - +
+
+ + + + +
+
+ + +
+
+
+ + +
+ 

+        

+    

+
+
+    
+    
+    
+    
+    
+    
+
+    
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/web/include/head.html b/src/main/resources/templates/web/include/head.html
index 2328fa1..fdb0068 100644
--- a/src/main/resources/templates/web/include/head.html
+++ b/src/main/resources/templates/web/include/head.html
@@ -1,107 +1,113 @@
 
-
+
 
-
-
-
-
-
-
+	
+	
+	
+	
+	
+	
 
-
-
-
-
-
-
+	
+	
+	
+	
+	
+	
 
-
-
-
-
-
-
+	
+	
+	
+	
+	
+	
 
-
-
+	
+	
 
-메이드유 CRM
+	메이드유 CRM
 
-
-
-
+	
+	
+	
 
-
-
+	
+	
 
-
-
-
-
-
-
-
-
-
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-
-
+	
+	
 
-
-
-
+	
+	
+	
 
-
-
-
-
-
-
+	
+	
+	
+	
+	
+	
 
-
+	
 
-
-
+	
+	
 
-
-
+	
+	
 
-
-
-
+	
+	
+	
 
-
-
+	
+	
 
-
+	
 
+
 
\ No newline at end of file