diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java index 9acb8d5d..a1a992ec 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java @@ -16,21 +16,14 @@ import cokr.xit.foundation.data.DataObject; public interface Crdn06Mapper extends AbstractMapper { /**단속자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrdnList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return 단속자료 목록 */ - List getCrdnList(CrdnQuery req); + List getCrackdownList(CrdnQuery req); - List getCrdns(CrdnQuery req); + List getCrackdowns(CrdnQuery req); - /**지정하는 단속 아이디의 단속 정보를 반환한다. - * @param crdnId 단속 아이디 - * @return 단속 정보 - */ - default DataObject getCrdnInfo(String crdnId) { - List list = getCrdnList(new CrdnQuery().setCrdnId(crdnId)); - return !list.isEmpty() ? list.get(0) : null; - } + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java index 2054364b..16967e82 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java +++ b/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java @@ -6,7 +6,7 @@ import cokr.xit.fims.crdn.Crdn; import cokr.xit.foundation.data.DataObject; /**단속관리 서비스를 제공한다. - *
  • {@link #getCrdnList(CrdnQuery) 단속자료 목록 조회}
    • + *
    • {@link #getCrackdownList(CrdnQuery) 단속자료 목록 조회}
      • *
    * @author leebj */ @@ -19,12 +19,8 @@ public interface Crdn06Service { *
* @return 단속자료 목록 */ - List getCrdnList(CrdnQuery req); + List getCrackdownList(CrdnQuery req); + - /**지정하는 단속아이디의 단속 정보를 반환한다. - * @param crdnId 단속 아이디 - * @return 단속 정보 - */ - DataObject getCrdnInfo(String crdnId); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java index d4f691ab..2db40812 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java @@ -22,19 +22,13 @@ public class Crdn06Bean extends AbstractComponent { private Crdn06Mapper crdn06Mapper; /** 단속자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrdnList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return 단속자료 목록 */ - public List getCrdnList(CrdnQuery req) { - return crdn06Mapper.getCrdnList(req.setOrderBy("CRDN_ID")); + public List getCrackdownList(CrdnQuery req) { + return crdn06Mapper.getCrackdownList(req.setOrderBy("CRDN_ID")); } - /**지정하는 단속아이디의 단속 정보를 반환한다. - * @param crdnId 단속 아이디 - * @return 단속 정보 - */ - public DataObject getCrdnInfo(String crdnId) { - return crdn06Mapper.getCrdnInfo(crdnId); - } + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java index ee65f8d6..0ea8e767 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java @@ -22,13 +22,10 @@ public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Serv protected Crdn06Bean crdn06Bean; @Override - public List getCrdnList(CrdnQuery req) { - return crdn06Bean.getCrdnList(req); + public List getCrackdownList(CrdnQuery req) { + return crdn06Bean.getCrackdownList(req); } - @Override - public DataObject getCrdnInfo(String crdnId) { - return crdn06Bean.getCrdnInfo(crdnId); - } + } diff --git a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn06Controller.java index 449473f0..e834d2c4 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn06Controller.java @@ -13,20 +13,20 @@ import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.service.CrdnQuery; import cokr.xit.fims.crdn.service.Crdn06Service; -@RequestMapping(name="단속관리", value="/crdn/crdn06") +@RequestMapping(name="단속 자료 조회", value="/crdn/crdn06") public class AbstractCrdn06Controller extends ApplicationController { @Resource(name="crdn06Service") private Crdn06Service crdn06Service; /** 단속 자료 조회 메인화면을 연다. - * @return fims/crdn/crdnDataInquire-main + * @return fims/crdn/crdn06010-main */ @RequestMapping(name="단속 자료 조회 메인", value="/010/main.do") - public ModelAndView crdnDataInquireMain() { + public ModelAndView crackdownDataInquireMain() { ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdnDataInquire-main"); - mav.addObject("pageSuffix","crdnDataInquire-main"); + mav.setViewName("fims/crdn/crdn06010-main"); + mav.addObject("pageSuffix", "crdn06010-main"); Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM010", "FIM026"); mav.addObject("FIM001List", commonCodes.get("FIM001")); @@ -37,7 +37,7 @@ public class AbstractCrdn06Controller extends ApplicationController { } /**단속자료 목록을 조회한다.
- * {@link Crdn06Service#getCrdnList(CrdnQuery)} 참고 + * {@link Crdn06Service#getCrackdownList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return jsonView * 
 {
@@ -47,27 +47,14 @@ public class AbstractCrdn06Controller extends ApplicationController {
 	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
 	 * }
*/ - public ModelAndView getCrdnList(CrdnQuery req) { + public ModelAndView getCrackdownList(CrdnQuery req) { setFetchSize(req); return setCollectionInfo( new ModelAndView("jsonView"), - crdn06Service.getCrdnList(req), + crdn06Service.getCrackdownList(req), "crdn" ); } - /**지정하는 단속아이디의 단속 정보를 반환한다. - * @param crdnId 단속 아이디 - * @return fims/crdn/crdnData-info - * 
 {
-	 *     "crdnInfo": {...}
-	 * }
- */ - public ModelAndView getCrdnInfo(String crdnId) { - ModelAndView mav = new ModelAndView("fims/crdn/crdnData-info"); - if (!isEmpty(crdnId)) { - mav.addObject("crdnInfo", crdn06Service.getCrdnInfo(crdnId)); - } - return mav; - } + } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 63e79b54..03773322 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -13,38 +13,22 @@ import cokr.xit.fims.crdn.service.CrdnQuery; public class Crdn06Controller extends AbstractCrdn06Controller { @RequestMapping(name="주정차과태료업무 단속자료 목록", value="/010/PVS/list.do") - public ModelAndView getPvsCrdnList(CrdnQuery req) { - return getCrdnList(req); + public ModelAndView getPvsCrackdownList(CrdnQuery req) { + return getCrackdownList(req); } @RequestMapping(name="전용차로과태료업무 단속자료 목록", value="/010/BPV/list.do") - public ModelAndView getBpvCrdnList(CrdnQuery req) { - return getCrdnList(req); + public ModelAndView getBpvCrackdownList(CrdnQuery req) { + return getCrackdownList(req); } @RequestMapping(name="장애인과태료업무 단속자료 목록", value="/010/DPV/list.do") - public ModelAndView getDpvCrdnList(CrdnQuery req) { - return getCrdnList(req); + public ModelAndView getDpvCrackdownList(CrdnQuery req) { + return getCrackdownList(req); } @RequestMapping(name="전기차과태료업무 단속자료 목록", value="/010/ECA/list.do") - public ModelAndView getEcaCrdnList(CrdnQuery req) { - return getCrdnList(req); + public ModelAndView getEcaCrackdownList(CrdnQuery req) { + return getCrackdownList(req); } - //TODO : 단속자료 상세화면은 여러화면에서 공통으로 사용하므로 통합조회 관련 소스로 이동이 필요함. - @RequestMapping(name="주정차과태료업무 단속자료 정보", value="/미정/PVS/info.do") - public ModelAndView getPvsCrdnInfo(String crdnId) { - return getCrdnInfo(crdnId); - } - @RequestMapping(name="전용차로과태료업무 단속자료 정보", value="/미정/BPV/info.do") - public ModelAndView getBpvCrdnInfo(String crdnId) { - return getCrdnInfo(crdnId); - } - @RequestMapping(name="장애인과태료업무 단속자료 정보", value="/미정/DPV/info.do") - public ModelAndView getDpvCrdnInfo(String crdnId) { - return getCrdnInfo(crdnId); - } - @RequestMapping(name="전기차과태료업무 단속자료 정보", value="/미정/ECA/info.do") - public ModelAndView getEcaCrdnInfo(String crdnId) { - return getCrdnInfo(crdnId); - } + } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index 15352578..c81934d6 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -10,7 +10,7 @@ - + SELECT A.CRDN_ID , A.SGG_CD @@ -91,14 +91,14 @@ - + /* 단속자료 목록 조회(crdnMapper.getCrackdownList) */ + - + /* 단속자료 가져오기 (crdnMapper.getCrackdowns) */ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp similarity index 99% rename from src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 022dec6f..775a200b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -228,7 +228,7 @@ crdnControl.onDatasetChange = obj => { function fnResetAndChangeBiz(sysSeCd){ $("#crdnTbody--${pageSuffix}").html(""); crdnControl.urls.load = wctx.url("/crdn/crdn06/010/"+ sysSeCd +"/list.do"); - crdnControl.urls.getInfo = wctx.url("/crdn/crdn미정/미정/"+ sysSeCd +"/info.do"); // TODO : 상세화면은 통합조회 관련 URL로 변경 필요 + crdnControl.urls.getInfo = wctx.url("/sprt/sprt01/020/"+ sysSeCd +"/info.do"); } function searchCrdnList(){