修改设备回调通知

common-lib/src/main/java/com/mortals/xhx/feign/device/IDeviceFeign.java

@@ -72,7 +72,7 @@ public interface IDeviceFeign extends IFeign {
      * @return
      */
     @PostMapping(value = "/api/receive")
-    Rest<String> deviceCall(@RequestBody DeviceReq deviceReq, @RequestHeader("Authorization") String authorization);
+    Rest<String> deviceCall(@RequestBody DeviceReq deviceReq);
 
 }
 
@@ -104,7 +104,7 @@ class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> {
             }
 
             @Override
-            public Rest<String> deviceCall(DeviceReq deviceReq, String authorization) {
+            public Rest<String> deviceCall(DeviceReq deviceReq) {
                 return Rest.fail("暂时无法保存设备，请稍后再试!");
             }
         };

sample-form-manager/pom.xml

@@ -99,7 +99,7 @@
                 <profiles.nginx.port>11199</profiles.nginx.port>
                 <profiles.server.gatewayport>11078</profiles.server.gatewayport>
                 <profiles.server.path>/sampleform</profiles.server.path>
-                <profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
+                <profiles.rabbitmq.host>172.15.28.117</profiles.rabbitmq.host>
                 <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
                 <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
                 <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>

sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -59,11 +59,11 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         deviceEntity.setEnabled(EnabledEnum.启用.getValue());
         this.getDao().update(deviceEntity);
         this.putCache(deviceEntity.getId().toString(), deviceEntity);
-        String token = getToken();
+
         DeviceReq deviceReq = new DeviceReq();
         deviceReq.setReceiveMethod(DeviceMethodEnum.ACTIVE.getValue());
         deviceReq.setDeviceCode(deviceCode);
-        Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
+        Rest<String> rest = deviceFeign.deviceCall(deviceReq);
         log.info("激活结果：{}", JSON.toJSONString(rest));
     }
 
@@ -76,21 +76,20 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         deviceEntity.setUpdateUserId(getContextUserId(context));
         this.getDao().update(deviceEntity);
         this.putCache(deviceEntity.getId().toString(), deviceEntity);
-        String token = getToken();
         DeviceReq deviceReq = new DeviceReq();
         deviceReq.setReceiveMethod(DeviceMethodEnum.ENABLED.getValue());
         deviceReq.setDeviceCode(deviceEntity.getDeviceCode());
-        Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
+        Rest<String> rest = deviceFeign.deviceCall(deviceReq);
         log.info("启用结果：{}", JSON.toJSONString(rest));
     }
 
 
-    private String getToken() {
+/*    private String getToken() {
         LoginForm loginForm = new LoginForm();
         loginForm.setLoginName(loginName);
         loginForm.setPassword(password);
         Rest<String> rest = deviceFeign.getToken(loginForm);
         String token = rest.getData();
         return token;
-    }
+    }*/
 }
\ No newline at end of file