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 b9f2fb9..fac2cb2 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -1,79 +1,43 @@ package cokr.xit.adds.nims.web; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.nio.charset.StandardCharsets; -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - -import javax.annotation.Resource; - -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.json.simple.JSONObject; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.servlet.ModelAndView; - -import com.fasterxml.jackson.core.type.TypeReference; - -import cokr.xit.adds.cmm.model.ApiBaseResponse; -import cokr.xit.adds.cmm.model.ApiUtil; -import cokr.xit.adds.cmm.model.DsuseMappingInfo; -import cokr.xit.adds.cmm.model.DsuseReceiptDtl; -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.ApiKeyQuery; -import cokr.xit.adds.nims.DsuseMgtDetailQuery; -import cokr.xit.adds.nims.DsuseMgtDocQuery; -import cokr.xit.adds.nims.DsuseMgtReceiptQuery; -import cokr.xit.adds.nims.DsuseMgtRsltQuery; -import cokr.xit.adds.nims.DsuseMgtStatisticsQuery; -import cokr.xit.adds.nims.DsuseProductAndSeqQuery; -import cokr.xit.adds.nims.service.AddsNimsService; -import cokr.xit.adds.nims.service.ApiKeyService; -import cokr.xit.adds.nims.service.DsuseMgtDocService; -import cokr.xit.adds.nims.service.DsuseMgtReceiptService; -import cokr.xit.applib.Print; -import cokr.xit.applib.PrintOption; -import cokr.xit.applib.xls.StyleMaker; -import cokr.xit.base.code.CommonCode; -import cokr.xit.base.docs.xls.CellDef; +import java.io.*; +import java.net.*; +import java.net.http.*; +import java.nio.charset.*; +import java.text.*; +import java.util.*; +import java.util.stream.*; + +import javax.annotation.*; + +import org.apache.poi.hssf.util.*; +import org.apache.poi.ss.usermodel.*; +import org.json.simple.*; +import org.springframework.beans.factory.annotation.*; +import org.springframework.stereotype.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.*; +import org.springframework.web.servlet.*; + +import com.fasterxml.jackson.core.type.*; + +import cokr.xit.adds.cmm.model.*; +import cokr.xit.adds.cmmn.hwp.format.*; +import cokr.xit.adds.nims.*; +import cokr.xit.adds.nims.service.*; +import cokr.xit.applib.*; +import cokr.xit.applib.xls.*; +import cokr.xit.base.code.*; import cokr.xit.base.docs.xls.Format; -import cokr.xit.base.docs.xls.Style; -import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.file.FileInfo; -import cokr.xit.base.file.FileInfo.Relation; -import cokr.xit.base.file.service.FileQuery; -import cokr.xit.base.file.service.FileService; -import cokr.xit.base.user.DepartmentQuery; -import cokr.xit.base.user.service.SigunguDepartmentService; -import cokr.xit.base.web.ApplicationController; -import cokr.xit.foundation.data.DataObject; -import cokr.xit.foundation.data.JSON; -import cokr.xit.foundation.web.WebClient; +import cokr.xit.base.docs.xls.*; +import cokr.xit.base.file.*; +import cokr.xit.base.file.FileInfo.*; +import cokr.xit.base.file.service.*; +import cokr.xit.base.user.*; +import cokr.xit.base.user.service.*; +import cokr.xit.base.web.*; +import cokr.xit.foundation.data.*; +import cokr.xit.foundation.web.*; @Controller @RequestMapping( @@ -125,7 +89,7 @@ public class AddsNimsController extends ApplicationController { @Resource(name="dsuseMgtDocService") private DsuseMgtDocService dsuseMgtDocService; - + @Resource(name="apiKeyService") private ApiKeyService apiKeyService; @@ -464,7 +428,7 @@ public class AddsNimsController extends ApplicationController { //------------------------------------------------------------------------------------------------- // ApiKey 관리 //------------------------------------------------------------------------------------------------- - + //------------------------------------------------------------------------------------------------- // menu 처리 //------------------------------------------------------------------------------------------------- @@ -616,6 +580,12 @@ public class AddsNimsController extends ApplicationController { return json.parse(rslt, new TypeReference<>() {}); } + @RequestMapping(value = "/getNimsBsshInfoSt2.do", name="업체(마약류취급자) 검색", produces = "application/json;charset=UTF-8") + public @ResponseBody ApiBaseResponse> getNimsBsshInfoSt2(@ModelAttribute NimsApiRequest.BsshInfoReq dto) { + String rslt = ApiUtil.callNimsApi(apiHost + bsshInfoEndpoint, dto); + return json.parse(rslt, new TypeReference<>() {}); + } + @RequestMapping(value = "/getNimsProductInfoKd.do", name="제품 검색", produces = "application/json;charset=UTF-8") public @ResponseBody ApiBaseResponse> getNimsProductInfoKd(@ModelAttribute NimsApiRequest.ProductInfoReq dto) { String rslt = ApiUtil.callNimsApi(apiHost + productInfoEndpoint, dto); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp index cb50fa7..ceb22fa 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp @@ -8,21 +8,17 @@ <%-- --%>
-
- - +
+ + +
- - -
-
-   - +
@@ -42,30 +38,24 @@