ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
hongawen
2025-01-16 19:36:09 +08:00
parent 12e805ccc1
commit a0e8e093fe
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java
View File

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

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

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

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

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