이준호 전자조정시스템 커밋

- 수정

src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java

@@ -47,7 +47,7 @@ public class OzSchdExportUtil {
 	
 			//개발서버
 			ozApiIp = "192.168.0.200";
-			ozApiUrl = "http://192.168.0.176:8091/oz80/server";
+			ozApiUrl = "http://192.168.0.176:8086/oz80/server";
 			
 			
 		}else {

src/main/java/kcc/kccadr/textsense/web/TextSenseAPIComm.java

@@ -82,7 +82,7 @@ public class TextSenseAPIComm {
 			if(statusCode.equals("200")) {
 				result = EntityUtils.toString(response.getEntity()); 
 				
-				result = new String(result.getBytes("iso-8859-1"));//한글 깨짐 현상이 있어서 변환 해줌.
+				result = new String(result.getBytes("utf-8"));//한글 깨짐 현상이 있어서 변환 해줌.
 				JSONParser parser = new JSONParser();
 				Object obj = parser.parse(result);
 				JSONObject object = (JSONObject) obj;

src/main/java/kcc/kccadr/textsense/web/TextSenseController.java

@@ -7,7 +7,14 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.ws.rs.POST;
 
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,6 +27,8 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.google.api.client.http.HttpRequest;
+
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.LoginVO;
@@ -263,6 +272,7 @@ public class TextSenseController {
 				String status = resultJson.get("status").toString();
 				
 				taskName = resultJson.get("name").toString();
+//				taskName = URLEncoder.encode(resultJson.get("name").toString());
 					
 				resultJsVO.setId(id);
 				resultJsVO.setTaskName(taskName);
@@ -475,4 +485,59 @@ public class TextSenseController {
 		
 	}
 	
+	
+	@POST
+	@RequestMapping(value="/kccadr/textsence/textSenseResponse.do")
+	public HttpResponse textSenseResponse(HttpServletRequest req, HttpServletResponse res, @RequestBody @Valid String test) throws Exception{
+		
+		JSONObject returnObject = new JSONObject();
+		
+		String result = "";
+		
+		try {
+			JSONParser parser = new JSONParser();
+			Object obj = parser.parse(test);
+			JSONObject object = (JSONObject) obj;
+			
+	        String USER_1		= EgovStringUtil.isNullToString(object.get("USER_1"));
+	        String ADDRESS_1	= EgovStringUtil.isNullToString(object.get("ADDRESS_1"));
+	        String PHONE_1		= EgovStringUtil.isNullToString(object.get("PHONE_1"));
+	        String MOBILE_1		= EgovStringUtil.isNullToString(object.get("MOBILE_1"));
+	        String MAIL_1		= EgovStringUtil.isNullToString(object.get("MAIL_1"));
+	        String USER_2		= EgovStringUtil.isNullToString(object.get("USER_2"));
+	        String ADDRESS_2	= EgovStringUtil.isNullToString(object.get("ADDRESS_2"));
+	        String PHONE_2		= EgovStringUtil.isNullToString(object.get("PHONE_2"));
+	        String MOBILE_2		= EgovStringUtil.isNullToString(object.get("MOBILE_2"));
+	        String MAIL_2		= EgovStringUtil.isNullToString(object.get("MAIL_2"));
+	        String PURPOSE		= EgovStringUtil.isNullToString(object.get("PURPOSE"));
+	        String REASON		= EgovStringUtil.isNullToString(object.get("REASON"));
+	        String ATTACHMENT	= EgovStringUtil.isNullToString(object.get("ATTACHMENT"));
+			
+			result = "success";
+			
+		} catch (Exception e) {
+			result = "fail";
+			System.out.println("textSenseCallbackUriPage Controller Error !!! " + e);
+		}
+		
+		returnObject.put("result", result);
+		
+		HttpPost httpPost = new HttpPost();
+        httpPost.setEntity(new StringEntity(returnObject.toString(), "UTF-8"));
+        httpPost.addHeader("Content-type", "application/json");
+        httpPost.addHeader("Accept", "application/json");
+
+        System.out.println(httpPost.getMethod());
+        System.out.println(httpPost.getEntity());
+        System.out.println(httpPost.getAllHeaders());
+        System.out.println(httpPost.getURI());
+		
+        HttpClient httpClient = HttpClientBuilder.create().build();
+		
+		return httpClient.execute(httpPost);
+		
+	}
+	
+	
+	
 }

src/main/java/kcc/let/main/web/EgovMainController.java

@@ -176,7 +176,6 @@ public class EgovMainController {
 	public String selectGetMgtMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{
 		
 		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
-		System.out.println("loginVO.getOfcpsNm() :: "+ loginVO.getOfcpsNm());
 		
 		/* 
 		 * 30 : 센터장(부서장)

src/main/webapp/WEB-INF/jsp/kccadr/stts/sttsAdr.jsp

@@ -74,6 +74,15 @@ $(document).ready(function() {
 
 </script>
 
+<style>
+#listForm > div > div > div.cont > div.list.tbType01 > table > tbody > tr > td{
+      overflow:hidden;
+      text-overflow:ellipsis;
+      white-space:nowrap;
+}
+
+</style>
+
 </head>
 <body>
 <form name="listForm" id="listForm" method="post">

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp

@@ -312,7 +312,7 @@
 								직권결정문송달 및 확정증명원
 								조정신청서 및 첨부서류(본인 제출서류에 한함)
 							-->
-				        		<kc:select codeId="CC601" name="docuTy" id="docuTy" css="style='margin-left: 10px;'"/>
+				        		<kc:select codeId="CC601" name="docuTy" id="docuTy" css="style='margin-left: 10px; width: 410px;'"/>
 				        	</div>
 				        </td>
 				    </tr>