From 8e7d8a16904389d887a0e2c390ec30c05255eccc Mon Sep 17 00:00:00 2001 From: leebj Date: Thu, 4 Jul 2024 09:34:10 +0900 Subject: [PATCH] =?UTF-8?q?jsp=ED=8C=8C=EC=9D=BC=EB=AA=85,=20=EC=BB=A8?= =?UTF-8?q?=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=ED=8C=8C=EC=9D=BC=EB=AA=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/base/web/OgdpController.java | 303 ++++++++++++++++++ .../xit/fims/mngt/web/Mngt03Controller.java | 237 -------------- .../xit/fims/mngt/web/Mngt04Controller.java | 121 ------- .../ogdp01010-main.jsp} | 12 +- .../ogdp02010-main.jsp} | 5 +- .../ogdp02020-info.jsp} | 3 +- .../jsp/fims/{mngt => ogdp}/select-sgg.jsp | 2 +- 7 files changed, 313 insertions(+), 370 deletions(-) delete mode 100644 src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java delete mode 100644 src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java rename src/main/webapp/WEB-INF/jsp/fims/{mngt/mngt03010-main.jsp => ogdp/ogdp01010-main.jsp} (98%) rename src/main/webapp/WEB-INF/jsp/fims/{mngt/mngt04010-main.jsp => ogdp/ogdp02010-main.jsp} (98%) rename src/main/webapp/WEB-INF/jsp/fims/{mngt/mngt04020-info.jsp => ogdp/ogdp02020-info.jsp} (99%) rename src/main/webapp/WEB-INF/jsp/fims/{mngt => ogdp}/select-sgg.jsp (94%) diff --git a/src/main/java/cokr/xit/fims/base/web/OgdpController.java b/src/main/java/cokr/xit/fims/base/web/OgdpController.java index acc27789..772d4b3f 100644 --- a/src/main/java/cokr/xit/fims/base/web/OgdpController.java +++ b/src/main/java/cokr/xit/fims/base/web/OgdpController.java @@ -1,13 +1,316 @@ package cokr.xit.fims.base.web; +import java.io.File; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.apache.commons.io.FilenameUtils; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.user.Department; import cokr.xit.base.user.Sigungu; +import cokr.xit.base.user.SigunguQuery; +import cokr.xit.base.user.service.SigunguDepartmentService; import cokr.xit.base.user.web.SigunguDepartmentController; +import cokr.xit.fims.base.FimsDepartment; +import cokr.xit.fims.base.FimsSigungu; +import cokr.xit.fims.base.OgdpQuery; +import cokr.xit.fims.base.service.bean.OgdpBean; +import cokr.xit.fims.cmmn.CmmnQuery; +import cokr.xit.fims.cmmn.service.StngService; +import cokr.xit.fims.mngt.Task; +import cokr.xit.fims.mngt.VltnQuery; +import cokr.xit.fims.mngt.service.bean.TaskBean; +import cokr.xit.fims.mngt.service.bean.VltnBean; +import cokr.xit.foundation.UserInfo; +import cokr.xit.foundation.data.DataObject; @Controller public class OgdpController extends SigunguDepartmentController { + public class METHOD_URL { + public static final String + sggStngMain = "/ogdp/sggStngMain.do", + getSggStngInfo = "/ogdp/getSggStngInfo.do", + getTasks = "/ogdp/getTasks.do", + getVltns = "/ogdp/getVltns.do", + updateSggStng = "/ogdp/updateSggStng.do", + updateTaskStng = "/ogdp/updateTaskStng.do", + createTaskStng = "/ogdp/createTaskStng.do", + deptStngMain = "/ogdp/deptStngMain.do", + getDeptStngList = "/ogdp/getDeptStngList.do", + getDeptStngInfo = "/ogdp/getDeptStngInfo.do", + updateDeptStng = "/ogdp/updateDeptStng.do" + ; + } + + @Resource(name="sigunguDepartmentService") + private SigunguDepartmentService sggDeptService; + + @Resource(name="ogdpBean") + private OgdpBean ogdpBean; + + /** 설정 정보 서비스 */ + @Resource(name = "stngService") + private StngService stngService; + + /** 업무 정보 Bean */ + @Resource(name = "taskBean") + private TaskBean taskBean; + + /** 위반 정보 Bean */ + @Resource(name = "vltnBean") + private VltnBean vltnBean; + + + /** 시군구 설정 관리 메인화면을 연다. + * @return fims/ogdp/ogdp01010-main + */ + @RequestMapping(name="시군구 설정 정보 관리 메인", value=METHOD_URL.sggStngMain) + public ModelAndView sggStngMain(String sggCd) { + ModelAndView mav = new ModelAndView(); + + UserInfo userInfo = currentUser(); + + if(userInfo.getInstitute().equals("default")) { + if(ifEmpty(sggCd, ()->"").equals("")) { + + mav.setViewName("fims/ogdp/select-sgg"); + mav.addObject("pageName", "selectSgg"); + + List sggList = ogdpBean.selectAllSggList(); + mav.addObject("sggList", sggList); + + } else { + mav.setViewName("fims/ogdp/ogdp01010-main"); + mav.addObject("pageName", "ogdp01010"); + mav.addObject("sggCd", sggCd); + } + + } else { + mav.setViewName("fims/ogdp/ogdp01010-main"); + mav.addObject("pageName", "ogdp01010"); + ogdpBean.initUserInfo(userInfo); + mav.addObject("sggCd", userInfo.getInfo().get("sggCd")); + } + + return mav; + } + + /**지정하는 시군구의 설정 정보를 가져온다.
+ * @param req + * @return jsonView + */ + @RequestMapping(name="시군구 설정 조회", value=METHOD_URL.getSggStngInfo) + public ModelAndView getSggStngInfo(OgdpQuery req) { + ModelAndView mav = new ModelAndView("jsonView"); + DataObject sggInfo = ogdpBean.getSggStngInfo(req); + mav.addObject("sggInfo", sggInfo); + return mav; + } + + /**지정하는 시군구의 업무 설정 정보를 가져온다.
+ * @param req + * @return jsonView + */ + @RequestMapping(name="업무 조회", value=METHOD_URL.getTasks) + public ModelAndView getTasks(CmmnQuery req) { + List result = taskBean.getTasks(req); + + return setCollectionInfo(new ModelAndView("jsonView"), result, "task"); + } + + /**지정하는 시군구와 업무의 위반 설정 정보를 가져온다.
+ * @return 위반 설정 정보 + */ + @RequestMapping(name="위반정보 조회", value=METHOD_URL.getVltns) + public ModelAndView getVltns(VltnQuery req) { + List result = vltnBean.getVltns(req); + return setCollectionInfo(new ModelAndView("jsonView"), result, "vltn"); + } + + /**시군구 설정 정보를 수정한다. + * @param sgg 시군구 정보, symbol 시군구 상징파일, logo 시군구 로고파일, offcs 시군구 직인파일 + * @return jsonView + * 
 {
+	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + @RequestMapping(name="시군구 설정 정보 수정", value=METHOD_URL.updateSggStng) + public ModelAndView updateSggStng(FimsSigungu sgg, MultipartFile symbol, MultipartFile logo, MultipartFile offcs) { + ModelAndView mav = new ModelAndView("jsonView"); + + String sggCd = sgg.getSggID(); + + if(symbol != null && !symbol.isEmpty() && symbol.getSize() != 0) { + Map newSymbol = this.uploadForSgg(symbol, sggCd, "symbol"); + sgg.setSymbolFilepath(newSymbol.get("filePath")); + sgg.setSymbolFilename(newSymbol.get("fileName")); + } + if(logo != null && !logo.isEmpty() && logo.getSize() != 0) { + Map newLogo = this.uploadForSgg(logo, sggCd, "logo"); + sgg.setLogoFilepath(newLogo.get("filePath")); + sgg.setLogoFilename(newLogo.get("fileName")); + } + if(offcs != null && !offcs.isEmpty() && offcs.getSize() != 0) { + Map newOffcs = this.uploadForSgg(offcs, sggCd, "offcs"); + sgg.setOfficialSealFilepath(newOffcs.get("filePath")); + sgg.setOfficialSealFilename(newOffcs.get("fileName")); + } + boolean saved = ogdpBean.updateSggStng(sgg); + + mav.addObject("saved", saved); + return mav; + } + + private Map uploadForSgg(MultipartFile mf, String sggCd, String fileSe){ + Map newFileInfoMap = new HashMap<>(); + String workDirPath = "files/attachment/etc/"+fileSe; + + String ext = FilenameUtils.getExtension(mf.getOriginalFilename()); + String fileName = sggCd+"."+ext; + + File workDir = new File(workDirPath); + workDir.mkdirs(); + String newFileFullPath = workDirPath + "/" + fileName; + + try { + + File newFile = new File(newFileFullPath); + if(newFile.exists()) { + if(!newFile.delete()) { + throw new RuntimeException("[F]이미지 업로드 중 오류가 발생하였습니다."); + } + } + mf.transferTo(newFile); + + } catch (Exception e) { + throw new RuntimeException("[F]이미지 업로드 중 오류가 발생하였습니다."); + } + + newFileInfoMap.put("filePath", newFileFullPath); + newFileInfoMap.put("fileName", mf.getOriginalFilename()); + return newFileInfoMap; + } + + /**시군구별 업무,위반 설정 정보를 수정한다. + * @param sgg 시군구 정보 + * @return jsonView + * 
 {
+	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + @RequestMapping(name="업무 설정 정보 수정", value=METHOD_URL.updateTaskStng) + public ModelAndView updateTaskStng(Task task) { + ModelAndView mav = new ModelAndView("jsonView"); + + boolean saved = false; + String rtnMsg = stngService.updateTaskStng(task, task.getVltnStngList()); + if(rtnMsg.contains("[S]")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; + } + + /**시군구별 업무,위반 설정을 추가한다. + * @param sggCd 시군구 코드, taskSeCd 업무 구분 코드 + * @return jsonView + * 
 {
+	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + @RequestMapping(name="시군구 과태료 업무 추가", value=METHOD_URL.createTaskStng) + public ModelAndView createTaskStng(String sggCd, String taskSeCd) { + ModelAndView mav = new ModelAndView("jsonView"); + + boolean saved = false; + String rtnMsg = stngService.createTaskStng(sggCd, taskSeCd); + if(rtnMsg.contains("[S]")) { + saved = true; + } + mav.addObject("saved", saved); + return mav; + } + + /** 부서 설정관리 메인화면을 연다. + * @return fims/ogdp/ogdp02010-main + */ + @RequestMapping(name="부서 설정 정보 관리 메인", value=METHOD_URL.deptStngMain) + public ModelAndView deptStngMain() { + ModelAndView mav = new ModelAndView(); + + mav.setViewName("fims/ogdp/ogdp02010-main"); + mav.addObject("pageName", "ogdp02010"); + + List allSggList = sggDeptService.getSigunguList(new SigunguQuery()); + + mav.addObject("sggList", allSggList); + + return mav; + } + + /**부서 설정 목록을 조회한다.
+ * {@link OgdpService#getDeptStngList(CmmnQuery)} 참고 + * @param query 부서 목록 조회 조건 + * @return jsonView + */ + @RequestMapping(name="부서 설정 목록 조회", value=METHOD_URL.getDeptStngList) + public ModelAndView getDeptStngList(OgdpQuery query) { + + setFetchSize(query); + + return setCollectionInfo(new ModelAndView("jsonView"), ogdpBean.getDeptStngList(query),"",""); + + } + + /**지정한 ID의 부서 설정 정보(info)를 반환한다. + * @param query 부서 조회 조건 + * @return fims/ogdp/ogdp02020-info 또는 jsonView + * 
{
+	 *     "deptInfo": 부서 정보
+	 * }
+ */ + @RequestMapping(name="부서 설정 상세 조회", value=METHOD_URL.getDeptStngInfo) + public ModelAndView getDeptStngInfo(OgdpQuery query) { + DataObject deptInfo = new DataObject(); + + if(!ifEmpty(query.getDeptCd(), ()->"").equals("")) { + deptInfo = ogdpBean.getDeptStngInfo(query); + } else { + deptInfo = null; + } + + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/ogdp/ogdp02020-info"); + + mav.addObject("pageName", "ogdp02020"); + mav.addObject("deptInfo", json ? deptInfo : toJson(deptInfo)); + return mav; + } + + + + + /**부서 설정 정보를 수정한다. + * @param dept 부서 정보 + * @return jsonView + * 
 {
+	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + @RequestMapping(name="부서 설정 수정", value=METHOD_URL.updateDeptStng) + public ModelAndView updateDeptStng(FimsDepartment dept) { + ModelAndView mav = new ModelAndView("jsonView"); + boolean saved = ogdpBean.updateDeptStng(dept); + mav.addObject("saved", saved); + return mav; + } } \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java deleted file mode 100644 index b601b3bf..00000000 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java +++ /dev/null @@ -1,237 +0,0 @@ -package cokr.xit.fims.mngt.web; - -import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.apache.commons.io.FilenameUtils; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsSigungu; -import cokr.xit.fims.base.OgdpQuery; -import cokr.xit.fims.base.service.bean.OgdpBean; -import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.fims.cmmn.service.StngService; -import cokr.xit.fims.mngt.Task; -import cokr.xit.fims.mngt.VltnQuery; -import cokr.xit.fims.mngt.service.bean.TaskBean; -import cokr.xit.fims.mngt.service.bean.VltnBean; -import cokr.xit.foundation.UserInfo; -import cokr.xit.foundation.data.DataObject; - -/**시군구관리 서비스 웹 컨트롤러.
- * {웹 컨텍스트}/mngt/mngt03 로 접근할 수 있다. - * @author leebj - */ -@Controller -@RequestMapping(name="시군구 정보 관리", value=Mngt03Controller.CLASS_URL) -public class Mngt03Controller extends ApplicationController { - - public static final String CLASS_URL = "/mngt/mngt03"; - - public class METHOD_URL { - public static final String - sggMngtMain = "/010/main.do", - getSggStngInfo = "/010/getSggInfo.do", - getTasks = "/010/getTasks.do", - getVltns = "/010/getVltns.do", - updateSggStng = "/010/updateSgg.do", - updateTaskStng = "/010/updateTaskStng.do", - createTaskStng = "/010/createTaskStng.do" - ; - } - - @Resource(name="ogdpBean") - private OgdpBean ogdpBean; - - /** 설정 정보 서비스 */ - @Resource(name = "stngService") - private StngService stngService; - - /** 업무 정보 Bean */ - @Resource(name = "taskBean") - private TaskBean taskBean; - - /** 위반 정보 Bean */ - @Resource(name = "vltnBean") - private VltnBean vltnBean; - - - /** 시군구관리 메인화면을 연다. - * @return fims/mngt/mngt03010-main - */ - @RequestMapping(name="시군구 정보 관리 메인", value=METHOD_URL.sggMngtMain) - public ModelAndView sggMngtMain(String sggCd) { - ModelAndView mav = new ModelAndView(); - - UserInfo userInfo = currentUser(); - - if(userInfo.getInstitute().equals("default")) { - if(ifEmpty(sggCd, ()->"").equals("")) { - - mav.setViewName("fims/mngt/select-sgg"); - mav.addObject("pageName", "selectSgg"); - - List sggList = ogdpBean.selectAllSggList(); - mav.addObject("sggList", sggList); - - } else { - mav.setViewName("fims/mngt/mngt03010-main"); - mav.addObject("pageName", "mngt03010"); - mav.addObject("sggCd", sggCd); - } - - } else { - mav.setViewName("fims/mngt/mngt03010-main"); - mav.addObject("pageName", "mngt03010"); - ogdpBean.initUserInfo(userInfo); - mav.addObject("sggCd", userInfo.getInfo().get("sggCd")); - } - - return mav; - } - - /**지정하는 시군구의 설정 정보를 가져온다.
- * @param req - * @return jsonView - */ - @RequestMapping(name="시군구 설정 조회", value=METHOD_URL.getSggStngInfo) - public ModelAndView getSggInfo(OgdpQuery req) { - ModelAndView mav = new ModelAndView("jsonView"); - DataObject sggInfo = ogdpBean.getSggStngInfo(req); - mav.addObject("sggInfo", sggInfo); - return mav; - } - - /**지정하는 시군구의 업무 설정 정보를 가져온다.
- * @param req - * @return jsonView - */ - @RequestMapping(name="업무 조회", value=METHOD_URL.getTasks) - public ModelAndView getTasks(CmmnQuery req) { - List result = taskBean.getTasks(req); - - return setCollectionInfo(new ModelAndView("jsonView"), result, "task"); - } - - /**지정하는 시군구와 업무의 위반 설정 정보를 가져온다.
- * @return 위반 설정 정보 - */ - @RequestMapping(name="위반정보 조회", value=METHOD_URL.getVltns) - public ModelAndView getVltns(VltnQuery req) { - List result = vltnBean.getVltns(req); - return setCollectionInfo(new ModelAndView("jsonView"), result, "vltn"); - } - - /**시군구 설정 정보를 수정한다. - * @param sgg 시군구 정보, symbol 시군구 상징파일, logo 시군구 로고파일, offcs 시군구 직인파일 - * @return jsonView - * 
 {
-	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
-	 * }
- */ - @RequestMapping(name="시군구 설정 정보 수정", value=METHOD_URL.updateSggStng) - public ModelAndView updateSggStng(FimsSigungu sgg, MultipartFile symbol, MultipartFile logo, MultipartFile offcs) { - ModelAndView mav = new ModelAndView("jsonView"); - - String sggCd = sgg.getSggID(); - - if(symbol != null && !symbol.isEmpty() && symbol.getSize() != 0) { - Map newSymbol = this.uploadForSgg(symbol, sggCd, "symbol"); - sgg.setSymbolFilepath(newSymbol.get("filePath")); - sgg.setSymbolFilename(newSymbol.get("fileName")); - } - if(logo != null && !logo.isEmpty() && logo.getSize() != 0) { - Map newLogo = this.uploadForSgg(logo, sggCd, "logo"); - sgg.setLogoFilepath(newLogo.get("filePath")); - sgg.setLogoFilename(newLogo.get("fileName")); - } - if(offcs != null && !offcs.isEmpty() && offcs.getSize() != 0) { - Map newOffcs = this.uploadForSgg(offcs, sggCd, "offcs"); - sgg.setOfficialSealFilepath(newOffcs.get("filePath")); - sgg.setOfficialSealFilename(newOffcs.get("fileName")); - } - boolean saved = ogdpBean.updateSggStng(sgg); - - mav.addObject("saved", saved); - return mav; - } - - private Map uploadForSgg(MultipartFile mf, String sggCd, String fileSe){ - Map newFileInfoMap = new HashMap<>(); - String workDirPath = "files/attachment/etc/"+fileSe; - - String ext = FilenameUtils.getExtension(mf.getOriginalFilename()); - String fileName = sggCd+"."+ext; - - File workDir = new File(workDirPath); - workDir.mkdirs(); - String newFileFullPath = workDirPath + "/" + fileName; - - try { - - File newFile = new File(newFileFullPath); - if(newFile.exists()) { - if(!newFile.delete()) { - throw new RuntimeException("[F]이미지 업로드 중 오류가 발생하였습니다."); - } - } - mf.transferTo(newFile); - - } catch (Exception e) { - throw new RuntimeException("[F]이미지 업로드 중 오류가 발생하였습니다."); - } - - newFileInfoMap.put("filePath", newFileFullPath); - newFileInfoMap.put("fileName", mf.getOriginalFilename()); - return newFileInfoMap; - } - - /**시군구별 업무,위반 설정 정보를 수정한다. - * @param sgg 시군구 정보 - * @return jsonView - * 
 {
-	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
-	 * }
- */ - @RequestMapping(name="업무 설정 정보 수정", value=METHOD_URL.updateTaskStng) - public ModelAndView updateTaskStng(Task task) { - ModelAndView mav = new ModelAndView("jsonView"); - - boolean saved = false; - String rtnMsg = stngService.updateTaskStng(task, task.getVltnStngList()); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; - } - - /**시군구별 업무,위반 설정을 추가한다. - * @param sggCd 시군구 코드, taskSeCd 업무 구분 코드 - * @return jsonView - * 
 {
-	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
-	 * }
- */ - @RequestMapping(name="시군구 과태료 업무 추가", value=METHOD_URL.createTaskStng) - public ModelAndView createTaskStng(String sggCd, String taskSeCd) { - ModelAndView mav = new ModelAndView("jsonView"); - - boolean saved = false; - String rtnMsg = stngService.createTaskStng(sggCd, taskSeCd); - if(rtnMsg.contains("[S]")) { - saved = true; - } - mav.addObject("saved", saved); - return mav; - } - -} diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java deleted file mode 100644 index 122d1c8c..00000000 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java +++ /dev/null @@ -1,121 +0,0 @@ -package cokr.xit.fims.mngt.web; - -import java.util.List; - -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.base.user.SigunguQuery; -import cokr.xit.base.user.service.SigunguDepartmentService; -import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.base.FimsDepartment; -import cokr.xit.fims.base.OgdpQuery; -import cokr.xit.fims.base.service.bean.OgdpBean; -import cokr.xit.fims.cmmn.CmmnQuery; -import cokr.xit.foundation.data.DataObject; - -/**부서관리 서비스 웹 컨트롤러.
- * {웹 컨텍스트}/mngt/mngt04 로 접근할 수 있다. - * @author leebj - */ -@Controller -@RequestMapping(name="부서 정보 관리", value=Mngt04Controller.CLASS_URL) -public class Mngt04Controller extends ApplicationController { - - public static final String CLASS_URL = "/mngt/mngt04"; - - public class METHOD_URL { - public static final String - deptStngMngtMain = "/010/main.do" - , getDeptStngList = "/010/list.do" - , getDeptStngInfo = "/020/info.do" - , updateDeptStng = "/020/update.do" - ; - } - - @Resource(name="sigunguDepartmentService") - private SigunguDepartmentService sggDeptService; - - /** 소속 정보 서비스 */ - @Resource(name = "ogdpBean") - private OgdpBean ogdpBean; - - - /** 부서 설정관리 메인화면을 연다. - * @return fims/mngt/mngt04010-main - */ - @RequestMapping(name="부서 설정 정보 관리 메인", value=METHOD_URL.deptStngMngtMain) - public ModelAndView deptStngMngtMain() { - ModelAndView mav = new ModelAndView(); - - mav.setViewName("fims/mngt/mngt04010-main"); - mav.addObject("pageName", "mngt04010"); - - List allSggList = sggDeptService.getSigunguList(new SigunguQuery()); - - mav.addObject("sggList", allSggList); - - return mav; - } - - /**부서 목록을 조회한다.
- * {@link OgdpService#getDeptStngList(CmmnQuery)} 참고 - * @param query 부서 목록 조회 조건 - * @return jsonView - */ - @RequestMapping(name="부서 목록 조회", value=METHOD_URL.getDeptStngList) - public ModelAndView getDeptStngList(OgdpQuery query) { - - setFetchSize(query); - - return setCollectionInfo(new ModelAndView("jsonView"), ogdpBean.getDeptStngList(query),"",""); - - } - - /**지정한 ID의 부서 정보(info)를 반환한다. - * @param query 부서 조회 조건 - * @return fims/mngt/mngt04020-info 또는 jsonView - * 
{
-	 *     "deptInfo": 부서 정보
-	 * }
- */ - @RequestMapping(name="부서 상세 조회", value=METHOD_URL.getDeptStngInfo) - public ModelAndView getDeptStngInfo(OgdpQuery query) { - DataObject deptInfo = new DataObject(); - - if(!ifEmpty(query.getDeptCd(), ()->"").equals("")) { - deptInfo = ogdpBean.getDeptStngInfo(query); - } else { - deptInfo = null; - } - - boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/mngt/mngt04020-info"); - - mav.addObject("pageName", "mngt04020"); - mav.addObject("deptInfo", json ? deptInfo : toJson(deptInfo)); - return mav; - } - - - - - /**부서 정보를 수정한다. - * @param dept 부서 정보 - * @return jsonView - * 
 {
-	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
-	 * }
- */ - @RequestMapping(name="부서 설정 수정", value=METHOD_URL.updateDeptStng) - public ModelAndView updateDeptStng(FimsDepartment dept) { - ModelAndView mav = new ModelAndView("jsonView"); - boolean saved = ogdpBean.updateDeptStng(dept); - - mav.addObject("saved", saved); - return mav; - } -} diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp similarity index 98% rename from src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03010-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp index 6d086db1..b6d92027 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp @@ -263,7 +263,7 @@ $(document).ready(function(){ $P.getSggInfo = async function(){ return new Promise((resolve, reject) => { ajax.get({ - url: wctx.url("mngt/mngt03/010/getSggInfo.do"), + url: wctx.url("user/ogdp/getSggStngInfo.do"), data: { sggCd : $P.curSggCd }, @@ -309,7 +309,7 @@ $(document).ready(function(){ $P.getSggTaskInfo = async function(){ return new Promise((resolve, reject) => { ajax.get({ - url: wctx.url("mngt/mngt03/010/getTasks.do"), + url: wctx.url("user/ogdp/getTasks.do"), data: { useYn : "Y", sggCd : $P.curSggCd @@ -381,7 +381,7 @@ $(document).ready(function(){ $P.getVltnInfo = async function(){ return new Promise((resolve, reject) => { ajax.get({ - url: wctx.url("mngt/mngt03/010/getVltns.do"), + url: wctx.url("user/ogdp/getVltns.do"), data: { useYN : "Y", sggCd : $P.curSggCd @@ -421,7 +421,7 @@ $(document).ready(function(){ var formData = new FormData($("#mainForm--${pageName}")[0]); ajax.post({ - url: wctx.url("mngt/mngt03/010/updateSgg.do"), + url: wctx.url("user/ogdp/updateSggStng.do"), data: formData, contentType : false, processData : false, success: (resp) => { @@ -478,7 +478,7 @@ $(document).ready(function(){ $("#selectTaskModal").modal("hide"); ajax.post({ - url: wctx.url("mngt/mngt03/010/createTaskStng.do"), + url: wctx.url("user/ogdp/createTaskStng.do"), data: { sggCd : $("#mainForm--${pageName}").find("[name='sggID']").val(), taskSeCd : taskSeCd @@ -515,7 +515,7 @@ $(document).ready(function(){ } ajax.post({ - url: wctx.url("mngt/mngt03/010/updateTaskStng.do"), + url: wctx.url("user/ogdp/updateTaskStng.do"), data: formData, contentType : false, processData : false, success: (resp) => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp similarity index 98% rename from src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp index 59f42491..b82a2d60 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp @@ -157,9 +157,8 @@ $(document).ready(function(){ dataGetter : obj => obj["List"], appendData:true, keymapper : info => info ? info.DEPT_CD : "", urls : { - load : wctx.url("/mngt/mngt04/010/list.do"), - getInfo : wctx.url("/mngt/mngt04/020/info.do"), - remove : wctx.url("/mngt/mngt04/010/remove.do") + load : wctx.url("/user/ogdp/getDeptStngList.do"), + getInfo : wctx.url("/user/ogdp/getDeptStngInfo.do") }, formats: { REG_DT : datetimeFormat, diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02020-info.jsp similarity index 99% rename from src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02020-info.jsp index bd4fe1fd..8bc741be 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02020-info.jsp @@ -287,8 +287,7 @@ $(document).ready(function(){ dataGetter : obj => obj["List"], appendData : true, keymapper : info => info ? info.DEPT_CD : "", urls : { - create : wctx.url("/mngt/mngt04/020/create.do"), - update : wctx.url("/mngt/mngt04/020/update.do") + update : wctx.url("/user/ogdp/updateDeptStng.do") }, formats: { diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp similarity index 94% rename from src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp rename to src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp index f6a16f22..a4625fdc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp @@ -21,7 +21,7 @@