diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index e5c3157..cd1544b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -72,7 +72,7 @@ @ApiOperation("自动批量分发(前端在调用收入后调用)") @PostMapping("/handOut/autoBatch") public ReturnDTO handOutBatch(@RequestBody @Valid List handOutInitList) { - return ReturnUtil.success(labExecutiveInfoService.handOutAutoBatch(handOutInitList)); + return labExecutiveInfoService.handOutAutoBatch(handOutInitList); } @ApiOperation("分发") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index e5c3157..cd1544b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -72,7 +72,7 @@ @ApiOperation("自动批量分发(前端在调用收入后调用)") @PostMapping("/handOut/autoBatch") public ReturnDTO handOutBatch(@RequestBody @Valid List handOutInitList) { - return ReturnUtil.success(labExecutiveInfoService.handOutAutoBatch(handOutInitList)); + return labExecutiveInfoService.handOutAutoBatch(handOutInitList); } @ApiOperation("分发") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 172f687..99e428b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1702,7 +1702,8 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaMBefore = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaM = deltaMBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1732,8 +1733,7 @@ BigDecimal aConvertQualityCorrectValue = new BigDecimal(measureData.getAConvertQualityCorrectValue()); BigDecimal bNominalQualityValue = new BigDecimal(measureData.getBNominalQualityValue()).multiply(BigDecimal.valueOf(100)); BigDecimal bConvertQualityCorrectValue = new BigDecimal(measureData.getBConvertQualityCorrectValue()); - BigDecimal deltaMThrowBefore = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); - BigDecimal deltaMThrow = deltaMThrowBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); + BigDecimal deltaMThrow = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { ptOneDeltaMThrowMap.put(deltaMThrow, measureData.getMeasureSequence()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { @@ -1894,20 +1894,25 @@ //频带宽度 String referenceAmplitude = measureData.getReferenceAmplitude(); String referenceAmplitudeUnit = measureData.getReferenceAmplitudeUnit(); - BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); String measureAmplitude = measureData.getMeasureAmplitude(); String measureAmplitudeUnit = measureData.getMeasureAmplitudeUnit(); - BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); - BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); - BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); - //分贝数 - BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); - measureData.setDecibelNumber(String.valueOf(decibelNumber)); - if (!"/".equals(measureData.getTechnicalIndex())) { - String symbol = measureData.getTechnicalIndexSymbol(); - BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); - exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + if (new BigDecimal(referenceAmplitude).compareTo(BigDecimal.ZERO) != 0 || new BigDecimal(measureAmplitude).compareTo(BigDecimal.ZERO) != 0) { + BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); + BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); + BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); + BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); + //分贝数 + BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); + measureData.setDecibelNumber(String.valueOf(decibelNumber)); + if (!"/".equals(measureData.getTechnicalIndex())) { + String symbol = measureData.getTechnicalIndexSymbol(); + BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); + exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + } else { + conclusion = "/"; + } } else { + measureData.setDecibelNumber("/"); conclusion = "/"; } } else if ("5".equals(measureData.getDataType())) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index e5c3157..cd1544b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -72,7 +72,7 @@ @ApiOperation("自动批量分发(前端在调用收入后调用)") @PostMapping("/handOut/autoBatch") public ReturnDTO handOutBatch(@RequestBody @Valid List handOutInitList) { - return ReturnUtil.success(labExecutiveInfoService.handOutAutoBatch(handOutInitList)); + return labExecutiveInfoService.handOutAutoBatch(handOutInitList); } @ApiOperation("分发") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 172f687..99e428b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1702,7 +1702,8 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaMBefore = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaM = deltaMBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1732,8 +1733,7 @@ BigDecimal aConvertQualityCorrectValue = new BigDecimal(measureData.getAConvertQualityCorrectValue()); BigDecimal bNominalQualityValue = new BigDecimal(measureData.getBNominalQualityValue()).multiply(BigDecimal.valueOf(100)); BigDecimal bConvertQualityCorrectValue = new BigDecimal(measureData.getBConvertQualityCorrectValue()); - BigDecimal deltaMThrowBefore = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); - BigDecimal deltaMThrow = deltaMThrowBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); + BigDecimal deltaMThrow = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { ptOneDeltaMThrowMap.put(deltaMThrow, measureData.getMeasureSequence()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { @@ -1894,20 +1894,25 @@ //频带宽度 String referenceAmplitude = measureData.getReferenceAmplitude(); String referenceAmplitudeUnit = measureData.getReferenceAmplitudeUnit(); - BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); String measureAmplitude = measureData.getMeasureAmplitude(); String measureAmplitudeUnit = measureData.getMeasureAmplitudeUnit(); - BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); - BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); - BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); - //分贝数 - BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); - measureData.setDecibelNumber(String.valueOf(decibelNumber)); - if (!"/".equals(measureData.getTechnicalIndex())) { - String symbol = measureData.getTechnicalIndexSymbol(); - BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); - exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + if (new BigDecimal(referenceAmplitude).compareTo(BigDecimal.ZERO) != 0 || new BigDecimal(measureAmplitude).compareTo(BigDecimal.ZERO) != 0) { + BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); + BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); + BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); + BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); + //分贝数 + BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); + measureData.setDecibelNumber(String.valueOf(decibelNumber)); + if (!"/".equals(measureData.getTechnicalIndex())) { + String symbol = measureData.getTechnicalIndexSymbol(); + BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); + exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + } else { + conclusion = "/"; + } } else { + measureData.setDecibelNumber("/"); conclusion = "/"; } } else if ("5".equals(measureData.getDataType())) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java index 658a7e3..ea03603 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java @@ -24,6 +24,6 @@ List sampleListByCustomerId(@Param("customerId") Long customerId); - boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId); + boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId, @Param("siteExecutiveNo") String siteExecutiveNo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index e5c3157..cd1544b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -72,7 +72,7 @@ @ApiOperation("自动批量分发(前端在调用收入后调用)") @PostMapping("/handOut/autoBatch") public ReturnDTO handOutBatch(@RequestBody @Valid List handOutInitList) { - return ReturnUtil.success(labExecutiveInfoService.handOutAutoBatch(handOutInitList)); + return labExecutiveInfoService.handOutAutoBatch(handOutInitList); } @ApiOperation("分发") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 172f687..99e428b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1702,7 +1702,8 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaMBefore = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaM = deltaMBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1732,8 +1733,7 @@ BigDecimal aConvertQualityCorrectValue = new BigDecimal(measureData.getAConvertQualityCorrectValue()); BigDecimal bNominalQualityValue = new BigDecimal(measureData.getBNominalQualityValue()).multiply(BigDecimal.valueOf(100)); BigDecimal bConvertQualityCorrectValue = new BigDecimal(measureData.getBConvertQualityCorrectValue()); - BigDecimal deltaMThrowBefore = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); - BigDecimal deltaMThrow = deltaMThrowBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); + BigDecimal deltaMThrow = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { ptOneDeltaMThrowMap.put(deltaMThrow, measureData.getMeasureSequence()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { @@ -1894,20 +1894,25 @@ //频带宽度 String referenceAmplitude = measureData.getReferenceAmplitude(); String referenceAmplitudeUnit = measureData.getReferenceAmplitudeUnit(); - BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); String measureAmplitude = measureData.getMeasureAmplitude(); String measureAmplitudeUnit = measureData.getMeasureAmplitudeUnit(); - BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); - BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); - BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); - //分贝数 - BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); - measureData.setDecibelNumber(String.valueOf(decibelNumber)); - if (!"/".equals(measureData.getTechnicalIndex())) { - String symbol = measureData.getTechnicalIndexSymbol(); - BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); - exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + if (new BigDecimal(referenceAmplitude).compareTo(BigDecimal.ZERO) != 0 || new BigDecimal(measureAmplitude).compareTo(BigDecimal.ZERO) != 0) { + BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); + BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); + BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); + BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); + //分贝数 + BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); + measureData.setDecibelNumber(String.valueOf(decibelNumber)); + if (!"/".equals(measureData.getTechnicalIndex())) { + String symbol = measureData.getTechnicalIndexSymbol(); + BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); + exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + } else { + conclusion = "/"; + } } else { + measureData.setDecibelNumber("/"); conclusion = "/"; } } else if ("5".equals(measureData.getDataType())) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java index 658a7e3..ea03603 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java @@ -24,6 +24,6 @@ List sampleListByCustomerId(@Param("customerId") Long customerId); - boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId); + boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId, @Param("siteExecutiveNo") String siteExecutiveNo); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index e5485b1..d473ab3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -28,6 +28,7 @@ + @@ -39,7 +40,7 @@ id, order_no, deliverer_id, deliverer, customer_id, customer_name, dept_id, dept_name, deliverer_tel, plan_deliver_time, require_over_time, customer_address, customer_phone, is_urgent, maintain_major, undertaker_id, measure_company, undertaker_name, undertake_time, receive_status, receive_illustrate, - is_on_site_check, on_site_check_time, site_executive_id, data_source, create_user_id, create_user_name, create_time, update_time + is_on_site_check, on_site_check_time, site_executive_id, site_executive_no, data_source, create_user_id, create_user_name, create_time, update_time - UPDATE biz_business_order_info SET site_executive_id = #{siteExecutiveId} WHERE id = #{orderId}; + UPDATE biz_business_order_info SET site_executive_id = #{siteExecutiveId}, site_executive_no = #{siteExecutiveNo} WHERE id = #{orderId}; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index e5c3157..cd1544b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -72,7 +72,7 @@ @ApiOperation("自动批量分发(前端在调用收入后调用)") @PostMapping("/handOut/autoBatch") public ReturnDTO handOutBatch(@RequestBody @Valid List handOutInitList) { - return ReturnUtil.success(labExecutiveInfoService.handOutAutoBatch(handOutInitList)); + return labExecutiveInfoService.handOutAutoBatch(handOutInitList); } @ApiOperation("分发") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 172f687..99e428b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1702,7 +1702,8 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaMBefore = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaM = deltaMBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1732,8 +1733,7 @@ BigDecimal aConvertQualityCorrectValue = new BigDecimal(measureData.getAConvertQualityCorrectValue()); BigDecimal bNominalQualityValue = new BigDecimal(measureData.getBNominalQualityValue()).multiply(BigDecimal.valueOf(100)); BigDecimal bConvertQualityCorrectValue = new BigDecimal(measureData.getBConvertQualityCorrectValue()); - BigDecimal deltaMThrowBefore = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); - BigDecimal deltaMThrow = deltaMThrowBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); + BigDecimal deltaMThrow = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { ptOneDeltaMThrowMap.put(deltaMThrow, measureData.getMeasureSequence()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { @@ -1894,20 +1894,25 @@ //频带宽度 String referenceAmplitude = measureData.getReferenceAmplitude(); String referenceAmplitudeUnit = measureData.getReferenceAmplitudeUnit(); - BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); String measureAmplitude = measureData.getMeasureAmplitude(); String measureAmplitudeUnit = measureData.getMeasureAmplitudeUnit(); - BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); - BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); - BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); - //分贝数 - BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); - measureData.setDecibelNumber(String.valueOf(decibelNumber)); - if (!"/".equals(measureData.getTechnicalIndex())) { - String symbol = measureData.getTechnicalIndexSymbol(); - BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); - exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + if (new BigDecimal(referenceAmplitude).compareTo(BigDecimal.ZERO) != 0 || new BigDecimal(measureAmplitude).compareTo(BigDecimal.ZERO) != 0) { + BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); + BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); + BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); + BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); + //分贝数 + BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); + measureData.setDecibelNumber(String.valueOf(decibelNumber)); + if (!"/".equals(measureData.getTechnicalIndex())) { + String symbol = measureData.getTechnicalIndexSymbol(); + BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); + exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + } else { + conclusion = "/"; + } } else { + measureData.setDecibelNumber("/"); conclusion = "/"; } } else if ("5".equals(measureData.getDataType())) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java index 658a7e3..ea03603 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java @@ -24,6 +24,6 @@ List sampleListByCustomerId(@Param("customerId") Long customerId); - boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId); + boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId, @Param("siteExecutiveNo") String siteExecutiveNo); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index e5485b1..d473ab3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -28,6 +28,7 @@ + @@ -39,7 +40,7 @@ id, order_no, deliverer_id, deliverer, customer_id, customer_name, dept_id, dept_name, deliverer_tel, plan_deliver_time, require_over_time, customer_address, customer_phone, is_urgent, maintain_major, undertaker_id, measure_company, undertaker_name, undertake_time, receive_status, receive_illustrate, - is_on_site_check, on_site_check_time, site_executive_id, data_source, create_user_id, create_user_name, create_time, update_time + is_on_site_check, on_site_check_time, site_executive_id, site_executive_no, data_source, create_user_id, create_user_name, create_time, update_time - UPDATE biz_business_order_info SET site_executive_id = #{siteExecutiveId} WHERE id = #{orderId}; + UPDATE biz_business_order_info SET site_executive_id = #{siteExecutiveId}, site_executive_no = #{siteExecutiveNo} WHERE id = #{orderId}; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java index 53bd4f1..3de61cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java @@ -22,6 +22,10 @@ @ApiModelProperty(value = "现场测试、校准或检定审批单id", dataType = "Long") private Long siteExecutiveId; + @NotEmpty(message = "现场测试、校准或检定审批单编号不能为空") + @ApiModelProperty(value = "现场测试、校准或检定审批单编号", dataType = "String") + private String siteExecutiveNo; + @ApiModelProperty(value = "确定解除原有绑定并进行本次绑定(1/0)", dataType = "Integer") private Integer flag = 0; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index e5c3157..cd1544b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -72,7 +72,7 @@ @ApiOperation("自动批量分发(前端在调用收入后调用)") @PostMapping("/handOut/autoBatch") public ReturnDTO handOutBatch(@RequestBody @Valid List handOutInitList) { - return ReturnUtil.success(labExecutiveInfoService.handOutAutoBatch(handOutInitList)); + return labExecutiveInfoService.handOutAutoBatch(handOutInitList); } @ApiOperation("分发") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 172f687..99e428b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1702,7 +1702,8 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaMBefore = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaM = deltaMBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1732,8 +1733,7 @@ BigDecimal aConvertQualityCorrectValue = new BigDecimal(measureData.getAConvertQualityCorrectValue()); BigDecimal bNominalQualityValue = new BigDecimal(measureData.getBNominalQualityValue()).multiply(BigDecimal.valueOf(100)); BigDecimal bConvertQualityCorrectValue = new BigDecimal(measureData.getBConvertQualityCorrectValue()); - BigDecimal deltaMThrowBefore = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); - BigDecimal deltaMThrow = deltaMThrowBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); + BigDecimal deltaMThrow = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { ptOneDeltaMThrowMap.put(deltaMThrow, measureData.getMeasureSequence()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { @@ -1894,20 +1894,25 @@ //频带宽度 String referenceAmplitude = measureData.getReferenceAmplitude(); String referenceAmplitudeUnit = measureData.getReferenceAmplitudeUnit(); - BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); String measureAmplitude = measureData.getMeasureAmplitude(); String measureAmplitudeUnit = measureData.getMeasureAmplitudeUnit(); - BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); - BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); - BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); - //分贝数 - BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); - measureData.setDecibelNumber(String.valueOf(decibelNumber)); - if (!"/".equals(measureData.getTechnicalIndex())) { - String symbol = measureData.getTechnicalIndexSymbol(); - BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); - exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + if (new BigDecimal(referenceAmplitude).compareTo(BigDecimal.ZERO) != 0 || new BigDecimal(measureAmplitude).compareTo(BigDecimal.ZERO) != 0) { + BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); + BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); + BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); + BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); + //分贝数 + BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); + measureData.setDecibelNumber(String.valueOf(decibelNumber)); + if (!"/".equals(measureData.getTechnicalIndex())) { + String symbol = measureData.getTechnicalIndexSymbol(); + BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); + exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + } else { + conclusion = "/"; + } } else { + measureData.setDecibelNumber("/"); conclusion = "/"; } } else if ("5".equals(measureData.getDataType())) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java index 658a7e3..ea03603 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java @@ -24,6 +24,6 @@ List sampleListByCustomerId(@Param("customerId") Long customerId); - boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId); + boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId, @Param("siteExecutiveNo") String siteExecutiveNo); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index e5485b1..d473ab3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -28,6 +28,7 @@ + @@ -39,7 +40,7 @@ id, order_no, deliverer_id, deliverer, customer_id, customer_name, dept_id, dept_name, deliverer_tel, plan_deliver_time, require_over_time, customer_address, customer_phone, is_urgent, maintain_major, undertaker_id, measure_company, undertaker_name, undertake_time, receive_status, receive_illustrate, - is_on_site_check, on_site_check_time, site_executive_id, data_source, create_user_id, create_user_name, create_time, update_time + is_on_site_check, on_site_check_time, site_executive_id, site_executive_no, data_source, create_user_id, create_user_name, create_time, update_time - UPDATE biz_business_order_info SET site_executive_id = #{siteExecutiveId} WHERE id = #{orderId}; + UPDATE biz_business_order_info SET site_executive_id = #{siteExecutiveId}, site_executive_no = #{siteExecutiveNo} WHERE id = #{orderId}; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java index 53bd4f1..3de61cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java @@ -22,6 +22,10 @@ @ApiModelProperty(value = "现场测试、校准或检定审批单id", dataType = "Long") private Long siteExecutiveId; + @NotEmpty(message = "现场测试、校准或检定审批单编号不能为空") + @ApiModelProperty(value = "现场测试、校准或检定审批单编号", dataType = "String") + private String siteExecutiveNo; + @ApiModelProperty(value = "确定解除原有绑定并进行本次绑定(1/0)", dataType = "Integer") private Integer flag = 0; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 517939b..5bfe965 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -177,6 +177,10 @@ @TableField("site_executive_id") private Long siteExecutiveId; + @ApiModelProperty(value = "现场测试、校准或检定审批单编号", dataType = "Long") + @TableField("site_executive_No") + private String siteExecutiveNo; + @ApiModelProperty(value = "任务单来源", dataType = "String") @TableField("data_source") private String dataSource; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index e5c3157..cd1544b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -72,7 +72,7 @@ @ApiOperation("自动批量分发(前端在调用收入后调用)") @PostMapping("/handOut/autoBatch") public ReturnDTO handOutBatch(@RequestBody @Valid List handOutInitList) { - return ReturnUtil.success(labExecutiveInfoService.handOutAutoBatch(handOutInitList)); + return labExecutiveInfoService.handOutAutoBatch(handOutInitList); } @ApiOperation("分发") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index 172f687..99e428b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1702,7 +1702,8 @@ BigDecimal bOne = new BigDecimal(measureData.getBOne()); BigDecimal bTwo = new BigDecimal(measureData.getBTwo()); //Δmi(单位固定mg)计算 - BigDecimal deltaM = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaMBefore = (bOne.add(bTwo).subtract(aOne).subtract(aTwo)).multiply(BigDecimal.valueOf(1000)).setScale(4, RoundingMode.HALF_UP); + BigDecimal deltaM = deltaMBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); measureData.setDeltaM(String.valueOf(deltaM)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { List deltaMList = ptOneDeltaMMap.get(measureData.getDataType()); @@ -1732,8 +1733,7 @@ BigDecimal aConvertQualityCorrectValue = new BigDecimal(measureData.getAConvertQualityCorrectValue()); BigDecimal bNominalQualityValue = new BigDecimal(measureData.getBNominalQualityValue()).multiply(BigDecimal.valueOf(100)); BigDecimal bConvertQualityCorrectValue = new BigDecimal(measureData.getBConvertQualityCorrectValue()); - BigDecimal deltaMThrowBefore = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); - BigDecimal deltaMThrow = deltaMThrowBefore.divide(BigDecimal.valueOf(2), RoundingMode.HALF_UP); + BigDecimal deltaMThrow = deltaM.add(aNominalQualityValue.add(aConvertQualityCorrectValue)).add(bNominalQualityValue.add(bConvertQualityCorrectValue)); if (StringUtils.isNotEmpty(measureData.getPtOne())) { ptOneDeltaMThrowMap.put(deltaMThrow, measureData.getMeasureSequence()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { @@ -1894,20 +1894,25 @@ //频带宽度 String referenceAmplitude = measureData.getReferenceAmplitude(); String referenceAmplitudeUnit = measureData.getReferenceAmplitudeUnit(); - BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); String measureAmplitude = measureData.getMeasureAmplitude(); String measureAmplitudeUnit = measureData.getMeasureAmplitudeUnit(); - BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); - BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); - BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); - //分贝数 - BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); - measureData.setDecibelNumber(String.valueOf(decibelNumber)); - if (!"/".equals(measureData.getTechnicalIndex())) { - String symbol = measureData.getTechnicalIndexSymbol(); - BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); - exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + if (new BigDecimal(referenceAmplitude).compareTo(BigDecimal.ZERO) != 0 || new BigDecimal(measureAmplitude).compareTo(BigDecimal.ZERO) != 0) { + BigDecimal convertReferenceAmplitude = UnitConvertUtil.voltageConvert(referenceAmplitude, referenceAmplitudeUnit, "V"); + BigDecimal convertMeasureAmplitude = UnitConvertUtil.voltageConvert(measureAmplitude, measureAmplitudeUnit, "V"); + BigDecimal referenceAmplitudeLg = BigDecimal.valueOf(Math.log10(convertReferenceAmplitude.doubleValue())); + BigDecimal measureAmplitudeLg = BigDecimal.valueOf(Math.log10(convertMeasureAmplitude.doubleValue())); + //分贝数 + BigDecimal decibelNumber = (measureAmplitudeLg.subtract(referenceAmplitudeLg)).multiply(BigDecimal.valueOf(20)).setScale(4, RoundingMode.HALF_UP); + measureData.setDecibelNumber(String.valueOf(decibelNumber)); + if (!"/".equals(measureData.getTechnicalIndex())) { + String symbol = measureData.getTechnicalIndexSymbol(); + BigDecimal technicalIndex = new BigDecimal(measureData.getTechnicalIndex()); + exceedMark = judgeSymbol(symbol, String.valueOf(decibelNumber), technicalIndex); + } else { + conclusion = "/"; + } } else { + measureData.setDecibelNumber("/"); conclusion = "/"; } } else if ("5".equals(measureData.getDataType())) { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java index 658a7e3..ea03603 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderInfoMapper.java @@ -24,6 +24,6 @@ List sampleListByCustomerId(@Param("customerId") Long customerId); - boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId); + boolean updateSiteExecutiveIdById(@Param("orderId") Long orderId, @Param("siteExecutiveId") Long siteExecutiveId, @Param("siteExecutiveNo") String siteExecutiveNo); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index e5485b1..d473ab3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -28,6 +28,7 @@ + @@ -39,7 +40,7 @@ id, order_no, deliverer_id, deliverer, customer_id, customer_name, dept_id, dept_name, deliverer_tel, plan_deliver_time, require_over_time, customer_address, customer_phone, is_urgent, maintain_major, undertaker_id, measure_company, undertaker_name, undertake_time, receive_status, receive_illustrate, - is_on_site_check, on_site_check_time, site_executive_id, data_source, create_user_id, create_user_name, create_time, update_time + is_on_site_check, on_site_check_time, site_executive_id, site_executive_no, data_source, create_user_id, create_user_name, create_time, update_time - UPDATE biz_business_order_info SET site_executive_id = #{siteExecutiveId} WHERE id = #{orderId}; + UPDATE biz_business_order_info SET site_executive_id = #{siteExecutiveId}, site_executive_no = #{siteExecutiveNo} WHERE id = #{orderId}; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java index 53bd4f1..3de61cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/BizBusinessOrderSiteExecutiveBindRequest.java @@ -22,6 +22,10 @@ @ApiModelProperty(value = "现场测试、校准或检定审批单id", dataType = "Long") private Long siteExecutiveId; + @NotEmpty(message = "现场测试、校准或检定审批单编号不能为空") + @ApiModelProperty(value = "现场测试、校准或检定审批单编号", dataType = "String") + private String siteExecutiveNo; + @ApiModelProperty(value = "确定解除原有绑定并进行本次绑定(1/0)", dataType = "Integer") private Integer flag = 0; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 517939b..5bfe965 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -177,6 +177,10 @@ @TableField("site_executive_id") private Long siteExecutiveId; + @ApiModelProperty(value = "现场测试、校准或检定审批单编号", dataType = "Long") + @TableField("site_executive_No") + private String siteExecutiveNo; + @ApiModelProperty(value = "任务单来源", dataType = "String") @TableField("data_source") private String dataSource; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java index 1687ae4..4c882f9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java @@ -279,7 +279,7 @@ return ReturnUtil.failed("绑定失败,设备编号:" + StringUtils.join(orderNoList, ",") + " 已有绑定的现场审批单"); } orderIds.forEach(orderId -> { - if (!this.baseMapper.updateSiteExecutiveIdById(orderId, request.getSiteExecutiveId())) { + if (!this.baseMapper.updateSiteExecutiveIdById(orderId, request.getSiteExecutiveId(), request.getSiteExecutiveNo())) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } });