系统管理:设备管理:更新同步服务接口地址

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

@@ -57,6 +57,7 @@ public class DeviceImpl implements IDevice {
     private String deviceEditService;
     @Value("${farm.device.removeService}")
     private String deviceRemoveService;
+
     /**
      * @Method : newDevice
      * @Description : 添加设备
@@ -81,17 +82,15 @@ public class DeviceImpl implements IDevice {
         deviceEntity.setLastTime(new Timestamp(new Date().getTime()));
         FarmDeviceEntity outFarmDeviceEntity = deviceRepo.saveAndFlush(deviceEntity);
         log.info("数据中心添加设备信息>>"+outFarmDeviceEntity);
-
         //同步牧场端设备数据
         if(dataSync){
             log.info("同步牧场端设备数据。");
             //从数据库查询出牧场id
             String farmIp = _getFarmIP(farmId);
             String serviceUrl = farmIp + deviceAddService;
-            System.out.println("serviceUrl>>"+serviceUrl);
+            log.info("serviceUrl>>"+serviceUrl);
             String data = textUtil.encode(JSON.toJSONString(outFarmDeviceEntity));
-            System.out.println("密文>>"+data);
-
+            log.info("base64密文>>"+data);
             //提交请求
             httpTemplete.doPostSimple(serviceUrl,data);
         }
@@ -139,10 +138,9 @@ public class DeviceImpl implements IDevice {
             //从数据库查询出牧场id
             String farmIp = _getFarmIP(farmId);
             String serviceUrl = farmIp + deviceEditService;
-            System.out.println("serviceUrl>>"+serviceUrl);
+            log.info("serviceUrl>>"+serviceUrl);
             String data = textUtil.encode(JSON.toJSONString(outFarmDeviceEntity));
-            System.out.println("密文>>"+data);
-
+            log.info("base64密文>>"+data);
             //提交请求
             httpTemplete.doPostSimple(serviceUrl,data);
         }
@@ -180,10 +178,9 @@ public class DeviceImpl implements IDevice {
             //从数据库查询出牧场id
             String farmIp = _getFarmIP(farmId);
             String serviceUrl = farmIp + deviceRemoveService;
-            System.out.println("serviceUrl>>"+serviceUrl);
+            log.info("serviceUrl>>"+serviceUrl);
             String data = textUtil.encode(JSON.toJSONString(id));
-            System.out.println("密文>>"+data);
-
+            log.info("base64密文>>"+data);
             //提交请求
             httpTemplete.doPostSimple(serviceUrl,data);
         }

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

@@ -16,6 +16,11 @@ 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();

huimv-farm-admin/src/main/resources/application.properties

@@ -21,6 +21,6 @@ weight.batchCode.spacemark=-
 
 #牧场端设备数据是否同步(true/false)
 farm.device.sync=true
-farm.device.addService=/farm/local/device/syncAddFarmDevice
-farm.device.editService=/farm/local/device/syncEditFarmDevice
-farm.device.removeService=/farm/local/device/syncRemoveFarmDevice
+farm.device.addService=/farm/device/syncAddFarmDevice
+farm.device.editService=/farm/device/syncEditFarmDevice
+farm.device.removeService=/farm/device/syncRemoveFarmDevice