Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
竹天卫
tianjin-cement
Commits
5fdeea28
Commit
5fdeea28
authored
Sep 27, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
校核接口完成。联调中
parent
1c14e234
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
349 additions
and
184 deletions
+349
-184
EntrustController.java
...wise/sc/cement/business/controller/EntrustController.java
+5
-2
EquipmentController.java
...se/sc/cement/business/controller/EquipmentController.java
+6
-4
Equipment.java
...ain/java/cn/wise/sc/cement/business/entity/Equipment.java
+21
-0
Team.java
...src/main/java/cn/wise/sc/cement/business/entity/Team.java
+3
-0
TeamMapper.xml
...java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
+1
-1
EquipmentTestQuery.java
...se/sc/cement/business/model/query/EquipmentTestQuery.java
+1
-4
TeamQuery.java
...ava/cn/wise/sc/cement/business/model/query/TeamQuery.java
+3
-0
EquipmentVo.java
...java/cn/wise/sc/cement/business/model/vo/EquipmentVo.java
+21
-0
SampleVo.java
...in/java/cn/wise/sc/cement/business/model/vo/SampleVo.java
+9
-0
IEntrustService.java
...a/cn/wise/sc/cement/business/service/IEntrustService.java
+3
-1
CommonServiceImpl.java
...se/sc/cement/business/service/impl/CommonServiceImpl.java
+28
-28
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+119
-42
EquipmentServiceImpl.java
...sc/cement/business/service/impl/EquipmentServiceImpl.java
+18
-10
TeamServiceImpl.java
...wise/sc/cement/business/service/impl/TeamServiceImpl.java
+6
-0
CheckCountUtil.java
.../java/cn/wise/sc/cement/business/util/CheckCountUtil.java
+105
-92
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java
View file @
5fdeea28
...
...
@@ -338,15 +338,18 @@ public class EntrustController {
@ApiOperation
(
value
=
"校核计算"
)
@PostMapping
(
"/checkCount"
)
public
BaseResponse
checkCount
(
Integer
teamGroupId
,
@RequestBody
Map
<
String
,
Object
>
mainResult
)
{
public
BaseResponse
checkCount
(
Integer
teamGroupId
,
Integer
isParallel
,
@RequestBody
Map
<
String
,
Object
>
mainResult
,
@RequestBody
Map
<
String
,
Object
>
secondaryResult
)
{
try
{
return
entrustService
.
checkCount
(
teamGroupId
,
main
Result
);
return
entrustService
.
checkCount
(
teamGroupId
,
isParallel
,
mainResult
,
secondary
Result
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"校核计算{}"
,
e
);
}
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"数据校核"
)
@PostMapping
(
"/check"
)
public
BaseResponse
check
(
@RequestBody
CheckQuery
query
)
{
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EquipmentController.java
View file @
5fdeea28
...
...
@@ -42,7 +42,7 @@ public class EquipmentController {
private
IEquipmentService
equipmentService
;
@ApiOperation
(
value
=
"设备分页列表"
)
@ApiOperation
(
value
=
"设备分页列表
(设备列表,设备检定列表)
"
)
@ApiImplicitParams
(
value
=
{
@ApiImplicitParam
(
name
=
"brand"
,
value
=
"设备品牌"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"supplierId"
,
value
=
"供应商表id"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
...
...
@@ -116,7 +116,7 @@ public class EquipmentController {
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"检定设备
(不传id为添加记录,传id为修改记录)
"
)
@ApiOperation
(
value
=
"检定设备"
)
@PostMapping
(
"/test"
)
public
BaseResponse
test
(
@RequestBody
EquipmentTestQuery
query
)
{
try
{
...
...
@@ -127,7 +127,7 @@ public class EquipmentController {
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"设备检定分页列表"
)
/*
@ApiOperation(value = "设备检定分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "equipmentId", value = "设备表id", paramType = "query", dataType = "Integer")
})
...
...
@@ -139,8 +139,9 @@ public class EquipmentController {
log.debug("设备检定分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
}
*/
/*
@ApiOperation(value = "设备检定详情")
@GetMapping("getTestDetail/{id}")
public BaseResponse getTestDetail(@PathVariable Integer id){
...
...
@@ -151,6 +152,7 @@ public class EquipmentController {
}
return BaseResponse.errorMsg("失败!");
}
*/
@ApiOperation
(
value
=
"设备故障维修登记 (不传id为添加记录,传id为修改记录)"
)
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Equipment.java
View file @
5fdeea28
...
...
@@ -67,6 +67,27 @@ public class Equipment implements Serializable {
@ApiModelProperty
(
"检/校周期(年)"
)
private
Integer
testCycle
;
@ApiModelProperty
(
"检定日期"
)
private
LocalDate
testDate
;
@ApiModelProperty
(
"校验日期"
)
private
LocalDate
checkDate
;
@ApiModelProperty
(
"期间核查日期"
)
private
LocalDate
periodDate
;
@ApiModelProperty
(
"实施结果"
)
private
String
tryResult
;
@ApiModelProperty
(
"附件地址"
)
private
String
enclosureUrl
;
@ApiModelProperty
(
"文件名"
)
private
String
alias
;
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Team.java
View file @
5fdeea28
...
...
@@ -57,6 +57,9 @@ public class Team extends BaseEntity implements Serializable {
@ApiModelProperty
(
"状态 0:禁用 1:激活"
)
private
Integer
status
;
@ApiModelProperty
(
"委托是否可见 0:不可见 1:可见"
)
private
Integer
isDisplay
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
View file @
5fdeea28
...
...
@@ -31,7 +31,7 @@
m.name as methodName, m.number as number
FROM team t
left join method m on m.id = t.method_id
where t.status=1
where t.status=1
and t.is_display = 1
ORDER BY t.id ASC
</select>
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/EquipmentTestQuery.java
View file @
5fdeea28
...
...
@@ -19,9 +19,6 @@ import java.util.List;
@ApiModel
(
"设备检定请求"
)
public
class
EquipmentTestQuery
{
@ApiModelProperty
(
"设备检定表id"
)
private
Integer
id
;
@ApiModelProperty
(
"设备表id"
)
private
Integer
equipmentId
;
...
...
@@ -41,6 +38,6 @@ public class EquipmentTestQuery {
private
String
remark
;
@ApiModelProperty
(
"校核附件信息"
)
private
List
<
EnclosureQuery
>
enclosureQueryList
;
private
EnclosureQuery
enclosureQuery
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/TeamQuery.java
View file @
5fdeea28
...
...
@@ -34,5 +34,8 @@ public class TeamQuery {
@ApiModelProperty
(
"资质范围"
)
private
String
qualifications
;
@ApiModelProperty
(
"是否可见 0:不可见 1:可见"
)
private
Integer
isDisplay
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EquipmentVo.java
View file @
5fdeea28
...
...
@@ -57,6 +57,27 @@ public class EquipmentVo {
@ApiModelProperty
(
"检/校周期(年)"
)
private
Integer
testCycle
;
@ApiModelProperty
(
"检定日期"
)
private
LocalDate
testDate
;
@ApiModelProperty
(
"校验日期"
)
private
LocalDate
checkDate
;
@ApiModelProperty
(
"期间核查日期"
)
private
LocalDate
periodDate
;
@ApiModelProperty
(
"实施结果"
)
private
String
tryResult
;
@ApiModelProperty
(
"附件地址"
)
private
String
enclosureUrl
;
@ApiModelProperty
(
"文件名"
)
private
String
alias
;
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleVo.java
View file @
5fdeea28
...
...
@@ -95,6 +95,15 @@ public class SampleVo {
@ApiModelProperty
(
"项目编号"
)
private
String
projectCode
;
@ApiModelProperty
(
"样品处理是否全部完成(0未处理完成,1处理完成"
)
private
Integer
isHandle
;
@ApiModelProperty
(
"样品是否检测完成(0未检测完成, 1检测完成,)"
)
private
Integer
isDistribution
;
@ApiModelProperty
(
"样品是否校核完成(0未检测完成, 1检测完成,)"
)
private
Integer
isCheck
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java
View file @
5fdeea28
...
...
@@ -74,7 +74,9 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse
<
List
<
SampleDistribution
>>
getEnclosureList
(
Integer
sampleId
,
Integer
teamGroupId
,
Integer
userId
);
BaseResponse
<
Map
<
String
,
Object
>>
checkCount
(
Integer
teamGroupId
,
Map
<
String
,
Object
>
mainResult
);
BaseResponse
<
Map
<
String
,
String
>>
checkCount
(
Integer
teamGroupId
,
Integer
isParallel
,
Map
<
String
,
Object
>
mainResult
,
Map
<
String
,
Object
>
secondaryResult
);
BaseResponse
<
String
>
check
(
CheckQuery
query
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java
View file @
5fdeea28
...
...
@@ -156,14 +156,14 @@ public class CommonServiceImpl {
/**
*
* @param
teamGroupId 检测组id
* @param
checkResutlList 检测组id集合
* @param resultMap 输入集合
* @return
*/
public
Map
<
String
,
Object
>
checkCount
(
Integer
teamGroupId
,
Map
<
String
,
Object
>
resultMap
){
List
<
String
>
checkResutlList
=
teamMapper
.
getByGroup
(
teamGroupId
);
public
Map
<
String
,
String
>
checkCount
(
List
<
String
>
checkResutlList
,
Map
<
String
,
Object
>
resultMap
){
//
List<String> checkResutlList = teamMapper.getByGroup(teamGroupId);
//定义输出集合
Map
<
String
,
Object
>
countMap
=
new
HashMap
<>();
Map
<
String
,
String
>
countMap
=
new
HashMap
<>();
//输出检测项第一次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"L.O.I"
)){
...
...
@@ -216,25 +216,25 @@ public class CommonServiceImpl {
//输出检测项第二次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"SO3"
)){
BigDecimal
countSO3
=
CheckCountUtil
.
countSO3
(
resultMap
,
countMap
);
String
countSO3
=
CheckCountUtil
.
countSO3
(
resultMap
,
countMap
);
countMap
.
put
(
name
,
countSO3
);
}
else
if
(
name
.
equals
(
"KH"
)){
BigDecimal
countKH
=
CheckCountUtil
.
countKH
(
countMap
);
String
countKH
=
CheckCountUtil
.
countKH
(
countMap
);
countMap
.
put
(
name
,
countKH
);
}
else
if
(
name
.
equals
(
"SM"
)){
BigDecimal
countSM
=
CheckCountUtil
.
countSM
(
countMap
);
String
countSM
=
CheckCountUtil
.
countSM
(
countMap
);
countMap
.
put
(
name
,
countSM
);
}
else
if
(
name
.
equals
(
"AM"
)){
BigDecimal
countAM
=
CheckCountUtil
.
countAM
(
countMap
);
String
countAM
=
CheckCountUtil
.
countAM
(
countMap
);
countMap
.
put
(
name
,
countAM
);
}
else
if
(
name
.
equals
(
"易烧性等级"
)){
String
burnupLevel
=
CheckCountUtil
.
countBurnupLevel
(
resultMap
,
countMap
);
countMap
.
put
(
name
,
burnupLevel
);
}
else
if
(
name
.
equals
(
"报出_Mad"
)){
BigDecimal
countBCMad
=
CheckCountUtil
.
countBCMad
(
countMap
);
String
countBCMad
=
CheckCountUtil
.
countBCMad
(
countMap
);
countMap
.
put
(
name
,
countBCMad
);
}
else
if
(
name
.
equals
(
"报出_Aad"
)){
BigDecimal
countBCAad
=
CheckCountUtil
.
countBCAad
(
countMap
);
String
countBCAad
=
CheckCountUtil
.
countBCAad
(
countMap
);
countMap
.
put
(
name
,
countBCAad
);
}
...
...
@@ -243,25 +243,25 @@ public class CommonServiceImpl {
//输出检测项第三次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"合量"
)){
BigDecimal
countHL
=
CheckCountUtil
.
countHL
(
countMap
);
String
countHL
=
CheckCountUtil
.
countHL
(
countMap
);
countMap
.
put
(
name
,
countHL
);
}
else
if
(
name
.
equals
(
"Mad"
)){
BigDecimal
countMad
=
CheckCountUtil
.
countMad
(
countMap
);
String
countMad
=
CheckCountUtil
.
countMad
(
countMap
);
countMap
.
put
(
name
,
countMad
);
}
else
if
(
name
.
equals
(
"Aad"
)){
BigDecimal
countAad
=
CheckCountUtil
.
countAad
(
countMap
);
String
countAad
=
CheckCountUtil
.
countAad
(
countMap
);
countMap
.
put
(
name
,
countAad
);
}
else
if
(
name
.
equals
(
"Vad1"
)){
BigDecimal
countVad1
=
CheckCountUtil
.
countVad1
(
resultMap
,
countMap
);
String
countVad1
=
CheckCountUtil
.
countVad1
(
resultMap
,
countMap
);
countMap
.
put
(
name
,
countVad1
);
}
else
if
(
name
.
equals
(
"Vad2"
))
{
BigDecimal
countVad2
=
CheckCountUtil
.
countVad2
(
resultMap
,
countMap
);
String
countVad2
=
CheckCountUtil
.
countVad2
(
resultMap
,
countMap
);
countMap
.
put
(
name
,
countVad2
);
}
else
if
(
name
.
equals
(
"Mad判断"
))
{
Integer
countMadPD
=
CheckCountUtil
.
countMadPD
(
countMap
);
String
countMadPD
=
CheckCountUtil
.
countMadPD
(
countMap
);
countMap
.
put
(
name
,
countMadPD
);
}
else
if
(
name
.
equals
(
"Ad"
))
{
BigDecimal
countAd
=
CheckCountUtil
.
countAd
(
countMap
);
String
countAd
=
CheckCountUtil
.
countAd
(
countMap
);
countMap
.
put
(
name
,
countAd
);
}
...
...
@@ -270,13 +270,13 @@ public class CommonServiceImpl {
//输出检测项第四次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"报出_Vad"
)){
BigDecimal
countBCVad
=
CheckCountUtil
.
countBCVad
(
countMap
);
String
countBCVad
=
CheckCountUtil
.
countBCVad
(
countMap
);
countMap
.
put
(
name
,
countBCVad
);
}
else
if
(
name
.
equals
(
"Ad系数0.1或0"
))
{
BigDecimal
countAdXS
=
CheckCountUtil
.
countAdXS
(
countMap
);
String
countAdXS
=
CheckCountUtil
.
countAdXS
(
countMap
);
countMap
.
put
(
name
,
countAdXS
);
}
else
if
(
name
.
equals
(
"Vdaf系数0.8~0.95"
))
{
BigDecimal
countVdafXS
=
CheckCountUtil
.
countVdafXS
(
countMap
);
String
countVdafXS
=
CheckCountUtil
.
countVdafXS
(
countMap
);
countMap
.
put
(
name
,
countVdafXS
);
}
...
...
@@ -285,7 +285,7 @@ public class CommonServiceImpl {
//输出检测项第五次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"Vad"
)){
BigDecimal
countVad
=
CheckCountUtil
.
countVad
(
countMap
);
String
countVad
=
CheckCountUtil
.
countVad
(
countMap
);
countMap
.
put
(
name
,
countVad
);
}
}
...
...
@@ -293,7 +293,7 @@ public class CommonServiceImpl {
//输出检测项第六次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"Vdaf"
)){
BigDecimal
countVdaf
=
CheckCountUtil
.
countVdaf
(
countMap
);
String
countVdaf
=
CheckCountUtil
.
countVdaf
(
countMap
);
countMap
.
put
(
name
,
countVdaf
);
}
}
...
...
@@ -301,16 +301,16 @@ public class CommonServiceImpl {
//输出检测项第七次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"K1,"
)){
BigDecimal
countK1_
=
CheckCountUtil
.
countK1_
(
countMap
);
String
countK1_
=
CheckCountUtil
.
countK1_
(
countMap
);
countMap
.
put
(
name
,
countK1_
);
}
else
if
(
name
.
equals
(
"K"
))
{
String
countK
=
CheckCountUtil
.
countK
(
resultMap
,
countMap
);
countMap
.
put
(
name
,
countK
);
}
else
if
(
name
.
equals
(
"Vdaf判断"
))
{
Integer
countVdafPD
=
CheckCountUtil
.
countVdafPD
(
countMap
);
String
countVdafPD
=
CheckCountUtil
.
countVdafPD
(
countMap
);
countMap
.
put
(
name
,
countVdafPD
);
}
else
if
(
name
.
equals
(
"V,daf"
))
{
BigDecimal
countV_daf
=
CheckCountUtil
.
countV_daf
(
countMap
);
String
countV_daf
=
CheckCountUtil
.
countV_daf
(
countMap
);
countMap
.
put
(
name
,
countV_daf
);
}
...
...
@@ -319,10 +319,10 @@ public class CommonServiceImpl {
//输出检测项第八次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"40Mad 0或1"
)){
BigDecimal
count40Mad0Or1
=
CheckCountUtil
.
count40Mad0Or1
(
countMap
);
String
count40Mad0Or1
=
CheckCountUtil
.
count40Mad0Or1
(
countMap
);
countMap
.
put
(
name
,
count40Mad0Or1
);
}
else
if
(
name
.
equals
(
"K0,"
))
{
BigDecimal
countK0_
=
CheckCountUtil
.
countK0_
(
countMap
);
String
countK0_
=
CheckCountUtil
.
countK0_
(
countMap
);
countMap
.
put
(
name
,
countK0_
);
}
}
...
...
@@ -330,7 +330,7 @@ public class CommonServiceImpl {
//输出检测项第九次循环
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"Qnet,ad MJ/kg"
)){
BigDecimal
countQnet_adMJ_kg
=
CheckCountUtil
.
countQnet_adMJ_kg
(
resultMap
,
countMap
);
String
countQnet_adMJ_kg
=
CheckCountUtil
.
countQnet_adMJ_kg
(
resultMap
,
countMap
);
countMap
.
put
(
name
,
countQnet_adMJ_kg
);
}
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
5fdeea28
...
...
@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.PageQuery;
import
cn.wise.sc.cement.business.model.query.*
;
import
cn.wise.sc.cement.business.model.vo.*
;
import
cn.wise.sc.cement.business.service.*
;
import
cn.wise.sc.cement.business.util.CheckCountUtil
;
import
cn.wise.sc.cement.business.util.RedisUtil
;
import
cn.wise.sc.cement.business.wrapper.page.Query
;
import
com.alibaba.fastjson.JSONArray
;
...
...
@@ -96,6 +97,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
private
SampleCheckMapper
sampleCheckMapper
;
@Resource
private
SampleCheckTeamMapper
sampleCheckTeamMapper
;
@Resource
private
EquipmentUseMapper
equipmentUseMapper
;
/**
* 委托分页
...
...
@@ -1345,12 +1348,93 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
* @param mainResult
* @return
*/
public
BaseResponse
<
Map
<
String
,
Object
>>
checkCount
(
Integer
teamGroupId
,
Map
<
String
,
Object
>
mainResult
){
Map
<
String
,
Object
>
map
=
commonService
.
checkCount
(
teamGroupId
,
mainResult
);
return
BaseResponse
.
okData
(
map
);
public
BaseResponse
<
Map
<
String
,
String
>>
checkCount
(
Integer
teamGroupId
,
Integer
isParallel
,
Map
<
String
,
Object
>
mainResult
,
Map
<
String
,
Object
>
secondaryResult
){
List
<
String
>
checkResutlList
=
teamMapper
.
getByGroup
(
teamGroupId
);
Map
<
String
,
String
>
countMap
=
new
HashMap
<>();
if
(
isParallel
==
0
){
Map
<
String
,
String
>
mainMap
=
commonService
.
checkCount
(
checkResutlList
,
mainResult
);
countMap
=
mainMap
;
}
else
if
(
isParallel
==
0
){
Map
<
String
,
String
>
mainMap
=
commonService
.
checkCount
(
checkResutlList
,
mainResult
);
Map
<
String
,
String
>
secondaryMap
=
commonService
.
checkCount
(
checkResutlList
,
mainResult
);
for
(
String
name
:
checkResutlList
){
if
(
name
.
equals
(
"L.O.I"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"SiO2"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"Al2O3+TiO2"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"Al2O3"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"Fe2O3"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"CaO"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"MgO"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"TiO2"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"K2O"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"Na2O"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"SO3"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"Cl"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"合量"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"KH"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"SM"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
if
(
name
.
equals
(
"AM"
)){
String
parallelResult
=
CheckCountUtil
.
countParallel
(
mainMap
.
get
(
name
),
secondaryMap
.
get
(
name
));
countMap
.
put
(
name
,
name
);
}
else
{
countMap
.
put
(
name
,
mainMap
.
get
(
name
));
}
}
}
return
BaseResponse
.
okData
(
countMap
);
}
/**
* 数据校核
* @param query
...
...
@@ -1377,7 +1461,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
String
cementCode
=
""
;
if
(
query
.
getSampleCheckTeamQueryList
()
!=
null
&&
query
.
getSampleCheckTeamQueryList
().
size
()>
0
){
List
<
SampleCheckTeamQuery
>
sctQueryList
=
query
.
getSampleCheckTeamQueryList
();
List
<
EquipmentUse
>
useList
=
new
ArrayList
<>();
for
(
SampleCheckTeamQuery
sctQuery
:
sctQueryList
){
if
(
sctQuery
==
null
||
sctQuery
.
getCementCode
()
==
null
){
return
BaseResponse
.
errorMsg
(
"检测组或样品信息错误"
);
...
...
@@ -1395,10 +1478,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
.
setCountResult
(
sctQuery
.
getEndResult
().
toString
())
.
setIsParallel
(
sctQuery
.
getIsParallel
())
.
setCreateTime
(
LocalDateTime
.
now
());
sampleCheck
Service
.
save
(
check
);
sampleCheck
Mapper
.
insert
(
check
);
//保存校核检测组检测项信息
List
<
SampleCheckTeam
>
sampleCheckTeamList
=
new
ArrayList
<>();
//
List<SampleCheckTeam> sampleCheckTeamList = new ArrayList<>();
SampleCheckTeam
sampleCheckTeam
=
new
SampleCheckTeam
();
sampleCheckTeam
.
setCheckId
(
check
.
getId
())
.
setSampleId
(
sctQuery
.
getMainSampleId
())
...
...
@@ -1407,8 +1490,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
.
setEquipmentName
(
sctQuery
.
getMainEquipmentName
())
.
setInputResult
(
sctQuery
.
getMainResult
().
toString
())
.
setCreateTime
(
LocalDateTime
.
now
());
if
(
check
.
getIsParallel
()
==
0
){
sampleCheckTeamService
.
save
(
sampleCheckTeam
);
sampleCheckTeamMapper
.
insert
(
sampleCheckTeam
);
//添加设备使用记录 设备使用记录表 equipment_use
EquipmentUse
equipmentUse
=
new
EquipmentUse
();
SysUser
sysUser
=
userService
.
getById
(
sampleCheckTeam
.
getUserId
());
...
...
@@ -1422,9 +1504,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
.
setTestItem
(
check
.
getTeamGroupName
())
.
setCreateTime
(
LocalDateTime
.
now
())
.
setRemark
(
"委托派发-数据校核"
);
useList
.
add
(
equipmentUse
);
}
else
{
sampleCheckTeamList
.
add
(
sampleCheckTeam
);
equipmentUseMapper
.
insert
(
equipmentUse
);
if
(
check
.
getIsParallel
()
==
1
){
SampleCheckTeam
sampleCheckTeam2
=
new
SampleCheckTeam
();
sampleCheckTeam2
.
setCheckId
(
check
.
getId
())
.
setSampleId
(
sctQuery
.
getSecondarySampleId
())
...
...
@@ -1433,14 +1514,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
.
setEquipmentName
(
sctQuery
.
getSecondaryEquipmentName
())
.
setInputResult
(
sctQuery
.
getSecondaryResult
().
toString
())
.
setCreateTime
(
sampleCheckTeam
.
getCreateTime
());
sampleCheckTeamList
.
add
(
sampleCheckTeam2
);
sampleCheckTeamService
.
saveBatch
(
sampleCheckTeamList
);
sampleCheckTeamMapper
.
insert
(
sampleCheckTeam2
);
//添加设备使用记录 设备使用记录表 equipment_use
for
(
SampleCheckTeam
scTeam
:
sampleCheckTeamList
){
EquipmentUse
equipmentUse
=
new
EquipmentUse
();
SysUser
sysUser
=
userService
.
getById
(
scTeam
.
getUserId
());
equipmentUse
.
setEquipmentId
(
scTeam
.
getEquipmentId
())
.
setUserId
(
scTeam
.
getUserId
())
EquipmentUse
equipmentUse2
=
new
EquipmentUse
();
SysUser
sysUser2
=
userService
.
getById
(
sampleCheckTeam2
.
getUserId
());
equipmentUse2
.
setEquipmentId
(
sampleCheckTeam2
.
getEquipmentId
())
.
setUserId
(
sampleCheckTeam2
.
getUserId
())
.
setUserName
(
sysUser
.
getName
())
.
setUseDate
(
LocalDate
.
now
())
.
setProjectId
(
entrust
.
getProjectId
())
...
...
@@ -1449,11 +1528,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
.
setTestItem
(
check
.
getTeamGroupName
())
.
setCreateTime
(
LocalDateTime
.
now
())
.
setRemark
(
"委托派发-数据校核"
);
useList
.
add
(
equipmentUse
);
}
equipmentUseMapper
.
insert
(
equipmentUse2
);
}
}
equipmentUseService
.
saveBatch
(
useList
);
}
//更新样品表状态为已经校核状态 is_check 0未处理 1处理完成
QueryWrapper
<
Sample
>
sampleQW
=
new
QueryWrapper
<>();
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java
View file @
5fdeea28
...
...
@@ -146,21 +146,29 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
if
(
query
==
null
||
query
.
getEquipmentId
()==
null
){
return
BaseResponse
.
errorMsg
(
"参数错误!"
);
}
EquipmentVo
equipmentVo
=
equipmentMapper
.
getDetail
(
query
.
getEquipmentId
());
if
(
equipmentVo
==
null
){
// EquipmentVo equipmentVo = equipmentMapper.getDetail(query.getEquipmentId());
Equipment
equipment
=
equipmentMapper
.
selectById
(
query
.
getEquipmentId
());
if
(
equipment
==
null
){
return
BaseResponse
.
errorMsg
(
"信息错误!"
);
}
EnclosureQuery
enclosureQuery
=
query
.
getEnclosureQuery
();
EquipmentTest
equipmentTest
=
new
EquipmentTest
();
BeanUtils
.
copyProperties
(
query
,
equipmentTest
);
if
(
query
.
getId
()
==
null
){
equipmentTest
.
setUserId
(
userService
.
getLoginUser
().
getId
())
.
setCreateTime
(
LocalDateTime
.
now
());
testMapper
.
insert
(
equipmentTest
);
}
else
{
testMapper
.
updateById
(
equipmentTest
);
}
equipment
.
setTestDate
(
equipmentTest
.
getTestDate
());
equipment
.
setCheckDate
(
equipmentTest
.
getCheckDate
());
equipment
.
setPeriodDate
(
equipmentTest
.
getPeriodDate
());
equipment
.
setTryResult
(
equipmentTest
.
getTryResult
());
equipment
.
setEnclosureUrl
(
enclosureQuery
.
getEnclosureUrl
());
equipment
.
setAlias
(
enclosureQuery
.
getAlias
());
equipment
.
setExtName
(
enclosureQuery
.
getExtName
());
equipmentMapper
.
updateById
(
equipment
);
//保存校核附件信息
Boolean
ref
=
commonService
.
saveEntityEnclosure
(
EntityEnclosure
.
EntityType
.
EQUIPMENT_TEST
,
equipmentTest
.
getId
(),
query
.
getEnclosureQueryList
());
List
<
EnclosureQuery
>
enclosureQueryList
=
new
ArrayList
<>();
enclosureQueryList
.
add
(
enclosureQuery
);
Boolean
ref
=
commonService
.
saveEntityEnclosure
(
EntityEnclosure
.
EntityType
.
EQUIPMENT_TEST
,
equipmentTest
.
getId
(),
enclosureQueryList
);
if
(!
ref
){
return
BaseResponse
.
errorMsg
(
"保存保存校核附件失败!"
);
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java
View file @
5fdeea28
...
...
@@ -81,6 +81,12 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
if
(
query
.
getMethodId
()
==
null
){
return
BaseResponse
.
errorMsg
(
"请选择检依据"
);
}
if
(
query
.
getIsDisplay
()
==
null
){
return
BaseResponse
.
errorMsg
(
"请选择委托是否可见"
);
}
if
(
query
.
getIsDisplay
()
!=
1
&&
query
.
getIsDisplay
()
!=
0
){
return
BaseResponse
.
errorMsg
(
"委托是否可见参数错误"
);
}
BeanUtils
.
copyProperties
(
query
,
create
);
create
.
setStatus
(
1
).
setCreateTime
(
LocalDateTime
.
now
());
teamMapper
.
insert
(
create
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java
View file @
5fdeea28
...
...
@@ -52,7 +52,7 @@ public class CheckCountUtil {
* @return
*/
//加 add 减 subtract 乘 multiply 除 divide
public
static
BigDecimal
checkCount
(
String
name
,
Map
<
String
,
Object
>
resultMap
)
{
public
static
String
checkCount
(
String
name
,
Map
<
String
,
Object
>
resultMap
)
{
BigDecimal
endResult
=
null
;
if
(
name
.
equals
(
"L.O.I"
)){
//样重m1—保留4位⼩数
...
...
@@ -62,7 +62,7 @@ public class CheckCountUtil {
//烧后重m3—保留4位⼩数
BigDecimal
m3
=
getBigDecimal
(
resultMap
.
get
(
"烧后重m3"
)).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
);
//计算的核心公式结果
BigDecimal
countResult
=
(
m1
.
add
(
m2
).
subtract
(
m3
)).
divide
(
m1
);
BigDecimal
countResult
=
(
m1
.
add
(
m2
).
subtract
(
m3
)).
divide
(
m1
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
.
multiply
(
param100
));
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -78,7 +78,7 @@ public class CheckCountUtil {
//样m
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
//计算的核心公式结果
BigDecimal
countResult
=
VSiO2
.
multiply
(
TSiO2
).
divide
(
m
);
BigDecimal
countResult
=
VSiO2
.
multiply
(
TSiO2
).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -93,7 +93,7 @@ public class CheckCountUtil {
BigDecimal
VCuSO4_I
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(I)"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
//计算的核心公式结果
BigDecimal
countResult
=
TAl2O3
.
multiply
(
VAl2O3
.
subtract
(
K
.
multiply
(
VCuSO4_I
))).
divide
(
m
);
BigDecimal
countResult
=
TAl2O3
.
multiply
(
VAl2O3
.
subtract
(
K
.
multiply
(
VCuSO4_I
))).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -109,7 +109,7 @@ public class CheckCountUtil {
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
BigDecimal
VCuSO4_II
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(II)"
));
//计算的核心公式结果
BigDecimal
countResult
=
TAl2O3
.
multiply
(
VAl2O3
.
subtract
(
K
.
multiply
(
VCuSO4_I
.
add
(
VCuSO4_II
)))).
divide
(
m
);
BigDecimal
countResult
=
TAl2O3
.
multiply
(
VAl2O3
.
subtract
(
K
.
multiply
(
VCuSO4_I
.
add
(
VCuSO4_II
)))).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -122,7 +122,7 @@ public class CheckCountUtil {
BigDecimal
VF2O3
=
getBigDecimal
(
resultMap
.
get
(
"VF2O3"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
//计算的核心公式结果
BigDecimal
countResult
=
TFe2O3
.
multiply
(
VF2O3
).
divide
(
m
);
BigDecimal
countResult
=
TFe2O3
.
multiply
(
VF2O3
).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -135,7 +135,7 @@ public class CheckCountUtil {
BigDecimal
VCaO
=
getBigDecimal
(
resultMap
.
get
(
"VCaO"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
//计算的核心公式结果
BigDecimal
countResult
=
TCaO
.
multiply
(
VCaO
).
divide
(
m
);
BigDecimal
countResult
=
TCaO
.
multiply
(
VCaO
).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -149,7 +149,7 @@ public class CheckCountUtil {
BigDecimal
VCaO
=
getBigDecimal
(
resultMap
.
get
(
"VCaO"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
//计算的核心公式结果
BigDecimal
countResult
=
TMgO
.
multiply
(
VMgO
.
subtract
(
VCaO
)).
divide
(
m
);
BigDecimal
countResult
=
TMgO
.
multiply
(
VMgO
.
subtract
(
VCaO
)).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -163,7 +163,7 @@ public class CheckCountUtil {
BigDecimal
K
=
getBigDecimal
(
resultMap
.
get
(
"K"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
//计算的核心公式结果
BigDecimal
countResult
=
TTiO2
.
multiply
(
VCuSO4_II
).
multiply
(
K
).
divide
(
m
);
BigDecimal
countResult
=
TTiO2
.
multiply
(
VCuSO4_II
).
multiply
(
K
).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -177,7 +177,7 @@ public class CheckCountUtil {
BigDecimal
m3
=
getBigDecimal
(
resultMap
.
get
(
"空白m3"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
//计算的核心公式结果
BigDecimal
countResult
=
m2
.
subtract
(
m1
).
subtract
(
m3
).
divide
(
m
).
multiply
(
new
BigDecimal
(
0.343
));
BigDecimal
countResult
=
m2
.
subtract
(
m1
).
subtract
(
m3
).
divide
(
m
,
4
).
multiply
(
new
BigDecimal
(
0.343
));
endResult
=
countResult
.
multiply
(
param100
);
}
else
if
(
name
.
equals
(
"K2O"
)){
BigDecimal
CK2O
=
getBigDecimal
(
resultMap
.
get
(
"CK2O"
));
...
...
@@ -185,7 +185,7 @@ public class CheckCountUtil {
BigDecimal
AK2O
=
getBigDecimal
(
resultMap
.
get
(
"AK2O"
));
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
));
//计算的核心公式结果
BigDecimal
countResult
=
CK2O
.
multiply
(
V
).
multiply
(
AK2O
).
divide
(
mR20
).
divide
(
param10000
);
BigDecimal
countResult
=
CK2O
.
multiply
(
V
).
multiply
(
AK2O
).
divide
(
mR20
,
4
).
divide
(
param10000
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -199,7 +199,7 @@ public class CheckCountUtil {
BigDecimal
ANa2O
=
getBigDecimal
(
resultMap
.
get
(
"ANa2O"
));
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
));
//计算的核心公式结果
BigDecimal
countResult
=
CNa2O
.
multiply
(
V
).
multiply
(
ANa2O
).
divide
(
mR20
).
divide
(
param10000
);
BigDecimal
countResult
=
CNa2O
.
multiply
(
V
).
multiply
(
ANa2O
).
divide
(
mR20
,
4
).
divide
(
param10000
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -213,7 +213,7 @@ public class CheckCountUtil {
BigDecimal
AMnO
=
getBigDecimal
(
resultMap
.
get
(
"AMnO"
));
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
));
//计算的核心公式结果
BigDecimal
countResult
=
CMnO
.
multiply
(
V
).
multiply
(
AMnO
).
divide
(
mR20
).
divide
(
param10000
);
BigDecimal
countResult
=
CMnO
.
multiply
(
V
).
multiply
(
AMnO
).
divide
(
mR20
,
4
).
divide
(
param10000
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -227,7 +227,7 @@ public class CheckCountUtil {
BigDecimal
V1
=
getBigDecimal
(
resultMap
.
get
(
"V1"
));
BigDecimal
mCl
=
getBigDecimal
(
resultMap
.
get
(
"样重Cl"
));
//计算的核心公式结果
BigDecimal
countResult
=
T
.
multiply
(
V2
.
subtract
(
V1
)).
divide
(
mCl
).
divide
(
param10
);
BigDecimal
countResult
=
T
.
multiply
(
V2
.
subtract
(
V1
)).
divide
(
mCl
,
4
).
divide
(
param10
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param1000
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
...
...
@@ -240,28 +240,28 @@ public class CheckCountUtil {
BigDecimal
MZ_M1
=
getBigDecimal
(
resultMap
.
get
(
"⽫重M1"
));
BigDecimal
SZ_M1
=
getBigDecimal
(
resultMap
.
get
(
"烧重M1"
));
//计算的核心公式结果
BigDecimal
countResult
=
YZ_M1
.
add
(
MZ_M1
).
subtract
(
SZ_M1
).
divide
(
YZ_M1
);
BigDecimal
countResult
=
YZ_M1
.
add
(
MZ_M1
).
subtract
(
SZ_M1
).
divide
(
YZ_M1
,
4
);
endResult
=
countResult
.
multiply
(
param100
);
}
else
if
(
name
.
equals
(
"Mad2"
)){
BigDecimal
YZ_M2
=
getBigDecimal
(
resultMap
.
get
(
"样重M2"
));
BigDecimal
MZ_M2
=
getBigDecimal
(
resultMap
.
get
(
"⽫重M2"
));
BigDecimal
SZ_M2
=
getBigDecimal
(
resultMap
.
get
(
"烧重M2"
));
//计算的核心公式结果
BigDecimal
countResult
=
YZ_M2
.
add
(
MZ_M2
).
subtract
(
SZ_M2
).
divide
(
YZ_M2
);
BigDecimal
countResult
=
YZ_M2
.
add
(
MZ_M2
).
subtract
(
SZ_M2
).
divide
(
YZ_M2
,
4
);
endResult
=
countResult
.
multiply
(
param100
);
}
else
if
(
name
.
equals
(
"Aad1"
)){
BigDecimal
SZ_A1
=
getBigDecimal
(
resultMap
.
get
(
"烧重A1"
));
BigDecimal
MZ_A1
=
getBigDecimal
(
resultMap
.
get
(
"⽫重A1"
));
BigDecimal
YZ_A1
=
getBigDecimal
(
resultMap
.
get
(
"样重A1"
));
//计算的核心公式结果
BigDecimal
countResult
=
SZ_A1
.
subtract
(
MZ_A1
).
divide
(
YZ_A1
);
BigDecimal
countResult
=
SZ_A1
.
subtract
(
MZ_A1
).
divide
(
YZ_A1
,
4
);
endResult
=
countResult
.
multiply
(
param100
);
}
else
if
(
name
.
equals
(
"Aad2"
)){
BigDecimal
SZ_A2
=
getBigDecimal
(
resultMap
.
get
(
"烧重A2"
));
BigDecimal
MZ_A2
=
getBigDecimal
(
resultMap
.
get
(
"⽫重A2"
));
BigDecimal
YZ_A2
=
getBigDecimal
(
resultMap
.
get
(
"样重A2"
));
//计算的核心公式结果
BigDecimal
countResult
=
SZ_A2
.
subtract
(
MZ_A2
).
divide
(
YZ_A2
);
BigDecimal
countResult
=
SZ_A2
.
subtract
(
MZ_A2
).
divide
(
YZ_A2
,
4
);
endResult
=
countResult
.
multiply
(
param100
);
}
else
if
(
name
.
equals
(
"焦渣"
)){
endResult
=
getBigDecimal
(
resultMap
.
get
(
"焦渣特征"
));
...
...
@@ -270,11 +270,7 @@ public class CheckCountUtil {
}
return
endResult
;
return
endResult
.
toString
();
}
/**
...
...
@@ -283,7 +279,7 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countSO3
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countSO3
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
weightSO3
=
getBigDecimal
(
countMap
.
get
(
"重量法_SO3"
));
BigDecimal
displaySO3
=
getBigDecimal
(
resultMap
.
get
(
"显示值"
));
BigDecimal
mSO3
=
getBigDecimal
(
resultMap
.
get
(
"样重SO3"
));
...
...
@@ -295,14 +291,14 @@ public class CheckCountUtil {
BigDecimal
count
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
BigDecimal
jsResult
=
weightSO3
.
compareTo
(
new
BigDecimal
(
0
))==
1
?
weightSO3:
elseResult
.
multiply
(
mSO3
).
divide
(
mSO3
);
weightSO3:
elseResult
.
multiply
(
mSO3
).
divide
(
mSO3
,
4
);
count
=
jsResult
.
setScale
(
3
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
BigDecimal
osResult
=
weightSO3
.
compareTo
(
new
BigDecimal
(
0
))==
1
?
weightSO3:
elseResult
.
multiply
(
mSO3
).
divide
(
mSO3
);
weightSO3:
elseResult
.
multiply
(
mSO3
).
divide
(
mSO3
,
4
);
count
=
osResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
3
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
count
;
return
count
.
toString
()
;
}
/**
...
...
@@ -310,11 +306,11 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countHL
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countHL
(
Map
<
String
,
String
>
countMap
)
{
List
<
String
>
list
=
new
ArrayList
<>();
list
.
add
(
countMap
.
get
(
"L.O.I"
).
toString
());
list
.
add
(
countMap
.
get
(
"SiO2"
).
toString
());
list
.
add
(
countMap
.
get
(
"Al2O3+TiO2"
).
toString
());
//
list.add(countMap.get("Al2O3+TiO2").toString());
list
.
add
(
countMap
.
get
(
"Al2O3"
).
toString
());
list
.
add
(
countMap
.
get
(
"Fe2O3"
).
toString
());
list
.
add
(
countMap
.
get
(
"CaO"
).
toString
());
...
...
@@ -328,7 +324,7 @@ public class CheckCountUtil {
for
(
String
s:
list
)
{
count
=
count
.
add
(
new
BigDecimal
(
s
));
}
return
count
;
return
count
.
toString
()
;
}
/**
...
...
@@ -336,14 +332,14 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countKH
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countKH
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
CaO
=
getBigDecimal
(
countMap
.
get
(
"Cao"
));
BigDecimal
Al2O3_TiO2
=
getBigDecimal
(
countMap
.
get
(
"Al2O3+TiO2"
));
BigDecimal
Fe2O3
=
getBigDecimal
(
countMap
.
get
(
"Fe2O3"
));
BigDecimal
SiO2
=
getBigDecimal
(
countMap
.
get
(
"SiO2"
));
BigDecimal
KH
=
CaO
.
subtract
(
new
BigDecimal
(
1.65
).
multiply
(
Al2O3_TiO2
)).
subtract
(
new
BigDecimal
(
0.35
).
multiply
(
Fe2O3
)).
divide
(
new
BigDecimal
(
2.8
)
).
divide
(
SiO2
);
return
KH
;
CaO
.
subtract
(
new
BigDecimal
(
1.65
).
multiply
(
Al2O3_TiO2
)).
subtract
(
new
BigDecimal
(
0.35
).
multiply
(
Fe2O3
)).
divide
(
new
BigDecimal
(
2.8
)
,
4
).
divide
(
SiO2
,
4
);
return
KH
.
toString
()
;
}
/**
...
...
@@ -351,12 +347,12 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countSM
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countSM
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
SiO2
=
getBigDecimal
(
countMap
.
get
(
"SiO2"
));
BigDecimal
Al2O3_TiO2
=
getBigDecimal
(
countMap
.
get
(
"Al2O3+TiO2"
));
BigDecimal
Fe2O3
=
getBigDecimal
(
countMap
.
get
(
"Fe2O3"
));
BigDecimal
SM
=
SiO2
.
divide
(
Al2O3_TiO2
.
add
(
Fe2O3
));
return
SM
;
BigDecimal
SM
=
SiO2
.
divide
(
Al2O3_TiO2
.
add
(
Fe2O3
)
,
4
);
return
SM
.
toString
()
;
}
/**
...
...
@@ -364,11 +360,11 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countAM
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countAM
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Al2O3_TiO2
=
getBigDecimal
(
countMap
.
get
(
"Al2O3+TiO2"
));
BigDecimal
Fe2O3
=
getBigDecimal
(
countMap
.
get
(
"Fe2O3"
));
BigDecimal
AM
=
Al2O3_TiO2
.
divide
(
Fe2O3
);
return
AM
;
BigDecimal
AM
=
Al2O3_TiO2
.
divide
(
Fe2O3
,
4
);
return
AM
.
toString
()
;
}
/**
...
...
@@ -377,7 +373,7 @@ public class CheckCountUtil {
* @param countMap 输出集合
* @return
*/
public
static
String
countBurnupLevel
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countBurnupLevel
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
fCaO_1450
=
getBigDecimal
(
resultMap
.
get
(
"fCaO_1450"
));
BigDecimal
KH
=
getBigDecimal
(
countMap
.
get
(
"KH"
));
BigDecimal
E
=
new
BigDecimal
(
45
).
multiply
(
KH
).
subtract
(
new
BigDecimal
(
37.4
));
...
...
@@ -402,12 +398,12 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countBCMad
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countBCMad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Mad1
=
getBigDecimal
(
countMap
.
get
(
"Mad1"
));
BigDecimal
Mad2
=
getBigDecimal
(
countMap
.
get
(
"Mad2"
));
//计算Mad1 和 Mad2 的平均值
BigDecimal
BC_Mad
=
Mad1
.
add
(
Mad2
).
divide
(
new
BigDecimal
(
2
));
return
BC_Mad
;
BigDecimal
BC_Mad
=
Mad1
.
add
(
Mad2
).
divide
(
new
BigDecimal
(
2
)
,
4
);
return
BC_Mad
.
toString
()
;
}
/**
...
...
@@ -415,7 +411,7 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countMad
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countMad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
//判断奇偶数的最终值
BigDecimal
result1
=
BC_Mad
.
multiply
(
param100
);
...
...
@@ -426,7 +422,7 @@ public class CheckCountUtil {
}
else
{
Mad
=
BC_Mad
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
Mad
;
return
Mad
.
toString
()
;
}
/**
...
...
@@ -434,12 +430,12 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countBCAad
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countBCAad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Aad1
=
getBigDecimal
(
countMap
.
get
(
"Aad1"
));
BigDecimal
Aad2
=
getBigDecimal
(
countMap
.
get
(
"Aad2"
));
//计算Mad1 和 Mad2 的平均值
BigDecimal
BC_Aad
=
Aad1
.
add
(
Aad2
).
divide
(
new
BigDecimal
(
2
));
return
BC_Aad
;
BigDecimal
BC_Aad
=
Aad1
.
add
(
Aad2
).
divide
(
new
BigDecimal
(
2
)
,
4
);
return
BC_Aad
.
toString
()
;
}
/**
...
...
@@ -447,7 +443,7 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countAad
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countAad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
BC_Aad
=
getBigDecimal
(
countMap
.
get
(
"报出_Aad"
));
//判断奇偶数的最终值
BigDecimal
result1
=
BC_Aad
.
multiply
(
param100
);
...
...
@@ -458,7 +454,7 @@ public class CheckCountUtil {
}
else
{
Aad
=
BC_Aad
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
Aad
;
return
Aad
.
toString
()
;
}
/**
...
...
@@ -467,15 +463,15 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countVad1
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countVad1
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
YZ_V1
=
getBigDecimal
(
resultMap
.
get
(
"样重V1"
));
BigDecimal
MZ_V1
=
getBigDecimal
(
resultMap
.
get
(
"皿重V1"
));
BigDecimal
SZ_V1
=
getBigDecimal
(
resultMap
.
get
(
"烧重V1"
));
BigDecimal
BC_Mad
=
getBigDecimal
(
resul
tMap
.
get
(
"报出_Mad"
));
BigDecimal
BC_Mad
=
getBigDecimal
(
coun
tMap
.
get
(
"报出_Mad"
));
//计算的核心公式结果
BigDecimal
countResult
=
YZ_V1
.
add
(
MZ_V1
).
subtract
(
SZ_V1
).
divide
(
YZ_V1
);
BigDecimal
countResult
=
YZ_V1
.
add
(
MZ_V1
).
subtract
(
SZ_V1
).
divide
(
YZ_V1
,
4
);
BigDecimal
count
=
countResult
.
multiply
(
param100
).
subtract
(
BC_Mad
);
return
count
;
return
count
.
toString
()
;
}
/**
...
...
@@ -484,15 +480,15 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countVad2
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countVad2
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
YZ_V2
=
getBigDecimal
(
resultMap
.
get
(
"样重V2"
));
BigDecimal
MZ_V2
=
getBigDecimal
(
resultMap
.
get
(
"皿重V2"
));
BigDecimal
SZ_V2
=
getBigDecimal
(
resultMap
.
get
(
"烧重V2"
));
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
//计算的核心公式结果
BigDecimal
countResult
=
YZ_V2
.
add
(
MZ_V2
).
subtract
(
SZ_V2
).
divide
(
YZ_V2
);
BigDecimal
countResult
=
YZ_V2
.
add
(
MZ_V2
).
subtract
(
SZ_V2
).
divide
(
YZ_V2
,
4
);
BigDecimal
count
=
countResult
.
multiply
(
param100
).
subtract
(
BC_Mad
);
return
count
;
return
count
.
toString
()
;
}
/**
...
...
@@ -500,12 +496,12 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countBCVad
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countBCVad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Vad1
=
getBigDecimal
(
countMap
.
get
(
"Vad1"
));
BigDecimal
Vad2
=
getBigDecimal
(
countMap
.
get
(
"Vad2"
));
//计算Vad1 和 Vad2 的平均值
BigDecimal
BC_Vad
=
Vad1
.
add
(
Vad2
).
divide
(
new
BigDecimal
(
2
));
return
BC_Vad
;
BigDecimal
BC_Vad
=
Vad1
.
add
(
Vad2
).
divide
(
new
BigDecimal
(
2
)
,
4
);
return
BC_Vad
.
toString
()
;
}
/**
...
...
@@ -513,7 +509,7 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countVad
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countVad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
BC_Vad
=
getBigDecimal
(
countMap
.
get
(
"报出_Vad"
));
//判断奇偶数的最终值
BigDecimal
result1
=
BC_Vad
.
multiply
(
param100
);
...
...
@@ -524,7 +520,7 @@ public class CheckCountUtil {
}
else
{
Vad
=
BC_Vad
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
Vad
;
return
Vad
.
toString
()
;
}
/**
...
...
@@ -532,12 +528,12 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countVdaf
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countVdaf
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Vad
=
getBigDecimal
(
countMap
.
get
(
"Vad"
));
BigDecimal
Mad
=
getBigDecimal
(
countMap
.
get
(
"Mad"
));
BigDecimal
Aad
=
getBigDecimal
(
countMap
.
get
(
"Aad"
));
BigDecimal
Vdaf
=
Vad
.
multiply
(
param100
).
multiply
(
param100
.
subtract
(
Mad
).
subtract
(
Aad
));
return
Vdaf
;
return
Vdaf
.
toString
()
;
}
/**
...
...
@@ -545,7 +541,7 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countK1_
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countK1_
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Vdaf
=
getBigDecimal
(
countMap
.
get
(
"Vdaf"
));
BigDecimal
K1_
=
Vdaf
.
compareTo
(
new
BigDecimal
(
62
))==
1
?
new
BigDecimal
(
61.5
):(
...
...
@@ -555,7 +551,7 @@ public class CheckCountUtil {
Vdaf
.
compareTo
(
new
BigDecimal
(
37
))==
1
?
new
BigDecimal
(
68.5
):
new
BigDecimal
(
0
)
))));
return
K1_
;
return
K1_
.
toString
()
;
}
/**
...
...
@@ -564,7 +560,7 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
String
countK
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countK
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
String
JZTZ
=
resultMap
.
get
(
"焦渣特征"
).
toString
();
BigDecimal
Vdaf
=
getBigDecimal
(
countMap
.
get
(
"Vdaf"
));
//获取焦渣特征序号对应的值
...
...
@@ -612,10 +608,10 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
Integer
countVdafPD
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countVdafPD
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Vdaf
=
getBigDecimal
(
countMap
.
get
(
"Vdaf"
));
Integer
VdafPD
=
Vdaf
.
compareTo
(
new
BigDecimal
(
35
))==-
1
?
1
:
0
;
return
VdafPD
;
return
VdafPD
.
toString
()
;
}
/**
...
...
@@ -623,10 +619,10 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
Integer
countMadPD
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countMadPD
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
Integer
MadPD
=
BC_Mad
.
compareTo
(
new
BigDecimal
(
3
))==
1
?
1
:
0
;
return
MadPD
;
return
MadPD
.
toString
()
;
}
/**
...
...
@@ -634,11 +630,11 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
count40Mad0Or1
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
count40Mad0Or1
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
VdafPD
=
getBigDecimal
(
countMap
.
get
(
"Vdaf判断"
));
BigDecimal
MadPD
=
getBigDecimal
(
countMap
.
get
(
"Mad判断"
));
BigDecimal
count
=
VdafPD
.
multiply
(
MadPD
);
return
count
;
return
count
.
toString
()
;
}
/**
...
...
@@ -646,11 +642,11 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countAd
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countAd
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
BC_Aad
=
getBigDecimal
(
countMap
.
get
(
"报出_Aad"
));
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
BigDecimal
count
=
BC_Aad
.
multiply
(
param100
).
divide
(
param100
.
subtract
(
BC_Mad
));
return
count
;
BigDecimal
count
=
BC_Aad
.
multiply
(
param100
).
divide
(
param100
.
subtract
(
BC_Mad
)
,
4
);
return
count
.
toString
()
;
}
/**
...
...
@@ -658,14 +654,14 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countAdXS
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countAdXS
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Ad
=
getBigDecimal
(
countMap
.
get
(
"Ad"
));
BigDecimal
count
=
Ad
.
compareTo
(
new
BigDecimal
(
20
))==
1
?
new
BigDecimal
(
0.1
):
new
BigDecimal
(
0
);
return
count
;
return
count
.
toString
()
;
}
public
static
BigDecimal
countVdafXS
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countVdafXS
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Ad
=
getBigDecimal
(
countMap
.
get
(
"Ad"
));
BigDecimal
count
=
Ad
.
compareTo
(
new
BigDecimal
(
30
))==
1
?
new
BigDecimal
(
0.8
):(
...
...
@@ -675,7 +671,7 @@ public class CheckCountUtil {
Ad
.
compareTo
(
new
BigDecimal
(
10
))==
1
?
new
BigDecimal
(
0.9
):
new
BigDecimal
(
0.95
)
))));
return
count
;
return
count
.
toString
()
;
}
/**
...
...
@@ -683,13 +679,13 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countV_daf
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countV_daf
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
VdafXS
=
getBigDecimal
(
countMap
.
get
(
"Vdaf系数0.8~0.95"
));
BigDecimal
Vdaf
=
getBigDecimal
(
countMap
.
get
(
"Vdaf"
));
BigDecimal
AdXS
=
getBigDecimal
(
countMap
.
get
(
"Ad系数0.1或0"
));
BigDecimal
Ad
=
getBigDecimal
(
countMap
.
get
(
"Ad"
));
BigDecimal
count
=
VdafXS
.
multiply
(
Vdaf
).
subtract
(
AdXS
.
multiply
(
Ad
));
return
count
;
return
count
.
toString
()
;
}
/**
...
...
@@ -697,7 +693,7 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countK0_
(
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countK0_
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
V_daf
=
getBigDecimal
(
countMap
.
get
(
"V,daf"
));
BigDecimal
count
=
V_daf
.
compareTo
(
new
BigDecimal
(
8
))==
1
?
new
BigDecimal
(
8500
):(
...
...
@@ -705,7 +701,7 @@ public class CheckCountUtil {
V_daf
.
compareTo
(
new
BigDecimal
(
3
))==
1
?
new
BigDecimal
(
8300
):
new
BigDecimal
(
8200
)
));
return
count
;
return
count
.
toString
()
;
}
/**
...
...
@@ -713,7 +709,7 @@ public class CheckCountUtil {
* @param countMap
* @return
*/
public
static
BigDecimal
countQnet_adMJ_kg
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
Object
>
countMap
)
{
public
static
String
countQnet_adMJ_kg
(
Map
<
String
,
Object
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
YWH_123
=
getBigDecimal
(
resultMap
.
get
(
"烟无褐123"
));
BigDecimal
K1_
=
getBigDecimal
(
countMap
.
get
(
"K1,"
));
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
...
...
@@ -735,8 +731,8 @@ public class CheckCountUtil {
.
subtract
(
new
BigDecimal
(
92
).
multiply
(
BC_Aad
))
.
subtract
(
new
BigDecimal
(
24
).
multiply
(
BC_Vad
));
}
BigDecimal
count
=
value
.
multiply
(
new
BigDecimal
(
4.1816
)).
divide
(
param1000
);
return
count
;
BigDecimal
count
=
value
.
multiply
(
new
BigDecimal
(
4.1816
)).
divide
(
param1000
,
4
);
return
count
.
toString
()
;
}
/**
...
...
@@ -774,8 +770,8 @@ public class CheckCountUtil {
Math
.
pow
(
80
,
0.23
)*
Math
.
pow
(
G
,
0.82
)*(
10
/(
Math
.
pow
(
P80
,
0.5
)-
10
/
Math
.
pow
(
F80
,
0.5
)));
BigDecimal
result1
=
new
BigDecimal
(
countResult
);
BigDecimal
value1
=
new
BigDecimal
(
176.2
).
divide
(
result1
).
subtract
(
new
BigDecimal
(
3.6
).
multiply
(
new
BigDecimal
(
P80
))).
abs
();
BigDecimal
value2
=
YMX_MJ_t
.
divide
(
YMX_kWh_t
);
new
BigDecimal
(
176.2
).
divide
(
result1
,
4
).
subtract
(
new
BigDecimal
(
3.6
).
multiply
(
new
BigDecimal
(
P80
))).
abs
();
BigDecimal
value2
=
YMX_MJ_t
.
divide
(
YMX_kWh_t
,
4
);
if
(
value1
.
compareTo
(
new
BigDecimal
(
0.5
)
)
==
-
1
&&
value2
.
compareTo
(
new
BigDecimal
(
3.5
))
==
1
&&
value2
.
compareTo
(
new
BigDecimal
(
3.7
))
==
-
1
){
...
...
@@ -785,9 +781,26 @@ public class CheckCountUtil {
}
}
/**
* 计算平行数
* @param mainResult 主样数据
* @param secondaryResult 次样数据
* @return
*/
public
static
String
countParallel
(
String
mainResult
,
String
secondaryResult
)
{
BigDecimal
main
=
getBigDecimal
(
mainResult
);
BigDecimal
secondary
=
getBigDecimal
(
secondaryResult
);
BigDecimal
aveCount
=
main
.
add
(
secondary
).
divide
(
new
BigDecimal
(
2
),
2
);
BigDecimal
result1
=
aveCount
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
BigDecimal
endResult
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
endResult
=
aveCount
.
multiply
(
param100
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
endResult
=
aveCount
.
multiply
(
param100
).
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
endResult
.
toString
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment