From f6ae1d6ff5560db7e14a1334d5eb70120e4d519d Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 18 Sep 2023 17:28:18 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=ED=8C=8C=EC=9D=BC=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/crdn/web/Crdn05Controller.java | 38 +++- .../cokr/xit/fims/task/web/BpvController.java | 12 +- .../cokr/xit/fims/task/web/DpvController.java | 16 +- .../cokr/xit/fims/task/web/EcaController.java | 16 +- .../cokr/xit/fims/task/web/PvsController.java | 12 +- .../WEB-INF/jsp/fims/crdn/crdn05020-info.jsp | 184 +++++++++++++++++- .../WEB-INF/jsp/fims/superUser-main.jsp | 10 +- 7 files changed, 257 insertions(+), 31 deletions(-) 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 f2312f98..21dc324b 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -34,8 +34,11 @@ public class Crdn05Controller extends ApplicationController { public class METHOD_URL { public static final String crackdownDataRegistrationMain = "/010/main.do", - getFileRegistrationScreen = "/020/info.do", getTodayCrdnDataList = "/010/list.do", + + getFileRegistrationScreen = "/020/info.do", + getCrdnFileListFromEquipmentEnterprise = "/020/list.do", + getManualRegistrationScreen = "/030/info.do", createCrdnDataByManual = "/030/create.do" ; @@ -71,8 +74,37 @@ public class Crdn05Controller extends ApplicationController { * @param * @return fims/crdn/crdn05020-info */ - public ModelAndView getFileRegistrationScreen() { - return new ModelAndView("fims/crdn/crdn05020-info"); + public ModelAndView getFileRegistrationScreen(HttpServletRequest hReq) { + ModelAndView mav = new ModelAndView("fims/crdn/crdn05020-info"); + mav.addObject("pageName", "crdn05020-info"); + + String urlTaskSeCd = hReq.getServletPath().split("/")[1]; + mav.addObject("taskSeCd", urlTaskSeCd); + + Map> commonCodes = getCodesOf("FIM054"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + + return mav; + } + + /**연계를 통해 서버의 스토리지로 전송된 장비업체의 단속파일을 조회한다. + * @param + * @return + */ + public ModelAndView getCrdnFileListFromEquipmentEnterprise(HttpServletRequest hReq) { + ModelAndView mav = new ModelAndView("jsonView"); + + String entType = hReq.getParameter("entType"); + + List dataObjectList = new ArrayList<>(); + + if(entType.equals("이노")) { + + + + } + + return mav; } /**당일 등록한 단속자료 목록을 조회한다. 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 810884bd..9703ba69 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -196,18 +196,18 @@ public class BpvController { @RequestMapping(name="전용차로과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) 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.getFileRegistrationScreen) + public ModelAndView getFileRegistrationScreen(HttpServletRequest hReq) { + return super.getFileRegistrationScreen(hReq); + } + @Override @RequestMapping(name="전용차로과태료업무 단속자료 수기 등록 화면", value=METHOD_URL.getManualRegistrationScreen) public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { 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 2dd64def..91b47d9e 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -219,16 +219,22 @@ public class DpvController { @RequestMapping(name="장애인과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) 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.getFileRegistrationScreen) - public ModelAndView getFileRegistrationScreen() { - return super.getFileRegistrationScreen(); + public ModelAndView getFileRegistrationScreen(HttpServletRequest hReq) { + return super.getFileRegistrationScreen(hReq); } @Override - @RequestMapping(name="장애인과태료업무 당일 입력 단속자료 목록 조회", value=METHOD_URL.getTodayCrdnDataList) - public ModelAndView getTodayCrdnDataList(CrdnQuery query) { - return super.getTodayCrdnDataList(query); + @RequestMapping(name="장애인과태료업무 장비업체 단속파일 목록 조회", value=METHOD_URL.getCrdnFileListFromEquipmentEnterprise) + public ModelAndView getCrdnFileListFromEquipmentEnterprise(HttpServletRequest hReq) { + return super.getCrdnFileListFromEquipmentEnterprise(hReq); } @Override 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 5fb8b7a9..6a46d578 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -197,16 +197,22 @@ public class EcaController { @RequestMapping(name="전기차과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) 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.getFileRegistrationScreen) - public ModelAndView getFileRegistrationScreen() { - return super.getFileRegistrationScreen(); + public ModelAndView getFileRegistrationScreen(HttpServletRequest hReq) { + return super.getFileRegistrationScreen(hReq); } @Override - @RequestMapping(name="전기차과태료업무 당일 입력 단속자료 목록 조회", value=METHOD_URL.getTodayCrdnDataList) - public ModelAndView getTodayCrdnDataList(CrdnQuery query) { - return super.getTodayCrdnDataList(query); + @RequestMapping(name="전기차과태료업무 장비업체 단속파일 목록 조회", value=METHOD_URL.getCrdnFileListFromEquipmentEnterprise) + public ModelAndView getCrdnFileListFromEquipmentEnterprise(HttpServletRequest hReq) { + return super.getCrdnFileListFromEquipmentEnterprise(hReq); } @Override 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 4cc6368c..5e10adb7 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -209,18 +209,18 @@ public class PvsController { @RequestMapping(name="주정차과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL) 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.getFileRegistrationScreen) + public ModelAndView getFileRegistrationScreen(HttpServletRequest hReq) { + return super.getFileRegistrationScreen(hReq); + } + @Override @RequestMapping(name="주정차과태료업무 단속자료 수기 등록 화면", value=METHOD_URL.getManualRegistrationScreen) public ModelAndView getManualRegistrationScreen(HttpServletRequest hReq) { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp index 49ec1fc6..7e49e2e0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp @@ -1,3 +1,185 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -파일등록팝업화면 \ No newline at end of file +단속 파일 등록 +
+
+
+
+
+ + +
+
+ + +
+
+ + + + +
+ +
+ + +
+ +
+ +
+
+
+
+ + + + + + +
+
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
No.파일명타임스탬프사이즈디바이스ID날짜/시간차량번호총사진갯수사진시퀀스위치좌표x위치좌표y입력구분locationaddress법정동파일확장자
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/superUser-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/superUser-main.jsp index 6c32a626..c2cfc00d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/superUser-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/superUser-main.jsp @@ -10,10 +10,10 @@
- - - - + + + +
@@ -75,7 +75,7 @@ /** * 수동 배치 실행 */ -function exceuteBatch(batch){ +function executeBatch(batch){ ajax.get({ url : wctx.url("/user/superUser/executeBatch.do"), data : { batch : batch},