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

导入功能，数据格式错误待解决

Browse Source
This commit is contained in:
caozehui
2025-01-16 15:45:38 +08:00
parent dfa0daf70c
commit dd9662091a
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
detection/src/main/java/com/njcn/gather/result/service/IResultService.java
View File

@@ -40,4 +40,9 @@ public interface IResultService {
ResultVO resultData(ResultParam param);
/**
* 导出原始数据
* @param param
*/
void exportRawData(ResultParam param);
}

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

@@ -233,9 +233,9 @@ public class PqDevController extends BaseController {
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
@PostMapping(value = "/importCNDev")
@ApiOperation("批量设备数据")
@ApiOperation("批量导入设备数据")
@ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true)
public HttpResult<Object> importCNDev(@RequestParam("file") MultipartFile file, String pattern, HttpServletResponse response) {
public HttpResult<String> importCNDev(@RequestParam("file") MultipartFile file, String patternId, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("importCNDev");
LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
@@ -257,6 +257,8 @@ public class PqDevController extends BaseController {
// 此处前端要做特殊处理，具体可以参考技术监督的数据导入
Workbook failWorkbook = excelImportResult.getFailWorkbook();
PoiUtil.exportFileByWorkbook(failWorkbook, "非法被检设备数据.xlsx", response);
throw new BusinessException(DevResponseEnum.IMPORT_DATA_FORMAT_FAIL);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
} else {
cnDevExcelList = excelImportResult.getList();
}
@@ -264,7 +266,7 @@ public class PqDevController extends BaseController {
throw new BusinessException(DevResponseEnum.IMPORT_DATA_FAIL);
}
if(ObjectUtil.isNotEmpty(cnDevExcelList)){
pqDevService.importCNDev(cnDevExcelList, pattern);
pqDevService.importCNDev(cnDevExcelList, patternId);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}

4
device/src/main/java/com/njcn/gather/device/device/service/IPqDevService.java
View File

@@ -206,7 +206,7 @@ public interface IPqDevService extends IService<PqDev> {
* 导入灿能二楼设备数据
*
* @param cnDevExcelList 灿能二楼设备数据列表
* @param pattern 模式Id
* @param patternId 模式Id
*/
void importCNDev(List<CNDevExcel> cnDevExcelList,String pattern);
void importCNDev(List<CNDevExcel> cnDevExcelList,String patternId);
}

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

@@ -582,7 +582,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
@Override
@Transactional(rollbackFor = Exception.class)
public void importCNDev(List<CNDevExcel> cnDevExcelList, String pattern) {
public void importCNDev(List<CNDevExcel> cnDevExcelList, String patternId) {
List<PqDev> oldDevList = BeanUtil.copyToList(cnDevExcelList, PqDev.class);
//逆向可视化
this.reverseVisualizeCNDev(oldDevList);
@@ -597,7 +597,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue());
pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue());
pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
pqDev.setPattern(pattern);
pqDev.setPattern(patternId);
pqDev.setState(DataStateEnum.ENABLE.getCode());
if (pqDev.getEncryptionFlag() == 1) {