Merge branch 'hylee'

src/main/java/kcc/com/cmm/aspect/LoggerAspect.java

@@ -88,7 +88,7 @@ public class LoggerAspect {
             logBuffer.append("└ [●●●●●●●●●●●●●●●●●●●●●●●●●●●●]");
             log.info(logBuffer.toString(), logList.toArray());
 
-            System.out.println("Throwable Log ::: ");
+            System.out.println("Throwable Log ::: "+ throwable.toString());
             throw throwable;
         }
     }

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

@@ -34,6 +34,8 @@ import com.epapyrus.pdf.pg.entity.BookMarkPage;
 import com.epapyrus.pdf.pg.entity.Merge;
 import com.epapyrus.pdf.pg.entity.PdfConversion;
 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;
@@ -1250,6 +1252,85 @@ 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;
+     }
+     
      
      
      

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

@@ -74,8 +74,11 @@
 		 commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/docRegPop.do" , "750", "550", "docRegPop", $("#pop"));
 	 }
 	
+	// DB 데이터 확인
  	function fnc_is_prcs_finish(){
- 		var data = new FormData(document.getElementById("pop"))
+ 		var data = new FormData(document.getElementById("pop"));
+ 		
+ 		console.log("data : ", data);
 		
  		$.ajax({
              type: "POST",
@@ -102,12 +105,51 @@
              error: function (e) {console.log("ERROR : ", e); }
          });
  	}
+	
+	// Pdf 뷰어솔루션
+ 	function fn_reg_streamDocs(){
+ 		var data = new FormData(document.getElementById("pop"));
+ 		
+ 		console.log("data : ", data);
+		
+ 		$.ajax({
+             type: "POST",
+             url: "/kccadr/adjPgrMgr/apm/regStreamDocsAPI.do",
+            
+             data: data,
+             dataType:'json',
+             async: false,
+             processData: false,
+             contentType: false,
+             cache: false,
+             success: function (returnData, status) {
+                 console.log('returnData : ', returnData);
+//                  console.log('returnData : ', returnData.result);
+                 
+                 if(returnData.result ==  'success'){
+
+//                  	 fn_read_streamDocs()();
+                	 
+                 }else{
+                  
+                     alert(returnData.message);
+                 }
+             },
+             error: function (e) {console.log("ERROR : ", e); }
+         });
+ 	}
 
 	function fnc_download_endFile(){
 		var adrSeq = document.pop.adrSeq.value;
 		window.open("<c:url value='/kccadr/adjPgrMgr/apm/adrEndPdfConversionDownload.do?adrSeq=" + adrSeq + "'/>");
 	}
 	
+
+	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) {
 // 		console.log('code : ', code);
@@ -136,9 +178,9 @@
 </head>
 <body>	
 
-	<form id="pop" name="pop" method="post">
+<%-- 	<form id="pop" name="pop" method="post"> --%>
-		<input type="hidden" name="atchFileId" id="atchFileId" value="">
+<!-- 		<input type="hidden" name="atchFileId" id="atchFileId" value=""> -->
-	</form>
+<%-- 	</form> --%>
 	
 	
 	<div class="mask" onclick="layerPopToggle();"></div>
@@ -312,6 +354,7 @@
 			    	<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="fnc_is_prcs_finish(); return false;">종결 문건 단권화파일 다운로드</button>
 				</div>
 				<!-- <div class="area_right">

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

@@ -72,12 +72,33 @@
 		$('#rppl01Email1').val(splEmail01[0]);
 		$('#rppl01Email2').val(splEmail01[1]);
 		
-		var splPhone01 = [];
-		splPhone01 = rppl01Phone.split("-");
 		
-		$('#rppl01Phone1').val(splPhone01[0]);
+		
-		$('#rppl01Phone2').val(splPhone01[1]);
+		
-		$('#rppl01Phone3').val(splPhone01[2]);
+		
+		// 10이면 지역번호
+		if(rppl01Phone.indexOf('-') > -1)
+		{
+			var splPhone01 = [];
+			splPhone01 = rppl01Phone.split("-");
+			$('#rppl01Phone1').val(splPhone01[0]);
+			$('#rppl01Phone2').val(splPhone01[1]);
+			$('#rppl01Phone3').val(splPhone01[2]);
+		}
+		else if(rppl01Phone.length == 10)
+		{
+			$('#rppl01Phone1').val(rppl01Phone.substring(0, 2));
+			$('#rppl01Phone2').val(rppl01Phone.substring(2, 6));
+			$('#rppl01Phone3').val(rppl01Phone.substring(6, 10));
+		}
+		else
+		{
+			$('#rppl01Phone1').val(rppl01Phone.substring(0, 3));
+			$('#rppl01Phone2').val(rppl01Phone.substring(3, 7));
+			$('#rppl01Phone3').val(rppl01Phone.substring(7, 11));
+			
+		}
+		
 		
 		//피신청인 화면 처리해주기
 		var reqTotCnt = $('#reqPerTotCnt').val();
@@ -128,11 +149,34 @@
 				$('#rppl0'+ num +'Email2').val(splEmail[1]);
 				
 				var splPhone = [];
-				splPhone = rpplPhone.split("-");
+				console.log('rpplPhone : ', rpplPhone);
+				
+				
+
+				// 10이면 지역번호
+				if(rpplPhone.indexOf('-') > -1)
+				{
+					splPhone01 = rpplPhone.split("-");
+					$('#rppl0'+ num +'Phone1').val(splPhone01[0]);
+					$('#rppl0'+ num +'Phone2').val(splPhone01[1]);
+					$('#rppl0'+ num +'Phone3').val(splPhone01[2]);
+				}
+				else if(rppl01Phone.length == 10)
+				{
+					$('#rppl0'+ num +'Phone1').val(rpplPhone.substring(0, 2));
+					$('#rppl0'+ num +'Phone2').val(rpplPhone.substring(2, 6));
+					$('#rppl0'+ num +'Phone3').val(rpplPhone.substring(6, 10));
+				}
+				else
+				{
+					$('#rppl0'+ num +'Phone1').val(rpplPhone.substring(0, 3));
+					$('#rppl0'+ num +'Phone2').val(rpplPhone.substring(3, 7));
+					$('#rppl0'+ num +'Phone3').val(rpplPhone.substring(7, 11));
+				}
+				
+				
+				
 				
-				$('#rppl0'+ num +'Phone1').val(splPhone[0]);
-				$('#rppl0'+ num +'Phone2').val(splPhone[1]);
-				$('#rppl0'+ num +'Phone3').val(splPhone[2]);
 				
 			}
 			

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

@@ -87,7 +87,9 @@
 		//피신청인 체크
 		var reqTotCnt = $('#reqPerTotCnt').val(); //총 피신청인 갯수
 		
-		if(reqTotCnt == 0){ // 첫번째 피신청인 데이터 체크
+		console.log('reqTotCnt : ', reqTotCnt);
+		
+		if(reqTotCnt > 0){ // 첫번째 피신청인 데이터 체크
 			
 			var rppl02UsrTy = $("[name = 'adjReqMgrVoList[2].rpplUsrTy']:checked").val();
 			
@@ -136,6 +138,7 @@
 			var rppl02Phone3 = $('#rppl02Phone3').val();
 			
 			$('#rppl02Phone').val(rppl02Phone1+rppl02Phone2+rppl02Phone3);
+			console.log('rppl02Phone1+rppl02Phone2+rppl02Phone3 : ', rppl02Phone1+rppl02Phone2+rppl02Phone3);
 			
 		}