diff --git a/src/main/java/cokr/xit/fims/crdn/dao/CrdnMapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java similarity index 84% rename from src/main/java/cokr/xit/fims/crdn/dao/CrdnMapper.java rename to src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java index e7d87bc0..9acb8d5d 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/CrdnMapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java @@ -12,11 +12,11 @@ import cokr.xit.foundation.data.DataObject; /**단속자료 관리 DAO * @author leebj */ -@Mapper("crdnMapper") -public interface CrdnMapper extends AbstractMapper { +@Mapper("crdn06Mapper") +public interface Crdn06Mapper extends AbstractMapper { /**단속자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.CrdnService#getCrdnList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrdnList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return 단속자료 목록 */ diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java similarity index 95% rename from src/main/java/cokr/xit/fims/crdn/service/CrdnService.java rename to src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java index 2ff77734..2054364b 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java @@ -10,7 +10,7 @@ import cokr.xit.foundation.data.DataObject; * * @author leebj */ -public interface CrdnService { +public interface Crdn06Service { /** 단속자료 목록을 조회한다. * @param req 단속자료 목록 조회 조건 diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java similarity index 66% rename from src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java rename to src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java index 14de857f..d4f691ab 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java @@ -7,7 +7,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.dao.CrdnMapper; +import cokr.xit.fims.crdn.dao.Crdn06Mapper; import cokr.xit.fims.crdn.service.CrdnQuery; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -15,19 +15,19 @@ import cokr.xit.foundation.data.DataObject; /** 단속관리 Bean * @author leebj */ -@Component("crdnBean") -public class CrdnBean extends AbstractComponent { +@Component("crdn06Bean") +public class Crdn06Bean extends AbstractComponent { - @Resource(name = "crdnMapper") - private CrdnMapper crdnMapper; + @Resource(name = "crdn06Mapper") + private Crdn06Mapper crdn06Mapper; /** 단속자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.CrdnService#getCrdnList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrdnList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return 단속자료 목록 */ public List getCrdnList(CrdnQuery req) { - return crdnMapper.getCrdnList(req.setOrderBy("CRDN_ID")); + return crdn06Mapper.getCrdnList(req.setOrderBy("CRDN_ID")); } /**지정하는 단속아이디의 단속 정보를 반환한다. @@ -35,6 +35,6 @@ public class CrdnBean extends AbstractComponent { * @return 단속 정보 */ public DataObject getCrdnInfo(String crdnId) { - return crdnMapper.getCrdnInfo(crdnId); + return crdn06Mapper.getCrdnInfo(crdnId); } } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java similarity index 62% rename from src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java rename to src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java index 1a7aca17..ee65f8d6 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java @@ -6,30 +6,29 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; -import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.service.CrdnQuery; -import cokr.xit.fims.crdn.service.CrdnService; +import cokr.xit.fims.crdn.service.Crdn06Service; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; /**단속관리 서비스 인터페이스의 구현체 * @author leebj */ -@Service("crdnService") -public class CrdnServiceBean extends AbstractServiceBean implements CrdnService { +@Service("crdn06Service") +public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Service { /** 단속관리 Bean */ - @Resource(name="crdnBean") - protected CrdnBean crdnBean; + @Resource(name="crdn06Bean") + protected Crdn06Bean crdn06Bean; @Override public List getCrdnList(CrdnQuery req) { - return crdnBean.getCrdnList(req); + return crdn06Bean.getCrdnList(req); } @Override public DataObject getCrdnInfo(String crdnId) { - return crdnBean.getCrdnInfo(crdnId); + return crdn06Bean.getCrdnInfo(crdnId); } } diff --git a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java deleted file mode 100644 index 838ff160..00000000 --- a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn0600Controller.java +++ /dev/null @@ -1,51 +0,0 @@ -package cokr.xit.fims.crdn.web; - -import javax.annotation.Resource; - -import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.crdn.service.CrdnQuery; -import cokr.xit.fims.crdn.service.CrdnService; -import cokr.xit.foundation.web.AbstractController; - -public class AbstractCrdn0600Controller extends ApplicationController { - - @Resource(name="crdnService") - private CrdnService crdnService; - - /**단속자료 목록을 조회한다.
- * {@link CrdnService#getCrdnList(CrdnQuery)} 참고 - * @param req 단속자료 목록 조회 조건 - * @return jsonView - *
 {
-	 *     "crdnList": [조회결과 목록],
-	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
-	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
-	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
-	 * }
- */ - public ModelAndView getCrdnList(CrdnQuery req) { - setFetchSize(req); - return setCollectionInfo( - new ModelAndView("jsonView"), - crdnService.getCrdnList(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", crdnService.getCrdnInfo(crdnId)); - } - return mav; - } -} diff --git a/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn06Controller.java new file mode 100644 index 00000000..449473f0 --- /dev/null +++ b/src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn06Controller.java @@ -0,0 +1,73 @@ +package cokr.xit.fims.crdn.web; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import cokr.xit.base.code.CommonCode; +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") +public class AbstractCrdn06Controller extends ApplicationController { + + @Resource(name="crdn06Service") + private Crdn06Service crdn06Service; + + /** 단속 자료 조회 메인화면을 연다. + * @return fims/crdn/crdnDataInquire-main + */ + @RequestMapping(name="단속 자료 조회 메인", value="/010/main.do") + public ModelAndView crdnDataInquireMain() { + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/crdn/crdnDataInquire-main"); + mav.addObject("pageSuffix","crdnDataInquire-main"); + + Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM010", "FIM026"); + mav.addObject("FIM001List", commonCodes.get("FIM001")); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + mav.addObject("FIM010List", commonCodes.get("FIM010")); + addCodes(commonCodes, mav, "FIM002", "FIM026"); + return mav; + } + + /**단속자료 목록을 조회한다.
+ * {@link Crdn06Service#getCrdnList(CrdnQuery)} 참고 + * @param req 단속자료 목록 조회 조건 + * @return jsonView + *
 {
+	 *     "crdnList": [조회결과 목록],
+	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
+	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
+	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
+	 * }
+ */ + public ModelAndView getCrdnList(CrdnQuery req) { + setFetchSize(req); + return setCollectionInfo( + new ModelAndView("jsonView"), + crdn06Service.getCrdnList(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/Crdn0600Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn0600Controller.java deleted file mode 100644 index 109018f0..00000000 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn0600Controller.java +++ /dev/null @@ -1,80 +0,0 @@ -package cokr.xit.fims.crdn.web; - -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.base.code.CommonCode; -import cokr.xit.base.code.service.CodeService; -import cokr.xit.fims.crdn.service.CrdnQuery; -import cokr.xit.fims.crdn.service.CrdnService; -import cokr.xit.foundation.web.AbstractController; - -/**단속관리 서비스 웹 컨트롤러.
- * {웹 컨텍스트}/crdn/*로 접근할 수 있다. - * @author leebj - */ -@Controller -@RequestMapping(name="단속관리", value="/crdn") -public class Crdn0600Controller extends AbstractCrdn0600Controller { - - @Resource(name = "codeService") - private CodeService codeService; - - /** 단속 자료 조회 메인화면을 연다. - * @return fims/crdn/crdnDataInquire-main - */ - @RequestMapping(name="단속 자료 조회 메인", value="/crdn0600/main.do") - public ModelAndView crdnDataInquireMain() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdnDataInquire-main"); - mav.addObject("pageSuffix","crdnDataInquire-main"); - - Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM010", "FIM026"); - mav.addObject("FIM001List", commonCodes.get("FIM001")); - mav.addObject("FIM002List", commonCodes.get("FIM002")); - mav.addObject("FIM010List", commonCodes.get("FIM010")); - addCodes(commonCodes, mav, "FIM002", "FIM026"); - return mav; - } - - @RequestMapping(name="주정차과태료업무 단속자료 목록", value="/PVS/list.do") - public ModelAndView getPvsCrdnList(CrdnQuery req) { - return getCrdnList(req); - } - @RequestMapping(name="전용차로과태료업무 단속자료 목록", value="/BPV/list.do") - public ModelAndView getBpvCrdnList(CrdnQuery req) { - return getCrdnList(req); - } - @RequestMapping(name="장애인과태료업무 단속자료 목록", value="/DPV/list.do") - public ModelAndView getDpvCrdnList(CrdnQuery req) { - return getCrdnList(req); - } - @RequestMapping(name="전기차과태료업무 단속자료 목록", value="/ECA/list.do") - public ModelAndView getEcaCrdnList(CrdnQuery req) { - return getCrdnList(req); - } - - @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/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java new file mode 100644 index 00000000..63e79b54 --- /dev/null +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -0,0 +1,50 @@ +package cokr.xit.fims.crdn.web; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; +import cokr.xit.fims.crdn.service.CrdnQuery; + +/**단속자료 조회 서비스 웹 컨트롤러.
+ * {웹 컨텍스트}/crdn/crdn06 로 접근할 수 있다. + * @author leebj + */ +@Controller +public class Crdn06Controller extends AbstractCrdn06Controller { + + @RequestMapping(name="주정차과태료업무 단속자료 목록", value="/010/PVS/list.do") + public ModelAndView getPvsCrdnList(CrdnQuery req) { + return getCrdnList(req); + } + @RequestMapping(name="전용차로과태료업무 단속자료 목록", value="/010/BPV/list.do") + public ModelAndView getBpvCrdnList(CrdnQuery req) { + return getCrdnList(req); + } + @RequestMapping(name="장애인과태료업무 단속자료 목록", value="/010/DPV/list.do") + public ModelAndView getDpvCrdnList(CrdnQuery req) { + return getCrdnList(req); + } + @RequestMapping(name="전기차과태료업무 단속자료 목록", value="/010/ECA/list.do") + public ModelAndView getEcaCrdnList(CrdnQuery req) { + return getCrdnList(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/crdn-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml similarity index 96% rename from src/main/resources/sql/mapper/fims/crdn/crdn-mapper.xml rename to src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index 43fceaf0..15352578 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -1,6 +1,6 @@ - + @@ -18,7 +18,7 @@ , A.CRDN_REG_SE_CD , A.CRDN_INPT_SE_CD , A.LINK_ID - , A.CRDN_SE_CD + , '10' AS CRDN_SE_CD , A.RTPYR_ID , A.CRDN_YMD , A.CRDN_TM diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp index d9241b31..022dec6f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdnDataInquire-main.jsp @@ -227,8 +227,8 @@ crdnControl.onDatasetChange = obj => { function fnResetAndChangeBiz(sysSeCd){ $("#crdnTbody--${pageSuffix}").html(""); - crdnControl.urls.load = wctx.url("/crdn/"+ sysSeCd +"/list.do"); - crdnControl.urls.getInfo = wctx.url("/crdn/"+ sysSeCd +"/info.do"); + crdnControl.urls.load = wctx.url("/crdn/crdn06/010/"+ sysSeCd +"/list.do"); + crdnControl.urls.getInfo = wctx.url("/crdn/crdn미정/미정/"+ sysSeCd +"/info.do"); // TODO : 상세화면은 통합조회 관련 URL로 변경 필요 } function searchCrdnList(){