bug修复

src/main/java/cn/fastfun/controller/api/ApiAppDeviceController.java

@@ -100,7 +100,7 @@ public class ApiAppDeviceController {
     @ApiOperation(value = "批量新增电池")
     @RequestMapping(value = "excelImport", method = RequestMethod.POST)
     public ApiDTO excelImport(MultipartFile file) {
-        appDeviceService.importDevice(sysExcelFieldService.importExcel("invoice", file),utilService.getUserName());
+        appDeviceService.importDevice(sysExcelFieldService.importExcel("invoice", file));
         return ApiDTO.ok();
     }
 

src/main/java/cn/fastfun/service/AppDeviceService.java

@@ -17,7 +17,7 @@ public interface AppDeviceService extends JpaService<AppDevice, String> {
     /**
      * excel导入设备
      */
-    void importDevice(List<Map<String, Object>> list, String operator);
+    void importDevice(List<Map<String, Object>> list);
 
     /**
      * 获得repository

src/main/java/cn/fastfun/service/impl/AppDeviceServiceImp.java

@@ -42,7 +42,7 @@ public class AppDeviceServiceImp extends JpaServiceImp<AppDevice, String> implem
     UtilService utilService;
 
     @Override
-    public void importDevice(List<Map<String, Object>> list, String operator) {
+    public void importDevice(List<Map<String, Object>> list) {
         List<AppDevice> devices = new ArrayList<>();
         DeviceAttrDTO diffAttrDTO = null;
 
@@ -83,7 +83,8 @@ public class AppDeviceServiceImp extends JpaServiceImp<AppDevice, String> implem
                 throw new ApiRuntimeException("sn:" + device.getSn() + "已经被录入");
             }
             device.setOperateID(operateID.intValue());
-            device.setOperator(operator);
+            // 批量导入时由于没有x-token， 无法确定操作者
+//            device.setOperator(utilService.getUserName());
             devices.add(device);
         }
         save(devices);