diff --git a/src/main/java/kr/xit/framework/biz/cmm/web/XitFrameAnonymousController.java b/src/main/java/kr/xit/framework/biz/cmm/web/XitFrameAnonymousController.java index 28468c0e..c379fc4c 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/web/XitFrameAnonymousController.java +++ b/src/main/java/kr/xit/framework/biz/cmm/web/XitFrameAnonymousController.java @@ -31,7 +31,7 @@ import kr.xit.framework.biz.mng.user.model.XitUserRegMngSearchVO; import kr.xit.framework.biz.mng.user.model.XitUserRegMngVO; import kr.xit.framework.biz.mng.user.service.XitEntUserRegMngService; import kr.xit.framework.biz.mng.user.service.XitGnrUserRegMngService; -import kr.xit.framework.biz.mng.user.service.XitUserRegMngService; +import kr.xit.framework.biz.mng.user.service.UserMgtService; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.constants.FrameworkConstants.TILES_TYPE; import kr.xit.framework.core.constants.FrameworkConstants.USER_SE; @@ -62,7 +62,7 @@ public class XitFrameAnonymousController { @Resource private XitEntUserRegMngService xitEntUserRegMngService; @Resource - private XitUserRegMngService xitUserRegMngService; + private UserMgtService xitUserRegMngService; @Resource private XitFrameUnitService xitFrameUnitService; @Autowired diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuCreateMngMapper.java b/src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuCreateMgtMapper.java similarity index 100% rename from src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuCreateMngMapper.java rename to src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuCreateMgtMapper.java diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuListMngMapper.java b/src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuListMgtMapper.java similarity index 98% rename from src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuListMngMapper.java rename to src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuListMgtMapper.java index f4310eb6..5e3cb4ae 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuListMngMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/mapper/MenuListMgtMapper.java @@ -22,7 +22,7 @@ import org.apache.ibatis.session.RowBounds; * @version 1.0 Copyright(c) XIT All rights reserved. */ @Mapper -public interface MenuListMngMapper { +public interface MenuListMgtMapper { /** * 
메소드 설명: 메뉴목록관리 목록 조회
diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/mapper/ProgramMngMapper.java b/src/main/java/kr/xit/framework/biz/mng/menu/mapper/ProgramMgtMapper.java similarity index 97% rename from src/main/java/kr/xit/framework/biz/mng/menu/mapper/ProgramMngMapper.java rename to src/main/java/kr/xit/framework/biz/mng/menu/mapper/ProgramMgtMapper.java index bfb4da5a..95016390 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/mapper/ProgramMngMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/mapper/ProgramMgtMapper.java @@ -19,7 +19,7 @@ import kr.xit.framework.biz.mng.menu.model.ProgramMngVO; * @version 1.0 Copyright(c) XIT All rights reserved. */ @Mapper -public interface ProgramMngMapper { +public interface ProgramMgtMapper { /** * 
메소드 설명: 프로그램관리 목록 조회
diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/service/MenuCreateMngService.java b/src/main/java/kr/xit/framework/biz/mng/menu/service/MenuCreateMgtService.java similarity index 98% rename from src/main/java/kr/xit/framework/biz/mng/menu/service/MenuCreateMngService.java rename to src/main/java/kr/xit/framework/biz/mng/menu/service/MenuCreateMgtService.java index 7ab93de5..134ce5a1 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/service/MenuCreateMngService.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/service/MenuCreateMgtService.java @@ -17,7 +17,7 @@ import org.apache.ibatis.session.RowBounds; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ -public interface MenuCreateMngService { +public interface MenuCreateMgtService { /** * 
메소드 설명: 메뉴생성관리 목록 조회
diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/service/MenuListMngService.java b/src/main/java/kr/xit/framework/biz/mng/menu/service/MenuListMgtService.java similarity index 98% rename from src/main/java/kr/xit/framework/biz/mng/menu/service/MenuListMngService.java rename to src/main/java/kr/xit/framework/biz/mng/menu/service/MenuListMgtService.java index 572bf514..5fad637d 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/service/MenuListMngService.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/service/MenuListMgtService.java @@ -18,7 +18,7 @@ import org.apache.ibatis.session.RowBounds; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ -public interface MenuListMngService { +public interface MenuListMgtService { /** * 
메소드 설명: 메뉴목록관리 목록 조회
diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/service/ProgramMngService.java b/src/main/java/kr/xit/framework/biz/mng/menu/service/ProgramMgtService.java similarity index 97% rename from src/main/java/kr/xit/framework/biz/mng/menu/service/ProgramMngService.java rename to src/main/java/kr/xit/framework/biz/mng/menu/service/ProgramMgtService.java index 6597c462..efaa2cf4 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/service/ProgramMngService.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/service/ProgramMgtService.java @@ -17,7 +17,7 @@ import kr.xit.framework.biz.mng.menu.model.ProgramMngVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ -public interface ProgramMngService { +public interface ProgramMgtService { /** * 
메소드 설명: 프로그램 목록 조회
diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/MenuCreateMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/MenuCreateMngServiceImpl.java index c542df4d..e37e2385 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/MenuCreateMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/MenuCreateMngServiceImpl.java @@ -7,8 +7,8 @@ import java.util.Map; import javax.annotation.Resource; -import kr.xit.framework.biz.mng.menu.mapper.MenuListMngMapper; -import kr.xit.framework.biz.mng.menu.service.MenuCreateMngService; +import kr.xit.framework.biz.mng.menu.mapper.MenuListMgtMapper; +import kr.xit.framework.biz.mng.menu.service.MenuCreateMgtService; import org.apache.ibatis.session.RowBounds; import org.springframework.stereotype.Service; @@ -19,10 +19,10 @@ import kr.xit.framework.biz.mng.menu.model.MenuCreateMngVO; import kr.xit.framework.core.message.XitMessageSource; @Service -public class MenuCreateMngServiceImpl implements MenuCreateMngService { +public class MenuCreateMngServiceImpl implements MenuCreateMgtService { @Resource - private MenuListMngMapper menuListMngMapper; + private MenuListMgtMapper menuListMngMapper; @Resource private XitFrameCrudService xitFrameCrudService; @Resource(name = "xitMessageSource") diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/MenuListMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/MenuListMngServiceImpl.java index 23087843..8f1ba15c 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/MenuListMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/MenuListMngServiceImpl.java @@ -20,27 +20,27 @@ import egovframework.rte.fdl.excel.EgovExcelService; import kr.xit.framework.biz.cmm.model.XitMenuInfoVO; import kr.xit.framework.biz.cmm.model.ProgrmListVO; import kr.xit.framework.biz.cmm.service.XitFrameCrudService; -import kr.xit.framework.biz.mng.menu.mapper.ProgramMngMapper; +import kr.xit.framework.biz.mng.menu.mapper.ProgramMgtMapper; import kr.xit.framework.biz.mng.menu.model.MenuListMngVO; -import kr.xit.framework.biz.mng.menu.service.MenuListMngService; -import kr.xit.framework.biz.mng.menu.mapper.MenuListMngMapper; +import kr.xit.framework.biz.mng.menu.service.MenuListMgtService; +import kr.xit.framework.biz.mng.menu.mapper.MenuListMgtMapper; import kr.xit.framework.biz.mng.menu.model.MenuListMngSearchVO; import kr.xit.framework.biz.mng.menu.model.ProgramMngVO; -import kr.xit.framework.biz.mng.menu.service.ProgramMngService; +import kr.xit.framework.biz.mng.menu.service.ProgramMgtService; import kr.xit.framework.core.message.XitMessageSource; import kr.xit.framework.core.utils.XitCmmnUtil; @Service -public class MenuListMngServiceImpl implements MenuListMngService { +public class MenuListMngServiceImpl implements MenuListMgtService { private static final Logger logger = LoggerFactory.getLogger(MenuListMngServiceImpl.class); @Resource - private MenuListMngMapper menuListMngMapper; + private MenuListMgtMapper menuListMngMapper; @Resource - private ProgramMngMapper programMngMapper; + private ProgramMgtMapper programMngMapper; @Resource - private ProgramMngService programMngService; + private ProgramMgtService programMngService; @Resource private XitFrameCrudService xitFrameCrudService; @Resource diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/ProgramMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/ProgramMngServiceImpl.java index 42b8e0e0..bc230a23 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/ProgramMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/service/impl/ProgramMngServiceImpl.java @@ -5,24 +5,23 @@ import java.util.Map; import javax.annotation.Resource; -import kr.xit.framework.biz.mng.menu.service.ProgramMngService; +import kr.xit.framework.biz.mng.menu.service.ProgramMgtService; import org.apache.ibatis.session.RowBounds; import org.springframework.stereotype.Service; -import kr.xit.framework.biz.mng.menu.mapper.ProgramMngMapper; +import kr.xit.framework.biz.mng.menu.mapper.ProgramMgtMapper; import kr.xit.framework.biz.mng.menu.model.ProgramMngVO; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.utils.XitCmmnUtil; import kr.xit.framework.support.exception.BizRuntimeException; -import kr.xit.framework.support.util.constants.MessageKey; import lombok.extern.slf4j.Slf4j; @Slf4j @Service -public class ProgramMngServiceImpl implements ProgramMngService { +public class ProgramMngServiceImpl implements ProgramMgtService { @Resource - private ProgramMngMapper programMngMapper; + private ProgramMgtMapper programMngMapper; @Override public List findPrograms(final Map paraMap, final RowBounds rowBounds) { diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/web/MenuCreateMngController.java b/src/main/java/kr/xit/framework/biz/mng/menu/web/MenuCreateMgtController.java similarity index 96% rename from src/main/java/kr/xit/framework/biz/mng/menu/web/MenuCreateMngController.java rename to src/main/java/kr/xit/framework/biz/mng/menu/web/MenuCreateMgtController.java index 248e3769..44401f94 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/web/MenuCreateMngController.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/web/MenuCreateMgtController.java @@ -19,9 +19,8 @@ import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -import kr.xit.framework.biz.mng.menu.model.MenuCreateMngSearchVO; import kr.xit.framework.biz.mng.menu.model.MenuCreateMngVO; -import kr.xit.framework.biz.mng.menu.service.MenuCreateMngService; +import kr.xit.framework.biz.mng.menu.service.MenuCreateMgtService; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.message.XitMessageSource; import kr.xit.framework.core.utils.XitCmmnUtil; @@ -43,10 +42,10 @@ import org.springframework.web.servlet.ModelAndView; @Controller //@RequestMapping(value = "/_mng_/menu/create/") @RequestMapping(value = "/framework/biz/mng/menu") -public class MenuCreateMngController { +public class MenuCreateMgtController { @Resource - private MenuCreateMngService menuCreateMngService; + private MenuCreateMgtService menuCreateMngService; @Autowired private XitBeanValidator beanValidator; @Resource(name = "xitMessageSource") diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/web/MenuListMngController.java b/src/main/java/kr/xit/framework/biz/mng/menu/web/MenuListMgtController.java similarity index 98% rename from src/main/java/kr/xit/framework/biz/mng/menu/web/MenuListMngController.java rename to src/main/java/kr/xit/framework/biz/mng/menu/web/MenuListMgtController.java index 9acfb670..4817b073 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/web/MenuListMngController.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/web/MenuListMgtController.java @@ -24,7 +24,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import kr.xit.framework.biz.mng.menu.model.MenuListMngVO; -import kr.xit.framework.biz.mng.menu.service.MenuListMngService; +import kr.xit.framework.biz.mng.menu.service.MenuListMgtService; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.constants.FrameworkConstants.TILES_TYPE; import kr.xit.framework.core.message.XitMessageSource; @@ -49,12 +49,12 @@ import org.springframework.web.servlet.ModelAndView; @Controller //@RequestMapping(value = "/_mng_/menu/list/") @RequestMapping(value = "/framework/biz/mng/menu/") -public class MenuListMngController { +public class MenuListMgtController { - private static final Logger logger = LoggerFactory.getLogger(MenuListMngController.class); + private static final Logger logger = LoggerFactory.getLogger(MenuListMgtController.class); @Resource - private MenuListMngService menuListMngService; + private MenuListMgtService menuListMngService; @Autowired private XitBeanValidator beanValidator; @Resource(name = "xitMessageSource") diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/web/ProgramMngController.java b/src/main/java/kr/xit/framework/biz/mng/menu/web/ProgramMgtController.java similarity index 94% rename from src/main/java/kr/xit/framework/biz/mng/menu/web/ProgramMngController.java rename to src/main/java/kr/xit/framework/biz/mng/menu/web/ProgramMgtController.java index 26bc5beb..024d7518 100644 --- a/src/main/java/kr/xit/framework/biz/mng/menu/web/ProgramMngController.java +++ b/src/main/java/kr/xit/framework/biz/mng/menu/web/ProgramMgtController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import kr.xit.framework.biz.mng.menu.model.ProgramMngVO; -import kr.xit.framework.biz.mng.menu.service.ProgramMngService; +import kr.xit.framework.biz.mng.menu.service.ProgramMgtService; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.model.ResultResponse; import kr.xit.framework.support.mybatis.MybatisUtils; @@ -37,9 +37,9 @@ import kr.xit.framework.support.util.constants.MessageKey; @Controller //@RequestMapping(value = "/_mng_/menu/program/") @RequestMapping(value = "/framework/biz/mng/menu") -public class ProgramMngController { +public class ProgramMgtController { @Resource - private ProgramMngService programMngService; + private ProgramMgtService programMngService; @Value("#{prop['Globals.Xit.Pagination.PageUnit']}") private int PAGE_UNIT; @@ -62,7 +62,7 @@ public class ProgramMngController { * @return ModelAndView */ @GetMapping(value = "/mngProgramMgtPopup") - public ModelAndView mngProgramMgtPopup(@RequestParam(required = false) String progrmFileNm) { + public ModelAndView mngProgramMgtPopup(final String progrmFileNm) { ModelAndView mav = new ModelAndView(); mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/mngProgramMgtPopup.popup"); diff --git a/src/main/java/kr/xit/framework/biz/mng/user/mapper/XitUserRegMngMapper.java b/src/main/java/kr/xit/framework/biz/mng/user/mapper/XitUserRegMngMapper.java index 42b3e9b1..d0dbe170 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/mapper/XitUserRegMngMapper.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/mapper/XitUserRegMngMapper.java @@ -27,6 +27,7 @@ public interface XitUserRegMngMapper { * 
메소드 설명: 사용자등록관리 목록 조회
*/ List selectUsers(final Map paraMap, final RowBounds rowBounds); + XitUserRegMngVO selectUser(final String userId); /** * 
메소드 설명: 사용자등록관리 목록 총건수 조회
@@ -45,4 +46,6 @@ public interface XitUserRegMngMapper { * @date: 2020. 3. 26. */ public XitUserRegMngVO findView(XitUserRegMngVO vo) throws SQLException; + + } diff --git a/src/main/java/kr/xit/framework/biz/mng/user/service/XitUserRegMngService.java b/src/main/java/kr/xit/framework/biz/mng/user/service/UserMgtService.java similarity index 93% rename from src/main/java/kr/xit/framework/biz/mng/user/service/XitUserRegMngService.java rename to src/main/java/kr/xit/framework/biz/mng/user/service/UserMgtService.java index 52780cf1..2c22d895 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/service/XitUserRegMngService.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/service/UserMgtService.java @@ -18,7 +18,7 @@ import kr.xit.framework.biz.mng.user.model.XitUserRegMngSearchVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ -public interface XitUserRegMngService { +public interface UserMgtService { /** * 
메소드 설명: 사용자등록관리 목록 조회
@@ -27,8 +27,9 @@ public interface XitUserRegMngService { * @author: 박민규 * @date: 2020. 4. 8. */ - public List findUsers(final Map paraMap, final RowBounds rowBounds); - + List findUsers(final Map paraMap, final RowBounds rowBounds); + XitUserRegMngVO findUser(final String userId); + /** * 
메소드 설명: 사용자등록관리 목록 총건수 조회
* @param searchVO diff --git a/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitUserRegMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/user/service/impl/UserMgtServiceImpl.java similarity index 98% rename from src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitUserRegMngServiceImpl.java rename to src/main/java/kr/xit/framework/biz/mng/user/service/impl/UserMgtServiceImpl.java index 828bff0b..4749ba02 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitUserRegMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/service/impl/UserMgtServiceImpl.java @@ -23,13 +23,13 @@ import kr.xit.framework.biz.cmm.model.XitLoginVO; import kr.xit.framework.biz.mng.user.mapper.XitUserRegMngMapper; import kr.xit.framework.biz.mng.user.model.XitUserRegMngSearchVO; import kr.xit.framework.biz.mng.user.model.XitUserRegMngVO; -import kr.xit.framework.biz.mng.user.service.XitUserRegMngService; +import kr.xit.framework.biz.mng.user.service.UserMgtService; import kr.xit.framework.core.message.XitMessageSource; import kr.xit.framework.core.utils.XitCmmnUtil; import kr.xit.framework.core.utils.XitScrtyUtil; @Service -public class XitUserRegMngServiceImpl implements XitUserRegMngService { +public class UserMgtServiceImpl implements UserMgtService { @Resource private XitUserRegMngMapper mapper; @Resource @@ -46,6 +46,11 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { return mapper.selectUsers(paraMap, rowBounds); } + @Override + public XitUserRegMngVO findUser(final String userId) { + return mapper.selectUser(userId); + } + @Override public int findListTotCnt(XitUserRegMngSearchVO searchVO) { int result = 0; diff --git a/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitEntUserRegMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitEntUserRegMngServiceImpl.java index 14016099..2f13368a 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitEntUserRegMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitEntUserRegMngServiceImpl.java @@ -21,7 +21,7 @@ import kr.xit.framework.biz.mng.user.mapper.XitEntUserRegMngMapper; import kr.xit.framework.biz.mng.user.model.XitEntUserRegMngSearchVO; import kr.xit.framework.biz.mng.user.model.XitEntUserRegMngVO; import kr.xit.framework.biz.mng.user.service.XitEntUserRegMngService; -import kr.xit.framework.biz.mng.user.service.XitUserRegMngService; +import kr.xit.framework.biz.mng.user.service.UserMgtService; import kr.xit.framework.core.message.XitMessageSource; import kr.xit.framework.core.utils.XitCmmnUtil; import kr.xit.framework.core.utils.XitScrtyUtil; @@ -33,7 +33,7 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { @Resource private XitEntUserRegMngMapper xitEntUserRegMngMapper; @Resource - private XitUserRegMngService xitUserRegMngService; + private UserMgtService xitUserRegMngService; @Resource private XitFrameCrudService xitFrameCrudService; @Resource diff --git a/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitGnrUserRegMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitGnrUserRegMngServiceImpl.java index 19d2bab7..5c688535 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitGnrUserRegMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/service/impl/XitGnrUserRegMngServiceImpl.java @@ -21,7 +21,7 @@ import kr.xit.framework.biz.mng.user.mapper.XitGnrUserRegMngMapper; import kr.xit.framework.biz.mng.user.model.XitGnrUserRegMngSearchVO; import kr.xit.framework.biz.mng.user.model.XitGnrUserRegMngVO; import kr.xit.framework.biz.mng.user.service.XitGnrUserRegMngService; -import kr.xit.framework.biz.mng.user.service.XitUserRegMngService; +import kr.xit.framework.biz.mng.user.service.UserMgtService; import kr.xit.framework.core.message.XitMessageSource; import kr.xit.framework.core.utils.XitCmmnUtil; import kr.xit.framework.core.utils.XitScrtyUtil; @@ -33,7 +33,7 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ @Resource private XitGnrUserRegMngMapper xitGnrUserRegMngMapper; @Resource - private XitUserRegMngService xitUserRegMngService; + private UserMgtService xitUserRegMngService; @Resource private XitFrameCrudService xitFrameCrudService; @Resource diff --git a/src/main/java/kr/xit/framework/biz/mng/user/web/XitUserRegMngController.java b/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java similarity index 94% rename from src/main/java/kr/xit/framework/biz/mng/user/web/XitUserRegMngController.java rename to src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java index 0376575f..e88971fc 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/web/XitUserRegMngController.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/web/UserMgtController.java @@ -1,7 +1,6 @@ package kr.xit.framework.biz.mng.user.web; import java.io.IOException; -import java.sql.SQLException; import java.util.HashMap; import java.util.Map; @@ -22,14 +21,12 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kr.xit.framework.biz.cmm.service.XitFrameCodeService; import kr.xit.framework.biz.mng.user.model.XitUserRegMngSearchVO; import kr.xit.framework.biz.mng.user.model.XitUserRegMngVO; -import kr.xit.framework.biz.mng.user.service.XitUserRegMngService; +import kr.xit.framework.biz.mng.user.service.UserMgtService; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.constants.FrameworkConstants.TILES_TYPE; import kr.xit.framework.core.message.XitMessageSource; @@ -38,6 +35,7 @@ import kr.xit.framework.core.utils.XitCmmnUtil; import kr.xit.framework.core.validation.XitBeanValidator; import kr.xit.framework.support.mybatis.MybatisUtils; import kr.xit.framework.support.util.AjaxUtils; +import kr.xit.framework.support.util.Checks; /** * @@ -51,9 +49,9 @@ import kr.xit.framework.support.util.AjaxUtils; */ @Controller @RequestMapping("/framework/biz/mng/usr") -public class XitUserRegMngController { +public class UserMgtController { @Resource - private XitUserRegMngService service; + private UserMgtService service; @Autowired private XitBeanValidator beanValidator; @Resource(name = "xitMessageSource") @@ -67,8 +65,19 @@ public class XitUserRegMngController { private int PAGE_SIZE; - @GetMapping(value = "/mngUserRegMgtForm") - public void mngUserRegMgtForm() { + @GetMapping(value = "/mngUserMgtForm") + public void mngUserMgtForm() { + } + + @GetMapping(value = "/mngUserMgtPopup") + public ModelAndView mngUserMgtPopup(final String uniqId) { + ModelAndView mav = new ModelAndView(); + + mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH + "mng/usr/mngUserMgtPopup.popup"); + if (Checks.isEmpty(uniqId)) mav.addObject("userManageVO", new XitUserRegMngVO()); + else mav.addObject("progrmMngVO", service.findUser(uniqId)); + + return mav; } /** @@ -187,10 +196,10 @@ public class XitUserRegMngController { ,@RequestParam(value="checkedIdForDel", required=false, defaultValue="") String checkedIdForDel ,@RequestParam(value="isViewPage", required=false, defaultValue="N") String isViewPage ,@RequestParam Map commandMap - ,BindingResult bindingResult - ,Model model + , BindingResult bindingResult + , Model model ,HttpServletRequest request - ,HttpServletResponse response + , HttpServletResponse response ) throws ServletException, IOException { /** diff --git a/src/main/resources/sqlmapper/framework/mng/menu/menuCreateMng-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/menu/menuCreateMng-mysql-mapper.xml index 201285bc..0ab47df8 100644 --- a/src/main/resources/sqlmapper/framework/mng/menu/menuCreateMng-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/menu/menuCreateMng-mysql-mapper.xml @@ -1,7 +1,7 @@ - + SELECT A.AUTHOR_CODE AS "authorCode" diff --git a/src/main/resources/sqlmapper/framework/mng/menu/menuListMng-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/menu/menuListMng-mysql-mapper.xml index 7bf2a6d1..15aae3b7 100644 --- a/src/main/resources/sqlmapper/framework/mng/menu/menuListMng-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/menu/menuListMng-mysql-mapper.xml @@ -1,7 +1,7 @@ - + /** XitMenuListMngMapper.findList */ diff --git a/src/main/resources/sqlmapper/framework/mng/menu/program-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/menu/program-mysql-mapper.xml index cabf6d95..90bbb2ab 100644 --- a/src/main/resources/sqlmapper/framework/mng/menu/program-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/menu/program-mysql-mapper.xml @@ -1,7 +1,7 @@ - + - /* user-mysql-mapper|selectUser-사용자 정보 조회|julim */ SELECT esntl_id AS uniqId , 'USR03' AS userTy diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/XitUserRegMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/XitUserRegMng_edit.jsp deleted file mode 100644 index 8e881248..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/XitUserRegMng_edit.jsp +++ /dev/null @@ -1,423 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%> - - - - - - - - - - - - - - -
-
- -

${pageTitle }

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${pageTitle }
사용자아이디 - 필수 - - - - - - 핸드폰번호   - - - -
비밀번호힌트 - 필수 - - - - - - 비밀번호정답 - 필수 - - - -
- 이름 - 필수 - - - - - 소속기관 - - - - - - -
- 조직코드 - 필수 - - - - - - - - 직위명 - - - -
- 이메일주소 - - - - - 집전화지역번호 - - - - - - - - - -
- 사무실전화번호 - - - - - 팩스번호 - - - -
- 주소 - - - - - - (우편번호 검색) - - - - - 상세주소 - - - -
- 사용자상태코드 - 필수 - - - - - - - - 그룹아이디 - 필수 - - - - - - -
- -
- - 수정 - 삭제 - 비밀번호변경 - 닫기 - -
- -
-
- - - - - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserRegMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp similarity index 93% rename from src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserRegMgtForm.jsp rename to src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp index 6f6e19da..23a73052 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserRegMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp @@ -31,7 +31,7 @@ - + @@ -233,11 +233,12 @@ } } - ,pagePopup: function(flag, url, params){ + ,pagePopup: function(flag, params){ + const url = ''; let popTitle; let popOption; switch (flag) { - case "insert": //등록 + case "add": //등록 popTitle = "사용자 신규등록"; popOption = {width: 1100, height:700} break; @@ -253,11 +254,7 @@ ,fnClickRegBtn: function(props){ const rowData = props.grid.getRow(props.rowKey); - fnUserMgt.pagePopup( - 'detail' - ,'' - ,{tilesDef: 'popup', selectedId: rowData.uniqId} - ); + fnUserMgt.pagePopup('add', {uniqId: rowData.uniqId}); } } @@ -265,7 +262,12 @@ * event **************************************************************************/ $(() => { - $('#btnSearch').bind('click', () => fnUserMgt.search()) + $('#btnSearch').bind('click', () => fnUserMgt.search()); + + $('#btnRegist').bind('click', () => { + fnUserMgt.pagePopup('detail', {}); + }); + }); /************************************************************************** diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp new file mode 100644 index 00000000..aa6be052 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtPopup.jsp @@ -0,0 +1,427 @@ +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%> + + + +<%--@elvariable id="userManageVO" type=""--%> + + + + + + + +
+
+ +

${pageTitle }

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${pageTitle }
+ + + + + + + + + + +
+ + + +<%-- + + + + +--%> + + + + + +
+ + + + + + + + +<%-- + + + + +--%> + +
+ + + +<%-- + + + + +--%> + + + + + + +
+ + + + + + + + + - + - + + + +
+ + + + + + + + + +
+ 주소 + + + + + + (우편번호 검색) + + + + + + + + +
+ + +<%-- + + + + +--%> + + + + + + <%-- + + + + + --%> + +
+ +
+ + 수정 + 삭제 + 비밀번호변경 + 닫기 + +
+ +
+
+ + + + +