优化 --配置

src/main/java/com/chinaitop/depot/system/service/impl/OrgInfoServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
@@ -35,6 +36,9 @@ public class OrgInfoServiceImpl implements OrgInfoService {
         return new RestTemplate();
     }
     
+    @Value("${jsgjjsjUrl}")
+    private String jsgjjsjUrl;
+    
 
 	@Override
 	public List<OrgInfo> queryByExample(OrgInfoExample example) {
@@ -57,31 +61,9 @@ public class OrgInfoServiceImpl implements OrgInfoService {
 		/**
 		 * 国家局数据
 		 */
-		Map<String, Object>  gjjMap = OrgInfoMapper.getKqGjjDate(orgInfo.getOrgId());
-		gjjMap.put("czbz", "i");
-		gjjMap.put("is_upload", 0);
-		String tableName = "ODS_UP_KQXXJK";
 		
-		/**
-         * restTemplate调用
-         */
-        String url = "http://localhost:9022/recPublish/sendMessage";//
-        // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
-        MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
-		//Map<String, Object>  sendMap = new HashMap<String, Object>();
-        ObjectMapper objectMapper = new ObjectMapper();
-        String jsonMap;
-        try {
-			 jsonMap = objectMapper.writeValueAsString(gjjMap);
-			 sendMap.add("gjjMapJson",jsonMap);
-		} catch (JsonProcessingException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		sendMap.add("tableName", tableName);
-		sendMap.add("orgId", orgInfo.getOrgId());
-
-       String result = (String) restTemplate.postForObject(url, sendMap, String.class);
+		this.gjjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "i");
+		
 	}
 
 	@Override
@@ -92,31 +74,7 @@ public class OrgInfoServiceImpl implements OrgInfoService {
 		/**
 		 * 国家局数据
 		 */
-		Map<String, Object>  gjjMap = OrgInfoMapper.getKqGjjDate(orgInfo.getOrgId());
-		gjjMap.put("czbz", "u");
-		gjjMap.put("is_upload", 0);
-		String tableName = "ODS_UP_KQXXJK";
-		
-		/**
-         * restTemplate调用
-         */
-        String url = "http://localhost:9022/recPublish/sendMessage";//
-        // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
-        MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
-		//Map<String, Object>  sendMap = new HashMap<String, Object>();
-        ObjectMapper objectMapper = new ObjectMapper();
-        String jsonMap;
-        try {
-			 jsonMap = objectMapper.writeValueAsString(gjjMap);
-			 sendMap.add("gjjMapJson",jsonMap);
-		} catch (JsonProcessingException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		sendMap.add("tableName", tableName);
-		sendMap.add("orgId", orgInfo.getOrgId());
-
-       String result = (String) restTemplate.postForObject(url, sendMap, String.class);
+		this.gjjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "u");
 	}
 
 	@Override
@@ -127,32 +85,8 @@ public class OrgInfoServiceImpl implements OrgInfoService {
 		/**
 		 * 国家局数据
 		 */
-		Map<String, Object>  gjjMap = OrgInfoMapper.getKqGjjDate(orgId);
-		gjjMap.put("czbz", "d");
-		gjjMap.put("is_upload", 0);
-		String tableName = "ODS_UP_KQXXJK";
 		
-		/**
-         * restTemplate调用
-         */
-        String url = "http://localhost:9022/recPublish/sendMessage";//
-        // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
-        MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
-		//Map<String, Object>  sendMap = new HashMap<String, Object>();
-        ObjectMapper objectMapper = new ObjectMapper();
-        String jsonMap;
-        try {
-			 jsonMap = objectMapper.writeValueAsString(gjjMap);
-			 sendMap.add("gjjMapJson",jsonMap);
-		} catch (JsonProcessingException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		sendMap.add("tableName", tableName);
-		sendMap.add("orgId", orgId);
-
-       String result = (String) restTemplate.postForObject(url, sendMap, String.class);
-        
+		this.gjjjk(orgId, orgId, "d");
 	}
 
 	@Override
@@ -287,4 +221,35 @@ public class OrgInfoServiceImpl implements OrgInfoService {
 		return OrgInfoMapper.getAllDepotInfo();
 	}
 
+	/**
+   	 * 国家局数据
+   	 */
+       public void gjjjk(Integer id, Integer orgId,String czbz) {
+           
+    	Map<String, Object>  gjjMap = OrgInfoMapper.getKqGjjDate(orgId);
+   		gjjMap.put("czbz", czbz);
+   		gjjMap.put("is_upload", 0);
+   		String tableName = "ODS_UP_KQXXJK";
+   		
+   		/**
+            * restTemplate调用
+            */
+           //String url = "http://localhost:9022/recPublish/sendMessage";//
+           // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+           MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
+   		//Map<String, Object>  sendMap = new HashMap<String, Object>();
+           ObjectMapper objectMapper = new ObjectMapper();
+           String jsonMap;
+           try {
+   			 jsonMap = objectMapper.writeValueAsString(gjjMap);
+   			 sendMap.add("gjjMapJson",jsonMap);
+   		} catch (JsonProcessingException e) {
+   			// TODO Auto-generated catch block
+   			e.printStackTrace();
+   		}
+   		sendMap.add("tableName", tableName);
+   		sendMap.add("orgId", orgId);
+
+          String result = (String) restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
+       }
 }

src/main/resources/application-dev.yml

@@ -50,4 +50,6 @@ loginTime: 5
 FLATID: 511100008
 KEY: 229558d3f8a9e2c67a7661a50487c790
 #webservice接口地址
-wsdlUrl: http://10.223.3.62:9025/yhzx/webServices/ExchangeServer?wsdl
+wsdlUrl: http://10.223.3.62:9025/yhzx/webServices/ExchangeServer?wsdl
+
+jsgjjsjUrl: http://localhost:9022/recPublish/sendMessage

src/main/resources/application-prod.yml

@@ -49,4 +49,6 @@ loginTime: 5
 FLATID: 511100008
 KEY: 229558d3f8a9e2c67a7661a50487c790
 #webservice接口地址
-wsdlUrl: http://10.223.3.62:9025/yhzx/webServices/ExchangeServer?wsdl
+wsdlUrl: http://10.223.3.62:9025/yhzx/webServices/ExchangeServer?wsdl
+
+jsgjjsjUrl: http://localhost:9022/recPublish/sendMessage