国家局上传接口

src/main/java/com/chinaitop/depot/system/mapper/OrgInfoMapper.java

@@ -36,5 +36,4 @@ public interface OrgInfoMapper {
     
     List<OrgInfo> getAllDepotInfo();
 
-	Map<String, Object> getKqGjjDate(Integer orgId);
 }

src/main/java/com/chinaitop/depot/system/mapper/OrgInfoMapper.xml

@@ -1088,34 +1088,4 @@
     where org_class_id = 5318
   </select>
   
-  
-  <select id="getKqGjjDate" parameterType="java.lang.Integer" resultType="java.util.Map">
-	select 
-	a.org_id id, 
-	a.kqbm kqdm, 
-	a.tykqbm tykqbm, 
-	dw.dwdm dwdm,
-	a.org_name kqmc    ,
-	e2.enumname || e3.enumname || e4.enumname || a.registered_address zcdz    ,
-	e5.gbcode xzqhdm  ,
-	a.depot_property kqcq,
-	a.effective_capacity yxcr,
-	a.yxgr, 
-	a.depot_area zdmj, 
-	a.house_number cfs,
-	a.tank_number ygs, 
-	a.longitude jd      ,
-	a.latitude wd      ,
-	'1' As kqzt,          
-	DATE_FORMAT(a.updatetime, '%Y-%m-%d %H:%i:%s') zhgxsj  
-	from org_info a 
-	left join org_info b on b.org_id=a.parent_id
-	left join basic_enum e1 on e1.enumid=a.depot_class
-	left join basic_enum e2 on e2.enumid=a.zc_province
-	left join basic_enum e3 on e3.enumid=a.zc_city
-	left join basic_enum e4 on e4.enumid=a.zc_county
-	left join basic_enum e5 on e5.enumid=a.area_code
-	left join province_all.biz_unit_info dw on dw.id = a.unit_info_id
-	where a.org_class_id=5318 and a.org_id = #{orgId}
-  </select>
 </mapper>

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.java

@@ -68,5 +68,4 @@ public interface UserInfoMapper {
 
 	List<Map<Object, Object>> sptgetUserInfo(Map<Object, Object> map);
 
-	Map<String, Object> getRyGjjDate(Integer id);
 }

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.xml

@@ -790,44 +790,4 @@
 	order by ui.real_name asc
   </select>
   
-  
-  <select id="getRyGjjDate" parameterType="java.lang.Integer" resultType="java.util.Map">
-  		select 
-		a.user_id id,
-		substr(b.kqbm, 1, 18) dwdm,  
-		b.kqbm kqdm,
-		dw.tydwbm tydwbm, 
-		b.tykqbm tykqbm, 
-		b.org_name dwmc,
-		a.bmmc lsbm,
-		e1.gbcode xzqhdm,
-		a.real_name xm,
-		case a.sex when '5288' then '1' when '5289' then '2' else '1' end xb,
-		UPPER(a.sfzhm) sfzhm,
-		DATE_FORMAT(a.rzrq, '%Y-%m-%d')  rzrq,
-		a.gwxz gwxz,
-		a.zgzt zgzt,
-		DATE_FORMAT(a.lzrq, '%Y-%m-%d') lzrq,
-		a.telphone zjdh,
-		a.mobile yddh,
-		a.email dzyx,
-		e2.gbcode mz,
-		e3.gbcode zzmm,
-		e4.gbcode rylb,
-		a.zy zy,
-		DATE_FORMAT(a.qdzgzchzyzgsj, '%Y-%m-%d') qdzgzchzyzgsj,
-		e5.gbcode xl,
-		a.zw zw,
-		DATE_FORMAT(a.updatetime, '%Y-%m-%d %H:%i:%s') zhgxsj
-		from user_info a 
-		left join org_info b on b.org_id=a.org_id
-		left join basic_enum e1 on e1.enumid=b.area_code
-		left join basic_enum e2 on e2.enumid=a.mz
-		left join basic_enum e3 on e3.enumid=a.zzmm
-		left join basic_enum e4 on e4.enumid=a.rylb
-		left join basic_enum e5 on e5.enumid=a.xl
-		left join basic_enum e6 on e6.enumid=a.sex
-		left join province_all.biz_unit_info dw on dw.id = b.unit_info_id
-		where length(a.real_name) &lt;12 and b.org_class_id=5318 and a.user_id = #{id}
-  </select>
 </mapper>

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

@@ -221,33 +221,22 @@ public class OrgInfoServiceImpl implements OrgInfoService {
    	 * 国家局数据
    	 */
        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";
-   		
+         
+    	  String tableName = "ODS_UP_KQXXJK";
    		/**
             * restTemplate调用
             */
            //String url = "http://localhost:9022/recPublish/sendMessage";//
-           // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+           //发送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("czbz", czbz);
+   		sendMap.add("ywId", id);
    		sendMap.add("orgId", orgId);
 
-   		System.out.println(jsgjjsjUrl);
-   		
-          restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
+        restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
+           
+    	
        }
 }

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

@@ -12,7 +12,6 @@ import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
@@ -33,7 +32,6 @@ import com.chinaitop.depot.utils.NetStateUtil;
 import com.chinaitop.depot.utils.SHA1Util;
 import com.chinaitop.depot.webservice.ExchangeServer;
 import com.chinaitop.depot.webservice.IExchangeService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Service
@@ -368,31 +366,20 @@ public class UserInfoServiceImpl implements UserInfoService {
    	 */
        public void gjjjk(Integer id, Integer orgId,String czbz) {
            
-   		Map<String, Object>  gjjMap = UserInfoMapper.getRyGjjDate(id);
-   		gjjMap.put("czbz",czbz);
-   		gjjMap.put("is_upload", 0);
-   		String tableName = "ODS_UP_RYXXJK";
-   		
-   		/**
-            * 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 tableName = "ODS_UP_RYXXJK";
+  		/**
+           * restTemplate调用
+           */
+          //String url = "http://localhost:9022/recPublish/sendMessage";//
+          //发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+  		
+          MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
+  		sendMap.add("tableName", tableName);
+  		sendMap.add("czbz", czbz);
+  		sendMap.add("ywId", id);
+  		sendMap.add("orgId", orgId);
 
           restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
-       }
+     }
 
 }