同步功能：优化转义符处理

huimv-farm-device/huimv-farm-business/src/main/java/com/huimv/business/server/service/impl/DeviceImpl.java

@@ -36,7 +36,7 @@ public class DeviceImpl implements IDevice {
     @Override
     public Result syncAddFarmDevice(String deviceData) throws UnsupportedEncodingException {
         //转义符号处理
-        JSONObject deviceDataJo = JSON.parseObject(_translateSymbol(deviceData));
+        JSONObject deviceDataJo = JSON.parseObject(textUtil.translateSymbol(deviceData));
         FarmDeviceEntity deviceEntity = new FarmDeviceEntity();
         deviceEntity.setDataId(deviceDataJo.getInteger("id"));
         deviceEntity.setDeviceCode(deviceDataJo.getString("deviceCode"));
@@ -57,14 +57,14 @@ public class DeviceImpl implements IDevice {
     }
 
     //转义处理
-    public String _translateSymbol(String data) throws UnsupportedEncodingException {
-        return textUtil.decode(data.replace("data=","").replace("%3D","="));
-    }
+//    public String _translateSymbol(String data) throws UnsupportedEncodingException {
+//        return textUtil.decode(data.replace("data=","").replace("%3D","="));
+//    }
 
     @Override
     public Result syncEditFarmDevice(String deviceData) throws UnsupportedEncodingException {
         //转义符号处理
-        JSONObject deviceDataJo = JSON.parseObject(_translateSymbol(deviceData));
+        JSONObject deviceDataJo = JSON.parseObject(textUtil.translateSymbol(deviceData));
         Integer dataId = deviceDataJo.getInteger("id");
         //查询目标设备数据
         List<Object[]> existList = deviceRepo.getDevice(dataId);
@@ -99,7 +99,7 @@ public class DeviceImpl implements IDevice {
     @Override
     public Result syncRemoveFarmDevice(String deviceData) throws UnsupportedEncodingException {
         //转义符号处理
-        Integer dataId = Integer.parseInt(_translateSymbol(deviceData));
+        Integer dataId = Integer.parseInt(textUtil.translateSymbol(deviceData));
         //查询目标设备数据
         List<Object[]> existList = deviceRepo.getDevice(dataId);
         if(existList.size()>0) {

huimv-farm-device/huimv-farm-business/src/main/java/com/huimv/business/utils/HttpTemplete.java

@@ -10,9 +10,11 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.*;
 
 /**
@@ -25,6 +27,8 @@ import java.util.*;
  **/
 @Component
 public class HttpTemplete {
+    @Autowired
+    private TextUtil textUtil;
     private String testHttpIp = "http://localhost:9105";
 
 //    public static void main(String[] args) throws Exception {

huimv-farm-device/huimv-farm-business/src/main/java/com/huimv/business/utils/TextUtil.java

@@ -16,6 +16,10 @@ import java.util.Base64;
 @Component
 public class TextUtil {
 
+    //转义符处理
+    public String translateSymbol(String data) throws UnsupportedEncodingException {
+        return decode(data.replace("data=","").replace("%3D","="));
+    }
     //base64编码
     public String encode(String text) throws UnsupportedEncodingException {
         final Base64.Encoder encoder = Base64.getEncoder();