Merge remote-tracking branch 'remotes/origin/dev_hainan' into dev_hainan

src/main/java/com/founder/service/ResourceService.java

@@ -7,6 +7,7 @@ import com.founder.model.TbZhzxCjxx;
 import com.founder.model.TbZhzxJjxx;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
@@ -84,12 +85,12 @@ public class ResourceService {
             URI uri = builder.build();
             //logger.info(uri.toString());
             // 创建Http Post请求
-            HttpGet httpGet = new HttpGet(uri);
+            HttpPost httpPost = new HttpPost(uri);
             //添加请求头
-            httpGet.addHeader("apikey",apiKey);
-            logger.info(httpGet.getURI().toString());
+            httpPost.addHeader("apikey",apiKey);
+            logger.info(httpPost.getURI().toString());
             // 执行http请求
-            response = httpClient.execute(httpGet);
+            response = httpClient.execute(httpPost);
             resultString = EntityUtils.toString(response.getEntity(), "utf-8");
             //resultString = "{ \"code\": 200,\"code_message\": \"\",\"message\": \"成功\",\"data\": {\"topic\": \"AZNB46000000000000015_4699980060\",\"time\": 1615191601,\"status\": \"1\",\"isSuccess\": true},\"error_data\": null}";
         } catch (Exception e) {
@@ -149,20 +150,29 @@ public class ResourceService {
 
             // 循环消费 任务进度 并更新前台界面
             while (true) {
-                ConsumerRecords<String, String> records = consumer.poll(10000);//消费间隔单位：毫秒
-                for (ConsumerRecord<String, String> consumerRecord : records) {
-                    logger.info(consumerRecord.key()+":"+consumerRecord.value()); // 消息key：taskid的值// 消息value：消息的json字符串
-                    try {
-                        if("JJXX".equals(type)){
-                            TbZhzxJjxx entity = parseJjxx(consumerRecord.value());
-                            xxcxDao.insertJjxx(entity);
-                        }else if("CJXX".equals(type)){
-                            TbZhzxCjxx entity = parseCjxx(consumerRecord.value());
-                            xxcxDao.insertCjxx(entity);
+                ConsumerRecords<String, String> records = null;//消费间隔单位：毫秒
+                try {
+                    records = consumer.poll(10000);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                if(records!=null){
+                    for (ConsumerRecord<String, String> consumerRecord : records) {
+                        logger.info("消息队列返回内容：{"+consumerRecord.key()+":"+consumerRecord.value()+"}"); // 消息key：taskid的值// 消息value：消息的json字符串
+                        try {
+                            if("JJXX".equals(type)){
+                                TbZhzxJjxx entity = parseJjxx(consumerRecord.value());
+                                xxcxDao.insertJjxx(entity);
+                            }else if("CJXX".equals(type)){
+                                TbZhzxCjxx entity = parseCjxx(consumerRecord.value());
+                                xxcxDao.insertCjxx(entity);
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
-                    } catch (Exception e) {
-                        e.printStackTrace();
                     }
+                }else{
+                    logger.warn("消息队列没有内容返回。");
                 }
             }