设备 国家局上传

src/main/java/com/chinaitop/depot/device/controller/DSblxxjyController.java

@@ -223,4 +223,18 @@ public class DSblxxjyController {
         List<String> collect = list.stream().map(DSbxxsjy::getSbbh).collect(Collectors.toList());
         return collect;
     }
+    
+    /**
+     * 测试
+     */
+    /**
+     * 根据仓房ID获取仓房name
+     */
+    @RequestMapping(value="/aaa",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    public void aaa() {
+    	 
+    	//String sbbh, String orgId,String czbz
+    	sblxxjyService.gjjjk("6820240308100531","68","i");
+    	
+    }
 }

src/main/java/com/chinaitop/depot/device/mapper/DSbxxsjyMapper.xml

@@ -837,27 +837,4 @@
     </if>
   </update>
   
-  <select id="getSbGjjDate" parameterType="java.lang.String" resultType="java.util.Map">
-  	select  
-	a.sbbh id,
-	b.kqbm kqdm,
-	b.tykqbm tykqbm,
-	b.credit_code dwdm,
-	b.org_name kqmc,
-	a.sbbh sbbh,
-	a.sbyqmc sbyqmc,
-	a.sbbm sbyqdm,
-	a.sbggxh sbggxh,
-	a.sccj sccj,
-	DATE_FORMAT(a.scrq, '%Y-%m-%d') scrq,
-	a.remark sbms,
-	a.status sbzt,
-	DATE_FORMAT(a.jdsj, '%Y-%m-%d') jdsj,
-	a.jddw jddw,
-	DATE_FORMAT(a.create_date, '%Y-%m-%d %H:%i:%s') zhgxsj 
-	from d_sbxxsjy a 
-	left join org_info b on b.org_id=a.szdwdm
-	where 1=1 
-	and a.ssfl='1' and a.sbbh = #{sbbh};
-  </select>
 </mapper>

src/main/java/com/chinaitop/depot/device/service/DSblxxjyService.java

@@ -37,4 +37,6 @@ public interface DSblxxjyService {
      * @param s
      */
     void remove(String sbbh, String s);
+
+	void gjjjk(String string, String i, String string2);
 }

src/main/java/com/chinaitop/depot/device/service/impl/DSblxxjyServiceImpl.java

@@ -4,11 +4,8 @@ import com.chinaitop.depot.device.mapper.DSbxxsjyMapper;
 import com.chinaitop.depot.device.model.DSbxxsjy;
 import com.chinaitop.depot.device.model.DSbxxsjyExample;
 import com.chinaitop.depot.device.service.DSblxxjyService;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -16,7 +13,6 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author qingsong.han
@@ -42,7 +38,7 @@ public class DSblxxjyServiceImpl implements DSblxxjyService {
     @Override
     public void save(DSbxxsjy dSbxxsjy) {
         sbxxsjyMapper.insert(dSbxxsjy);
-        this.gjjjk(dSbxxsjy.getSbbh(),"","i");
+        this.gjjjk(dSbxxsjy.getSbbh(),dSbxxsjy.getSzdwdm(),"i");
         
     }
 
@@ -53,7 +49,7 @@ public class DSblxxjyServiceImpl implements DSblxxjyService {
         criteria.andSbbhEqualTo(dSbxxsjy.getSbbh());
         sbxxsjyMapper.updateByExampleSelective(dSbxxsjy,example);
         
-        this.gjjjk(dSbxxsjy.getSbbh(),"","u");
+        this.gjjjk(dSbxxsjy.getSbbh(),dSbxxsjy.getSzdwdm(),"u");
     }
 
     @Override
@@ -73,32 +69,21 @@ public class DSblxxjyServiceImpl implements DSblxxjyService {
 	 * 国家局数据
 	 */
     public void gjjjk(String sbbh, String orgId,String czbz) {
-        
-		Map<String, Object>  gjjMap = sbxxsjyMapper.getSbGjjDate(sbbh);
-		gjjMap.put("czbz",czbz);
-		gjjMap.put("is_upload", 0);
+    	
 		String tableName = "ODS_UP_SBXXJK";
-		
 		/**
          * 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("orgId",111);
+		sendMap.add("czbz", czbz);
+		sendMap.add("ywId", sbbh);
+		sendMap.add("orgId", orgId);
 
-       String result = (String) restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
+        restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
     }
     
 }