diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index d54a559..2cbb047 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -34,7 +34,6 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_name customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index d54a559..2cbb047 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -34,7 +34,6 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_name customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 465542f..9374043 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -201,7 +201,6 @@ valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS "measureContent",customer_no AS "customerNo" FROM customer_sample_info - WHERE customer_id=#{request.customerId} AND sample_no like concat('%',#{request.sampleNo},'%') @@ -215,7 +214,6 @@ JOIN ( SELECT id,order_code FROM business_order - WHERE customer_id=#{request.customerId} )bo ON bo.id=bosr.order_id )bor ON bor.sampleId=csi.id ORDER BY create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index d54a559..2cbb047 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -34,7 +34,6 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_name customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 465542f..9374043 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -201,7 +201,6 @@ valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS "measureContent",customer_no AS "customerNo" FROM customer_sample_info - WHERE customer_id=#{request.customerId} AND sample_no like concat('%',#{request.sampleNo},'%') @@ -215,7 +214,6 @@ JOIN ( SELECT id,order_code FROM business_order - WHERE customer_id=#{request.customerId} )bo ON bo.id=bosr.order_id )bor ON bor.sampleId=csi.id ORDER BY create_time DESC diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 25bad5e..869ad37 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -17,6 +17,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.FilePrintTypeEnum; import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper; @@ -73,9 +74,9 @@ if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(8, 1, 30000, + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); - executor.execute(() -> registerPrintFile(siteExecutiveLog.getId())); + executor.execute(() -> registerPrintFile(siteExecutiveLog)); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -104,7 +105,7 @@ TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); executor.execute(() -> { deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); - registerPrintFile(businessSiteExecutiveLog.getId()); + registerPrintFile(businessSiteExecutiveLog); }); return ReturnUtil.success(); } @@ -173,20 +174,18 @@ /** * 增加,修改环境审批单需要进行 * - * @param id */ - private void registerPrintFile(Long id) { + private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { //获取证书报告信息 - BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id); - businessSiteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(businessSiteExecutiveLog.getLaboratoryId())); + siteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(siteExecutiveLog.getLaboratoryId())); //进行证书报告生成,并在远程注册服务器注册 PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); try { - DictCodeUtils.convertDictCodeToName(businessSiteExecutiveLog); - String printFileName = printFileRegister.registerPrintFile(businessSiteExecutiveLog, PrintFileDataBeanNameAliasEnum.EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); - setSitePrintFileName(id, printFileName); + DictCodeUtils.convertDictCodeToName(siteExecutiveLog); + String printFileName = printFileRegister.registerPrintFile(siteExecutiveLog, FilePrintTypeEnum.EXTERNAL_ENVIRONMENTAL_RECORD); + setSitePrintFileName(siteExecutiveLog.getId(), printFileName); } catch (Exception ex) { - log.error("打印异常,证书报告信息为{},异常信息为{}", JSONObject.toJSON(businessSiteExecutiveLog), ex); + log.error("打印异常,证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutiveLog), ex); } } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml index d54a559..2cbb047 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml @@ -34,7 +34,6 @@ FROM business_site_executive_info JOIN ( SELECT id as orderId,customer_name AS customerName,customer_address AS customerAddress, - customer_name customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel FROM business_order where is_del = 0 diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 465542f..9374043 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -201,7 +201,6 @@ valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS "measureContent",customer_no AS "customerNo" FROM customer_sample_info - WHERE customer_id=#{request.customerId} AND sample_no like concat('%',#{request.sampleNo},'%') @@ -215,7 +214,6 @@ JOIN ( SELECT id,order_code FROM business_order - WHERE customer_id=#{request.customerId} )bo ON bo.id=bosr.order_id )bor ON bor.sampleId=csi.id ORDER BY create_time DESC diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 25bad5e..869ad37 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -17,6 +17,7 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.FilePrintTypeEnum; import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper; @@ -73,9 +74,9 @@ if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(8, 1, 30000, + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); - executor.execute(() -> registerPrintFile(siteExecutiveLog.getId())); + executor.execute(() -> registerPrintFile(siteExecutiveLog)); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -104,7 +105,7 @@ TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); executor.execute(() -> { deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); - registerPrintFile(businessSiteExecutiveLog.getId()); + registerPrintFile(businessSiteExecutiveLog); }); return ReturnUtil.success(); } @@ -173,20 +174,18 @@ /** * 增加,修改环境审批单需要进行 * - * @param id */ - private void registerPrintFile(Long id) { + private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { //获取证书报告信息 - BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id); - businessSiteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(businessSiteExecutiveLog.getLaboratoryId())); + siteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(siteExecutiveLog.getLaboratoryId())); //进行证书报告生成,并在远程注册服务器注册 PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); try { - DictCodeUtils.convertDictCodeToName(businessSiteExecutiveLog); - String printFileName = printFileRegister.registerPrintFile(businessSiteExecutiveLog, PrintFileDataBeanNameAliasEnum.EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); - setSitePrintFileName(id, printFileName); + DictCodeUtils.convertDictCodeToName(siteExecutiveLog); + String printFileName = printFileRegister.registerPrintFile(siteExecutiveLog, FilePrintTypeEnum.EXTERNAL_ENVIRONMENTAL_RECORD); + setSitePrintFileName(siteExecutiveLog.getId(), printFileName); } catch (Exception ex) { - log.error("打印异常,证书报告信息为{},异常信息为{}", JSONObject.toJSON(businessSiteExecutiveLog), ex); + log.error("打印异常,证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutiveLog), ex); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/EnvironmentalRecordData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/EnvironmentalRecordData.java index 0e59ed7..9d65081 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/EnvironmentalRecordData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/EnvironmentalRecordData.java @@ -106,6 +106,7 @@ */ private EnvironmentalRecordData equipmentRelation(FilePrintRegister filePrintRegister, BusinessSiteExecutiveLog metaData) { List> siteEquipments = new ArrayList<>(); + Map params=new HashMap<>(); for (BusinessSiteExecutiveEquipmentRelation equipmentRelation : metaData.getSiteExecutiveEquipmentRelationList()) { Map equipmentFixedAssetsMap = new HashMap<>(); equipmentFixedAssetsMap.put("beforeWorkResult ", equipmentRelation.getBeforeWorkCheck()); @@ -114,7 +115,8 @@ equipmentFixedAssetsMap.put("afterWorkResult", equipmentRelation.getAfterWorkResult()); siteEquipments.add(equipmentFixedAssetsMap); } - filePrintRegister.getParams().put("siteEquipments", siteEquipments); + params.put("siteEquipments", siteEquipments); + filePrintRegister.setParams(params); return this; }