diff --git a/src/main/java/cokr/xit/fims/MainController.java b/src/main/java/cokr/xit/fims/MainController.java index 52bb13da..baa9b62b 100644 --- a/src/main/java/cokr/xit/fims/MainController.java +++ b/src/main/java/cokr/xit/fims/MainController.java @@ -13,7 +13,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.service.UserService; -import cokr.xit.fims.mngt.service.bean.FimsOgdpBean; +import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.task.TaskRequestMappingHandlerMapping; import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.web.RequestHandlerReader; @@ -30,8 +30,8 @@ public class MainController extends cokr.xit.base.web.MainController { @Autowired private TaskRequestMappingHandlerMapping requestHandlers; - @Resource(name="fimsOgdpBean") - private FimsOgdpBean fimsOgdpBean; + @Resource(name="ogdpBean") + private OgdpBean ogdpBean; @Resource(name="userService") private UserService userService; @@ -41,7 +41,7 @@ public class MainController extends cokr.xit.base.web.MainController { ModelAndView mav = new ModelAndView("login"); - List sggList = fimsOgdpBean.selectAllSggList(); + List sggList = ogdpBean.selectAllSggList(); mav.addObject("sggList", sggList); mav.addObject("sysInstCd", instCd); @@ -84,12 +84,12 @@ public class MainController extends cokr.xit.base.web.MainController { public ModelAndView signupPage(String sggCd) { ModelAndView mav = new ModelAndView("fims/user/user-info"); - mav.addObject("allOgdpList", fimsOgdpBean.selectAllOgdpList()); + mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList()); DataObject params = new DataObject(); params.set("anonymous", "Y"); params.set("sggCd", sggCd); - List ableOgdpList = fimsOgdpBean.selectAbleOgdpList(params); + List ableOgdpList = ogdpBean.selectAbleOgdpList(params); mav.addObject("ableOgdpList", ableOgdpList); mav.addObject("userInfo", "{}"); diff --git a/src/main/java/cokr/xit/fims/mngt/FimsDepartment.java b/src/main/java/cokr/xit/fims/base/FimsDepartment.java similarity index 98% rename from src/main/java/cokr/xit/fims/mngt/FimsDepartment.java rename to src/main/java/cokr/xit/fims/base/FimsDepartment.java index 1d5e9f0d..c82ff5b2 100644 --- a/src/main/java/cokr/xit/fims/mngt/FimsDepartment.java +++ b/src/main/java/cokr/xit/fims/base/FimsDepartment.java @@ -1,4 +1,4 @@ -package cokr.xit.fims.mngt; +package cokr.xit.fims.base; import cokr.xit.base.user.Department; import lombok.Getter; diff --git a/src/main/java/cokr/xit/fims/base/FimsSggDeptController.java b/src/main/java/cokr/xit/fims/base/FimsSggDeptController.java index 4eb11aa7..15f2c1b0 100644 --- a/src/main/java/cokr/xit/fims/base/FimsSggDeptController.java +++ b/src/main/java/cokr/xit/fims/base/FimsSggDeptController.java @@ -7,4 +7,7 @@ import cokr.xit.base.user.Sigungu; import cokr.xit.base.user.web.SigunguDepartmentController; @Controller -public class FimsSggDeptController extends SigunguDepartmentController {} \ No newline at end of file +public class FimsSggDeptController extends SigunguDepartmentController { + + +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/base/OgdpSigungu.java b/src/main/java/cokr/xit/fims/base/FimsSigungu.java similarity index 90% rename from src/main/java/cokr/xit/fims/base/OgdpSigungu.java rename to src/main/java/cokr/xit/fims/base/FimsSigungu.java index 1f9b9249..c0494685 100644 --- a/src/main/java/cokr/xit/fims/base/OgdpSigungu.java +++ b/src/main/java/cokr/xit/fims/base/FimsSigungu.java @@ -6,7 +6,7 @@ import lombok.Setter; @Getter @Setter -public class OgdpSigungu extends Sigungu { +public class FimsSigungu extends Sigungu { /** * 상징 파일 경로 diff --git a/src/main/java/cokr/xit/fims/base/dao/OgdpMapper.java b/src/main/java/cokr/xit/fims/base/dao/OgdpMapper.java index dff4c9f7..9ae978c7 100644 --- a/src/main/java/cokr/xit/fims/base/dao/OgdpMapper.java +++ b/src/main/java/cokr/xit/fims/base/dao/OgdpMapper.java @@ -11,7 +11,7 @@ import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import cokr.xit.applib.SQLUtil; import cokr.xit.fims.base.OgdpQuery; -import cokr.xit.fims.base.OgdpSigungu; +import cokr.xit.fims.base.FimsSigungu; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -136,7 +136,7 @@ public interface OgdpMapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean updateSgg(OgdpSigungu sgg) { + default boolean updateSgg(FimsSigungu sgg) { return sgg != null && updateSgg(params().set("sgg", sgg)) == 1; } diff --git a/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java b/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java index d2e6c315..290d98da 100644 --- a/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java +++ b/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java @@ -10,9 +10,9 @@ import org.springframework.stereotype.Component; import cokr.xit.base.user.Department; import cokr.xit.fims.base.OgdpQuery; -import cokr.xit.fims.base.OgdpSigungu; +import cokr.xit.fims.base.FimsDepartment; +import cokr.xit.fims.base.FimsSigungu; import cokr.xit.fims.base.dao.OgdpMapper; -import cokr.xit.fims.mngt.FimsDepartment; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.component.AbstractBean; import cokr.xit.foundation.data.DataObject; @@ -102,7 +102,7 @@ public class OgdpBean extends AbstractBean { *
  • 그렇지 않으면 false
  • * */ - public boolean updateSgg(OgdpSigungu sgg) { + public boolean updateSgg(FimsSigungu sgg) { return ogdpMapper.updateSgg(sgg); } diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java index b3b8e518..5d4cb1ce 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java @@ -15,7 +15,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.base.OgdpQuery; -import cokr.xit.fims.base.OgdpSigungu; +import cokr.xit.fims.base.FimsSigungu; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.service.StngService; @@ -138,7 +138,7 @@ public class Mngt03Controller extends ApplicationController { * } */ @RequestMapping(name="시군구 정보 수정", value=METHOD_URL.updateSgg) - public ModelAndView updateSgg(OgdpSigungu sgg, MultipartFile symbol, MultipartFile logo, MultipartFile offcs) { + public ModelAndView updateSgg(FimsSigungu sgg, MultipartFile symbol, MultipartFile logo, MultipartFile offcs) { ModelAndView mav = new ModelAndView("jsonView"); String sggCd = sgg.getSggID(); diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java index ca0e57fa..89f19976 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java @@ -11,10 +11,10 @@ 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.fims.mngt.FimsDepartment; import cokr.xit.foundation.data.DataObject; /**부서관리 서비스 웹 컨트롤러.