Merge pull request #12 from OpenGDSMobile/publicData

Public data
OpenGDSMobile · Jul 24, 2015 · 1ff33cf · 1ff33cf
2 parents 7e52842 + 98f5ddd
commit 1ff33cf
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 19 deletions.
diff --git a/src/main/java/com/openGDSMobileApplicationServer/service/impl/AttributeTableServiceImp.java b/src/main/java/com/openGDSMobileApplicationServer/service/impl/AttributeTableServiceImp.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.ListIterator;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -24,6 +25,13 @@ public class AttributeTableServiceImp extends EgovAbstractServiceImpl implements
 	@Override
 	public List<LinkedHashMap<String, Object>> createAttr(HashMap<String, Object> tableName) {
 		List<LinkedHashMap<String, Object>> resultData = at.selectAttr(tableName);
+		ListIterator<LinkedHashMap<String, Object>> listItr = resultData.listIterator();
+		while(listItr.hasNext()){
+			LinkedHashMap<String, Object> tmp = listItr.next();
+			tmp.remove("geom");
+		}
+
+		System.out.println(resultData);
 		return resultData;
 	}
 

diff --git a/src/main/java/com/openGDSMobileApplicationServer/service/impl/GeoServerManagerDAO.java b/src/main/java/com/openGDSMobileApplicationServer/service/impl/GeoServerManagerDAO.java
@@ -8,14 +8,12 @@
 
 import org.springframework.stereotype.Repository;
 
-import egovframework.rte.psl.dataaccess.EgovAbstractMapper;
-
 
 @Repository("geodao")
 public class GeoServerManagerDAO{
 
 	static String RESTURL = "http://127.0.0.1/geoserver";
-	static String RESTUSER = "root";
+	static String RESTUSER = "admin";
 	static String RESTPW = "geoserver";
 
 	GeoServerRESTPublisher publisher; 
@@ -25,6 +23,7 @@ public class GeoServerManagerDAO{
 		super();
 		publisher = new GeoServerRESTPublisher(RESTURL, RESTUSER, RESTPW);
 		reader= new GeoServerRESTReader(RESTURL, RESTUSER, RESTPW);  
+		System.out.println(reader.existGeoserver());
 	}
 
 	public boolean geoserverCreateWorkspace(String name) {
@@ -34,8 +33,7 @@ public boolean geoserverCreateWorkspace(String name) {
 
 	public List<String> getGeoserverLayerNames(String workspace) {
 		// TODO Auto-generated method stub 
-		System.out.println(reader.getLayers().getNames());
-		return reader.getLayers().getNames();
+		return reader.getDatastores(workspace).getNames();
 	}
 
 }
diff --git a/...main/java/com/openGDSMobileApplicationServer/service/impl/PublicDataPortalServiceImp.java b/...main/java/com/openGDSMobileApplicationServer/service/impl/PublicDataPortalServiceImp.java
@@ -127,6 +127,7 @@ public JSONObject processXmlbyPublicData(Document src, String[] keys){
 			}
 		}
 		result.put("row", list);
+
 		log.info(result);
 		return result;
 	}

diff --git a/src/main/java/com/openGDSMobileApplicationServer/service/impl/SeoulOpenDataServiceImp.java b/src/main/java/com/openGDSMobileApplicationServer/service/impl/SeoulOpenDataServiceImp.java
@@ -39,8 +39,7 @@ public String requestPublicData(JSONObject data) {
 				serviceName = String.valueOf(data.get(tmp));
 			}			
 		} 
-		if(serviceName.equals("TimeAverageAirQuality") 
-				|| serviceName.equals("RealtimeRoadsideStation")){
+		if(serviceName.equals("TimeAverageAirQuality") || serviceName.equals("RealtimeRoadsideStation")){
 			String baseURL = "http://openapi.seoul.go.kr:8088/";
 			String[] urlOrder = 
 					new String []{"serviceKey", "returnType", "serviceName", "amount", "dateTimeValue"};
@@ -74,20 +73,19 @@ public String processServiceURL(JSONObject data, String[] urlOrder,String baseUR
 	@SuppressWarnings("unchecked")
 	public JSONObject processJSONbySeoulData(JSONObject data, String[] keys){
 		JSONObject source = (JSONObject) data.get(serviceName);
-		log.info(source);
-		source = (JSONObject) source.get("row");
+		JSONArray rowList = (JSONArray) source.get("row");
 		JSONObject result = new JSONObject();
 		JSONArray list = new JSONArray();
-
-		for(int i=0; i<source.size(); i++){
-			JSONObject contents = (JSONObject) source.get(i);
+		for(int i=0; i<rowList.size(); i++){
+			JSONObject contents = (JSONObject) rowList.get(i);
 			JSONObject obj = new JSONObject();
 			for(int j=0; j<keys.length; j++){
 				obj.put(keys[j], contents.get(keys[j]));				
 			}
 			list.add(obj);
 		}
 		result.put("row", list);
+		log.info(source);
 		log.info(result);
 		return result;
 	}

diff --git a/src/main/java/com/openGDSMobileApplicationServer/web/GeoServerManagerController.java b/src/main/java/com/openGDSMobileApplicationServer/web/GeoServerManagerController.java
@@ -36,7 +36,7 @@ public class GeoServerManagerController {
 	@RequestMapping(value="/getLayerNames.do")
 	public @ResponseBody Map<String, Object> getLayerNames(@RequestBody String data){ 
 		Map<String, Object> message = new HashMap<String, Object>();
-		try {  
+		try {
 			Map<String,Object> Mapdata = Util.convertJsonToObject(data);
 			message.put("result", "OK");
 			message.put("message", null); 

diff --git a/src/main/resources/webmapping/db/pgqlCreateDBSQL.sql b/src/main/resources/webmapping/db/pgqlCreateDBSQL.sql
@@ -6,4 +6,4 @@ CREATE DATABASE OPENGDSMOBILE_DB
        LC_CTYPE = 'en_US.UTF-8'
        CONNECTION LIMIT = -1;
 
-CREATE EXTENSTION postgis;
+CREATE EXTENSION postgis;
diff --git a/src/main/webapp/WEB-INF/config/webmapping/context-servlet.xml b/src/main/webapp/WEB-INF/config/webmapping/context-servlet.xml
@@ -13,10 +13,10 @@
 	<context:annotation-config/>     	
 	<mvc:annotation-driven/>	  	
 
-	<context:component-scan base-package="com.openGDSMobileApplicationServer">
+	<context:component-scan base-package="com.openGDSMobileApplicationServer"><!-- 
 		<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
 		<context:include-filter type="annotation" expression="org.springframework.stereotype.Service"/>
-		<context:include-filter type="annotation" expression="org.springframework.stereotype.Repository"/>
+		<context:include-filter type="annotation" expression="org.springframework.stereotype.Repository"/> -->
 	</context:component-scan>
 
 	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">

diff --git a/src/main/webapp/geoBasedData/DONG.json b/src/main/webapp/geoBasedData/DONG.json
diff --git a/src/main/webapp/geoBasedData/GU.json b/src/main/webapp/geoBasedData/GU.json
diff --git a/src/main/webapp/geoBasedData/SIDO.json b/src/main/webapp/geoBasedData/SIDO.json
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -12,7 +12,7 @@
         <script type="text/javascript" src="./js/egovframework/mbl/cmm/EgovMobile-1.3.2.js"></script>      <!-- eGov Mobile -->
 
         <script>
-        	var serverAddr = "http://113.198.80.60:8081/mobile/SeoulOpenData.do";
+        	var serverAddr = "http://localhost:8080/mobile/SeoulOpenData.do";
             var obj = null;
 
             function dataPortal() {
@@ -106,7 +106,7 @@
                 paramData['serviceName'] = "TimeAverageAirQuality"; 
                 paramData['amount'] = "1/100";
                 paramData['dateTimeValue'] = '201501011100';
-                paramData['envType'] = "pm10"; 
+                paramData['envType'] = "PM10"; 
                 console.log(paramData);
                 $.ajax({
                 	type : 'POST',

diff --git a/.../impl/PublicDataPortalServiceImpTest.java → .../test/PublicDataPortalServiceImpTest.java b/.../impl/PublicDataPortalServiceImpTest.java → .../test/PublicDataPortalServiceImpTest.java
@@ -1,4 +1,4 @@
-package com.openGDSMobileApplicaionServer.service.impl;
+package com.openGDSMobileApplicaionServer.service.impl.test;
 
 import static org.junit.Assert.*;
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		}
     		result.put("row", list);
     		log.info(result);
     		return result;
     	}
@@ Expand Down @@