From 8f620d6660fa22179d9e8e93e4a98d32d251e32d Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Thu, 11 Jul 2024 10:39:32 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B3=B5=ED=86=B5=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EB=A9=94=EC=86=8C=EB=93=9C=20refactoring=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20-=20=ED=8F=90=EA=B8=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=83=81=EC=84=B8=20=EC=A0=95=EB=B3=B4=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20AddsNimsService=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adds/nims/service/AddsNimsService.java | 10 +++ .../nims/service/DsuseMgtDetailService.java | 20 ------ .../service/bean/AddsNimsServiceBean.java | 25 ++++++++ .../bean/DsuseMgtDetailServiceBean.java | 30 --------- .../xit/adds/nims/web/AddsNimsController.java | 20 ++++++ .../nims/web/DsuseMgtDetailController.java | 61 ------------------- 6 files changed, 55 insertions(+), 111 deletions(-) create mode 100644 src/main/java/cokr/xit/adds/nims/service/AddsNimsService.java delete mode 100644 src/main/java/cokr/xit/adds/nims/service/DsuseMgtDetailService.java create mode 100644 src/main/java/cokr/xit/adds/nims/service/bean/AddsNimsServiceBean.java delete mode 100644 src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtDetailServiceBean.java delete mode 100644 src/main/java/cokr/xit/adds/nims/web/DsuseMgtDetailController.java diff --git a/src/main/java/cokr/xit/adds/nims/service/AddsNimsService.java b/src/main/java/cokr/xit/adds/nims/service/AddsNimsService.java new file mode 100644 index 0000000..bed8597 --- /dev/null +++ b/src/main/java/cokr/xit/adds/nims/service/AddsNimsService.java @@ -0,0 +1,10 @@ +package cokr.xit.adds.nims.service; + +import java.util.List; + +import cokr.xit.adds.nims.DsuseMgtDetailQuery; +import cokr.xit.foundation.data.DataObject; + +public interface AddsNimsService { + List getDsuseMgtDetailList(DsuseMgtDetailQuery query); +} diff --git a/src/main/java/cokr/xit/adds/nims/service/DsuseMgtDetailService.java b/src/main/java/cokr/xit/adds/nims/service/DsuseMgtDetailService.java deleted file mode 100644 index fe89c43..0000000 --- a/src/main/java/cokr/xit/adds/nims/service/DsuseMgtDetailService.java +++ /dev/null @@ -1,20 +0,0 @@ -package cokr.xit.adds.nims.service; - -import java.util.List; -import java.util.Map; - -import cokr.xit.adds.nims.DsuseMgtDetailQuery; -import cokr.xit.foundation.data.DataObject; - -public interface DsuseMgtDetailService { - - /** 단속자료 목록을 조회한다. - * @param query 단속자료 목록 조회 조건 - * - * @return 단속자료 목록 - */ - List getDsuseMgtDetailList(DsuseMgtDetailQuery query); - -} diff --git a/src/main/java/cokr/xit/adds/nims/service/bean/AddsNimsServiceBean.java b/src/main/java/cokr/xit/adds/nims/service/bean/AddsNimsServiceBean.java new file mode 100644 index 0000000..c648a14 --- /dev/null +++ b/src/main/java/cokr/xit/adds/nims/service/bean/AddsNimsServiceBean.java @@ -0,0 +1,25 @@ +package cokr.xit.adds.nims.service.bean; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import cokr.xit.adds.nims.DsuseMgtDetailQuery; +import cokr.xit.adds.nims.dao.DsuseMgtDetailMapper; +import cokr.xit.adds.nims.service.AddsNimsService; +import cokr.xit.foundation.component.AbstractServiceBean; +import cokr.xit.foundation.data.DataObject; + +@Service("addsNimsService") +public class AddsNimsServiceBean extends AbstractServiceBean implements AddsNimsService { + /** 폐기관리상세 정보 DAO */ + @Resource(name = "dsuseMgtDetailMapper") + private DsuseMgtDetailMapper dsuseMgtDetailMapper; + + @Override + public List getDsuseMgtDetailList(DsuseMgtDetailQuery query){ + return dsuseMgtDetailMapper.selectDsuseMgtDetailList(query); + } +} diff --git a/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtDetailServiceBean.java b/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtDetailServiceBean.java deleted file mode 100644 index 84c762d..0000000 --- a/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtDetailServiceBean.java +++ /dev/null @@ -1,30 +0,0 @@ -package cokr.xit.adds.nims.service.bean; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import cokr.xit.adds.nims.DsuseMgtDetailQuery; -import cokr.xit.adds.nims.dao.DsuseMgtDetailMapper; -import cokr.xit.adds.nims.service.DsuseMgtDetailService; -import cokr.xit.foundation.component.AbstractServiceBean; -import cokr.xit.foundation.data.DataObject; - -@Service("dsuseMgtDetailService") -public class DsuseMgtDetailServiceBean extends AbstractServiceBean implements DsuseMgtDetailService { - - /** 폐기관리상세 정보 DAO */ - @Resource(name = "dsuseMgtDetailMapper") - private DsuseMgtDetailMapper dsuseMgtDetailMapper; - - @Override - public List getDsuseMgtDetailList(DsuseMgtDetailQuery query){ - return dsuseMgtDetailMapper.selectDsuseMgtDetailList(query); - } - -} diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java index fbd56d8..6402a87 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -33,8 +33,10 @@ import cokr.xit.adds.cmm.model.DsuseRsltInfo; import cokr.xit.adds.cmm.model.NimsApiRequest; import cokr.xit.adds.cmmn.hwp.format.DisposeProcessDetails; import cokr.xit.adds.cmmn.hwp.format.DisposeResultReport; +import cokr.xit.adds.nims.DsuseMgtDetailQuery; import cokr.xit.adds.nims.DsuseMgtDocQuery; import cokr.xit.adds.nims.DsuseMgtReceiptQuery; +import cokr.xit.adds.nims.service.AddsNimsService; import cokr.xit.adds.nims.service.DsuseMgtDocService; import cokr.xit.adds.nims.service.DsuseMgtReceiptService; import cokr.xit.applib.Print; @@ -81,6 +83,9 @@ public class AddsNimsController extends ApplicationController { @Resource(name="sigunguDepartmentService") private SigunguDepartmentService sggDeptService; + @Resource(name="addsNimsService") + private AddsNimsService addsNimsService; + @Resource(name="dsuseMgtReceiptService") private DsuseMgtReceiptService dsuseMgtReceiptService; @@ -91,6 +96,21 @@ public class AddsNimsController extends ApplicationController { private FileService fileService; private JSON json = new JSON(); + + //------------------------------------------------------------------------------------------------- + // 공통 - 폐기관리 상세 목록 + //------------------------------------------------------------------------------------------------- + @RequestMapping(name="폐기관리 상세 목록 조회", value= "/dsuseMgtDetail-list.do") + public ModelAndView getDsuseMgtList(DsuseMgtDetailQuery query) { + + return setCollectionInfo(new ModelAndView("jsonView"), addsNimsService.getDsuseMgtDetailList(query),"","dsuseMgtDetail"); + + } + //------------------------------------------------------------------------------------------------- + // 공통 - 폐기관리 상세 목록 + //------------------------------------------------------------------------------------------------- + + //------------------------------------------------------------------------------------------------- // 신청서 접수 //------------------------------------------------------------------------------------------------- diff --git a/src/main/java/cokr/xit/adds/nims/web/DsuseMgtDetailController.java b/src/main/java/cokr/xit/adds/nims/web/DsuseMgtDetailController.java deleted file mode 100644 index bf12632..0000000 --- a/src/main/java/cokr/xit/adds/nims/web/DsuseMgtDetailController.java +++ /dev/null @@ -1,61 +0,0 @@ -package cokr.xit.adds.nims.web; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -import com.fasterxml.jackson.core.JsonProcessingException; - -import cokr.xit.adds.nims.DsuseMgtDetailQuery; -import cokr.xit.adds.nims.service.DsuseMgtDetailService; -import cokr.xit.base.web.ApplicationController; -import net.minidev.json.parser.ParseException; - - - -@Controller -@RequestMapping( - name = "마약류폐기 신청 상세", - value = {"/adds/nims"} -) -public class DsuseMgtDetailController extends ApplicationController { - - public static final String CLASS_URL = "/adds/nims"; - - public class METHOD_URL { - public static final String - dsuseMgtDetailMain = "/dsuseMgt-info.do" // 부과 제외 관리 메인 화면 - , getDsuseMgtDetailList = "/dsuseMgtDetail-list.do" // 부과 제외 대장 목록 조회 -// , getLevyExclusionInfo = "/020/info.do" // 부과 제외 대장 조회 -// , createLevyExclusion = "/020/create.do" // 부과 제외 대장 등록 - ; - } - - @Resource(name="dsuseMgtDetailService") - private DsuseMgtDetailService dsuseMgtDetailService; - - @RequestMapping(name="마약류폐기 신청서 접수 메인", value=METHOD_URL.dsuseMgtDetailMain) - public ModelAndView dsuseMgtMain(String usrRptIdNo) { - ModelAndView mav = new ModelAndView("adds/nims/dsuseMgt-info"); - - // 사용자 정보 - //ManagedUser managedUser = (ManagedUser)currentUser().getUser(); - - return mav - .addObject("pageName", "dsuseMgtInfo") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("infoPrefix", "dsuseMgt") // prefix - .addObject("infoPrefixUrl", "/adds/nims") // prefixUrl - .addObject("usrRptIdNo", usrRptIdNo) - ; - } - - @RequestMapping(name="마약류폐기 신청서 접수 조회", value=METHOD_URL.getDsuseMgtDetailList) - public ModelAndView getDsuseMgtList(DsuseMgtDetailQuery query) throws JsonProcessingException, ParseException { - - return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtDetailService.getDsuseMgtDetailList(query),"","dsuseMgtDetail"); - - } - -}