|
@@ -1,6 +1,7 @@
|
|
|
package com.huimv.eartag2.service.impl;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+import cn.hutool.http.HttpRequest;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
|
import com.huimv.eartag2.common.dao.entity.*;
|
|
@@ -418,9 +419,26 @@ public class DataServiceImpl implements IDataService {
|
|
|
//预留字段
|
|
|
dataJo.put("other", dataArray[9]);
|
|
|
type = "eartag";
|
|
|
+
|
|
|
+ HashMap<String, String> paramsMap = new HashMap<>();
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ jsonObject.put("code", dataArray[2]);
|
|
|
+ jsonObject.put("bat", dataArray[3]);
|
|
|
+ jsonObject.put("oldEarconTemp", dataArray[4]);
|
|
|
+ jsonObject.put("newEarconTemp", earTemp);
|
|
|
+ jsonObject.put("collectorTemp", dataArray[5]);
|
|
|
+ jsonObject.put("amountExercise", dataArray[6]);
|
|
|
+ jsonObject.put("signal", dataArray[7]);
|
|
|
+ jsonObject.put("repeaterCode", dataArray[1]);
|
|
|
+ jsonObject.put("time", dataArray[8]);
|
|
|
+ jsonObject.put("original", askText);
|
|
|
+ paramsMap.put("Content-Type", "application/json;charset=utf-8");
|
|
|
+ String post = HttpRequest.post("https://sahwt.xuyunbao.com/earcon/oauth/receive")
|
|
|
+ .headerMap(paramsMap, false).body(jsonObject.toJSONString()).timeout(30 * 1000).execute().body();
|
|
|
}
|
|
|
outMap.put("type", type);
|
|
|
outMap.put("data", dataJo);
|
|
|
+
|
|
|
return outMap;
|
|
|
}
|
|
|
|