diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 0abe025..5ff22e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; -import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.enums.IsMenu; @@ -32,7 +31,6 @@ import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.modular.application.enums.AdminExceptionEnum; -import com.casic.missiles.modular.interfaces.dictmap.UserDict; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.interfaces.utils.ResultUtils; import com.casic.missiles.modular.system.factory.UserFactory; @@ -113,7 +111,6 @@ @PostMapping("/sign/list") @ResponseBody public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { - return ReturnUtil.success(signService.list(request)); } @@ -319,12 +316,8 @@ } @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/add"}) - @BussinessLog( - value = "添加用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/add") + @ResponseBody public ResponseData add(@RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); @@ -350,12 +343,8 @@ } @ApiOperation("修改用户（扩展基础包修改用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/update"}) - @BussinessLog( - value = "修改用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/update") + @ResponseBody public ResponseData update(@ApiParam("用户传输对象") @RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 0abe025..5ff22e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; -import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.enums.IsMenu; @@ -32,7 +31,6 @@ import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.modular.application.enums.AdminExceptionEnum; -import com.casic.missiles.modular.interfaces.dictmap.UserDict; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.interfaces.utils.ResultUtils; import com.casic.missiles.modular.system.factory.UserFactory; @@ -113,7 +111,6 @@ @PostMapping("/sign/list") @ResponseBody public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { - return ReturnUtil.success(signService.list(request)); } @@ -319,12 +316,8 @@ } @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/add"}) - @BussinessLog( - value = "添加用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/add") + @ResponseBody public ResponseData add(@RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); @@ -350,12 +343,8 @@ } @ApiOperation("修改用户（扩展基础包修改用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/update"}) - @BussinessLog( - value = "修改用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/update") + @ResponseBody public ResponseData update(@ApiParam("用户传输对象") @RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); 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 e12eeda..e996365 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 @@ -168,6 +168,10 @@ String frictionError = dataPistonGauge.getFrictionError(); String indicatingError = dataPistonGauge.getIndicatingError(); + //示值误差允许值/回程误差允许值-压力变送器计算结果使用 + String indicatingErrorBak = ""; + String returnErrorBak = ""; + for (BizBusinessDeviceMeasureDataPistonGauge measureData : measureDataList) { if ("一般压力表".equals(itemCategoryName)) { //轻敲前后变动量正行程和反行程计算 @@ -188,6 +192,10 @@ //也用lowerXxx做中间数据，少创建List getTransferValue(lowerIndicatingErrorTransferList, lowerFrictionErrorTransferList, lowerReturnErrorTransferList, measureData); } else if ("压力变送器".equals(itemCategoryName)) { + if (StringUtils.isBlank(indicatingErrorBak)) { + indicatingErrorBak = measureData.getIndicatingErrorBak(); + returnErrorBak = measureData.getReturnErrorBak(); + } //示值误差计算，=三次测量中测量值-理论输出值的最大偏差值，带原符号 BigDecimal fForward = new BigDecimal(measureData.getFirstForwardStroke()).subtract(measureData.getTheoreticalOutputValue()); BigDecimal fReverse = new BigDecimal(measureData.getFirstReverseStroke()).subtract(measureData.getTheoreticalOutputValue()); @@ -197,30 +205,35 @@ BigDecimal tReverse = new BigDecimal(measureData.getThirdReverseStroke()).subtract(measureData.getTheoreticalOutputValue()); List transferList = Arrays.asList(fForward, fReverse, sForward, sReverse, tForward, tReverse); BigDecimal maxTransfer = transferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); - measureData.setIndicatingError(String.valueOf(transferList.stream().filter(x -> x.abs().equals(maxTransfer)).findFirst().get())); + BigDecimal indicating = transferList.stream().filter(x -> x.abs().equals(maxTransfer)).findFirst().get(); + measureData.setIndicatingError(String.valueOf(indicating)); //回程误差计算，=三次测量中降压值-升压值的绝对值中的最大值 - BigDecimal fStroke = (new BigDecimal(measureData.getFirstReverseStroke()).subtract(new BigDecimal(measureData.getFirstForwardStroke()))).abs(); - BigDecimal sStroke = (new BigDecimal(measureData.getSecondReverseStroke()).subtract(new BigDecimal(measureData.getSecondForwardStroke()))).abs(); - BigDecimal tStroke = (new BigDecimal(measureData.getThirdReverseStroke()).subtract(new BigDecimal(measureData.getThirdForwardStroke()))).abs(); + BigDecimal fStroke = (new BigDecimal(measureData.getFirstReverseStroke()).subtract(new BigDecimal(measureData.getFirstForwardStroke()))); + BigDecimal sStroke = (new BigDecimal(measureData.getSecondReverseStroke()).subtract(new BigDecimal(measureData.getSecondForwardStroke()))); + BigDecimal tStroke = (new BigDecimal(measureData.getThirdReverseStroke()).subtract(new BigDecimal(measureData.getThirdForwardStroke()))); BigDecimal maxReturn = Arrays.asList(fStroke, sStroke, tStroke).stream().max(BigDecimal::compareTo).get(); - measureData.setReturnError(String.valueOf(maxReturn)); + BigDecimal fStrokeAbs = fStroke.abs(); + BigDecimal sStrokeAbs = sStroke.abs(); + BigDecimal tStrokeAbs = tStroke.abs(); + BigDecimal maxReturnAbs = Arrays.asList(fStrokeAbs, sStrokeAbs, tStrokeAbs).stream().max(BigDecimal::compareTo).get(); + measureData.setReturnError(String.valueOf(maxReturnAbs)); //计算结果使用的中间数据 //最大误差=示值误差结果绝对值的最大值，带原符号 //最大回程误差=回程误差允许值绝对值的最大值 - indicatingErrorTransferList.add(maxTransfer); + indicatingErrorTransferList.add(indicating); returnErrorTransferList.add(maxReturn); } else if ("压力传感器".equals(itemCategoryName)) { //正行程平均值=三次测量正行程的平均值 BigDecimal averageForward = (new BigDecimal(measureData.getFirstForwardStroke()) .add(new BigDecimal(measureData.getSecondForwardStroke())) .add(new BigDecimal(measureData.getThirdForwardStroke())) - ).divide(BigDecimal.valueOf(3), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP); measureData.setAverageForwardStroke(String.valueOf(averageForward)); //反行程平均值=三次测量反行程的平均值 BigDecimal reverseForward = (new BigDecimal(measureData.getFirstReverseStroke()) .add(new BigDecimal(measureData.getSecondReverseStroke())) .add(new BigDecimal(measureData.getThirdReverseStroke())) - ).divide(BigDecimal.valueOf(3), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP); measureData.setAverageReverseStroke(String.valueOf(reverseForward)); //平均值=六次测量中的平均值 BigDecimal averageValue = (new BigDecimal(measureData.getFirstForwardStroke()) @@ -229,7 +242,7 @@ .add(new BigDecimal(measureData.getFirstReverseStroke())) .add(new BigDecimal(measureData.getSecondReverseStroke())) .add(new BigDecimal(measureData.getThirdReverseStroke())) - ).divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(6), 3, RoundingMode.HALF_UP); measureData.setAverageValue(String.valueOf(averageValue)); //回差平均值=正行程平均值-反行程平均值 measureData.setAverageReturnError(String.valueOf(averageForward.subtract(reverseForward))); @@ -515,6 +528,8 @@ } measureDataList.add(pistonGaugeData); } else if ("压力变送器".equals(itemCategoryName)) { + pistonGaugeData.setIndicatingError(indicatingErrorBak); + pistonGaugeData.setReturnError(returnErrorBak); //取绝对值最大的原值 getErrorResultTwo(measureDataList, indicatingErrorTransferList, returnErrorTransferList, pistonGaugeData); } else if ("电接点一般压力表".equals(itemCategoryName)) { @@ -1578,24 +1593,23 @@ BigDecimal sevenValue = new BigDecimal(measureData.getSevenValue()); if ("/".equals(measureData.getUpperIndexTwice())) { measureData.setConclusion("/"); - } else { + } else if (StringUtils.isNotBlank(measureData.getUpperIndexTwice())) { BigDecimal upperIndexTwice = new BigDecimal(measureData.getUpperIndexTwice()); if (threeValue.compareTo(upperIndexTwice) > 0) measureData.setExceedMark(1); } if ("/".equals(measureData.getUpperIndexThrice())) { measureData.setConclusion("/"); - } else { - + } else if (StringUtils.isNotBlank(measureData.getUpperIndexThrice())) { BigDecimal upperIndexThrice = new BigDecimal(measureData.getUpperIndexThrice()); if (fiveValue.compareTo(upperIndexThrice) > 0) measureData.setExceedMarkOne(1); } if ("/".equals(measureData.getUpperIndexQuartic())) { measureData.setConclusion("/"); - } else { + } else if (StringUtils.isNotBlank(measureData.getUpperIndexQuartic())) { BigDecimal upperIndexQuartic = new BigDecimal(measureData.getUpperIndexQuartic()); if (sevenValue.compareTo(upperIndexQuartic) > 0) measureData.setExceedMarkTwo(1); } - if (measureData.getExceedMark() == 1 && measureData.getExceedMarkOne() == 1 || measureData.getExceedMarkTwo() == 1) { + if (measureData.getExceedMark() == 1 || measureData.getExceedMarkOne() == 1 || measureData.getExceedMarkTwo() == 1) { measureData.setConclusion("不符合指标"); } else { measureData.setConclusion("符合指标"); @@ -2787,7 +2801,7 @@ //测量值 = 谐波幅度-基波幅度 BigDecimal harmonicAmplitude = new BigDecimal(measureData.getHarmonicAmplitude()); BigDecimal fundamentalAmplitude = new BigDecimal(measureData.getFundamentalAmplitude()); - BigDecimal measureValue = harmonicAmplitude.subtract(fundamentalAmplitude); + BigDecimal measureValue = harmonicAmplitude.subtract(fundamentalAmplitude).setScale(1, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); if (!"/".equals(measureData.getUpperIndex())) { BigDecimal upperIndex = new BigDecimal(measureData.getUpperIndex()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 0abe025..5ff22e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; -import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.enums.IsMenu; @@ -32,7 +31,6 @@ import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.modular.application.enums.AdminExceptionEnum; -import com.casic.missiles.modular.interfaces.dictmap.UserDict; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.interfaces.utils.ResultUtils; import com.casic.missiles.modular.system.factory.UserFactory; @@ -113,7 +111,6 @@ @PostMapping("/sign/list") @ResponseBody public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { - return ReturnUtil.success(signService.list(request)); } @@ -319,12 +316,8 @@ } @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/add"}) - @BussinessLog( - value = "添加用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/add") + @ResponseBody public ResponseData add(@RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); @@ -350,12 +343,8 @@ } @ApiOperation("修改用户（扩展基础包修改用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/update"}) - @BussinessLog( - value = "修改用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/update") + @ResponseBody public ResponseData update(@ApiParam("用户传输对象") @RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); 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 e12eeda..e996365 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 @@ -168,6 +168,10 @@ String frictionError = dataPistonGauge.getFrictionError(); String indicatingError = dataPistonGauge.getIndicatingError(); + //示值误差允许值/回程误差允许值-压力变送器计算结果使用 + String indicatingErrorBak = ""; + String returnErrorBak = ""; + for (BizBusinessDeviceMeasureDataPistonGauge measureData : measureDataList) { if ("一般压力表".equals(itemCategoryName)) { //轻敲前后变动量正行程和反行程计算 @@ -188,6 +192,10 @@ //也用lowerXxx做中间数据，少创建List getTransferValue(lowerIndicatingErrorTransferList, lowerFrictionErrorTransferList, lowerReturnErrorTransferList, measureData); } else if ("压力变送器".equals(itemCategoryName)) { + if (StringUtils.isBlank(indicatingErrorBak)) { + indicatingErrorBak = measureData.getIndicatingErrorBak(); + returnErrorBak = measureData.getReturnErrorBak(); + } //示值误差计算，=三次测量中测量值-理论输出值的最大偏差值，带原符号 BigDecimal fForward = new BigDecimal(measureData.getFirstForwardStroke()).subtract(measureData.getTheoreticalOutputValue()); BigDecimal fReverse = new BigDecimal(measureData.getFirstReverseStroke()).subtract(measureData.getTheoreticalOutputValue()); @@ -197,30 +205,35 @@ BigDecimal tReverse = new BigDecimal(measureData.getThirdReverseStroke()).subtract(measureData.getTheoreticalOutputValue()); List transferList = Arrays.asList(fForward, fReverse, sForward, sReverse, tForward, tReverse); BigDecimal maxTransfer = transferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); - measureData.setIndicatingError(String.valueOf(transferList.stream().filter(x -> x.abs().equals(maxTransfer)).findFirst().get())); + BigDecimal indicating = transferList.stream().filter(x -> x.abs().equals(maxTransfer)).findFirst().get(); + measureData.setIndicatingError(String.valueOf(indicating)); //回程误差计算，=三次测量中降压值-升压值的绝对值中的最大值 - BigDecimal fStroke = (new BigDecimal(measureData.getFirstReverseStroke()).subtract(new BigDecimal(measureData.getFirstForwardStroke()))).abs(); - BigDecimal sStroke = (new BigDecimal(measureData.getSecondReverseStroke()).subtract(new BigDecimal(measureData.getSecondForwardStroke()))).abs(); - BigDecimal tStroke = (new BigDecimal(measureData.getThirdReverseStroke()).subtract(new BigDecimal(measureData.getThirdForwardStroke()))).abs(); + BigDecimal fStroke = (new BigDecimal(measureData.getFirstReverseStroke()).subtract(new BigDecimal(measureData.getFirstForwardStroke()))); + BigDecimal sStroke = (new BigDecimal(measureData.getSecondReverseStroke()).subtract(new BigDecimal(measureData.getSecondForwardStroke()))); + BigDecimal tStroke = (new BigDecimal(measureData.getThirdReverseStroke()).subtract(new BigDecimal(measureData.getThirdForwardStroke()))); BigDecimal maxReturn = Arrays.asList(fStroke, sStroke, tStroke).stream().max(BigDecimal::compareTo).get(); - measureData.setReturnError(String.valueOf(maxReturn)); + BigDecimal fStrokeAbs = fStroke.abs(); + BigDecimal sStrokeAbs = sStroke.abs(); + BigDecimal tStrokeAbs = tStroke.abs(); + BigDecimal maxReturnAbs = Arrays.asList(fStrokeAbs, sStrokeAbs, tStrokeAbs).stream().max(BigDecimal::compareTo).get(); + measureData.setReturnError(String.valueOf(maxReturnAbs)); //计算结果使用的中间数据 //最大误差=示值误差结果绝对值的最大值，带原符号 //最大回程误差=回程误差允许值绝对值的最大值 - indicatingErrorTransferList.add(maxTransfer); + indicatingErrorTransferList.add(indicating); returnErrorTransferList.add(maxReturn); } else if ("压力传感器".equals(itemCategoryName)) { //正行程平均值=三次测量正行程的平均值 BigDecimal averageForward = (new BigDecimal(measureData.getFirstForwardStroke()) .add(new BigDecimal(measureData.getSecondForwardStroke())) .add(new BigDecimal(measureData.getThirdForwardStroke())) - ).divide(BigDecimal.valueOf(3), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP); measureData.setAverageForwardStroke(String.valueOf(averageForward)); //反行程平均值=三次测量反行程的平均值 BigDecimal reverseForward = (new BigDecimal(measureData.getFirstReverseStroke()) .add(new BigDecimal(measureData.getSecondReverseStroke())) .add(new BigDecimal(measureData.getThirdReverseStroke())) - ).divide(BigDecimal.valueOf(3), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP); measureData.setAverageReverseStroke(String.valueOf(reverseForward)); //平均值=六次测量中的平均值 BigDecimal averageValue = (new BigDecimal(measureData.getFirstForwardStroke()) @@ -229,7 +242,7 @@ .add(new BigDecimal(measureData.getFirstReverseStroke())) .add(new BigDecimal(measureData.getSecondReverseStroke())) .add(new BigDecimal(measureData.getThirdReverseStroke())) - ).divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(6), 3, RoundingMode.HALF_UP); measureData.setAverageValue(String.valueOf(averageValue)); //回差平均值=正行程平均值-反行程平均值 measureData.setAverageReturnError(String.valueOf(averageForward.subtract(reverseForward))); @@ -515,6 +528,8 @@ } measureDataList.add(pistonGaugeData); } else if ("压力变送器".equals(itemCategoryName)) { + pistonGaugeData.setIndicatingError(indicatingErrorBak); + pistonGaugeData.setReturnError(returnErrorBak); //取绝对值最大的原值 getErrorResultTwo(measureDataList, indicatingErrorTransferList, returnErrorTransferList, pistonGaugeData); } else if ("电接点一般压力表".equals(itemCategoryName)) { @@ -1578,24 +1593,23 @@ BigDecimal sevenValue = new BigDecimal(measureData.getSevenValue()); if ("/".equals(measureData.getUpperIndexTwice())) { measureData.setConclusion("/"); - } else { + } else if (StringUtils.isNotBlank(measureData.getUpperIndexTwice())) { BigDecimal upperIndexTwice = new BigDecimal(measureData.getUpperIndexTwice()); if (threeValue.compareTo(upperIndexTwice) > 0) measureData.setExceedMark(1); } if ("/".equals(measureData.getUpperIndexThrice())) { measureData.setConclusion("/"); - } else { - + } else if (StringUtils.isNotBlank(measureData.getUpperIndexThrice())) { BigDecimal upperIndexThrice = new BigDecimal(measureData.getUpperIndexThrice()); if (fiveValue.compareTo(upperIndexThrice) > 0) measureData.setExceedMarkOne(1); } if ("/".equals(measureData.getUpperIndexQuartic())) { measureData.setConclusion("/"); - } else { + } else if (StringUtils.isNotBlank(measureData.getUpperIndexQuartic())) { BigDecimal upperIndexQuartic = new BigDecimal(measureData.getUpperIndexQuartic()); if (sevenValue.compareTo(upperIndexQuartic) > 0) measureData.setExceedMarkTwo(1); } - if (measureData.getExceedMark() == 1 && measureData.getExceedMarkOne() == 1 || measureData.getExceedMarkTwo() == 1) { + if (measureData.getExceedMark() == 1 || measureData.getExceedMarkOne() == 1 || measureData.getExceedMarkTwo() == 1) { measureData.setConclusion("不符合指标"); } else { measureData.setConclusion("符合指标"); @@ -2787,7 +2801,7 @@ //测量值 = 谐波幅度-基波幅度 BigDecimal harmonicAmplitude = new BigDecimal(measureData.getHarmonicAmplitude()); BigDecimal fundamentalAmplitude = new BigDecimal(measureData.getFundamentalAmplitude()); - BigDecimal measureValue = harmonicAmplitude.subtract(fundamentalAmplitude); + BigDecimal measureValue = harmonicAmplitude.subtract(fundamentalAmplitude).setScale(1, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); if (!"/".equals(measureData.getUpperIndex())) { BigDecimal upperIndex = new BigDecimal(measureData.getUpperIndex()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java index eeef223..7dbcaee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java @@ -325,6 +325,14 @@ @TableField(exist = false) private String workLineEquation; + @ApiModelProperty(value = "示值误差允许值-压力变送器计算结果使用", dataType = "String") + @TableField(exist = false) + private String indicatingErrorBak; + + @ApiModelProperty(value = "回程误差允许值-压力变送器计算结果使用", dataType = "String") + @TableField(exist = false) + private String returnErrorBak; + public void applyStrategyBasedOnDataType(String type) { Map meterHandlerMap = new HashMap<>(); meterHandlerMap.put("1", PistonGaugeType.KINDS_DIFFERENCE); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 0abe025..5ff22e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; -import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.enums.IsMenu; @@ -32,7 +31,6 @@ import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.modular.application.enums.AdminExceptionEnum; -import com.casic.missiles.modular.interfaces.dictmap.UserDict; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.interfaces.utils.ResultUtils; import com.casic.missiles.modular.system.factory.UserFactory; @@ -113,7 +111,6 @@ @PostMapping("/sign/list") @ResponseBody public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { - return ReturnUtil.success(signService.list(request)); } @@ -319,12 +316,8 @@ } @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/add"}) - @BussinessLog( - value = "添加用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/add") + @ResponseBody public ResponseData add(@RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); @@ -350,12 +343,8 @@ } @ApiOperation("修改用户（扩展基础包修改用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/update"}) - @BussinessLog( - value = "修改用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/update") + @ResponseBody public ResponseData update(@ApiParam("用户传输对象") @RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); 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 e12eeda..e996365 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 @@ -168,6 +168,10 @@ String frictionError = dataPistonGauge.getFrictionError(); String indicatingError = dataPistonGauge.getIndicatingError(); + //示值误差允许值/回程误差允许值-压力变送器计算结果使用 + String indicatingErrorBak = ""; + String returnErrorBak = ""; + for (BizBusinessDeviceMeasureDataPistonGauge measureData : measureDataList) { if ("一般压力表".equals(itemCategoryName)) { //轻敲前后变动量正行程和反行程计算 @@ -188,6 +192,10 @@ //也用lowerXxx做中间数据，少创建List getTransferValue(lowerIndicatingErrorTransferList, lowerFrictionErrorTransferList, lowerReturnErrorTransferList, measureData); } else if ("压力变送器".equals(itemCategoryName)) { + if (StringUtils.isBlank(indicatingErrorBak)) { + indicatingErrorBak = measureData.getIndicatingErrorBak(); + returnErrorBak = measureData.getReturnErrorBak(); + } //示值误差计算，=三次测量中测量值-理论输出值的最大偏差值，带原符号 BigDecimal fForward = new BigDecimal(measureData.getFirstForwardStroke()).subtract(measureData.getTheoreticalOutputValue()); BigDecimal fReverse = new BigDecimal(measureData.getFirstReverseStroke()).subtract(measureData.getTheoreticalOutputValue()); @@ -197,30 +205,35 @@ BigDecimal tReverse = new BigDecimal(measureData.getThirdReverseStroke()).subtract(measureData.getTheoreticalOutputValue()); List transferList = Arrays.asList(fForward, fReverse, sForward, sReverse, tForward, tReverse); BigDecimal maxTransfer = transferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); - measureData.setIndicatingError(String.valueOf(transferList.stream().filter(x -> x.abs().equals(maxTransfer)).findFirst().get())); + BigDecimal indicating = transferList.stream().filter(x -> x.abs().equals(maxTransfer)).findFirst().get(); + measureData.setIndicatingError(String.valueOf(indicating)); //回程误差计算，=三次测量中降压值-升压值的绝对值中的最大值 - BigDecimal fStroke = (new BigDecimal(measureData.getFirstReverseStroke()).subtract(new BigDecimal(measureData.getFirstForwardStroke()))).abs(); - BigDecimal sStroke = (new BigDecimal(measureData.getSecondReverseStroke()).subtract(new BigDecimal(measureData.getSecondForwardStroke()))).abs(); - BigDecimal tStroke = (new BigDecimal(measureData.getThirdReverseStroke()).subtract(new BigDecimal(measureData.getThirdForwardStroke()))).abs(); + BigDecimal fStroke = (new BigDecimal(measureData.getFirstReverseStroke()).subtract(new BigDecimal(measureData.getFirstForwardStroke()))); + BigDecimal sStroke = (new BigDecimal(measureData.getSecondReverseStroke()).subtract(new BigDecimal(measureData.getSecondForwardStroke()))); + BigDecimal tStroke = (new BigDecimal(measureData.getThirdReverseStroke()).subtract(new BigDecimal(measureData.getThirdForwardStroke()))); BigDecimal maxReturn = Arrays.asList(fStroke, sStroke, tStroke).stream().max(BigDecimal::compareTo).get(); - measureData.setReturnError(String.valueOf(maxReturn)); + BigDecimal fStrokeAbs = fStroke.abs(); + BigDecimal sStrokeAbs = sStroke.abs(); + BigDecimal tStrokeAbs = tStroke.abs(); + BigDecimal maxReturnAbs = Arrays.asList(fStrokeAbs, sStrokeAbs, tStrokeAbs).stream().max(BigDecimal::compareTo).get(); + measureData.setReturnError(String.valueOf(maxReturnAbs)); //计算结果使用的中间数据 //最大误差=示值误差结果绝对值的最大值，带原符号 //最大回程误差=回程误差允许值绝对值的最大值 - indicatingErrorTransferList.add(maxTransfer); + indicatingErrorTransferList.add(indicating); returnErrorTransferList.add(maxReturn); } else if ("压力传感器".equals(itemCategoryName)) { //正行程平均值=三次测量正行程的平均值 BigDecimal averageForward = (new BigDecimal(measureData.getFirstForwardStroke()) .add(new BigDecimal(measureData.getSecondForwardStroke())) .add(new BigDecimal(measureData.getThirdForwardStroke())) - ).divide(BigDecimal.valueOf(3), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP); measureData.setAverageForwardStroke(String.valueOf(averageForward)); //反行程平均值=三次测量反行程的平均值 BigDecimal reverseForward = (new BigDecimal(measureData.getFirstReverseStroke()) .add(new BigDecimal(measureData.getSecondReverseStroke())) .add(new BigDecimal(measureData.getThirdReverseStroke())) - ).divide(BigDecimal.valueOf(3), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP); measureData.setAverageReverseStroke(String.valueOf(reverseForward)); //平均值=六次测量中的平均值 BigDecimal averageValue = (new BigDecimal(measureData.getFirstForwardStroke()) @@ -229,7 +242,7 @@ .add(new BigDecimal(measureData.getFirstReverseStroke())) .add(new BigDecimal(measureData.getSecondReverseStroke())) .add(new BigDecimal(measureData.getThirdReverseStroke())) - ).divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(6), 3, RoundingMode.HALF_UP); measureData.setAverageValue(String.valueOf(averageValue)); //回差平均值=正行程平均值-反行程平均值 measureData.setAverageReturnError(String.valueOf(averageForward.subtract(reverseForward))); @@ -515,6 +528,8 @@ } measureDataList.add(pistonGaugeData); } else if ("压力变送器".equals(itemCategoryName)) { + pistonGaugeData.setIndicatingError(indicatingErrorBak); + pistonGaugeData.setReturnError(returnErrorBak); //取绝对值最大的原值 getErrorResultTwo(measureDataList, indicatingErrorTransferList, returnErrorTransferList, pistonGaugeData); } else if ("电接点一般压力表".equals(itemCategoryName)) { @@ -1578,24 +1593,23 @@ BigDecimal sevenValue = new BigDecimal(measureData.getSevenValue()); if ("/".equals(measureData.getUpperIndexTwice())) { measureData.setConclusion("/"); - } else { + } else if (StringUtils.isNotBlank(measureData.getUpperIndexTwice())) { BigDecimal upperIndexTwice = new BigDecimal(measureData.getUpperIndexTwice()); if (threeValue.compareTo(upperIndexTwice) > 0) measureData.setExceedMark(1); } if ("/".equals(measureData.getUpperIndexThrice())) { measureData.setConclusion("/"); - } else { - + } else if (StringUtils.isNotBlank(measureData.getUpperIndexThrice())) { BigDecimal upperIndexThrice = new BigDecimal(measureData.getUpperIndexThrice()); if (fiveValue.compareTo(upperIndexThrice) > 0) measureData.setExceedMarkOne(1); } if ("/".equals(measureData.getUpperIndexQuartic())) { measureData.setConclusion("/"); - } else { + } else if (StringUtils.isNotBlank(measureData.getUpperIndexQuartic())) { BigDecimal upperIndexQuartic = new BigDecimal(measureData.getUpperIndexQuartic()); if (sevenValue.compareTo(upperIndexQuartic) > 0) measureData.setExceedMarkTwo(1); } - if (measureData.getExceedMark() == 1 && measureData.getExceedMarkOne() == 1 || measureData.getExceedMarkTwo() == 1) { + if (measureData.getExceedMark() == 1 || measureData.getExceedMarkOne() == 1 || measureData.getExceedMarkTwo() == 1) { measureData.setConclusion("不符合指标"); } else { measureData.setConclusion("符合指标"); @@ -2787,7 +2801,7 @@ //测量值 = 谐波幅度-基波幅度 BigDecimal harmonicAmplitude = new BigDecimal(measureData.getHarmonicAmplitude()); BigDecimal fundamentalAmplitude = new BigDecimal(measureData.getFundamentalAmplitude()); - BigDecimal measureValue = harmonicAmplitude.subtract(fundamentalAmplitude); + BigDecimal measureValue = harmonicAmplitude.subtract(fundamentalAmplitude).setScale(1, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); if (!"/".equals(measureData.getUpperIndex())) { BigDecimal upperIndex = new BigDecimal(measureData.getUpperIndex()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java index eeef223..7dbcaee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java @@ -325,6 +325,14 @@ @TableField(exist = false) private String workLineEquation; + @ApiModelProperty(value = "示值误差允许值-压力变送器计算结果使用", dataType = "String") + @TableField(exist = false) + private String indicatingErrorBak; + + @ApiModelProperty(value = "回程误差允许值-压力变送器计算结果使用", dataType = "String") + @TableField(exist = false) + private String returnErrorBak; + public void applyStrategyBasedOnDataType(String type) { Map meterHandlerMap = new HashMap<>(); meterHandlerMap.put("1", PistonGaugeType.KINDS_DIFFERENCE); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index 485902f..018f017 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -103,7 +103,7 @@ * 流程实例id，前端跳转审批详情使用 */ @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") - @TableField(exist = false) + @TableField("process_id") private String processId; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 0abe025..5ff22e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -6,7 +6,6 @@ import com.casic.missiles.core.application.service.AbstractAuthService; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.controller.ExportController; -import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.exception.BizExceptionEnum; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.enums.IsMenu; @@ -32,7 +31,6 @@ import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.modular.application.enums.AdminExceptionEnum; -import com.casic.missiles.modular.interfaces.dictmap.UserDict; import com.casic.missiles.modular.interfaces.enums.ManagerStatus; import com.casic.missiles.modular.interfaces.utils.ResultUtils; import com.casic.missiles.modular.system.factory.UserFactory; @@ -113,7 +111,6 @@ @PostMapping("/sign/list") @ResponseBody public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { - return ReturnUtil.success(signService.list(request)); } @@ -319,12 +316,8 @@ } @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/add"}) - @BussinessLog( - value = "添加用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/add") + @ResponseBody public ResponseData add(@RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); @@ -350,12 +343,8 @@ } @ApiOperation("修改用户（扩展基础包修改用户,使用attr1作为人员类别code）") - @PostMapping({"/mgr/update"}) - @BussinessLog( - value = "修改用户", - key = "account", - dict = UserDict.class - ) + @PostMapping("/mgr/update") + @ResponseBody public ResponseData update(@ApiParam("用户传输对象") @RequestBody @Valid UserExtendDTO user, BindingResult result) { Assert.isFalse(result.hasErrors(), () -> { return new RequestValidException(result, Optional.of((new Throwable()).getStackTrace()[2])); 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 e12eeda..e996365 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 @@ -168,6 +168,10 @@ String frictionError = dataPistonGauge.getFrictionError(); String indicatingError = dataPistonGauge.getIndicatingError(); + //示值误差允许值/回程误差允许值-压力变送器计算结果使用 + String indicatingErrorBak = ""; + String returnErrorBak = ""; + for (BizBusinessDeviceMeasureDataPistonGauge measureData : measureDataList) { if ("一般压力表".equals(itemCategoryName)) { //轻敲前后变动量正行程和反行程计算 @@ -188,6 +192,10 @@ //也用lowerXxx做中间数据，少创建List getTransferValue(lowerIndicatingErrorTransferList, lowerFrictionErrorTransferList, lowerReturnErrorTransferList, measureData); } else if ("压力变送器".equals(itemCategoryName)) { + if (StringUtils.isBlank(indicatingErrorBak)) { + indicatingErrorBak = measureData.getIndicatingErrorBak(); + returnErrorBak = measureData.getReturnErrorBak(); + } //示值误差计算，=三次测量中测量值-理论输出值的最大偏差值，带原符号 BigDecimal fForward = new BigDecimal(measureData.getFirstForwardStroke()).subtract(measureData.getTheoreticalOutputValue()); BigDecimal fReverse = new BigDecimal(measureData.getFirstReverseStroke()).subtract(measureData.getTheoreticalOutputValue()); @@ -197,30 +205,35 @@ BigDecimal tReverse = new BigDecimal(measureData.getThirdReverseStroke()).subtract(measureData.getTheoreticalOutputValue()); List transferList = Arrays.asList(fForward, fReverse, sForward, sReverse, tForward, tReverse); BigDecimal maxTransfer = transferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); - measureData.setIndicatingError(String.valueOf(transferList.stream().filter(x -> x.abs().equals(maxTransfer)).findFirst().get())); + BigDecimal indicating = transferList.stream().filter(x -> x.abs().equals(maxTransfer)).findFirst().get(); + measureData.setIndicatingError(String.valueOf(indicating)); //回程误差计算，=三次测量中降压值-升压值的绝对值中的最大值 - BigDecimal fStroke = (new BigDecimal(measureData.getFirstReverseStroke()).subtract(new BigDecimal(measureData.getFirstForwardStroke()))).abs(); - BigDecimal sStroke = (new BigDecimal(measureData.getSecondReverseStroke()).subtract(new BigDecimal(measureData.getSecondForwardStroke()))).abs(); - BigDecimal tStroke = (new BigDecimal(measureData.getThirdReverseStroke()).subtract(new BigDecimal(measureData.getThirdForwardStroke()))).abs(); + BigDecimal fStroke = (new BigDecimal(measureData.getFirstReverseStroke()).subtract(new BigDecimal(measureData.getFirstForwardStroke()))); + BigDecimal sStroke = (new BigDecimal(measureData.getSecondReverseStroke()).subtract(new BigDecimal(measureData.getSecondForwardStroke()))); + BigDecimal tStroke = (new BigDecimal(measureData.getThirdReverseStroke()).subtract(new BigDecimal(measureData.getThirdForwardStroke()))); BigDecimal maxReturn = Arrays.asList(fStroke, sStroke, tStroke).stream().max(BigDecimal::compareTo).get(); - measureData.setReturnError(String.valueOf(maxReturn)); + BigDecimal fStrokeAbs = fStroke.abs(); + BigDecimal sStrokeAbs = sStroke.abs(); + BigDecimal tStrokeAbs = tStroke.abs(); + BigDecimal maxReturnAbs = Arrays.asList(fStrokeAbs, sStrokeAbs, tStrokeAbs).stream().max(BigDecimal::compareTo).get(); + measureData.setReturnError(String.valueOf(maxReturnAbs)); //计算结果使用的中间数据 //最大误差=示值误差结果绝对值的最大值，带原符号 //最大回程误差=回程误差允许值绝对值的最大值 - indicatingErrorTransferList.add(maxTransfer); + indicatingErrorTransferList.add(indicating); returnErrorTransferList.add(maxReturn); } else if ("压力传感器".equals(itemCategoryName)) { //正行程平均值=三次测量正行程的平均值 BigDecimal averageForward = (new BigDecimal(measureData.getFirstForwardStroke()) .add(new BigDecimal(measureData.getSecondForwardStroke())) .add(new BigDecimal(measureData.getThirdForwardStroke())) - ).divide(BigDecimal.valueOf(3), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP); measureData.setAverageForwardStroke(String.valueOf(averageForward)); //反行程平均值=三次测量反行程的平均值 BigDecimal reverseForward = (new BigDecimal(measureData.getFirstReverseStroke()) .add(new BigDecimal(measureData.getSecondReverseStroke())) .add(new BigDecimal(measureData.getThirdReverseStroke())) - ).divide(BigDecimal.valueOf(3), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP); measureData.setAverageReverseStroke(String.valueOf(reverseForward)); //平均值=六次测量中的平均值 BigDecimal averageValue = (new BigDecimal(measureData.getFirstForwardStroke()) @@ -229,7 +242,7 @@ .add(new BigDecimal(measureData.getFirstReverseStroke())) .add(new BigDecimal(measureData.getSecondReverseStroke())) .add(new BigDecimal(measureData.getThirdReverseStroke())) - ).divide(BigDecimal.valueOf(6), 4, RoundingMode.HALF_UP); + ).divide(BigDecimal.valueOf(6), 3, RoundingMode.HALF_UP); measureData.setAverageValue(String.valueOf(averageValue)); //回差平均值=正行程平均值-反行程平均值 measureData.setAverageReturnError(String.valueOf(averageForward.subtract(reverseForward))); @@ -515,6 +528,8 @@ } measureDataList.add(pistonGaugeData); } else if ("压力变送器".equals(itemCategoryName)) { + pistonGaugeData.setIndicatingError(indicatingErrorBak); + pistonGaugeData.setReturnError(returnErrorBak); //取绝对值最大的原值 getErrorResultTwo(measureDataList, indicatingErrorTransferList, returnErrorTransferList, pistonGaugeData); } else if ("电接点一般压力表".equals(itemCategoryName)) { @@ -1578,24 +1593,23 @@ BigDecimal sevenValue = new BigDecimal(measureData.getSevenValue()); if ("/".equals(measureData.getUpperIndexTwice())) { measureData.setConclusion("/"); - } else { + } else if (StringUtils.isNotBlank(measureData.getUpperIndexTwice())) { BigDecimal upperIndexTwice = new BigDecimal(measureData.getUpperIndexTwice()); if (threeValue.compareTo(upperIndexTwice) > 0) measureData.setExceedMark(1); } if ("/".equals(measureData.getUpperIndexThrice())) { measureData.setConclusion("/"); - } else { - + } else if (StringUtils.isNotBlank(measureData.getUpperIndexThrice())) { BigDecimal upperIndexThrice = new BigDecimal(measureData.getUpperIndexThrice()); if (fiveValue.compareTo(upperIndexThrice) > 0) measureData.setExceedMarkOne(1); } if ("/".equals(measureData.getUpperIndexQuartic())) { measureData.setConclusion("/"); - } else { + } else if (StringUtils.isNotBlank(measureData.getUpperIndexQuartic())) { BigDecimal upperIndexQuartic = new BigDecimal(measureData.getUpperIndexQuartic()); if (sevenValue.compareTo(upperIndexQuartic) > 0) measureData.setExceedMarkTwo(1); } - if (measureData.getExceedMark() == 1 && measureData.getExceedMarkOne() == 1 || measureData.getExceedMarkTwo() == 1) { + if (measureData.getExceedMark() == 1 || measureData.getExceedMarkOne() == 1 || measureData.getExceedMarkTwo() == 1) { measureData.setConclusion("不符合指标"); } else { measureData.setConclusion("符合指标"); @@ -2787,7 +2801,7 @@ //测量值 = 谐波幅度-基波幅度 BigDecimal harmonicAmplitude = new BigDecimal(measureData.getHarmonicAmplitude()); BigDecimal fundamentalAmplitude = new BigDecimal(measureData.getFundamentalAmplitude()); - BigDecimal measureValue = harmonicAmplitude.subtract(fundamentalAmplitude); + BigDecimal measureValue = harmonicAmplitude.subtract(fundamentalAmplitude).setScale(1, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); if (!"/".equals(measureData.getUpperIndex())) { BigDecimal upperIndex = new BigDecimal(measureData.getUpperIndex()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java index eeef223..7dbcaee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataPistonGauge.java @@ -325,6 +325,14 @@ @TableField(exist = false) private String workLineEquation; + @ApiModelProperty(value = "示值误差允许值-压力变送器计算结果使用", dataType = "String") + @TableField(exist = false) + private String indicatingErrorBak; + + @ApiModelProperty(value = "回程误差允许值-压力变送器计算结果使用", dataType = "String") + @TableField(exist = false) + private String returnErrorBak; + public void applyStrategyBasedOnDataType(String type) { Map meterHandlerMap = new HashMap<>(); meterHandlerMap.put("1", PistonGaugeType.KINDS_DIFFERENCE); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index 485902f..018f017 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -103,7 +103,7 @@ * 流程实例id，前端跳转审批详情使用 */ @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") - @TableField(exist = false) + @TableField("process_id") private String processId; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java index 327e969..8440a7f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java @@ -315,9 +315,6 @@ if (1 == approvalType) convertForEquipment(resultList, applyFromIdEnum, 1); else convertForEquipment(resultList, applyFromIdEnum, 2); } else if (ApplyFromIdEnum.STANDARD_APPROVAL.getCode().equals(applyFromIdEnum.getCode())) { - if (1 == approvalType) convertForEquipment(resultList, applyFromIdEnum, 1); - else convertForEquipment(resultList, applyFromIdEnum, 2); - } else if (ApplyFromIdEnum.STANDARD_APPROVAL.getCode().equals(applyFromIdEnum.getCode())) { //标准装置 if (1 == approvalType) convertForStandard(resultList, applyFromIdEnum, 1); else convertForStandard(resultList, applyFromIdEnum, 2);