diff --git a/src/main/java/kr/xit/fims/biz/rt/web/Rt0200Controller.java b/src/main/java/kr/xit/fims/biz/rt/web/Rt0200Controller.java index 1dc6feab..bc20df07 100644 --- a/src/main/java/kr/xit/fims/biz/rt/web/Rt0200Controller.java +++ b/src/main/java/kr/xit/fims/biz/rt/web/Rt0200Controller.java @@ -1,8 +1,7 @@ package kr.xit.fims.biz.rt.web; -import kr.xit.fims.biz.rt.model.Rt0200SearchVO; import kr.xit.fims.biz.rt.service.Rt0200Service; -import kr.xit.framework.biz.cmm.CacheCodeUtils; +import kr.xit.framework.biz.cache.util.CacheCodeUtils; import kr.xit.framework.core.message.XitMessageSource; import kr.xit.framework.core.model.ResultResponse; import kr.xit.framework.core.validation.XitBeanValidator; @@ -11,9 +10,7 @@ import kr.xit.framework.support.mybatis.MybatisUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; 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.servlet.ModelAndView; diff --git a/src/main/java/kr/xit/framework/biz/cmm/mapper/CacheCodeMapper.java b/src/main/java/kr/xit/framework/biz/cache/mapper/CacheCodeMapper.java similarity index 84% rename from src/main/java/kr/xit/framework/biz/cmm/mapper/CacheCodeMapper.java rename to src/main/java/kr/xit/framework/biz/cache/mapper/CacheCodeMapper.java index 385fef1f..f46cbf27 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/mapper/CacheCodeMapper.java +++ b/src/main/java/kr/xit/framework/biz/cache/mapper/CacheCodeMapper.java @@ -1,4 +1,4 @@ -package kr.xit.framework.biz.cmm.mapper; +package kr.xit.framework.biz.cache.mapper; import java.util.List; diff --git a/src/main/java/kr/xit/framework/biz/cmm/mapper/CacheMenuMapper.java b/src/main/java/kr/xit/framework/biz/cache/mapper/CacheMenuMapper.java similarity index 85% rename from src/main/java/kr/xit/framework/biz/cmm/mapper/CacheMenuMapper.java rename to src/main/java/kr/xit/framework/biz/cache/mapper/CacheMenuMapper.java index 973d05df..9b03d8ac 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/mapper/CacheMenuMapper.java +++ b/src/main/java/kr/xit/framework/biz/cache/mapper/CacheMenuMapper.java @@ -1,4 +1,4 @@ -package kr.xit.framework.biz.cmm.mapper; +package kr.xit.framework.biz.cache.mapper; import java.util.List; diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/CacheService.java b/src/main/java/kr/xit/framework/biz/cache/service/CacheService.java similarity index 96% rename from src/main/java/kr/xit/framework/biz/cmm/service/CacheService.java rename to src/main/java/kr/xit/framework/biz/cache/service/CacheService.java index 8a554980..a52749e6 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/CacheService.java +++ b/src/main/java/kr/xit/framework/biz/cache/service/CacheService.java @@ -1,4 +1,4 @@ -package kr.xit.framework.biz.cmm.service; +package kr.xit.framework.biz.cache.service; import java.util.List; import java.util.Map; diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/impl/CacheServiceImpl.java b/src/main/java/kr/xit/framework/biz/cache/service/impl/CacheServiceImpl.java similarity index 89% rename from src/main/java/kr/xit/framework/biz/cmm/service/impl/CacheServiceImpl.java rename to src/main/java/kr/xit/framework/biz/cache/service/impl/CacheServiceImpl.java index 2c3482c5..be21d65b 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/impl/CacheServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/cache/service/impl/CacheServiceImpl.java @@ -1,4 +1,4 @@ -package kr.xit.framework.biz.cmm.service.impl; +package kr.xit.framework.biz.cache.service.impl; import java.util.List; import java.util.Map; @@ -7,9 +7,9 @@ import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import kr.xit.framework.biz.cmm.service.CacheService; -import kr.xit.framework.biz.cmm.mapper.CacheCodeMapper; -import kr.xit.framework.biz.cmm.mapper.CacheMenuMapper; +import kr.xit.framework.biz.cache.service.CacheService; +import kr.xit.framework.biz.cache.mapper.CacheCodeMapper; +import kr.xit.framework.biz.cache.mapper.CacheMenuMapper; import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/src/main/java/kr/xit/framework/biz/cmm/CacheCodeUtils.java b/src/main/java/kr/xit/framework/biz/cache/util/CacheCodeUtils.java similarity index 95% rename from src/main/java/kr/xit/framework/biz/cmm/CacheCodeUtils.java rename to src/main/java/kr/xit/framework/biz/cache/util/CacheCodeUtils.java index 225a9dbd..e185ee83 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/CacheCodeUtils.java +++ b/src/main/java/kr/xit/framework/biz/cache/util/CacheCodeUtils.java @@ -1,4 +1,4 @@ -package kr.xit.framework.biz.cmm; +package kr.xit.framework.biz.cache.util; import java.util.List; import java.util.Map; diff --git a/src/main/java/kr/xit/framework/biz/cmm/CacheMenuUtils.java b/src/main/java/kr/xit/framework/biz/cache/util/CacheMenuUtils.java similarity index 94% rename from src/main/java/kr/xit/framework/biz/cmm/CacheMenuUtils.java rename to src/main/java/kr/xit/framework/biz/cache/util/CacheMenuUtils.java index 8e56922d..4265cf54 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/CacheMenuUtils.java +++ b/src/main/java/kr/xit/framework/biz/cache/util/CacheMenuUtils.java @@ -1,4 +1,4 @@ -package kr.xit.framework.biz.cmm; +package kr.xit.framework.biz.cache.util; import java.util.List; import java.util.Map; diff --git a/src/main/java/kr/xit/framework/biz/cmm/web/CacheController.java b/src/main/java/kr/xit/framework/biz/cache/web/CacheController.java similarity index 91% rename from src/main/java/kr/xit/framework/biz/cmm/web/CacheController.java rename to src/main/java/kr/xit/framework/biz/cache/web/CacheController.java index 10e2b409..51b3f855 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/web/CacheController.java +++ b/src/main/java/kr/xit/framework/biz/cache/web/CacheController.java @@ -1,12 +1,12 @@ -package kr.xit.framework.biz.cmm.web; +package kr.xit.framework.biz.cache.web; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import kr.xit.framework.biz.cmm.CacheCodeUtils; -import kr.xit.framework.biz.cmm.CacheMenuUtils; +import kr.xit.framework.biz.cache.util.CacheCodeUtils; +import kr.xit.framework.biz.cache.util.CacheMenuUtils; import kr.xit.framework.core.constants.FrameworkConstants; /** diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java index 08160ea4..c7dd0364 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java @@ -1,6 +1,5 @@ package kr.xit.framework.biz.cmm.service.impl; -import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -13,7 +12,7 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.intercept.EgovReloadableFilterInvocationSecurityMetadataSource; -import kr.xit.framework.biz.cmm.CacheMenuUtils; +import kr.xit.framework.biz.cache.util.CacheMenuUtils; import lombok.extern.slf4j.Slf4j; import kr.xit.framework.biz.cmm.mapper.XitFrameUnitMapper; import kr.xit.framework.biz.cmm.model.XitAuthorGroupInfoVO; diff --git a/src/main/java/kr/xit/framework/core/interceptor/XitMenuListIntercepter.java b/src/main/java/kr/xit/framework/core/interceptor/XitMenuListIntercepter.java index 18ad424d..064afed2 100644 --- a/src/main/java/kr/xit/framework/core/interceptor/XitMenuListIntercepter.java +++ b/src/main/java/kr/xit/framework/core/interceptor/XitMenuListIntercepter.java @@ -14,7 +14,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import com.fasterxml.jackson.databind.JsonMappingException; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; -import kr.xit.framework.biz.cmm.CacheMenuUtils; +import kr.xit.framework.biz.cache.util.CacheMenuUtils; import kr.xit.framework.core.model.XitRollingNotiVO; import kr.xit.framework.support.exception.JSONExceptionMessageWriter; import kr.xit.framework.support.util.Checks; diff --git a/src/main/java/kr/xit/framework/support/tag/code/CodeRadioBoxTag.java b/src/main/java/kr/xit/framework/support/tag/code/CodeRadioBoxTag.java index 91b11c53..054ae7f1 100644 --- a/src/main/java/kr/xit/framework/support/tag/code/CodeRadioBoxTag.java +++ b/src/main/java/kr/xit/framework/support/tag/code/CodeRadioBoxTag.java @@ -10,7 +10,7 @@ import javax.servlet.jsp.tagext.TagSupport; import org.springframework.util.StringUtils; -import kr.xit.framework.biz.cmm.CacheCodeUtils; +import kr.xit.framework.biz.cache.util.CacheCodeUtils; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/kr/xit/framework/support/tag/code/CodeSelectBoxTag.java b/src/main/java/kr/xit/framework/support/tag/code/CodeSelectBoxTag.java index d84b7456..4f7f89a7 100644 --- a/src/main/java/kr/xit/framework/support/tag/code/CodeSelectBoxTag.java +++ b/src/main/java/kr/xit/framework/support/tag/code/CodeSelectBoxTag.java @@ -12,7 +12,7 @@ import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.support.MessageSourceAccessor; import org.springframework.util.StringUtils; -import kr.xit.framework.biz.cmm.CacheCodeUtils; +import kr.xit.framework.biz.cache.util.CacheCodeUtils; import kr.xit.framework.support.util.JBeanRegistry; import kr.xit.framework.support.util.constants.MessageKey; import lombok.Getter; diff --git a/src/main/java/kr/xit/framework/support/util/JBeanRegistry.java b/src/main/java/kr/xit/framework/support/util/JBeanRegistry.java index 411e24d2..c0cfcc6b 100644 --- a/src/main/java/kr/xit/framework/support/util/JBeanRegistry.java +++ b/src/main/java/kr/xit/framework/support/util/JBeanRegistry.java @@ -3,7 +3,7 @@ package kr.xit.framework.support.util; import org.springframework.context.MessageSource; import org.springframework.context.support.MessageSourceAccessor; -import kr.xit.framework.biz.cmm.service.CacheService; +import kr.xit.framework.biz.cache.service.CacheService; import kr.xit.framework.core.message.XitMessageSource; import kr.xit.framework.core.validation.XitBeanValidator; diff --git a/src/main/resources/sqlmapper/framework/cache/cacheboard-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/cache/cacheboard-mysql-mapper.xml new file mode 100644 index 00000000..81b1206f --- /dev/null +++ b/src/main/resources/sqlmapper/framework/cache/cacheboard-mysql-mapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT XB.ntt_sj + , XB.ntcr_id + , XB.ntcr_nm + , XB.ntt_no + , XB.ntt_cn + , XB.password + , XB.frst_register_id + , IFNULL(VUM.user_nm, XB.ntcr_nm) AS frstRegisterNm + , DATE_FORMAT(XB.frst_regist_pnttm, '%Y-%m-%d') AS frstRegisterPnttm + , XB.ntce_begin_de + , XB.ntce_end_de + , XB.rdcnt AS inqireCo + , XB.use_at + , XB.atch_file_id + , XB.bbs_id + , XB.ntt_id + , XB.parnts_sntnc_no AS parnts + , XB.answer_at + , XB.answer_lc + , XB.sort_ordr + , XBM.bbs_ty_code + , XBM.bbs_attrb_code + , XBM.reply_posbl_at + , XBM.file_atch_posbl_at + , XBM.atch_posbl_file_number + , XBM.BBS_NM + FROM xit_bbs xb + LEFT OUTER JOIN xit_vw_user_mastr VUM + ON XB.frst_register_id = VUM.esntl_id + LEFT OUTER JOIN xit_bbs_mastr XBM + ON XB.bbs_id = XBM.bbs_id + WHERE XB.BBS_ID = #{bbsId} + + + AND XB.parnts_sntnc_no = #{nttId} + AND XB.parnts_sntnc_no != 0 + + + AND XB.parnts_sntnc_no = 0 + + + + diff --git a/src/main/resources/sqlmapper/biz/cmm/cachecode-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/cache/cachecode-mysql-mapper.xml similarity index 92% rename from src/main/resources/sqlmapper/biz/cmm/cachecode-mysql-mapper.xml rename to src/main/resources/sqlmapper/framework/cache/cachecode-mysql-mapper.xml index 4b7c216b..c9fcf3e0 100644 --- a/src/main/resources/sqlmapper/biz/cmm/cachecode-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/cache/cachecode-mysql-mapper.xml @@ -1,7 +1,7 @@ - + /* cachemenu-mysql-mapper|selectMenuListByUser-사용자별 메뉴 조회|julim */ - + SELECT D.menu_id AS "menuSid" , D.menu_name AS "menuName" , (SELECT CASE SA.URL WHEN '/' THEN '#' ELSE SA.URL END @@ -35,7 +35,7 @@ - + WITH RECURSIVE tree_query( menu_id , PARNT_menu_id