微调

device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java

@@ -250,15 +250,15 @@ public class PqDevController extends BaseController {
         params.setHeadRows(1);
         params.setNeedVerify(true);
 
-        List<CNDevExcel> cnDevExcelList = null;
+        List<CNDevExcel> cnDevExcelList;
         try {
             ExcelImportResult<CNDevExcel> excelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), CNDevExcel.class, params);
             if (excelImportResult.isVerifyFail()) {
                 // 此处前端要做特殊处理，具体可以参考技术监督的数据导入
                 Workbook failWorkbook = excelImportResult.getFailWorkbook();
                 PoiUtil.exportFileByWorkbook(failWorkbook, "非法被检设备数据.xlsx", response);
-                throw new BusinessException(DevResponseEnum.IMPORT_DATA_FORMAT_FAIL);
-//                return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+//                throw new BusinessException(DevResponseEnum.IMPORT_DATA_FORMAT_FAIL);
+                return null;
             } else {
                 cnDevExcelList = excelImportResult.getList();
             }

device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java

@@ -215,6 +215,5 @@ public class PqDev extends BaseEntity implements Serializable {
     @TableField("Preinvestment_Plan")
     private String preinvestmentPlan;
 
-    private String power;
 }
 

device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java

@@ -811,7 +811,6 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
             DevType devType = devTypeService.getByName(pqDev.getDevType());
             pqDev.setDevType(devType.getId());
             pqDev.setIcdId(devType.getIcd());
-            pqDev.setPower(devType.getPower());
             pqDev.setDevVolt(devType.getDevVolt());
             pqDev.setDevCurr(devType.getDevCurr());
             pqDev.setDevChns(devType.getDevChns());