diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index ef819d6..005625f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -9,7 +9,9 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.core.util.RSAUtils; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.domain.constants.PermissionConstants; import com.casic.missiles.modular.interfaces.log.LogManager; @@ -95,14 +97,14 @@ @GetMapping("/test") @ResponseBody public void test(Long id) { - GenericEqptDataProvider genericEqptDataProvider=SpringContextUtil.getBean(GenericEqptDataProvider.class); - BizBusinessDeviceMeasureApprovalMapper measureApprovalMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - BizBusinessDeviceMeasureApproval deviceMeasureApproval = measureApprovalMapper.selectById(id); - Map map = BeanUtil.beanToMap(deviceMeasureApproval); - genericEqptDataProvider.excuteMeasureTaskAsyn(map,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + GenericEqptDataProvider genericEqptDataProvider = SpringContextUtil.getBean(GenericEqptDataProvider.class); + BizEquipmentStandardCheckRecordApprovalMapper checkApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); +// BizBusinessDeviceMeasureApproval deviceMeasureApproval = measureApprovalMapper.selectById(id); +// genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); //进行证书报告生成,并在远程注册服务器注册 -// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); -// printFileRegister.registerPrintFile("计量人员", "导出word", StringUtils.isEmpty(id) ? null : Long.valueOf(id), null, false, response); + BizEquipmentStandardCheckRecordApproval checkApproval = checkApprovalMapper.selectById(id); + Map map = BeanUtil.beanToMap(checkApproval); + genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); } // //批量生成测试用户 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index ef819d6..005625f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -9,7 +9,9 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.core.util.RSAUtils; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.domain.constants.PermissionConstants; import com.casic.missiles.modular.interfaces.log.LogManager; @@ -95,14 +97,14 @@ @GetMapping("/test") @ResponseBody public void test(Long id) { - GenericEqptDataProvider genericEqptDataProvider=SpringContextUtil.getBean(GenericEqptDataProvider.class); - BizBusinessDeviceMeasureApprovalMapper measureApprovalMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - BizBusinessDeviceMeasureApproval deviceMeasureApproval = measureApprovalMapper.selectById(id); - Map map = BeanUtil.beanToMap(deviceMeasureApproval); - genericEqptDataProvider.excuteMeasureTaskAsyn(map,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + GenericEqptDataProvider genericEqptDataProvider = SpringContextUtil.getBean(GenericEqptDataProvider.class); + BizEquipmentStandardCheckRecordApprovalMapper checkApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); +// BizBusinessDeviceMeasureApproval deviceMeasureApproval = measureApprovalMapper.selectById(id); +// genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); //进行证书报告生成,并在远程注册服务器注册 -// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); -// printFileRegister.registerPrintFile("计量人员", "导出word", StringUtils.isEmpty(id) ? null : Long.valueOf(id), null, false, response); + BizEquipmentStandardCheckRecordApproval checkApproval = checkApprovalMapper.selectById(id); + Map map = BeanUtil.beanToMap(checkApproval); + genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); } // //批量生成测试用户 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 4a5d705..d720da7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -130,18 +130,18 @@ } catch (RuntimeException rex) { log.error("文件打印出现异常,打印参数信息为{},异常信息为{}", JSON.toJSON(filePrintRegister), rex); } finally { -// if (ObjectUtils.isNotEmpty(registerParameters.getCompressParameter()) && registerParameters.getCompressParameter().getZip()) { -// //转移文件 -// fileMove(localFileDir + registerParameters.getCompressParameter().getRootDirName(), printDocUrl); -// } else if (StringUtils.isNotEmpty(printDocUrl)) { -// //如果文件路径不为空,回传文件流 -// miniName = createResponseFileInput(printDocUrl, registerParameters.getResponse()); -// } -// //删除无效的文件 -// File invalidFile = new File(tempLocalFileDir); -// // 删除运行空间下的文件 -// deleteFile(invalidFile); -// log.info("证书打印完成......,证书名称为{}", miniName); + if (ObjectUtils.isNotEmpty(registerParameters.getCompressParameter()) && registerParameters.getCompressParameter().getZip()) { + //转移文件 + fileMove(localFileDir + registerParameters.getCompressParameter().getRootDirName(), printDocUrl); + } else if (StringUtils.isNotEmpty(printDocUrl)) { + //如果文件路径不为空,回传文件流 + miniName = createResponseFileInput(printDocUrl, registerParameters.getResponse()); + } + //删除无效的文件 + File invalidFile = new File(tempLocalFileDir); + // 删除运行空间下的文件 + deleteFile(invalidFile); + log.info("证书打印完成......,证书名称为{}", miniName); } return miniName; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index ef819d6..005625f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -9,7 +9,9 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.core.util.RSAUtils; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; +import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.domain.constants.PermissionConstants; import com.casic.missiles.modular.interfaces.log.LogManager; @@ -95,14 +97,14 @@ @GetMapping("/test") @ResponseBody public void test(Long id) { - GenericEqptDataProvider genericEqptDataProvider=SpringContextUtil.getBean(GenericEqptDataProvider.class); - BizBusinessDeviceMeasureApprovalMapper measureApprovalMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - BizBusinessDeviceMeasureApproval deviceMeasureApproval = measureApprovalMapper.selectById(id); - Map map = BeanUtil.beanToMap(deviceMeasureApproval); - genericEqptDataProvider.excuteMeasureTaskAsyn(map,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + GenericEqptDataProvider genericEqptDataProvider = SpringContextUtil.getBean(GenericEqptDataProvider.class); + BizEquipmentStandardCheckRecordApprovalMapper checkApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); +// BizBusinessDeviceMeasureApproval deviceMeasureApproval = measureApprovalMapper.selectById(id); +// genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); //进行证书报告生成,并在远程注册服务器注册 -// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); -// printFileRegister.registerPrintFile("计量人员", "导出word", StringUtils.isEmpty(id) ? null : Long.valueOf(id), null, false, response); + BizEquipmentStandardCheckRecordApproval checkApproval = checkApprovalMapper.selectById(id); + Map map = BeanUtil.beanToMap(checkApproval); + genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); } // //批量生成测试用户 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 4a5d705..d720da7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -130,18 +130,18 @@ } catch (RuntimeException rex) { log.error("文件打印出现异常,打印参数信息为{},异常信息为{}", JSON.toJSON(filePrintRegister), rex); } finally { -// if (ObjectUtils.isNotEmpty(registerParameters.getCompressParameter()) && registerParameters.getCompressParameter().getZip()) { -// //转移文件 -// fileMove(localFileDir + registerParameters.getCompressParameter().getRootDirName(), printDocUrl); -// } else if (StringUtils.isNotEmpty(printDocUrl)) { -// //如果文件路径不为空,回传文件流 -// miniName = createResponseFileInput(printDocUrl, registerParameters.getResponse()); -// } -// //删除无效的文件 -// File invalidFile = new File(tempLocalFileDir); -// // 删除运行空间下的文件 -// deleteFile(invalidFile); -// log.info("证书打印完成......,证书名称为{}", miniName); + if (ObjectUtils.isNotEmpty(registerParameters.getCompressParameter()) && registerParameters.getCompressParameter().getZip()) { + //转移文件 + fileMove(localFileDir + registerParameters.getCompressParameter().getRootDirName(), printDocUrl); + } else if (StringUtils.isNotEmpty(printDocUrl)) { + //如果文件路径不为空,回传文件流 + miniName = createResponseFileInput(printDocUrl, registerParameters.getResponse()); + } + //删除无效的文件 + File invalidFile = new File(tempLocalFileDir); + // 删除运行空间下的文件 + deleteFile(invalidFile); + log.info("证书打印完成......,证书名称为{}", miniName); } return miniName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java index bc6d070..b4a530b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java @@ -100,15 +100,18 @@ if (currentText.contains("fe:") && currentText.startsWith("{{")) { currentText = currentText.replace("fe:", "").replace("{{", "").replace("}}", ""); String[] keys = currentText.replaceAll("\\s{1,}", " ").trim().split(" "); - List list = (List) PoiPublicUtil.getParamsValue(keys[0], map); - list.forEach((objx) -> { - if (objx instanceof ImageEntity) { - currentRun.setText("", 0); - ExcelMapParse.addAnImage((ImageEntity) objx, currentRun); - } else { - PoiPublicUtil.setWordText(currentRun, objx.toString()); - } - }); + Object object = PoiPublicUtil.getParamsValue(keys[0], map); + if (object instanceof List) { + List list = (List) object; + list.forEach((objx) -> { + if (objx instanceof ImageEntity) { + currentRun.setText("", 0); + ExcelMapParse.addAnImage((ImageEntity) objx, currentRun); + } else { + PoiPublicUtil.setWordText(currentRun, objx.toString()); + } + }); + } } else { Object obj = PoiPublicUtil.getRealValue(currentText, map); if (obj instanceof ImageEntity) { @@ -137,7 +140,9 @@ text = text.replace("#fe:", "").replace("{{", "").replace("}}", ""); String[] keys = text.replaceAll("\\s{1,}", " ").trim().split(" "); Object result = PoiPublicUtil.getParamsValue(keys[0], map); - differExpansionLength = ((List) result).size(); + if (result instanceof List) { + differExpansionLength = ((List) result).size(); + } break; } cellIndex++;