diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f748d46..32e2189 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 compile diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f748d46..32e2189 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 8edd6fc..58b5bbb 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f748d46..32e2189 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 8edd6fc..58b5bbb 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index bf6f216..94c52f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** @@ -13,11 +14,11 @@ @ApiModel("设备扫描参数") public class LabelBindDTO { - @NotNull - @ApiModelProperty("标签列表") + @NotEmpty(message = "标签不能为空") + @ApiModelProperty("标签") private String label; - @NotNull - @ApiModelProperty("样品id(测量设备中为设备主键id)") + @NotNull(message = "受检设备id不能为空") + @ApiModelProperty("受检设备id") private String equipmentId; } diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f748d46..32e2189 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 8edd6fc..58b5bbb 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index bf6f216..94c52f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** @@ -13,11 +14,11 @@ @ApiModel("设备扫描参数") public class LabelBindDTO { - @NotNull - @ApiModelProperty("标签列表") + @NotEmpty(message = "标签不能为空") + @ApiModelProperty("标签") private String label; - @NotNull - @ApiModelProperty("样品id(测量设备中为设备主键id)") + @NotNull(message = "受检设备id不能为空") + @ApiModelProperty("受检设备id") private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java index 90bab95..371e30e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java @@ -134,7 +134,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f748d46..32e2189 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 8edd6fc..58b5bbb 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index bf6f216..94c52f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** @@ -13,11 +14,11 @@ @ApiModel("设备扫描参数") public class LabelBindDTO { - @NotNull - @ApiModelProperty("标签列表") + @NotEmpty(message = "标签不能为空") + @ApiModelProperty("标签") private String label; - @NotNull - @ApiModelProperty("样品id(测量设备中为设备主键id)") + @NotNull(message = "受检设备id不能为空") + @ApiModelProperty("受检设备id") private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java index 90bab95..371e30e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java @@ -134,7 +134,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java index e3868e1..bdcb5a2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java @@ -101,7 +101,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f748d46..32e2189 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 8edd6fc..58b5bbb 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index bf6f216..94c52f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** @@ -13,11 +14,11 @@ @ApiModel("设备扫描参数") public class LabelBindDTO { - @NotNull - @ApiModelProperty("标签列表") + @NotEmpty(message = "标签不能为空") + @ApiModelProperty("标签") private String label; - @NotNull - @ApiModelProperty("样品id(测量设备中为设备主键id)") + @NotNull(message = "受检设备id不能为空") + @ApiModelProperty("受检设备id") private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java index 90bab95..371e30e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java @@ -134,7 +134,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java index e3868e1..bdcb5a2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java @@ -101,7 +101,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 8e3221c..52959c2 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-common - 1.2.1 + 1.3.0 org.apache.poi diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f748d46..32e2189 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 8edd6fc..58b5bbb 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index bf6f216..94c52f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** @@ -13,11 +14,11 @@ @ApiModel("设备扫描参数") public class LabelBindDTO { - @NotNull - @ApiModelProperty("标签列表") + @NotEmpty(message = "标签不能为空") + @ApiModelProperty("标签") private String label; - @NotNull - @ApiModelProperty("样品id(测量设备中为设备主键id)") + @NotNull(message = "受检设备id不能为空") + @ApiModelProperty("受检设备id") private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java index 90bab95..371e30e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java @@ -134,7 +134,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java index e3868e1..bdcb5a2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java @@ -101,7 +101,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 8e3221c..52959c2 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-common - 1.2.1 + 1.3.0 org.apache.poi diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java index 4e67aa4..948b919 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.utils.MeasureItemFormulaCalculateUtil; import com.casic.missiles.utils.UnitConvertUtil; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; import java.lang.reflect.Field; @@ -229,37 +230,44 @@ BigDecimal sweepWidth = UnitConvertUtil.frequencyConvert(itemData.getSweepWidth(), itemData.getSweepWidthUnit(), itemData.getUnit()); BigDecimal resolutionBandwidth = UnitConvertUtil.frequencyConvert(itemData.getResolutionBandwidth(), itemData.getResolutionBandwidthUnit(), itemData.getUnit()); BigDecimal frequencyReferenceAccuracy = itemData.getFrequencyReferenceAccuracy(); - //数值% x 扫频宽度 - BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); - BigDecimal processOne = valueOne.divide(BigDecimal.valueOf(100)).multiply(sweepWidth); - //数值% x 分辨率带宽 - BigDecimal valueTwo = new BigDecimal(itemData.getValueTwo()); - BigDecimal processTwo = valueTwo.divide(BigDecimal.valueOf(100)).multiply(resolutionBandwidth); - //数值Hz - BigDecimal processThree = new BigDecimal(itemData.getValueThree()); - //数值 x 水平分辨率 - BigDecimal valueFour = new BigDecimal(itemData.getValueFour()); - BigDecimal processFour = valueFour.multiply(horizontalResolution); - BigDecimal technicalIndex = (nominalValue.multiply(frequencyReferenceAccuracy).add(processOne).add(processTwo).add(processThree).add(processFour)).setScale(4, RoundingMode.HALF_UP); - itemData.setTechnicalIndex("±" + technicalIndex); + if (StringUtils.isNotEmpty(itemData.getValueOne()) && StringUtils.isNotEmpty(itemData.getValueTwo()) && StringUtils.isNotEmpty(itemData.getValueThree()) + && StringUtils.isNotEmpty(itemData.getValueFour())) { + //数值% x 扫频宽度 + BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); + BigDecimal processOne = valueOne.divide(BigDecimal.valueOf(100)).multiply(sweepWidth); + //数值% x 分辨率带宽 + BigDecimal valueTwo = new BigDecimal(itemData.getValueTwo()); + BigDecimal processTwo = valueTwo.divide(BigDecimal.valueOf(100)).multiply(resolutionBandwidth); + //数值Hz + BigDecimal processThree = new BigDecimal(itemData.getValueThree()); + //数值 x 水平分辨率 + BigDecimal valueFour = new BigDecimal(itemData.getValueFour()); + BigDecimal processFour = valueFour.multiply(horizontalResolution); + BigDecimal technicalIndex = (nominalValue.multiply(frequencyReferenceAccuracy).add(processOne).add(processTwo).add(processThree).add(processFour)).setScale(4, RoundingMode.HALF_UP); + itemData.setTechnicalIndex("±" + technicalIndex); + } } else if ("2".equals(itemData.getDataType())) { //扫频宽度 //技术指标 = ±(数值% x 标称值 + 水平分辨率) - BigDecimal nominalValue = new BigDecimal(itemData.getNominalValue()); - BigDecimal horizontalResolution = UnitConvertUtil.frequencyConvert(itemData.getHorizontalResolution(), itemData.getHorizontalResolutionUnit(), itemData.getUnit()); - BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); - BigDecimal technicalIndex = valueOne.divide(BigDecimal.valueOf(100)).multiply(nominalValue).add(horizontalResolution).setScale(4, RoundingMode.HALF_UP); - itemData.setTechnicalIndex("±" + technicalIndex); + if (StringUtils.isNotEmpty(itemData.getValueOne())) { + BigDecimal nominalValue = new BigDecimal(itemData.getNominalValue()); + BigDecimal horizontalResolution = UnitConvertUtil.frequencyConvert(itemData.getHorizontalResolution(), itemData.getHorizontalResolutionUnit(), itemData.getUnit()); + BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); + BigDecimal technicalIndex = valueOne.divide(BigDecimal.valueOf(100)).multiply(nominalValue).add(horizontalResolution).setScale(4, RoundingMode.HALF_UP); + itemData.setTechnicalIndex("±" + technicalIndex); + } } else if ("3".equals(itemData.getDataType())) { //中频带宽 //技术指标 = (数值% x 标称值)~(数值% x 标称值) - BigDecimal nominalValue = new BigDecimal(itemData.getNominalValue()); - BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); - BigDecimal valueTwo = new BigDecimal(itemData.getValueTwo()); - BigDecimal technicalIndexLeft = valueOne.divide(BigDecimal.valueOf(100)).multiply(nominalValue).setScale(4, RoundingMode.HALF_UP); - BigDecimal technicalIndexRight = valueTwo.divide(BigDecimal.valueOf(100)).multiply(nominalValue).setScale(4, RoundingMode.HALF_UP); - itemData.setTechnicalIndexLeft(String.valueOf(technicalIndexLeft)); - itemData.setTechnicalIndexRight(String.valueOf(technicalIndexRight)); + if (StringUtils.isNotEmpty(itemData.getValueOne()) && StringUtils.isNotEmpty(itemData.getValueTwo())) { + BigDecimal nominalValue = new BigDecimal(itemData.getNominalValue()); + BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); + BigDecimal valueTwo = new BigDecimal(itemData.getValueTwo()); + BigDecimal technicalIndexLeft = valueOne.divide(BigDecimal.valueOf(100)).multiply(nominalValue).setScale(4, RoundingMode.HALF_UP); + BigDecimal technicalIndexRight = valueTwo.divide(BigDecimal.valueOf(100)).multiply(nominalValue).setScale(4, RoundingMode.HALF_UP); + itemData.setTechnicalIndexLeft(String.valueOf(technicalIndexLeft)); + itemData.setTechnicalIndexRight(String.valueOf(technicalIndexRight)); + } } //其余的检定项目技术指标前端直接传数值即可 }); diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index 5315290..bb3c3b6 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 com.casic casic-metering-job - 1.2.1 + 1.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 5caff2c..784ba4c 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 937dda4..10264bc 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index f748d46..32e2189 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.2.1 + 1.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 8edd6fc..58b5bbb 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java index bf6f216..94c52f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/LabelBindDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** @@ -13,11 +14,11 @@ @ApiModel("设备扫描参数") public class LabelBindDTO { - @NotNull - @ApiModelProperty("标签列表") + @NotEmpty(message = "标签不能为空") + @ApiModelProperty("标签") private String label; - @NotNull - @ApiModelProperty("样品id(测量设备中为设备主键id)") + @NotNull(message = "受检设备id不能为空") + @ApiModelProperty("受检设备id") private String equipmentId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java index 90bab95..371e30e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCesiumAtom.java @@ -134,7 +134,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java index e3868e1..bdcb5a2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemDataCesiumAtom.java @@ -101,7 +101,8 @@ private String technicalIndex; public String getTechnicalIndex() { - if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex)) { + if (!StringUtils.isBlank(technicalIndex) && !"/".equals(technicalIndex) && !technicalIndex.contains("<") + && !technicalIndex.contains(">") && !technicalIndex.contains("≤") && !technicalIndex.contains("≥")) { //将bigDecimal转为科学计数法,String.format转换方式,bigDecimal.toString()和bigDecimal.toPlainString()不生效 if (technicalIndex.contains("±")) { int scale = new BigDecimal(technicalIndex.replace("±", "")).scale(); diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 8e3221c..52959c2 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-biz-xichang com.casic - 1.2.1 + 1.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.2.1 + 1.3.0 com.casic casic-metering-model - 1.2.1 + 1.3.0 com.casic casic-metering-common - 1.2.1 + 1.3.0 org.apache.poi diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java index 4e67aa4..948b919 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.utils.MeasureItemFormulaCalculateUtil; import com.casic.missiles.utils.UnitConvertUtil; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; import java.lang.reflect.Field; @@ -229,37 +230,44 @@ BigDecimal sweepWidth = UnitConvertUtil.frequencyConvert(itemData.getSweepWidth(), itemData.getSweepWidthUnit(), itemData.getUnit()); BigDecimal resolutionBandwidth = UnitConvertUtil.frequencyConvert(itemData.getResolutionBandwidth(), itemData.getResolutionBandwidthUnit(), itemData.getUnit()); BigDecimal frequencyReferenceAccuracy = itemData.getFrequencyReferenceAccuracy(); - //数值% x 扫频宽度 - BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); - BigDecimal processOne = valueOne.divide(BigDecimal.valueOf(100)).multiply(sweepWidth); - //数值% x 分辨率带宽 - BigDecimal valueTwo = new BigDecimal(itemData.getValueTwo()); - BigDecimal processTwo = valueTwo.divide(BigDecimal.valueOf(100)).multiply(resolutionBandwidth); - //数值Hz - BigDecimal processThree = new BigDecimal(itemData.getValueThree()); - //数值 x 水平分辨率 - BigDecimal valueFour = new BigDecimal(itemData.getValueFour()); - BigDecimal processFour = valueFour.multiply(horizontalResolution); - BigDecimal technicalIndex = (nominalValue.multiply(frequencyReferenceAccuracy).add(processOne).add(processTwo).add(processThree).add(processFour)).setScale(4, RoundingMode.HALF_UP); - itemData.setTechnicalIndex("±" + technicalIndex); + if (StringUtils.isNotEmpty(itemData.getValueOne()) && StringUtils.isNotEmpty(itemData.getValueTwo()) && StringUtils.isNotEmpty(itemData.getValueThree()) + && StringUtils.isNotEmpty(itemData.getValueFour())) { + //数值% x 扫频宽度 + BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); + BigDecimal processOne = valueOne.divide(BigDecimal.valueOf(100)).multiply(sweepWidth); + //数值% x 分辨率带宽 + BigDecimal valueTwo = new BigDecimal(itemData.getValueTwo()); + BigDecimal processTwo = valueTwo.divide(BigDecimal.valueOf(100)).multiply(resolutionBandwidth); + //数值Hz + BigDecimal processThree = new BigDecimal(itemData.getValueThree()); + //数值 x 水平分辨率 + BigDecimal valueFour = new BigDecimal(itemData.getValueFour()); + BigDecimal processFour = valueFour.multiply(horizontalResolution); + BigDecimal technicalIndex = (nominalValue.multiply(frequencyReferenceAccuracy).add(processOne).add(processTwo).add(processThree).add(processFour)).setScale(4, RoundingMode.HALF_UP); + itemData.setTechnicalIndex("±" + technicalIndex); + } } else if ("2".equals(itemData.getDataType())) { //扫频宽度 //技术指标 = ±(数值% x 标称值 + 水平分辨率) - BigDecimal nominalValue = new BigDecimal(itemData.getNominalValue()); - BigDecimal horizontalResolution = UnitConvertUtil.frequencyConvert(itemData.getHorizontalResolution(), itemData.getHorizontalResolutionUnit(), itemData.getUnit()); - BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); - BigDecimal technicalIndex = valueOne.divide(BigDecimal.valueOf(100)).multiply(nominalValue).add(horizontalResolution).setScale(4, RoundingMode.HALF_UP); - itemData.setTechnicalIndex("±" + technicalIndex); + if (StringUtils.isNotEmpty(itemData.getValueOne())) { + BigDecimal nominalValue = new BigDecimal(itemData.getNominalValue()); + BigDecimal horizontalResolution = UnitConvertUtil.frequencyConvert(itemData.getHorizontalResolution(), itemData.getHorizontalResolutionUnit(), itemData.getUnit()); + BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); + BigDecimal technicalIndex = valueOne.divide(BigDecimal.valueOf(100)).multiply(nominalValue).add(horizontalResolution).setScale(4, RoundingMode.HALF_UP); + itemData.setTechnicalIndex("±" + technicalIndex); + } } else if ("3".equals(itemData.getDataType())) { //中频带宽 //技术指标 = (数值% x 标称值)~(数值% x 标称值) - BigDecimal nominalValue = new BigDecimal(itemData.getNominalValue()); - BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); - BigDecimal valueTwo = new BigDecimal(itemData.getValueTwo()); - BigDecimal technicalIndexLeft = valueOne.divide(BigDecimal.valueOf(100)).multiply(nominalValue).setScale(4, RoundingMode.HALF_UP); - BigDecimal technicalIndexRight = valueTwo.divide(BigDecimal.valueOf(100)).multiply(nominalValue).setScale(4, RoundingMode.HALF_UP); - itemData.setTechnicalIndexLeft(String.valueOf(technicalIndexLeft)); - itemData.setTechnicalIndexRight(String.valueOf(technicalIndexRight)); + if (StringUtils.isNotEmpty(itemData.getValueOne()) && StringUtils.isNotEmpty(itemData.getValueTwo())) { + BigDecimal nominalValue = new BigDecimal(itemData.getNominalValue()); + BigDecimal valueOne = new BigDecimal(itemData.getValueOne()); + BigDecimal valueTwo = new BigDecimal(itemData.getValueTwo()); + BigDecimal technicalIndexLeft = valueOne.divide(BigDecimal.valueOf(100)).multiply(nominalValue).setScale(4, RoundingMode.HALF_UP); + BigDecimal technicalIndexRight = valueTwo.divide(BigDecimal.valueOf(100)).multiply(nominalValue).setScale(4, RoundingMode.HALF_UP); + itemData.setTechnicalIndexLeft(String.valueOf(technicalIndexLeft)); + itemData.setTechnicalIndexRight(String.valueOf(technicalIndexRight)); + } } //其余的检定项目技术指标前端直接传数值即可 }); diff --git a/pom.xml b/pom.xml index 4556f1c..b8243e1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-biz-xichang - 1.2.1 + 1.3.0 casic-metering pom