업무별 URL매핑 처리용 컨트롤러 이름 변경(접두어 Task 추가)

src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java

@@ -9,7 +9,7 @@ import cokr.xit.fims.crdn.service.CrdnQuery;
 import cokr.xit.foundation.component.AbstractMapper;
 import cokr.xit.foundation.data.DataObject;
 
-/**단속자료 관리 DAO
+/**단속 관리 DAO
  * @author leebj
  */
 @Mapper("crdn06Mapper")

src/main/java/cokr/xit/fims/crdn/service/CrdnQuery.java

@@ -7,7 +7,8 @@ public class CrdnQuery extends QueryRequest {
 	private static final long serialVersionUID = 1L;
 	
 	private String crdnId;
-	private String schVhrno;
+	private String sysSeCd;
+	private String vhrno;
 	
 	public String getCrdnId() {
 		return ifEmpty(crdnId, () -> null);
@@ -18,12 +19,21 @@ public class CrdnQuery extends QueryRequest {
 		return self();
 	}
 	
-	public String getSchVhrno() {
+	public String getSysSeCd() {
-		return ifEmpty(schVhrno, () -> null);
+		return ifEmpty(sysSeCd, () -> null);
 	}
 
-	public <T extends CrdnQuery> T setSchVhrno(String schVhrno) {
+	public <T extends CrdnQuery> T setSysSeCd(String sysSeCd) {
-		this.schVhrno = schVhrno;
+		this.sysSeCd = sysSeCd;
+		return self();
+	}
+	
+	public String getVhrno() {
+		return ifEmpty(vhrno, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setVhrno(String vhrno) {
+		this.vhrno = vhrno;
 		return self();
 	}
 

src/main/java/cokr/xit/fims/crdn/web/AbstractCrdn06Controller.java

@@ -1,77 +0,0 @@
-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/crdn06010-main
-	 */
-	@RequestMapping(name="단속 자료 조회 메인", value="/010/main.do")
-	public ModelAndView crackdownDataInquireMain() {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("fims/crdn/crdn06010-main");
-		mav.addObject("pageName", "crdn06010-main");
-		
-		Map<String, List<CommonCode>> 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;
-	}
-	
-	/** 표지정보 미확인 자료 메인화면을 연다.
-	 * @return fims/crdn/crdn06030-main
-	 */
-	@RequestMapping(name="표지정보 미확인 자료 메인", value="/030/main.do")
-	public ModelAndView tagInformationUndefinedDataMain() {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("fims/crdn/crdn06030-main");
-		mav.addObject("pageName","crdn06030-main");
-		
-		Map<String, List<CommonCode>> 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;
-	}
-	
-	/**단속자료 목록을 조회한다.<br />
-	 * {@link Crdn06Service#getCrackdownList(CrdnQuery)} 참고
-	 * @param req 단속자료 목록 조회 조건
-	 * @return jsonView
-	 * <pre><code> {
-	 *     "crdnList": [조회결과 목록],
-	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
-	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
-	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
-	 * }</code></pre>
-	 */
-	public ModelAndView getCrackdownList(CrdnQuery req) {
-		setFetchSize(req);
-		return setCollectionInfo(
-			new ModelAndView("jsonView"),
-			crdn06Service.getCrackdownList(req),
-			"crdn"
-		);
-	}
-	
-	
-}

src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java

@@ -1,34 +1,77 @@
 package cokr.xit.fims.crdn.web;
 
-import org.springframework.stereotype.Controller;
+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;
 
-/**단속자료 조회 서비스 웹 컨트롤러.<br />
+@RequestMapping(name="단속 관리", value="/crdn/crdn06")
- * {웹 컨텍스트}/crdn/crdn06 로 접근할 수 있다.
+public class Crdn06Controller extends ApplicationController {
- * @author leebj
+
+	@Resource(name="crdn06Service")
+	private Crdn06Service crdn06Service;
+	
+	/** 단속 관리 메인화면을 연다.
+	 * @return fims/crdn/crdn06010-main
 	 */
-@Controller
+	@RequestMapping(name="단속 관리 메인", value="/010/main.do")
-public class Crdn06Controller extends AbstractCrdn06Controller {
+	public ModelAndView crackdownManagementMain() {
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/crdn/crdn06010-main");
+		mav.addObject("pageName", "crdn06010-main");
 		
-	@RequestMapping(name="주정차과태료업무 단속자료 목록", value="/010/PVS/list.do")
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM001", "FIM002", "FIM010", "FIM026");
-	public ModelAndView getPvsCrackdownList(CrdnQuery req) {
+		mav.addObject("FIM001List", commonCodes.get("FIM001"));
-		return getCrackdownList(req);
+		mav.addObject("FIM002List", commonCodes.get("FIM002"));
-	}
+		mav.addObject("FIM010List", commonCodes.get("FIM010"));
-	@RequestMapping(name="전용차로과태료업무 단속자료 목록", value="/010/BPV/list.do")
+		addCodes(commonCodes, mav, "FIM002", "FIM026");
-	public ModelAndView getBpvCrackdownList(CrdnQuery req) {
+		return mav;
-		return getCrackdownList(req);
 	}
-	@RequestMapping(name="장애인과태료업무 단속자료 목록", value="/010/DPV/list.do")
+	
-	public ModelAndView getDpvCrackdownList(CrdnQuery req) {
+	/** 표지정보 미확인 자료 메인화면을 연다.
-		return getCrackdownList(req);
+	 * @return fims/crdn/crdn06030-main
-	}
+	 */
-	@RequestMapping(name="전기차과태료업무 단속자료 목록", value="/010/ECA/list.do")
+	@RequestMapping(name="표지정보 미확인 자료 메인", value="/030/main.do")
-	public ModelAndView getEcaCrackdownList(CrdnQuery req) {
+	public ModelAndView tagInformationUndefinedDataMain() {
-		return getCrackdownList(req);
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/crdn/crdn06030-main");
+		mav.addObject("pageName","crdn06030-main");
+		
+		Map<String, List<CommonCode>> 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;
 	}
 	
+	/**단속자료 목록을 조회한다.<br />
+	 * {@link Crdn06Service#getCrackdownList(CrdnQuery)} 참고
+	 * @param req 단속자료 목록 조회 조건
+	 * @return jsonView
+	 * <pre><code> {
+	 *     "crdnList": [조회결과 목록],
+	 *     "crdnStart": 현재 페이지의 시작 자료 인덱스,
+	 *     "crdnFetchTotal": 한 페이지에 가져오는 자료 건 수,
+	 *     "crdnTotal": 조회 결과 찾은 전체 건 수
+	 * }</code></pre>
+	 */
+	public ModelAndView getCrackdownList(CrdnQuery req) {
+		setFetchSize(req);
+		return setCollectionInfo(
+			new ModelAndView("jsonView"),
+			crdn06Service.getCrackdownList(req),
+			"crdn"
+		);
+	}
 	
 	
 }

src/main/java/cokr/xit/fims/crdn/web/TaskCrdn06Controller.java

@@ -0,0 +1,41 @@
+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;
+
+/**단속 관리 서비스 웹 컨트롤러.<br />
+ * {웹 컨텍스트}/crdn/crdn06 로 접근할 수 있다.
+ * @author leebj
+ */
+@Controller
+public class TaskCrdn06Controller extends Crdn06Controller {
+
+	@RequestMapping(name="주정차과태료업무 단속자료 목록", value="/010/PVS/list.do")
+	public ModelAndView getPvsCrackdownList(CrdnQuery req) {
+		return getCrackdownList(req);
+	}
+	@RequestMapping(name="전용차로과태료업무 단속자료 목록", value="/010/BPV/list.do")
+	public ModelAndView getBpvCrackdownList(CrdnQuery req) {
+		return getCrackdownList(req);
+	}
+	@RequestMapping(name="장애인과태료업무 단속자료 목록", value="/010/DPV/list.do")
+	public ModelAndView getDpvCrackdownList(CrdnQuery req) {
+		return getCrackdownList(req);
+	}
+	@RequestMapping(name="전기차과태료업무 단속자료 목록", value="/010/ECA/list.do")
+	public ModelAndView getEcaCrackdownList(CrdnQuery req) {
+		return getCrackdownList(req);
+	}
+	
+	@RequestMapping(name="장애인과태료업무 표지정보미확인자료 목록", value="/030/DPV/list.do")
+	public ModelAndView getTagInformationUndefinedDataList(CrdnQuery req) {
+		
+		//TODO : 표지정보 관련 연계
+		
+		return getCrackdownList(req);
+	}
+	
+	
+}

src/main/java/cokr/xit/fims/sprt/web/AbstractSprt01Controller.java

@@ -1,50 +0,0 @@
-package cokr.xit.fims.sprt.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.fims.sprt.service.Sprt01Service;
-import cokr.xit.base.code.CommonCode;
-import cokr.xit.base.web.ApplicationController;
-
-
-@RequestMapping(name="업무지원", value="/sprt/sprt01")
-public class AbstractSprt01Controller extends ApplicationController {
-	
-	@Resource(name="sprt01Service")
-	private Sprt01Service sprt01Service;
-
-	/** 통합조회 메인화면을 연다.
-	 * @return fims/sprt/sprt01010-main
-	 */
-	@RequestMapping(name="통합조회 메인", value="/010/main.do")
-	public ModelAndView integratedInquireMain() {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("fims/sprt/sprt01010-main");
-		mav.addObject("pageName", "sprt01010-main");
-		
-		
-		return mav;
-	}
-	
-	/**지정하는 단속아이디의 개별총정보를 반환한다.
-	 * @param crdnId 단속 아이디
-	 * @return fims/sprt/sprt01020-info
-	 * <pre><code> {
-	 *     "totalDataInfo": {...}
-	 * }</code></pre>
-	 */
-	public ModelAndView getTotalDataInfo(String crdnId) {
-		ModelAndView mav = new ModelAndView("fims/sprt/sprt01020-info");
-		mav.addObject("pageName", "sprt01020-info");
-		if (!isEmpty(crdnId)) {
-			mav.addObject("totalDataInfo", sprt01Service.getTotalDataInfo(crdnId));
-		}
-		return mav;
-	}
-	
-}

src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java

@@ -1,33 +1,50 @@
 package cokr.xit.fims.sprt.web;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
+import cokr.xit.fims.sprt.service.Sprt01Service;
+import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.web.ApplicationController;
+
+
+@RequestMapping(name="업무지원", value="/sprt/sprt01")
+public class Sprt01Controller extends ApplicationController {
+	
+	@Resource(name="sprt01Service")
+	private Sprt01Service sprt01Service;
 
-/**업무지원 서비스 웹 컨트롤러.<br />
+	/** 통합조회 메인화면을 연다.
- * {웹 컨텍스트}/sprt/sprt01 로 접근할 수 있다.
+	 * @return fims/sprt/sprt01010-main
- * @author leebj
 	 */
-@Controller
+	@RequestMapping(name="통합조회 메인", value="/010/main.do")
-public class Sprt01Controller extends AbstractSprt01Controller {
+	public ModelAndView integratedInquireMain() {
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/sprt/sprt01010-main");
+		mav.addObject("pageName", "sprt01010-main");
 		
 		
-	@RequestMapping(name="주정차과태료업무 개별총정보 조회", value="/020/PVS/info.do")
+		return mav;
-	public ModelAndView getPvsTotalDataInfo(String crdnId) {
-		return getTotalDataInfo(crdnId);
 	}
-	@RequestMapping(name="전용차로과태료업무 개별총정보 조회", value="/020/BPV/info.do")
+	
-	public ModelAndView getBpvTotalDataInfo(String crdnId) {
+	/**지정하는 단속아이디의 개별총정보를 반환한다.
-		return getTotalDataInfo(crdnId);
+	 * @param crdnId 단속 아이디
-	}
+	 * @return fims/sprt/sprt01020-info
-	@RequestMapping(name="장애인과태료업무 개별총정보 조회", value="/020/DPV/info.do")
+	 * <pre><code> {
-	public ModelAndView getDpvTotalDataInfo(String crdnId) {
+	 *     "totalDataInfo": {...}
-		return getTotalDataInfo(crdnId);
+	 * }</code></pre>
+	 */
+	public ModelAndView getTotalDataInfo(String crdnId) {
+		ModelAndView mav = new ModelAndView("fims/sprt/sprt01020-info");
+		mav.addObject("pageName", "sprt01020-info");
+		if (!isEmpty(crdnId)) {
+			mav.addObject("totalDataInfo", sprt01Service.getTotalDataInfo(crdnId));
 		}
-	@RequestMapping(name="전기차과태료업무 개별총정보 조회", value="/020/ECA/info.do")
+		return mav;
-	public ModelAndView getEcaTotalDataInfo(String crdnId) {
-		return getTotalDataInfo(crdnId);
 	}
 	
 }

src/main/java/cokr/xit/fims/sprt/web/TaskSprt01Controller.java

@@ -0,0 +1,33 @@
+package cokr.xit.fims.sprt.web;
+
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+/**업무지원 서비스 웹 컨트롤러.<br />
+ * {웹 컨텍스트}/sprt/sprt01 로 접근할 수 있다.
+ * @author leebj
+ */
+@Controller
+public class TaskSprt01Controller extends Sprt01Controller {
+	
+	
+	@RequestMapping(name="주정차과태료업무 개별총정보 조회", value="/020/PVS/info.do")
+	public ModelAndView getPvsTotalDataInfo(String crdnId) {
+		return getTotalDataInfo(crdnId);
+	}
+	@RequestMapping(name="전용차로과태료업무 개별총정보 조회", value="/020/BPV/info.do")
+	public ModelAndView getBpvTotalDataInfo(String crdnId) {
+		return getTotalDataInfo(crdnId);
+	}
+	@RequestMapping(name="장애인과태료업무 개별총정보 조회", value="/020/DPV/info.do")
+	public ModelAndView getDpvTotalDataInfo(String crdnId) {
+		return getTotalDataInfo(crdnId);
+	}
+	@RequestMapping(name="전기차과태료업무 개별총정보 조회", value="/020/ECA/info.do")
+	public ModelAndView getEcaTotalDataInfo(String crdnId) {
+		return getTotalDataInfo(crdnId);
+	}
+
+}

src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml

@@ -86,7 +86,8 @@
 	  WHERE DEL_YN = 'N'
 	<if test="term != null">AND A.${by} LIKE CONCAT('%', #{term}, '%')</if>
 	<if test="crdnId != null">AND A.CRDN_ID = #{crdnId}</if>
-	<if test="schVhrno != null">AND A.VHRNO LIKE CONCAT('%', #{schVhrno}, '%')</if>
+	<if test="sysSeCd != null">AND A.SYS_SE_CD = #{sysSeCd}</if>
+	<if test="vhrno != null">AND A.VHRNO LIKE CONCAT('%', #{vhrno}, '%')</if>
 	<include refid="utility.orderBy" />
 	<include refid="utility.paging-suffix"/>
 </sql>

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp

@@ -68,7 +68,7 @@
 				                            </select>
 				                                
 				                            <select id="schOpt--${pageName}" name="schOpt" class="form-select">
-				                                <option value="schVhrno">차량번호</option>
+				                                <option value="vhrno">차량번호</option>
 				                            </select>
 				                            <input type="text" id="schWord--${pageName}" name="schWord" class="form-control" value="" />
 

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp

@@ -11,9 +11,7 @@
 				    <div class="container-page-btn">
 				        <button type="button" class="btn btn-outline-dark">초기화</button>
 				        <span class="container-window-btn-right">
-				            <button type="button" class="btn btn-darkgray" id="btnSingoRegist--${pageName}" title="시민신고개별등록">시민신고개별등록</button>
+
-				            <button type="button" class="btn btn-darkgray" id="btnMenualRegist--${pageName}" title="위반자료수기등록">위반자료수기등록</button>
-				            <button type="button" class="btn btn-darkgray" id="btnExtrRegist--${pageName}" title="외부연계파일처리">외부연계파일처리</button>
 				        </span>
 				    </div>
 
@@ -22,19 +20,6 @@
 				            <div class="row">
 				                <div class="col-11">
 				                    <div class="row">
-				                        <div class="col-12">
-				                            <label class="form-label fw-bold form-search-title">시스템구분</label>
-				                            <span class="form-search-linebox">
-												<c:forEach items="${FIM001List}" var="item">
-													<label>
-														<input name="sysSeCd" type="radio" value="${item.code}"
-														class="form-check-input" alt="시스템구분"
-														onchange="pageObject['${pageName}'].fnResetAndChangeBiz(this.value);">
-														${item.value}
-													</label> 
-												</c:forEach>
-				                            </span>
-				                        </div>
 				                        <div class="col-12">
 				                            <select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
 				                                <option value="crdnYmd">단속일자</option>
@@ -68,7 +53,7 @@
 				                            </select>
 				                                
 				                            <select id="schOpt--${pageName}" name="schOpt" class="form-select">
-				                                <option value="schVhrno">차량번호</option>
+				                                <option value="vhrno">차량번호</option>
 				                            </select>
 				                            <input type="text" id="schWord--${pageName}" name="schWord" class="form-control" value="" />
 
@@ -164,8 +149,8 @@ $(document).ready(function(){
 	    prefixName:"종합",
 	    infoSize:"xl",
 	    urls : {
-	        load : "",
+	        load : wctx.url("/crdn/crdn06/030/DPV/list.do"),
-	        getInfo : ""
+	        getInfo : wctx.url("/sprt/sprt01/020/DPV/info.do")
 	    },
 	    formats: {
 	    	CRDN_YMD_TM : datetimeFormat,
@@ -201,11 +186,6 @@ $(document).ready(function(){
 	};
 
 
-	thisPO.fnResetAndChangeBiz = sysSeCd => {
-		$("#crdnTbody--${pageName}").html("");
-		thisPO.crdnControl.urls.load = wctx.url("/crdn/crdn06/010/"+ sysSeCd +"/list.do");
-		thisPO.crdnControl.urls.getInfo = wctx.url("/sprt/sprt01/020/"+ sysSeCd +"/info.do");
-	}
 
 	thisPO.searchCrdnList = () => {
 		thisPO.crdnControl.query = thisPO.getParams();
@@ -236,7 +216,7 @@ $(document).ready(function(){
 		var form = $("#frmSearch--${pageName}");
 		
 		return {
-			sysSeCd: form.find("[name='sysSeCd']:checked").val()
+			sysSeCd: 'DPV'
 			,[form.find("[name='schOpt']").val()]: form.find("[name='schWord']").val()
 		    ,schDateOpt: form.find("[name='schDateOpt']").val()
 		    ,schDateFrom: form.find("[name='schDateFrom']").val()
@@ -312,9 +292,7 @@ $(document).ready(function(){
         $(this).prev().focus();
     });
 
-    var defaultBizValue = $("#layout-navbar input[name='sysSeCd']:checked").val();
+
-	$("#frmSearch--${pageName} input[name='sysSeCd'][value='" + defaultBizValue + "']").prop("checked",true);
-	thisPO.fnResetAndChangeBiz(defaultBizValue);
     
     //스크롤 이벤트 추가
     $("#table-responsive--${pageName}").scroll(function(){