设备管理导入模板增加siteId参数

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

@@ -80,7 +80,7 @@ public interface IDeviceFeign extends IFeign {
     Rest<String> downMsg(@RequestBody DeviceNotifyPdu deviceNotifyPdu);
 
     @PostMapping(value = "/device/importData",consumes= MediaType.MULTIPART_FORM_DATA_VALUE)
-    String importData(@RequestPart MultipartFile file,@RequestHeader("Authorization") String authorization);
+    String importData(@RequestPart MultipartFile file,@RequestHeader("Authorization") String authorization,@RequestParam("siteId") Long siteId);
 }
 
 
@@ -124,7 +124,7 @@ class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> {
             }
 
             @Override
-            public String importData(MultipartFile file, String authorization) {
+            public String importData(MultipartFile file, String authorization,Long siteId) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("code", -1);
                 jsonObject.put("msg", "暂时无法导入设备，请稍后再试!");

sst-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -402,9 +402,9 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
 
 
     @PostMapping({"m/importData"})
-    public String importData(MultipartFile file,@RequestHeader("Authorization") String authorization) {
+    public String importData(MultipartFile file,@RequestHeader("Authorization") String authorization,@RequestParam("siteId") Long siteId) {
 
-        return deviceFeign.importData(file,authorization);
+        return deviceFeign.importData(file,authorization,siteId);
     }
 
 }
\ No newline at end of file