diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
index 4e74e27..0a824b6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
@@ -50,7 +50,7 @@
}
if ("平分点法".equals(request.getGenerateWay())) {
//步长,保留2位小数
- BigDecimal step = range.divide(BigDecimal.valueOf(points - 1)).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal step = range.divide(BigDecimal.valueOf(points - 1), 2, BigDecimal.ROUND_DOWN);
for (Integer i = 0; i < points; i++) {
BizBusinessDeviceMeasureItemDataPistonGauge itemDataPistonGauge = new BizBusinessDeviceMeasureItemDataPistonGauge();
itemDataPistonGauge.setItemId(request.getItemId());
@@ -96,13 +96,13 @@
}
//最大允许误差计算:准确度等级*满表量程值/100,为范围值自动补充±,满表量程值=手工输入量程上限-下限
- BigDecimal maximumErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal maximumErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
String maximumError = maximumErrorDecimal.toPlainString();
itemDataPistonGauge.setMaximumError("±" + maximumError);
//回程误差允许值(不带±),为最大允许误差的绝对值
if (itemCategoryName.contains("压力变送器")) {
//压力变送器的回程误差允许值计算,16*准确度等级/100
- BigDecimal returnErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(BigDecimal.valueOf(16)).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal returnErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(BigDecimal.valueOf(16)).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
itemDataPistonGauge.setReturnError(returnErrorDecimal.toPlainString());
} else {
itemDataPistonGauge.setReturnError(maximumError);
@@ -122,7 +122,8 @@
if(StringUtils.isNotEmpty(itemDataPistonGauge.getIndicatingValue())) {
BigDecimal indicatingValueDecimal = new BigDecimal(itemDataPistonGauge.getIndicatingValue());
BigDecimal rangeLower = new BigDecimal(request.getRangeLower());
- itemDataPistonGauge.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
+ BigDecimal bigDecimal = BigDecimal.valueOf(16).divide(range, 4, BigDecimal.ROUND_DOWN);
+ itemDataPistonGauge.setTheoreticalOutputValue(bigDecimal.multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
}
}
return itemDataPistonGauge;
@@ -148,7 +149,7 @@
itemData.setAccuracyClass(itemConfig.getAccuracyLevelUpper());
}
//最大允许误差
- BigDecimal maximumErrorDecimal = itemData.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal maximumErrorDecimal = itemData.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
String maximumError = maximumErrorDecimal.toPlainString();
itemData.setMaximumError("±" + maximumError);
//回程误差允许值
@@ -160,7 +161,7 @@
} else if(itemCategoryName.contains("压力变送器") || itemCategoryName.contains("压力传感器")) {
if (StringUtils.isNotEmpty(itemData.getIndicatingValue())) {
BigDecimal indicatingValueDecimal = new BigDecimal(itemData.getIndicatingValue());
- itemData.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
+ itemData.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range, 4, BigDecimal.ROUND_DOWN).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
}
}
});
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
index 4e74e27..0a824b6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
@@ -50,7 +50,7 @@
}
if ("平分点法".equals(request.getGenerateWay())) {
//步长,保留2位小数
- BigDecimal step = range.divide(BigDecimal.valueOf(points - 1)).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal step = range.divide(BigDecimal.valueOf(points - 1), 2, BigDecimal.ROUND_DOWN);
for (Integer i = 0; i < points; i++) {
BizBusinessDeviceMeasureItemDataPistonGauge itemDataPistonGauge = new BizBusinessDeviceMeasureItemDataPistonGauge();
itemDataPistonGauge.setItemId(request.getItemId());
@@ -96,13 +96,13 @@
}
//最大允许误差计算:准确度等级*满表量程值/100,为范围值自动补充±,满表量程值=手工输入量程上限-下限
- BigDecimal maximumErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal maximumErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
String maximumError = maximumErrorDecimal.toPlainString();
itemDataPistonGauge.setMaximumError("±" + maximumError);
//回程误差允许值(不带±),为最大允许误差的绝对值
if (itemCategoryName.contains("压力变送器")) {
//压力变送器的回程误差允许值计算,16*准确度等级/100
- BigDecimal returnErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(BigDecimal.valueOf(16)).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal returnErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(BigDecimal.valueOf(16)).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
itemDataPistonGauge.setReturnError(returnErrorDecimal.toPlainString());
} else {
itemDataPistonGauge.setReturnError(maximumError);
@@ -122,7 +122,8 @@
if(StringUtils.isNotEmpty(itemDataPistonGauge.getIndicatingValue())) {
BigDecimal indicatingValueDecimal = new BigDecimal(itemDataPistonGauge.getIndicatingValue());
BigDecimal rangeLower = new BigDecimal(request.getRangeLower());
- itemDataPistonGauge.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
+ BigDecimal bigDecimal = BigDecimal.valueOf(16).divide(range, 4, BigDecimal.ROUND_DOWN);
+ itemDataPistonGauge.setTheoreticalOutputValue(bigDecimal.multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
}
}
return itemDataPistonGauge;
@@ -148,7 +149,7 @@
itemData.setAccuracyClass(itemConfig.getAccuracyLevelUpper());
}
//最大允许误差
- BigDecimal maximumErrorDecimal = itemData.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal maximumErrorDecimal = itemData.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
String maximumError = maximumErrorDecimal.toPlainString();
itemData.setMaximumError("±" + maximumError);
//回程误差允许值
@@ -160,7 +161,7 @@
} else if(itemCategoryName.contains("压力变送器") || itemCategoryName.contains("压力传感器")) {
if (StringUtils.isNotEmpty(itemData.getIndicatingValue())) {
BigDecimal indicatingValueDecimal = new BigDecimal(itemData.getIndicatingValue());
- itemData.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
+ itemData.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range, 4, BigDecimal.ROUND_DOWN).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
}
}
});
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 80d7424..786aa7d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -5,7 +5,6 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
@@ -26,7 +25,7 @@
/**
* 审批状态类型,对应ApprovalStatusEnum
*/
- @NotEmpty(message = "审批状态类型不能为空")
+// @NotEmpty(message = "审批状态类型不能为空")
@ApiModelProperty(value = "审批状态类型code,导出接口不用传", dataType = "String")
private String approvalStatus;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
index 4e74e27..0a824b6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
@@ -50,7 +50,7 @@
}
if ("平分点法".equals(request.getGenerateWay())) {
//步长,保留2位小数
- BigDecimal step = range.divide(BigDecimal.valueOf(points - 1)).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal step = range.divide(BigDecimal.valueOf(points - 1), 2, BigDecimal.ROUND_DOWN);
for (Integer i = 0; i < points; i++) {
BizBusinessDeviceMeasureItemDataPistonGauge itemDataPistonGauge = new BizBusinessDeviceMeasureItemDataPistonGauge();
itemDataPistonGauge.setItemId(request.getItemId());
@@ -96,13 +96,13 @@
}
//最大允许误差计算:准确度等级*满表量程值/100,为范围值自动补充±,满表量程值=手工输入量程上限-下限
- BigDecimal maximumErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal maximumErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
String maximumError = maximumErrorDecimal.toPlainString();
itemDataPistonGauge.setMaximumError("±" + maximumError);
//回程误差允许值(不带±),为最大允许误差的绝对值
if (itemCategoryName.contains("压力变送器")) {
//压力变送器的回程误差允许值计算,16*准确度等级/100
- BigDecimal returnErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(BigDecimal.valueOf(16)).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal returnErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(BigDecimal.valueOf(16)).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
itemDataPistonGauge.setReturnError(returnErrorDecimal.toPlainString());
} else {
itemDataPistonGauge.setReturnError(maximumError);
@@ -122,7 +122,8 @@
if(StringUtils.isNotEmpty(itemDataPistonGauge.getIndicatingValue())) {
BigDecimal indicatingValueDecimal = new BigDecimal(itemDataPistonGauge.getIndicatingValue());
BigDecimal rangeLower = new BigDecimal(request.getRangeLower());
- itemDataPistonGauge.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
+ BigDecimal bigDecimal = BigDecimal.valueOf(16).divide(range, 4, BigDecimal.ROUND_DOWN);
+ itemDataPistonGauge.setTheoreticalOutputValue(bigDecimal.multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
}
}
return itemDataPistonGauge;
@@ -148,7 +149,7 @@
itemData.setAccuracyClass(itemConfig.getAccuracyLevelUpper());
}
//最大允许误差
- BigDecimal maximumErrorDecimal = itemData.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal maximumErrorDecimal = itemData.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
String maximumError = maximumErrorDecimal.toPlainString();
itemData.setMaximumError("±" + maximumError);
//回程误差允许值
@@ -160,7 +161,7 @@
} else if(itemCategoryName.contains("压力变送器") || itemCategoryName.contains("压力传感器")) {
if (StringUtils.isNotEmpty(itemData.getIndicatingValue())) {
BigDecimal indicatingValueDecimal = new BigDecimal(itemData.getIndicatingValue());
- itemData.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
+ itemData.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range, 4, BigDecimal.ROUND_DOWN).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
}
}
});
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 80d7424..786aa7d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -5,7 +5,6 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
@@ -26,7 +25,7 @@
/**
* 审批状态类型,对应ApprovalStatusEnum
*/
- @NotEmpty(message = "审批状态类型不能为空")
+// @NotEmpty(message = "审批状态类型不能为空")
@ApiModelProperty(value = "审批状态类型code,导出接口不用传", dataType = "String")
private String approvalStatus;
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index c7ad452..d5eb22f 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -66,17 +66,14 @@
poi
4.1.2
-
com.itextpdf
itextpdf
5.0.6
-
com.aspose
aspose-words
- 0.0.1-SNAPSHOT
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
index 4e74e27..0a824b6 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/FormulaCalculateUtil.java
@@ -50,7 +50,7 @@
}
if ("平分点法".equals(request.getGenerateWay())) {
//步长,保留2位小数
- BigDecimal step = range.divide(BigDecimal.valueOf(points - 1)).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal step = range.divide(BigDecimal.valueOf(points - 1), 2, BigDecimal.ROUND_DOWN);
for (Integer i = 0; i < points; i++) {
BizBusinessDeviceMeasureItemDataPistonGauge itemDataPistonGauge = new BizBusinessDeviceMeasureItemDataPistonGauge();
itemDataPistonGauge.setItemId(request.getItemId());
@@ -96,13 +96,13 @@
}
//最大允许误差计算:准确度等级*满表量程值/100,为范围值自动补充±,满表量程值=手工输入量程上限-下限
- BigDecimal maximumErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal maximumErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
String maximumError = maximumErrorDecimal.toPlainString();
itemDataPistonGauge.setMaximumError("±" + maximumError);
//回程误差允许值(不带±),为最大允许误差的绝对值
if (itemCategoryName.contains("压力变送器")) {
//压力变送器的回程误差允许值计算,16*准确度等级/100
- BigDecimal returnErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(BigDecimal.valueOf(16)).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal returnErrorDecimal = itemDataPistonGauge.getAccuracyClass().multiply(BigDecimal.valueOf(16)).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
itemDataPistonGauge.setReturnError(returnErrorDecimal.toPlainString());
} else {
itemDataPistonGauge.setReturnError(maximumError);
@@ -122,7 +122,8 @@
if(StringUtils.isNotEmpty(itemDataPistonGauge.getIndicatingValue())) {
BigDecimal indicatingValueDecimal = new BigDecimal(itemDataPistonGauge.getIndicatingValue());
BigDecimal rangeLower = new BigDecimal(request.getRangeLower());
- itemDataPistonGauge.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
+ BigDecimal bigDecimal = BigDecimal.valueOf(16).divide(range, 4, BigDecimal.ROUND_DOWN);
+ itemDataPistonGauge.setTheoreticalOutputValue(bigDecimal.multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
}
}
return itemDataPistonGauge;
@@ -148,7 +149,7 @@
itemData.setAccuracyClass(itemConfig.getAccuracyLevelUpper());
}
//最大允许误差
- BigDecimal maximumErrorDecimal = itemData.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100)).setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal maximumErrorDecimal = itemData.getAccuracyClass().multiply(range).divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN);
String maximumError = maximumErrorDecimal.toPlainString();
itemData.setMaximumError("±" + maximumError);
//回程误差允许值
@@ -160,7 +161,7 @@
} else if(itemCategoryName.contains("压力变送器") || itemCategoryName.contains("压力传感器")) {
if (StringUtils.isNotEmpty(itemData.getIndicatingValue())) {
BigDecimal indicatingValueDecimal = new BigDecimal(itemData.getIndicatingValue());
- itemData.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
+ itemData.setTheoreticalOutputValue(BigDecimal.valueOf(16).divide(range, 4, BigDecimal.ROUND_DOWN).multiply(indicatingValueDecimal.subtract(rangeLower)).add(BigDecimal.valueOf(4)));
}
}
});
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
index 80d7424..786aa7d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/BaseApprovalListRequest.java
@@ -5,7 +5,6 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
@@ -26,7 +25,7 @@
/**
* 审批状态类型,对应ApprovalStatusEnum
*/
- @NotEmpty(message = "审批状态类型不能为空")
+// @NotEmpty(message = "审批状态类型不能为空")
@ApiModelProperty(value = "审批状态类型code,导出接口不用传", dataType = "String")
private String approvalStatus;
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index c7ad452..d5eb22f 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -66,17 +66,14 @@
poi
4.1.2
-
com.itextpdf
itextpdf
5.0.6
-
com.aspose
aspose-words
- 0.0.1-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 8a7db06..4204935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
3.5.2
2.3.0
1.0
+ 0.0.1-SNAPSHOT
1.3.3
2.3.1.RELEASE
@@ -199,6 +200,11 @@
casic-cache-redis
${extension.version}
+
+ com.aspose
+ aspose-words
+ ${aspose.version}
+