From 6750980bb46091b4330c103ef6fd54b900e12789 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 29 Aug 2023 15:00:40 +0900 Subject: [PATCH] no message --- .../xit/fims/crdn/web/Crdn02Controller.java | 2 - .../xit/fims/crdn/web/Crdn04Controller.java | 2 - .../xit/fims/crdn/web/Crdn05Controller.java | 6 -- .../xit/fims/crdn/web/Crdn06Controller.java | 2 - .../xit/fims/crdn/web/Crdn07Controller.java | 2 - .../cokr/xit/fims/task/web/BpvController.java | 68 +++++++++++++++++-- .../cokr/xit/fims/task/web/DpvController.java | 52 ++++++++++++-- .../cokr/xit/fims/task/web/EcaController.java | 52 ++++++++++++-- .../cokr/xit/fims/task/web/PvsController.java | 64 +++++++++++++++-- 9 files changed, 219 insertions(+), 31 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index 8f5611da..e97f1d0e 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -5,7 +5,6 @@ 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; @@ -64,7 +63,6 @@ public class Crdn02Controller extends ApplicationController { * "crdnTotal": 조회 결과 찾은 전체 건 수 * } */ - @RequestMapping(name="검사자료 목록", value="/020/list.do") public ModelAndView getInspectionDataList(CrdnQuery query) { switch(query.getInspectionDataType()) { case "photo" -> query.setGridType("photo"); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn04Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn04Controller.java index 87b79d9d..1520f654 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn04Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn04Controller.java @@ -5,7 +5,6 @@ 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; @@ -59,7 +58,6 @@ public class Crdn04Controller extends ApplicationController { * "crdnTotal": 조회 결과 찾은 전체 건 수 * } */ - @RequestMapping(name="감경자료 목록", value="/040/list.do") public ModelAndView getFineReductionDataList(CrdnQuery query) { query.setGridType("fineReductionData"); setFetchSize(query); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index 554e84a2..639c375b 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -8,8 +8,6 @@ import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; @@ -72,7 +70,6 @@ public class Crdn05Controller extends ApplicationController { * @param * @return fims/crdn/crdn05020-info */ - @RequestMapping(name="단속자료 파일 등록 화면", value="/020/info.do") public ModelAndView getFileRegistrationScreen() { return new ModelAndView("fims/crdn/crdn05020-info"); } @@ -88,7 +85,6 @@ public class Crdn05Controller extends ApplicationController { * "crdnTotal": 조회 결과 찾은 전체 건 수 * } */ - @RequestMapping(name="당일 입력 단속자료 목록 조회", value="/010/list.do") public ModelAndView getTodayCrdnDataList(CrdnQuery query) { setFetchSize(query); query.setGridType("todayInsert"); @@ -99,7 +95,6 @@ public class Crdn05Controller extends ApplicationController { * @param * @return fims/crdn/crdn05030-info */ - @RequestMapping(name="단속자료 수기 등록 화면", value="/030/info.do") public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { ModelAndView mav = new ModelAndView("fims/crdn/crdn05030-info"); @@ -157,7 +152,6 @@ public class Crdn05Controller extends ApplicationController { * "saved": 등록되었으면 true, 그렇지 않으면 false * } */ - @PostMapping(name="단속자료 수기 등록", value="/030/create.do") public ModelAndView createCrdnDataByManual(HttpServletRequest hReq, Crdn crdn, MultipartFile[] newFileList) { boolean saved = false; 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 c23eadda..e61fc11f 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -5,7 +5,6 @@ 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; @@ -62,7 +61,6 @@ public class Crdn06Controller extends ApplicationController { * "crdnTotal": 조회 결과 찾은 전체 건 수 * } */ - @RequestMapping(name="단속자료 목록", value="/010/list.do") public ModelAndView getCrackdownList(CrdnQuery query) { setFetchSize(query); return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),""); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java index a0c29846..32cd6fee 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java @@ -2,7 +2,6 @@ package cokr.xit.fims.crdn.web; import javax.annotation.Resource; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.web.ApplicationController; @@ -41,7 +40,6 @@ public class Crdn07Controller extends ApplicationController { * @param crdn 단속 * @return jsonView */ - @RequestMapping(name="단속팀 정보 조회", value="/010/info.do") public ModelAndView getTeamInfo(String teamId) { ModelAndView mav = new ModelAndView("jsonView"); mav.addObject("teamInfo", crdnStngService.getTeamInfo(teamId)); diff --git a/src/main/java/cokr/xit/fims/task/web/BpvController.java b/src/main/java/cokr/xit/fims/task/web/BpvController.java index cc9e2b39..118f54b3 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -158,23 +158,81 @@ public class BpvController { @Controller @RequestMapping(name="전용차로과태료업무 단속자료검사 업무", value=CLASS_URL+Crdn02Controller.CLASS_URL) - class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller {} + class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller { + + @Override + @RequestMapping(name="전용차로과태료업무 검사자료 목록 조회", value=METHOD_URL.getInspectionDataList) + public ModelAndView getInspectionDataList(CrdnQuery query) { + return super.getInspectionDataList(query); + } + + } @Controller @RequestMapping(name="전용차로과태료업무 과태료감경자료 업무", value=CLASS_URL+Crdn04Controller.CLASS_URL) - class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {} + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller { + + @Override + @RequestMapping(name="전용차로과태료업무 감경자료 목록 조회", value=METHOD_URL.getFineReductionDataList) + public ModelAndView getFineReductionDataList(CrdnQuery query) { + return super.getFineReductionDataList(query); + } + + } @Controller @RequestMapping(name="전용차로과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) - class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} + class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller { + + @Override + @RequestMapping(name="전용차로과태료업무 단속자료 파일 등록 화면", value=METHOD_URL.getFileRegistrationScreen) + public ModelAndView getFileRegistrationScreen() { + return super.getFileRegistrationScreen(); + } + + @Override + @RequestMapping(name="전용차로과태료업무 당일 입력 단속자료 목록 조회", value=METHOD_URL.getTodayCrdnDataList) + public ModelAndView getTodayCrdnDataList(CrdnQuery query) { + return super.getTodayCrdnDataList(query); + } + + @Override + @RequestMapping(name="전용차로과태료업무 단속자료 수기 등록 화면", value=METHOD_URL.getManualRegistrationScreen) + public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { + return super.getManualRegistrationScreen(hReq); + } + + @Override + @RequestMapping(name="전용차로과태료업무 단속자료 수기 등록", value=METHOD_URL.createCrdnDataByManual) + public ModelAndView createCrdnDataByManual(HttpServletRequest hReq, Crdn crdn, MultipartFile[] newFileList) { + return super.createCrdnDataByManual(hReq, crdn, newFileList); + } + + } @Controller @RequestMapping(name="전용차로과태료업무 단속업무", value=CLASS_URL+Crdn06Controller.CLASS_URL) - class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller {} + class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller { + + @Override + @RequestMapping(name="전용차로과태료업무 단속자료 목록", value=METHOD_URL.getCrackdownList) + public ModelAndView getCrackdownList(CrdnQuery query) { + return super.getCrackdownList(query); + } + + } @Controller @RequestMapping(name="전용차로과태료업무 단속팀 관리", value=CLASS_URL+Crdn07Controller.CLASS_URL) - class Crdn07Controller extends cokr.xit.fims.crdn.web.Crdn07Controller {} + class Crdn07Controller extends cokr.xit.fims.crdn.web.Crdn07Controller { + + @Override + @RequestMapping(name="전용차로과태료업무 단속팀 정보 조회", value=METHOD_URL.getTeamInfo) + public ModelAndView getTeamInfo(String teamId) { + return super.getTeamInfo(teamId); + } + + } @Controller @RequestMapping(name="전용차로과태료업무 부과제외_부과제외관리", value=CLASS_URL+"/excl/excl01") diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index 67823c50..4b653804 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -160,7 +160,15 @@ public class DpvController { @Controller @RequestMapping(name="장애인과태료업무 단속자료검사 업무", value=CLASS_URL+Crdn02Controller.CLASS_URL) - class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller {} + class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller { + + @Override + @RequestMapping(name="장애인과태료업무 검사자료 목록 조회", value=METHOD_URL.getInspectionDataList) + public ModelAndView getInspectionDataList(CrdnQuery query) { + return super.getInspectionDataList(query); + } + + } @Controller @RequestMapping(name="장애인과태료업무 표지정보확인 업무", value=CLASS_URL+Crdn03Controller.CLASS_URL) @@ -205,15 +213,51 @@ public class DpvController { @Controller @RequestMapping(name="장애인과태료업무 과태료감경자료 업무", value=CLASS_URL+Crdn04Controller.CLASS_URL) - class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {} + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller { + + @Override + @RequestMapping(name="장애인과태료업무 감경자료 목록 조회", value=METHOD_URL.getFineReductionDataList) + public ModelAndView getFineReductionDataList(CrdnQuery query) { + return super.getFineReductionDataList(query); + } + + } @Controller @RequestMapping(name="장애인과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) - class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} + class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller { + + @Override + @RequestMapping(name="장애인과태료업무 당일 입력 단속자료 목록 조회", value=METHOD_URL.getTodayCrdnDataList) + public ModelAndView getTodayCrdnDataList(CrdnQuery query) { + return super.getTodayCrdnDataList(query); + } + + @Override + @RequestMapping(name="장애인과태료업무 단속자료 수기 등록 화면", value=METHOD_URL.getManualRegistrationScreen) + public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { + return super.getManualRegistrationScreen(hReq); + } + + @Override + @RequestMapping(name="장애인과태료업무 단속자료 수기 등록", value=METHOD_URL.createCrdnDataByManual) + public ModelAndView createCrdnDataByManual(HttpServletRequest hReq, Crdn crdn, MultipartFile[] newFileList) { + return super.createCrdnDataByManual(hReq, crdn, newFileList); + } + + } @Controller @RequestMapping(name="장애인과태료업무 단속업무", value=CLASS_URL+Crdn06Controller.CLASS_URL) - class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller {} + class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller { + + @Override + @RequestMapping(name="장애인과태료업무 단속자료 목록", value=METHOD_URL.getCrackdownList) + public ModelAndView getCrackdownList(CrdnQuery query) { + return super.getCrackdownList(query); + } + + } @Controller @RequestMapping(name="장애인과태료업무 부과제외_부과제외관리", value=CLASS_URL+"/excl/excl01") diff --git a/src/main/java/cokr/xit/fims/task/web/EcaController.java b/src/main/java/cokr/xit/fims/task/web/EcaController.java index 04d2b64b..a591ebee 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -158,19 +158,63 @@ public class EcaController { @Controller @RequestMapping(name="전기차과태료업무 단속자료검사 업무", value=CLASS_URL+Crdn02Controller.CLASS_URL) - class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller {} + class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller { + + @Override + @RequestMapping(name="전기차과태료업무 검사자료 목록 조회", value=METHOD_URL.getInspectionDataList) + public ModelAndView getInspectionDataList(CrdnQuery query) { + return super.getInspectionDataList(query); + } + + } @Controller @RequestMapping(name="전기차과태료업무 과태료감경자료 업무", value=CLASS_URL+Crdn04Controller.CLASS_URL) - class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {} + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller { + + @Override + @RequestMapping(name="전기차과태료업무 감경자료 목록 조회", value=METHOD_URL.getFineReductionDataList) + public ModelAndView getFineReductionDataList(CrdnQuery query) { + return super.getFineReductionDataList(query); + } + + } @Controller @RequestMapping(name="전기차과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) - class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} + class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller { + + @Override + @RequestMapping(name="전기차과태료업무 당일 입력 단속자료 목록 조회", value=METHOD_URL.getTodayCrdnDataList) + public ModelAndView getTodayCrdnDataList(CrdnQuery query) { + return super.getTodayCrdnDataList(query); + } + + @Override + @RequestMapping(name="전기차과태료업무 단속자료 수기 등록 화면", value=METHOD_URL.getManualRegistrationScreen) + public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { + return super.getManualRegistrationScreen(hReq); + } + + @Override + @RequestMapping(name="전기차과태료업무 단속자료 수기 등록", value=METHOD_URL.createCrdnDataByManual) + public ModelAndView createCrdnDataByManual(HttpServletRequest hReq, Crdn crdn, MultipartFile[] newFileList) { + return super.createCrdnDataByManual(hReq, crdn, newFileList); + } + + } @Controller @RequestMapping(name="전기차과태료업무 단속업무", value=CLASS_URL+Crdn06Controller.CLASS_URL) - class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller {} + class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller { + + @Override + @RequestMapping(name="전기차과태료업무 단속자료 목록", value=METHOD_URL.getCrackdownList) + public ModelAndView getCrackdownList(CrdnQuery query) { + return super.getCrackdownList(query); + } + + } @Controller @RequestMapping(name="전기차과태료업무 부과제외_부과제외관리", value=CLASS_URL+"/excl/excl01") diff --git a/src/main/java/cokr/xit/fims/task/web/PvsController.java b/src/main/java/cokr/xit/fims/task/web/PvsController.java index aa347875..fb60e0d6 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -171,6 +171,12 @@ public class PvsController { @Resource(name="crdnInfoMapper") private CrdnInfoMapper crdnInfoMapper; + @Override + @RequestMapping(name="주정차과태료업무 검사자료 목록 조회", value=METHOD_URL.getInspectionDataList) + public ModelAndView getInspectionDataList(CrdnQuery query) { + return super.getInspectionDataList(query); + } + /**2시간 초과처리 팝업을 호출한다.
* @param crdnId 단속 ID * @return crdn02050-info @@ -208,19 +214,69 @@ public class PvsController { @Controller @RequestMapping(name="주정차과태료업무 과태료감경자료 업무", value=CLASS_URL+Crdn04Controller.CLASS_URL) - class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {} + class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller { + + @Override + @RequestMapping(name="주정차과태료업무 감경자료 목록 조회", value=METHOD_URL.getFineReductionDataList) + public ModelAndView getFineReductionDataList(CrdnQuery query) { + return super.getFineReductionDataList(query); + } + + } @Controller @RequestMapping(name="주정차과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) - class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {} + class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller { + + @Override + @RequestMapping(name="주정차과태료업무 단속자료 파일 등록 화면", value=METHOD_URL.getFileRegistrationScreen) + public ModelAndView getFileRegistrationScreen() { + return super.getFileRegistrationScreen(); + } + + @Override + @RequestMapping(name="주정차과태료업무 당일 입력 단속자료 목록 조회", value=METHOD_URL.getTodayCrdnDataList) + public ModelAndView getTodayCrdnDataList(CrdnQuery query) { + return super.getTodayCrdnDataList(query); + } + + @Override + @RequestMapping(name="주정차과태료업무 단속자료 수기 등록 화면", value=METHOD_URL.getManualRegistrationScreen) + public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { + return super.getManualRegistrationScreen(hReq); + } + + @Override + @RequestMapping(name="주정차과태료업무 단속자료 수기 등록", value=METHOD_URL.createCrdnDataByManual) + public ModelAndView createCrdnDataByManual(HttpServletRequest hReq, Crdn crdn, MultipartFile[] newFileList) { + return super.createCrdnDataByManual(hReq, crdn, newFileList); + } + + } @Controller @RequestMapping(name="주정차과태료업무 단속업무", value=CLASS_URL+Crdn06Controller.CLASS_URL) - class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller {} + class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller { + + @Override + @RequestMapping(name="주정차과태료업무 단속자료 목록", value=METHOD_URL.getCrackdownList) + public ModelAndView getCrackdownList(CrdnQuery query) { + return super.getCrackdownList(query); + } + + } @Controller @RequestMapping(name="주정차과태료업무 단속팀 관리", value=CLASS_URL+Crdn07Controller.CLASS_URL) - class Crdn07Controller extends cokr.xit.fims.crdn.web.Crdn07Controller {} + class Crdn07Controller extends cokr.xit.fims.crdn.web.Crdn07Controller { + + @Override + @RequestMapping(name="주정차과태료업무 단속팀 정보 조회", value=METHOD_URL.getTeamInfo) + public ModelAndView getTeamInfo(String teamId) { + return super.getTeamInfo(teamId); + } + + } @Controller @RequestMapping(name="주정차과태료업무 부과제외_부과제외관리", value=CLASS_URL+"/excl/excl01")