diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 45cb646..b79adfb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -44,6 +44,7 @@ String SIGNAL_GENERATOR_CHECK_DATA = "信号发生器核查数据"; String LOW_FREQUENCY_SIGNAL_SOURCE = "低频信号源"; + String LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA = "低频信号源核查数据"; String FILE_CHANGE_FORM = "文件更改申请单"; String FILE_GRANT_NOTICE_FORM = "文件发放通知单"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 45cb646..b79adfb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -44,6 +44,7 @@ String SIGNAL_GENERATOR_CHECK_DATA = "信号发生器核查数据"; String LOW_FREQUENCY_SIGNAL_SOURCE = "低频信号源"; + String LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA = "低频信号源核查数据"; String FILE_CHANGE_FORM = "文件更改申请单"; String FILE_GRANT_NOTICE_FORM = "文件发放通知单"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index a54fb06..a272fe1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -350,6 +350,7 @@ String HARMONIC = "谐波"; String AC_VOLTAGE = "交流电压"; + String RISE_AND_FALL_TIME = "上升下降时间"; String FLATNESS = "平坦度"; String DISTORTION = "失真"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 45cb646..b79adfb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -44,6 +44,7 @@ String SIGNAL_GENERATOR_CHECK_DATA = "信号发生器核查数据"; String LOW_FREQUENCY_SIGNAL_SOURCE = "低频信号源"; + String LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA = "低频信号源核查数据"; String FILE_CHANGE_FORM = "文件更改申请单"; String FILE_GRANT_NOTICE_FORM = "文件发放通知单"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index a54fb06..a272fe1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -350,6 +350,7 @@ String HARMONIC = "谐波"; String AC_VOLTAGE = "交流电压"; + String RISE_AND_FALL_TIME = "上升下降时间"; String FLATNESS = "平坦度"; String DISTORTION = "失真"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 633116e..7be3f45 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -69,7 +69,7 @@ replaceSlash(map); map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 - String wordUrl = printFileRegister.registerPrintFile(SIGNAL_GENERATOR_CHECK_DATA, "数据打印", null, map, false, null, null); + String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); @@ -85,7 +85,7 @@ } private void readyForCheckParams(Map map, List frequencySignalList) { - String[] params = {FREQUENCY_CN, AC_VOLTAGE, DC_VOLTAGE, RISE_TIME_CHECK, FLATNESS, DISTORTION}; + String[] params = {FREQUENCY_CN, AC_VOLTAGE, DC_VOLTAGE, RISE_AND_FALL_TIME, FLATNESS, DISTORTION}; String[] checkType = {REPEATABILITY, STABILITY}; for (int i = 0; i < params.length; i++) { String param = params[i]; @@ -110,8 +110,8 @@ } private void appendUnits(BizEquipmentStandardCheckDataLowFrequencySignal f) { - f.setNominalValue(f.getNominalValue() + f.getUnit()); - f.setFrequency(f.getFrequency() + f.getFrequency()); +// f.setNominalValue(f.getNominalValue() + f.getUnit()); +// f.setFrequency(f.getFrequency() + f.getFrequency()); f.setAmplitude(f.getAmplitude() + f.getAmplitudeUnit()); f.setVoltage(f.getVoltage() + f.getVoltageUnit()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 45cb646..b79adfb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -44,6 +44,7 @@ String SIGNAL_GENERATOR_CHECK_DATA = "信号发生器核查数据"; String LOW_FREQUENCY_SIGNAL_SOURCE = "低频信号源"; + String LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA = "低频信号源核查数据"; String FILE_CHANGE_FORM = "文件更改申请单"; String FILE_GRANT_NOTICE_FORM = "文件发放通知单"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index a54fb06..a272fe1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -350,6 +350,7 @@ String HARMONIC = "谐波"; String AC_VOLTAGE = "交流电压"; + String RISE_AND_FALL_TIME = "上升下降时间"; String FLATNESS = "平坦度"; String DISTORTION = "失真"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 633116e..7be3f45 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -69,7 +69,7 @@ replaceSlash(map); map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 - String wordUrl = printFileRegister.registerPrintFile(SIGNAL_GENERATOR_CHECK_DATA, "数据打印", null, map, false, null, null); + String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); @@ -85,7 +85,7 @@ } private void readyForCheckParams(Map map, List frequencySignalList) { - String[] params = {FREQUENCY_CN, AC_VOLTAGE, DC_VOLTAGE, RISE_TIME_CHECK, FLATNESS, DISTORTION}; + String[] params = {FREQUENCY_CN, AC_VOLTAGE, DC_VOLTAGE, RISE_AND_FALL_TIME, FLATNESS, DISTORTION}; String[] checkType = {REPEATABILITY, STABILITY}; for (int i = 0; i < params.length; i++) { String param = params[i]; @@ -110,8 +110,8 @@ } private void appendUnits(BizEquipmentStandardCheckDataLowFrequencySignal f) { - f.setNominalValue(f.getNominalValue() + f.getUnit()); - f.setFrequency(f.getFrequency() + f.getFrequency()); +// f.setNominalValue(f.getNominalValue() + f.getUnit()); +// f.setFrequency(f.getFrequency() + f.getFrequency()); f.setAmplitude(f.getAmplitude() + f.getAmplitudeUnit()); f.setVoltage(f.getVoltage() + f.getVoltageUnit()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java index d830e71..5ec34db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java @@ -497,7 +497,6 @@ } analyzer.setMeasureResult(REFERENCE_POINT.equals(analyzer.getMeasureResult()) || START_POINT.equals(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() : StringUtils.isNotBlank(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() + analyzer.getMeasureResultUnit() : ""); analyzer.setLowerIndex(REFERENCE_POINT.equals(analyzer.getLowerIndex()) || START_POINT.equals(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() : StringUtils.isNotBlank(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() + analyzer.getUnit() : ""); - analyzer.setAverageValue(REFERENCE_POINT.equals(analyzer.getAverageValue()) || START_POINT.equals(analyzer.getAverageValue()) ? analyzer.getAverageValue() : StringUtils.isNotBlank(analyzer.getAverageValue()) ? analyzer.getAverageValue() + analyzer.getUnit() : ""); analyzer.setUpperIndex(REFERENCE_POINT.equals(analyzer.getUpperIndex()) || START_POINT.equals(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() : StringUtils.isNotBlank(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() + analyzer.getUnit() : ""); if (StringUtils.isBlank(analyzer.getConclusion())){ analyzer.setConclusion("/"); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 45cb646..b79adfb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -44,6 +44,7 @@ String SIGNAL_GENERATOR_CHECK_DATA = "信号发生器核查数据"; String LOW_FREQUENCY_SIGNAL_SOURCE = "低频信号源"; + String LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA = "低频信号源核查数据"; String FILE_CHANGE_FORM = "文件更改申请单"; String FILE_GRANT_NOTICE_FORM = "文件发放通知单"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index a54fb06..a272fe1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -350,6 +350,7 @@ String HARMONIC = "谐波"; String AC_VOLTAGE = "交流电压"; + String RISE_AND_FALL_TIME = "上升下降时间"; String FLATNESS = "平坦度"; String DISTORTION = "失真"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 633116e..7be3f45 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -69,7 +69,7 @@ replaceSlash(map); map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 - String wordUrl = printFileRegister.registerPrintFile(SIGNAL_GENERATOR_CHECK_DATA, "数据打印", null, map, false, null, null); + String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); @@ -85,7 +85,7 @@ } private void readyForCheckParams(Map map, List frequencySignalList) { - String[] params = {FREQUENCY_CN, AC_VOLTAGE, DC_VOLTAGE, RISE_TIME_CHECK, FLATNESS, DISTORTION}; + String[] params = {FREQUENCY_CN, AC_VOLTAGE, DC_VOLTAGE, RISE_AND_FALL_TIME, FLATNESS, DISTORTION}; String[] checkType = {REPEATABILITY, STABILITY}; for (int i = 0; i < params.length; i++) { String param = params[i]; @@ -110,8 +110,8 @@ } private void appendUnits(BizEquipmentStandardCheckDataLowFrequencySignal f) { - f.setNominalValue(f.getNominalValue() + f.getUnit()); - f.setFrequency(f.getFrequency() + f.getFrequency()); +// f.setNominalValue(f.getNominalValue() + f.getUnit()); +// f.setFrequency(f.getFrequency() + f.getFrequency()); f.setAmplitude(f.getAmplitude() + f.getAmplitudeUnit()); f.setVoltage(f.getVoltage() + f.getVoltageUnit()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java index d830e71..5ec34db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java @@ -497,7 +497,6 @@ } analyzer.setMeasureResult(REFERENCE_POINT.equals(analyzer.getMeasureResult()) || START_POINT.equals(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() : StringUtils.isNotBlank(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() + analyzer.getMeasureResultUnit() : ""); analyzer.setLowerIndex(REFERENCE_POINT.equals(analyzer.getLowerIndex()) || START_POINT.equals(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() : StringUtils.isNotBlank(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() + analyzer.getUnit() : ""); - analyzer.setAverageValue(REFERENCE_POINT.equals(analyzer.getAverageValue()) || START_POINT.equals(analyzer.getAverageValue()) ? analyzer.getAverageValue() : StringUtils.isNotBlank(analyzer.getAverageValue()) ? analyzer.getAverageValue() + analyzer.getUnit() : ""); analyzer.setUpperIndex(REFERENCE_POINT.equals(analyzer.getUpperIndex()) || START_POINT.equals(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() : StringUtils.isNotBlank(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() + analyzer.getUnit() : ""); if (StringUtils.isBlank(analyzer.getConclusion())){ analyzer.setConclusion("/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java index 3f81edb..52c1209 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -42,7 +42,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; /** @@ -221,7 +222,7 @@ //所有线程并发执行 CompletableFuture.allOf(futuresArr).join(); //等待所有生成的线程结束，则进行数据的打包下载 - ZipUtils.batchDownloadFiles(rootFileName, response,localFileDir); + ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } @@ -252,7 +253,7 @@ map.put("day", calendar.get(Calendar.DAY_OF_MONTH)); List contentList = new ArrayList<>(); for (BizQualityProcessRecord processRecord : record.getProcessRecords()) { - String content = "监督的过程：" + processRecord.getProcessInfo() + "过程运行情况事实：" + processRecord.getOptFacts(); + String content = "监督的过程：" + processRecord.getProcessInfo() + "\r" + "过程运行情况事实：" + processRecord.getOptFacts(); contentList.add(content); } map.put("contentList", contentList); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 45cb646..b79adfb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -44,6 +44,7 @@ String SIGNAL_GENERATOR_CHECK_DATA = "信号发生器核查数据"; String LOW_FREQUENCY_SIGNAL_SOURCE = "低频信号源"; + String LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA = "低频信号源核查数据"; String FILE_CHANGE_FORM = "文件更改申请单"; String FILE_GRANT_NOTICE_FORM = "文件发放通知单"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index a54fb06..a272fe1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -350,6 +350,7 @@ String HARMONIC = "谐波"; String AC_VOLTAGE = "交流电压"; + String RISE_AND_FALL_TIME = "上升下降时间"; String FLATNESS = "平坦度"; String DISTORTION = "失真"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 633116e..7be3f45 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -69,7 +69,7 @@ replaceSlash(map); map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 - String wordUrl = printFileRegister.registerPrintFile(SIGNAL_GENERATOR_CHECK_DATA, "数据打印", null, map, false, null, null); + String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); if (StringUtils.isNotEmpty(wordUrl)) { urlList.add(wordUrl); @@ -85,7 +85,7 @@ } private void readyForCheckParams(Map map, List frequencySignalList) { - String[] params = {FREQUENCY_CN, AC_VOLTAGE, DC_VOLTAGE, RISE_TIME_CHECK, FLATNESS, DISTORTION}; + String[] params = {FREQUENCY_CN, AC_VOLTAGE, DC_VOLTAGE, RISE_AND_FALL_TIME, FLATNESS, DISTORTION}; String[] checkType = {REPEATABILITY, STABILITY}; for (int i = 0; i < params.length; i++) { String param = params[i]; @@ -110,8 +110,8 @@ } private void appendUnits(BizEquipmentStandardCheckDataLowFrequencySignal f) { - f.setNominalValue(f.getNominalValue() + f.getUnit()); - f.setFrequency(f.getFrequency() + f.getFrequency()); +// f.setNominalValue(f.getNominalValue() + f.getUnit()); +// f.setFrequency(f.getFrequency() + f.getFrequency()); f.setAmplitude(f.getAmplitude() + f.getAmplitudeUnit()); f.setVoltage(f.getVoltage() + f.getVoltageUnit()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java index d830e71..5ec34db 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java @@ -497,7 +497,6 @@ } analyzer.setMeasureResult(REFERENCE_POINT.equals(analyzer.getMeasureResult()) || START_POINT.equals(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() : StringUtils.isNotBlank(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() + analyzer.getMeasureResultUnit() : ""); analyzer.setLowerIndex(REFERENCE_POINT.equals(analyzer.getLowerIndex()) || START_POINT.equals(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() : StringUtils.isNotBlank(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() + analyzer.getUnit() : ""); - analyzer.setAverageValue(REFERENCE_POINT.equals(analyzer.getAverageValue()) || START_POINT.equals(analyzer.getAverageValue()) ? analyzer.getAverageValue() : StringUtils.isNotBlank(analyzer.getAverageValue()) ? analyzer.getAverageValue() + analyzer.getUnit() : ""); analyzer.setUpperIndex(REFERENCE_POINT.equals(analyzer.getUpperIndex()) || START_POINT.equals(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() : StringUtils.isNotBlank(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() + analyzer.getUnit() : ""); if (StringUtils.isBlank(analyzer.getConclusion())){ analyzer.setConclusion("/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java index 3f81edb..52c1209 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -42,7 +42,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; /** @@ -221,7 +222,7 @@ //所有线程并发执行 CompletableFuture.allOf(futuresArr).join(); //等待所有生成的线程结束，则进行数据的打包下载 - ZipUtils.batchDownloadFiles(rootFileName, response,localFileDir); + ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } @@ -252,7 +253,7 @@ map.put("day", calendar.get(Calendar.DAY_OF_MONTH)); List contentList = new ArrayList<>(); for (BizQualityProcessRecord processRecord : record.getProcessRecords()) { - String content = "监督的过程：" + processRecord.getProcessInfo() + "过程运行情况事实：" + processRecord.getOptFacts(); + String content = "监督的过程：" + processRecord.getProcessInfo() + "\r" + "过程运行情况事实：" + processRecord.getOptFacts(); contentList.add(content); } map.put("contentList", contentList); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index 5610aaa..297293a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -6,6 +6,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.druid.util.HttpClientUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -29,13 +31,31 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; +import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; +import org.apache.http.*; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.HttpClient; +import org.apache.http.client.ResponseHandler; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.params.HttpParams; +import org.apache.http.protocol.HttpContext; +import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -147,12 +167,13 @@ /** * 导出zip + * * @param supervisionRepList 分页数据 * @param response 响应 */ @Override public void exportZip(List supervisionRepList, HttpServletResponse response) { - if (CollectionUtil.isEmpty(supervisionRepList)){ + if (CollectionUtil.isEmpty(supervisionRepList)) { return; } int corePoolSize = 1; @@ -165,31 +186,31 @@ String rootFileName = "质量监督报告" + new SimpleDateFormat("yyyyMMddHHmm").format(new Date()); List> futures = new ArrayList<>(); for (BizQualitySupervisionRep supervisionRep : supervisionRepList) { - if (ObjectUtil.isNotEmpty(supervisionRep)){ + if (ObjectUtil.isNotEmpty(supervisionRep)) { wrapRep(supervisionRep); Map map = BeanUtil.beanToMap(supervisionRep); String date = DateUtil.format(supervisionRep.getLogTime(), "yyyy-MM-dd"); map.put("logTime", date); CompletableFuture completableFuture = CompletableFuture.supplyAsync( - ()->{ + () -> { //添加附件 List attachmentFiles = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(supervisionRep.getReps())){ + if (CollectionUtils.isNotEmpty(supervisionRep.getReps())) { for (BizQualityNonConformanceRep rep : supervisionRep.getReps()) { attachmentFiles.add(rep.getFileName()); } } - if (CollectionUtils.isNotEmpty(supervisionRep.getCorrectiveRecords())){ + if (CollectionUtils.isNotEmpty(supervisionRep.getCorrectiveRecords())) { for (BizQualityCorrectiveRecord correctiveRecord : supervisionRep.getCorrectiveRecords()) { attachmentFiles.add(correctiveRecord.getFileName()); } } - if (CollectionUtils.isNotEmpty(supervisionRep.getPreventRecords())){ + if (CollectionUtils.isNotEmpty(supervisionRep.getPreventRecords())) { for (BizQualityPreventRecord preventRecord : supervisionRep.getPreventRecords()) { attachmentFiles.add(preventRecord.getFileName()); } } - if (CollectionUtils.isNotEmpty(supervisionRep.getRecords())){ + if (CollectionUtils.isNotEmpty(supervisionRep.getRecords())) { for (BizQualitySupervisionRecord record : supervisionRep.getRecords()) { attachmentFiles.add(record.getFileName()); } @@ -216,7 +237,7 @@ //所有线程并发执行 CompletableFuture.allOf(futuresArr).join(); //等待所有生成的线程结束，则进行数据的打包下载 - ZipUtils.batchDownloadFiles(rootFileName, response,localFileDir); + ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } /**