Merge branch 'hylee'

pom.xml

@@ -71,6 +71,41 @@
 	</repositories>
 
 	<dependencies>
+	
+		<!-- Solr -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.apache.httpcomponents</groupId> -->
+<!-- 			<artifactId>httpclient</artifactId> -->
+<!-- 			<version>4.3.1</version> -->
+<!-- 		</dependency> -->
+		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+		<dependency>
+		    <groupId>org.apache.httpcomponents</groupId>
+		    <artifactId>httpclient</artifactId>
+		    <version>4.5.3</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.apache.solr</groupId>
+			<artifactId>solr-solrj</artifactId>
+			<version>5.3.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
+		<dependency>
+		    <groupId>org.apache.httpcomponents</groupId>
+		    <artifactId>httpcore</artifactId>
+		    <version>4.4.6</version>
+		</dependency>
+	
+		<!-- pdf 솔루션을 위한 lib -->
+		<dependency>
+		    <groupId>com.mashape.unirest</groupId>
+		    <artifactId>unirest-java</artifactId>
+		    <version>1.4.9</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>egovframework.rte</groupId>
 			<artifactId>egovframework.rte.fdl.security</artifactId>
@@ -465,19 +500,13 @@
 		  <version>4.1.0.Final</version>
 		</dependency>
 
-		<!-- Solr -->
+		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime -->
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
+			<artifactId>httpmime</artifactId>
-			<version>4.3.1</version>
+			<version>4.5.3</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.solr</groupId>
-			<artifactId>solr-solrj</artifactId>
-			<version>5.3.1</version>
-		</dependency>
-		
 		<!-- Java thumbnailator -->
 		<dependency>
 			<groupId>net.coobird</groupId>

src/main/java/kcc/com/cmm/util/StreamDocsUtil.java

@@ -0,0 +1,25 @@
+package kcc.com.cmm.util;
+
+import java.io.File;
+
+import com.mashape.unirest.http.HttpResponse;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
+import java.net.URL;
+
+
+public class StreamDocsUtil {
+	
+	
+	public static HttpResponse<String> regPdfDoc(String filePath, String requestUrl) throws UnirestException {
+
+		HttpResponse<String> response=Unirest.post(requestUrl)
+				.field("pdf", new File(filePath))
+				.asString();
+//		System.out.println(response.getStatus());
+//		System.out.println(response.getBody());
+		
+		return response;
+	}
+
+}

src/main/java/kcc/com/cmm/web/InnorixFileController.java

@@ -47,8 +47,6 @@ public class InnorixFileController {
 	@RequestMapping(value = {"/kccadr/common/insertInnorixFileAjax.do"}, method = RequestMethod.POST)
 	public ResponseEntity<RestResponse> insertInnorixFileAjax(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception {
 
-		logger.info(" ++ adrSeq :: [{}], adrDocTy :: [{}], frstRegistPnttm :: [{}]  ", adrInnorixFileVO.getAdrSeq(), adrInnorixFileVO.getAdrDocTy(), adrInnorixFileVO.getFrstRegistPnttm());
-		
 		//로그인 권한정보 불러오기
 		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
 		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());

src/main/java/kcc/com/cmm/web/StreamDocsController.java

@@ -0,0 +1,99 @@
+package kcc.com.cmm.web;
+
+import java.time.LocalDateTime;
+
+import javax.annotation.Resource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.mashape.unirest.http.HttpResponse;
+
+import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.AdrInnorixFileVO;
+import kcc.com.cmm.service.InnorixFileService;
+import kcc.com.cmm.util.StreamDocsUtil;
+import kcc.com.utl.fcc.service.EgovStringUtil;
+import kcc.kccadr.accdnt.ans.service.AnsVO;
+import kcc.kccadr.cmm.RestResponse;
+import kcc.kccadr.cmm.service.PdfConversionService;
+import kcc.kccadr.cmm.service.PdfConversionVO;
+
+/**
+ * 
+ * @author 		: 이호영
+ * @fileName 	: InnorixFileController.java 
+ * @date 		: 2022.11.01
+ * @description : innorix 대용량 파일 업로드 솔루션 
+ * =========================================================== 
+ * DATE          AUTHOR   NOTE 
+ * ----------------------------------------------------------- *
+ * 2022.11.01    이호영          최초 생성
+ * 
+ * 
+ * 
+ */
+@Controller
+public class StreamDocsController {
+
+    private static final Logger log = LoggerFactory.getLogger(StreamDocsController.class);
+
+    //pdf 변환 service
+  	@Resource(name="PdfConversionService")
+  	private PdfConversionService pdfConversionService;
+  	
+	/** EgovPropertyService */
+	@Resource(name = "InnorixFileService")
+	protected InnorixFileService innorixService;
+    
+    private static String pdfMakepathOut;	//c:/usr/local/tomcat/file/sht/out
+    @Value("#{globalSettings['Globals.pdf.makepath.out']}")
+    public void setPdfMakepathOut(String path) { pdfMakepathOut = path; }
+    
+
+    @Value("#{globalSettings['Globals.Streamdocs.Url']}")
+    public String streamdocsURL;
+	
+	/** 
+	 * @methodName	: regStreamDocsAjax 
+	 * @author		: 이호영
+	 * @date		: 2022.12.12 
+	 * @description	: StreamDocs에 파일 등록  하는 controller
+	 * @param pdfConversionVO
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = {"/kccadr/common/regStreamDocsAjax.do"}, method = RequestMethod.POST)
+	public ResponseEntity<RestResponse> regStreamDocsAjax(@RequestBody PdfConversionVO pdfConversionVO) throws Exception {
+
+
+		PdfConversionVO tmpPdfConversionVO = pdfConversionService.selectConversionPdf(pdfConversionVO);
+
+
+		try {
+			// make 파일 경로
+			String filePath = pdfMakepathOut + tmpPdfConversionVO.getAdrSeq() +"/result/bookmark.pdf";
+
+			// pdf 파일 등록
+			HttpResponse<String> responseInfo = StreamDocsUtil.regPdfDoc(filePath, streamdocsURL);
+
+			// 성공 시 return value
+			return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "등록 되었습니다.", responseInfo.getBody(), LocalDateTime.now()));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		// 실패 시 return value
+		return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "pdf 로드에 실패하였습니다.", LocalDateTime.now()));
+	}
+
+	
+}

src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusPdfController.java

@@ -37,8 +37,10 @@ import com.epapyrus.pdf.pg.entity.TextWatermark;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.Unirest;
 
+
 import kcc.com.cmm.service.EgovFileMngService;
 import kcc.com.cmm.service.FileVO;
+import kcc.com.cmm.util.StreamDocsUtil;
 import kcc.kccadr.accdnt.ai.service.AdjstIncidentService;
 import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO;
 import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService;
@@ -1251,89 +1253,7 @@ public class AdjstReqStatusPdfController {
        
        return modelAndView;
      }
-     
-     /**
-      * 종결사건 단권화 파일 다운르도
-      */
-     @RequestMapping(value = "/kccadr/adjPgrMgr/apm/regStreamDocsAPI.do")
-     public ModelAndView regStreamDocsAPI(PdfConversionVO pdfConversionVO) {
-    	 
-    	 ModelAndView modelAndView = new ModelAndView("jsonView");
-//    	 String accessToken = "eyJjdHkiOiJKV1QiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..wPlmcQ9_3F7DIUi--a5CYg.svTX0D57aaST4tDmDAmd4jXk_sAac491b51VLn49OJwT5__ytx_T4Z1Jt3qX-HY1sQS3xqaBqt9JmTyyKXSCDrai4dNnirNRHj-_tu2loFZiPNEm7oXaH50eZkU_uJQOVwvN1Zxct_MotJOOwoAI1xEIBiMCA3CjFFgbW3PEIZnCmp-Tjv1TJuVumBOgfQgCwzcNYr30EMKg6Go7ECsxkBxldFy52a7YGzMkdj6_qv0.Ez6gSV4sNmBnW1gx7U8TKw";
-    	 //alert 메세지
-    	 //결과 flag
-    	 
-    	 try {
-    		 PdfConversionVO tmpPdfConversionVO = pdfConversionService.selectConversionPdf(pdfConversionVO);
 
-    		 /*
-    	     String request = "http://192.168.0.176:8085/streamdocs/v4/auth";
-    	      String queryParam = "?id=admin&password=streamdocs-admin";
-    	      String apiURL = request + queryParam;
-
-    	      HttpResponse<String> response = Unirest.post(apiURL)
-    	          .asString();
-
-    	      System.out.println("응답코드 : " + response.getStatus());
-    	      System.out.println("response : " + response.getBody());
-    		 */
-			
-			try {
-
-				File uFile = new File(pdfMakepathOut + tmpPdfConversionVO.getAdrSeq() +"/result/", "bookmark.pdf");
-			
-				String requestUrl="http://192.168.0.176:8085/streamdocs/v4/documents";
-				HttpResponse<String> response=Unirest.post(requestUrl)
-						.field("pdf", pdfMakepathOut + tmpPdfConversionVO.getAdrSeq() +"/result/", "bookmark.pdf")
-						.field("name","sample.pdf")
-						.field("docName","singleDocsample.pdf")
-						.field("lifespan","1M")
-						.field("category","singleDocTest")
-						.field("description","singleDocSample")
-						.field("password","1234")
-						.field("save",false)
-						.asString();
-
-				/*
-				String requestUrl="http://192.168.0.176:8085/streamdocs/v4/documents/external-resources";
-				String filePath = pdfMakepathOut + tmpPdfConversionVO.getAdrSeq() +"/result/bookmark.pdf";
-				  HttpResponse<String> response = Unirest.post(requestUrl)
-					        .header("Content-Type", "application/json")
-					        .body("{\"externalResource\":\"file:/"+filePath+"\"}")
-					        .asString();
-				  System.out.println("filePath : "+ filePath);
-
-*/			
-			
-				System.out.println("!!!!!");
-				System.out.println(response.getStatus());
-				System.out.println(response.getBody());
-
-				
-			} catch (Exception e) {
-				System.out.println("Exception ");
-				e.printStackTrace();
-				// TODO: handle exception
-			}
-
-    		 
-    	      modelAndView.addObject("result", "success");
-//    	      modelAndView.addObject("data", response);
-    	      modelAndView.addObject("message", "성공");
-    		 
-    	 }catch (Exception e) {
-    		 e.printStackTrace();
-    		 System.out.println(e.getMessage());
-    		 modelAndView.addObject("result", "fail");
-    		 modelAndView.addObject("message", "요청에 실패하였습니다.");
-    	 }
-    	 
-    	 return modelAndView;
-     }
-     
-     
-     
-     
      /**
   	 * Disposition 지정하기.
   	 *

src/main/java/kcc/kccadr/cmm/RestResponse.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import org.springframework.http.HttpStatus;
 
+import com.mashape.unirest.http.HttpResponse;
+
 
 /**
  * 
@@ -46,7 +48,7 @@ public class RestResponse {
 	private LocalDateTime timestamp;
 	
 	private List<?> dataList;
-
+	
 	public RestResponse(HttpStatus status, String data, LocalDateTime timestamp) {
 		this.status = status;
 		this.data = data;
@@ -112,14 +114,6 @@ public class RestResponse {
 	public void setDataSub(String dataSub) {
 		this.dataSub = dataSub;
 	}
-	
+
-	
-	
-	
-	
-	
-	
-	
-	
 }
 

src/main/resources/egovframework/egovProps/globals_dev.properties

@@ -204,6 +204,9 @@ Globals.Naver.callbackUrl=http://119.193.215.98:8081/web/kccadr/certDoc/snsCallB
 #[\uce74\uce74\uc624]Sns \uc778\uc99d \uac12
 Globals.Kakao.Key=5c0404a0840eb8821a0fdf6b3f2659b4
 
+#Streamdocs \ub4f1\ub85d URL
+Globals.Streamdocs.Url=http://192.168.0.176:8085/streamdocs/v4/documents
+
 # \uce74\uce74\uc624\uc54c\ub9bc\ud1a1(\ube44\uc988\ubfcc\ub9ac\uc624) API URL
 #\uac1c\ubc1c\uc11c\ubc84
 #Globals.BizPpurio.siteUrl=https://dev-api.bizppurio.com

src/main/resources/egovframework/egovProps/globals_local.properties

@@ -203,6 +203,9 @@ Globals.Naver.callbackUrl=http://127.0.0.1:8090/web/kccadr/certDoc/snsCallBack.d
 #[\uce74\uce74\uc624]Sns \uc778\uc99d \uac12
 Globals.Kakao.Key=bf3de0d897afe0e4bef0775f7086f048
 
+#Streamdocs \ub4f1\ub85d URL
+Globals.Streamdocs.Url=http://192.168.0.176:8085/streamdocs/v4/documents
+
 # \uce74\uce74\uc624\uc54c\ub9bc\ud1a1(\ube44\uc988\ubfcc\ub9ac\uc624) API URL
 #\uac1c\ubc1c\uc11c\ubc84
 Globals.BizPpurio.siteUrl=https://dev-api.bizppurio.com

src/main/resources/egovframework/egovProps/globals_svr.properties

@@ -193,6 +193,9 @@ Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay
 #DB \uc554\ud638\ud654 \uc194\ub8e8\uc158 \uc815\ucc45\uba85
 Globals.MagicDB.PolicyName=POLICY001
 
+#Streamdocs \ub4f1\ub85d URL
+Globals.Streamdocs.Url=
+
 # \uce74\uce74\uc624\uc54c\ub9bc\ud1a1(\ube44\uc988\ubfcc\ub9ac\uc624) API URL
 #\uac1c\ubc1c\uc11c\ubc84
 #Globals.BizPpurio.siteUrl=https://dev-api.bizppurio.com

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp

@@ -105,7 +105,7 @@
              error: function (e) {console.log("ERROR : ", e); }
          });
  	}
-	
+	/* 
 	// Pdf 뷰어솔루션
  	function fn_reg_streamDocs(){
  		var data = new FormData(document.getElementById("pop"));
@@ -114,7 +114,8 @@
 		
  		$.ajax({
              type: "POST",
-             url: "/kccadr/adjPgrMgr/apm/regStreamDocsAPI.do",
+//              url: "/kccadr/adjPgrMgr/apm/regStreamDocsAPI.do",
+             url: "/kccadr/common/regStreamDocsAjax.do",
             
              data: data,
              dataType:'json',
@@ -138,6 +139,56 @@
              error: function (e) {console.log("ERROR : ", e); }
          });
  	}
+	
+	 */
+	
+	
+	
+
+	/*   
+	 * Pdf 뷰어솔루션
+	 * */
+	function fn_reg_streamDocs(){
+
+		
+		var data = {
+				"adrSeq": $('#adrSeq').val()
+		}
+		
+		console.log('data :: ', data);
+
+		$.ajax({
+			type: "POST",
+			url: "<c:url value='/kccadr/common/regStreamDocsAjax.do' />",
+			data: JSON.stringify(data),
+			dataType:'json',
+			async: false,
+			processData: false,
+			contentType: "application/json",
+			cache: false,
+			success: function (returnData) {
+				console.log('returnData : ', returnData);
+				if(returnData.status == "OK"){
+					// text => JSON
+					var obj = JSON.parse(returnData.dataSub);
+					// window.open 호출
+					fn_read_streamDocs(obj.alink);
+				}else{
+					alert(returnData.data);
+					return false;
+				}
+			},
+			error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+		});
+		
+	};
+	
+	/*
+	* pdf Stream road
+	*/
+	function fn_read_streamDocs(url){
+		window.open(url);
+	}
 
 	function fnc_download_endFile(){
 		var adrSeq = document.pop.adrSeq.value;
@@ -145,10 +196,6 @@
 	}
 	
 
-	function fn_read_streamDocs(){
-		var adrSeq = document.pop.adrSeq.value;
-		window.open("http://192.168.0.176:8085/streamdocs/view/sd;streamdocsId=-Q_zRU0tisIOGyXPQpUgZvES1CSm7zhp78sXUx_y11Q");
-	}
 	
 	
 // 	function fn_viewPop(code) {
@@ -354,8 +401,8 @@
 			    	<button type="button" class="btnType02" onclick="fnc_view_download_step_1(); return false;">선택다운로드</button>
 			    	<%-- <button type="button" class="btnType02" onclick="fncDocRegPopup(); return false;">답변서 등록</button> --%>
 			    	<button type="button" class="btnType02" onclick="fncDocRegPopup(); return false;">문서 등록</button>
-<!-- 					<button type="button" class="btnType02" onclick="fn_reg_streamDocs()(); return false;">종결 문건 단권화파일 다운로드</button> -->
+					<button type="button" class="btnType02" onclick="fn_reg_streamDocs(); return false;">종결 문건 단권화파일 다운로드</button>
-					<button type="button" class="btnType02" onclick="fnc_is_prcs_finish(); return false;">종결 문건 단권화파일 다운로드</button>
+<!-- 					<button type="button" class="btnType02" onclick="fnc_is_prcs_finish(); return false;">종결 문건 단권화파일 다운로드</button> -->
 				</div>
 				<!-- <div class="area_right">
 					<button type="button" class="btnType02" onclick="fnc_is_prcs_finish(); return false;">종결 문건 단권화파일 다운로드</button>

src/main/webapp/js/kccadr/adjReqMgrPast/init.js

@@ -23,8 +23,6 @@
 		var reqTy = $('input[name=reqTy]:checked').val();; // 조정신청 유형
 		var rpplTy = $('input[name=rpplTy]:checked').val();; // 조정신청 유형
 		
-		console.log('reqTy : ', reqTy);
-		console.log('rpplTy : ', rpplTy);
 		
 		//대리인 정보 처리해주기
 		if (rpplTy == "30") {
@@ -40,12 +38,38 @@
 			$('#rppl00Email1').val(splEmail00[0]);
 			$('#rppl00Email2').val(splEmail00[1]);
 			
-			var splPhone00 = [];
+
-			splPhone00 = rppl00Phone.split("-");
+			// 10이면 지역번호
+			if(rppl00Phone.indexOf('-') > -1)
+			{
+				var splPhone00 = [];
+				splPhone00 = rppl00Phone.split("-");
+				
+				$('#rppl00Phone1').val(splPhone00[0]);
+				$('#rppl00Phone2').val(splPhone00[1]);
+				$('#rppl00Phone3').val(splPhone00[2]);
+			}
+			else if(rppl00Phone.length == 10)
+			{
+				$('#rppl00Phone1').val(rppl00Phone.substring(0, 2));
+				$('#rppl00Phone2').val(rppl00Phone.substring(2, 6));
+				$('#rppl00Phone3').val(rppl00Phone.substring(6, 10));
+			}
+			else
+			{
+				$('#rppl00Phone1').val(rppl00Phone.substring(0, 3));
+				$('#rppl00Phone2').val(rppl00Phone.substring(3, 7));
+				$('#rppl00Phone3').val(rppl00Phone.substring(7, 11));
+			}
+			
+			
+			
+			
+			
+			
+			
+			
 			
-			$('#rppl00Phone1').val(splPhone00[0]);
-			$('#rppl00Phone2').val(splPhone00[1]);
-			$('#rppl00Phone3').val(splPhone00[2]);
 			
 		} else {
 			$("#agntInfo").hide();
@@ -73,9 +97,6 @@
 		$('#rppl01Email2').val(splEmail01[1]);
 		
 		
-		
-		
-		
 		// 10이면 지역번호
 		if(rppl01Phone.indexOf('-') > -1)
 		{
@@ -96,7 +117,6 @@
 			$('#rppl01Phone1').val(rppl01Phone.substring(0, 3));
 			$('#rppl01Phone2').val(rppl01Phone.substring(3, 7));
 			$('#rppl01Phone3').val(rppl01Phone.substring(7, 11));
-			
 		}
 		
 		
@@ -149,7 +169,6 @@
 				$('#rppl0'+ num +'Email2').val(splEmail[1]);
 				
 				var splPhone = [];
-				console.log('rpplPhone : ', rpplPhone);
 				
 				
 

src/main/webapp/js/kccadr/adjReqMgrPast/value.js

@@ -31,9 +31,7 @@
 			var rppl00Phone3 = $('#rppl00Phone3').val();
 			var rppl00RealPost = $('#rppl00RealPost').val();
 			var rppl00RealAddrDtl = $('#rppl00RealAddrDtl').val();
-			
+			$('#rppl00Phone').val(rppl00Phone1+rppl00Phone2+rppl00Phone2);
-			
-			
 		}
 		
 		var rpplUsrTy = $("[name='adjReqMgrVoList[1].rpplUsrTy']:checked").val(); //신청인 분류 
@@ -69,6 +67,7 @@
 		var rppl01RealPost = $('#rppl01RealPost').val();
 		var rppl01RealAddrDtl = $('#rppl01RealAddrDtl').val();
 		
+		console.log('rppl01Phone1 :: ', rppl01Phone1);
 		
 		//신청인 이메일정보 합쳐주기
 		var rppl01Email1 = $('#rppl01Email1').val();
@@ -83,6 +82,8 @@
 		
 		$('#rppl01Phone').val(rppl01Phone1+rppl01Phone2+rppl01Phone3);
 		
+		console.log('85 :: rppl01Phone1+rppl01Phone2+rppl01Phone3 :: ', rppl01Phone1+rppl01Phone2+rppl01Phone3);
+		
 		
 		//피신청인 체크
 		var reqTotCnt = $('#reqPerTotCnt').val(); //총 피신청인 갯수