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
2bccf2fa
Commit
2bccf2fa
authored
Oct 30, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
校核计算 测试完成 加上校验版本
parent
03f25c1d
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
769 additions
and
494 deletions
+769
-494
TokenFilter.java
...n/java/cn/wise/sc/cement/business/filter/TokenFilter.java
+1
-1
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+21
-19
WeiXinService.java
...n/wise/sc/cement/business/service/impl/WeiXinService.java
+6
-6
CheckCountUtil.java
.../java/cn/wise/sc/cement/business/util/CheckCountUtil.java
+732
-459
Global.java
...n/java/cn/wise/sc/cement/business/util/weixin/Global.java
+6
-6
application.yml
cement-business/src/main/resources/application.yml
+2
-2
fastdfs-client.properties
cement-business/src/main/resources/fastdfs-client.properties
+1
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/filter/TokenFilter.java
View file @
2bccf2fa
...
...
@@ -25,7 +25,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
@Component
public
class
TokenFilter
extends
OncePerRequestFilter
{
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
"
WeiXinService
"
);
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
"
TokenFilter
"
);
public
static
final
String
TOKEN_KEY
=
"Authorization"
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
2bccf2fa
...
...
@@ -265,10 +265,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
for
(
String
teamId
:
teamIdS
)
{
Team
team
=
teamMapper
.
selectById
(
Integer
.
valueOf
(
teamId
));
if
(
team
!=
null
)
{
if
(!
teamNameList
.
contains
(
teamId
)){
charge
=
charge
.
compareTo
(
BigDecimal
.
ZERO
)
==
0
?
team
.
getCharge
()
:
(
charge
.
add
(
team
.
getCharge
()));
teamNameList
.
add
(
team
.
getName
());
}
}
}
//选择Mg必须选择Ca;选择Al必须选择Fe
if
(
teamNameList
.
contains
(
"MgO"
)){
if
(!
teamNameList
.
contains
(
"CaO"
)){
...
...
@@ -2722,7 +2724,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
else
if
(
j
==
10
)
{
obj
=
checkMethodStr
;
}
else
{
obj
=
m
.
get
(
headers
[
j
])
.
toString
()
;
obj
=
m
.
get
(
headers
[
j
])
!=
null
?
m
.
get
(
headers
[
j
]).
toString
()
:
""
;
//如果序号带小数点 去除.0,保留整数
if
(
j
==
0
)
{
obj
=
obj
.
split
(
"\\."
)[
0
];
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java
View file @
2bccf2fa
...
...
@@ -47,7 +47,7 @@ public class WeiXinService {
System
.
out
.
println
(
"==================code==================="
);
System
.
out
.
println
(
code
);
try
{
String
accessToken
=
null
;
/*
String accessToken = null;
if (type.equals("PC")) {
accessToken = getAccessToken();
} else if (type.equals("APP")) {
...
...
@@ -64,10 +64,10 @@ public class WeiXinService {
String UserId = jsonObject.getString("UserId");
System.out.println("==================UserId===================");
System.out.println(UserId);
JSONObject
userJson
=
getUser
(
accessToken
,
UserId
);
JSONObject userJson = getUser(accessToken, UserId);
*/
QueryWrapper
<
SysUser
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
"phone"
,
userJson
.
get
(
"mobile"
));
//
wrapper.eq("phone", code); //暂时用手机号代替code
//
wrapper.eq("phone", userJson.get("mobile"));
wrapper
.
eq
(
"phone"
,
code
);
//暂时用手机号代替code
SysUser
sysUser
=
userService
.
getOne
(
wrapper
);
if
(
sysUser
==
null
)
{
return
BaseResponse
.
errorMsg
(
"非系统用户不允许登录!"
);
...
...
@@ -83,8 +83,8 @@ public class WeiXinService {
sysUser
.
getName
(),
sysUser
.
getPhone
());
System
.
out
.
println
(
token
);
redisUtil
.
setString
(
sysUser
.
getId
().
toString
(),
token
,
3600
);
sysUser
.
setWxId
(
UserId
);
userService
.
updateById
(
sysUser
);
//
sysUser.setWxId(UserId);
//
userService.updateById(sysUser);
return
BaseResponse
.
okData
(
token
);
}
catch
(
Exception
e
)
{
return
BaseResponse
.
errorMsg
(
e
.
getMessage
());
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java
View file @
2bccf2fa
package
cn
.
wise
.
sc
.
cement
.
business
.
util
;
import
com.sun.org.apache.bcel.internal.generic.RETURN
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.http.cookie.SM
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
import
org.apache.poi.ss.formula.functions.T
;
import
org.apache.poi.ss.usermodel.*
;
...
...
@@ -31,7 +33,7 @@ public class CheckCountUtil {
//object 转成 BigDecimal
public
static
BigDecimal
getBigDecimal
(
Object
value
)
{
BigDecimal
ret
=
null
;
if
(
value
!=
null
)
{
if
(
value
!=
null
&&
!
value
.
equals
(
""
)
)
{
if
(
value
instanceof
BigDecimal
)
{
ret
=
(
BigDecimal
)
value
;
}
else
if
(
value
instanceof
String
)
{
...
...
@@ -56,12 +58,15 @@ public class CheckCountUtil {
public
static
String
checkCount
(
String
name
,
Map
<
String
,
String
>
resultMap
)
{
BigDecimal
endResult
=
null
;
if
(
name
.
equals
(
"L.O.I"
)){
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m1"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"空堝重m2"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"烧后重m3"
))){
//样重m1—保留4位⼩数
BigDecimal
m1
=
getBigDecimal
(
resultMap
.
get
(
"样重m1"
)).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
);
BigDecimal
m1
=
getBigDecimal
(
resultMap
.
get
(
"样重m1"
).
trim
(
)).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
);
//空堝重m2—保留4位⼩数
BigDecimal
m2
=
getBigDecimal
(
resultMap
.
get
(
"空堝重m2"
)).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
);
BigDecimal
m2
=
getBigDecimal
(
resultMap
.
get
(
"空堝重m2"
).
trim
(
)).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
);
//烧后重m3—保留4位⼩数
BigDecimal
m3
=
getBigDecimal
(
resultMap
.
get
(
"烧后重m3"
)).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
);
BigDecimal
m3
=
getBigDecimal
(
resultMap
.
get
(
"烧后重m3"
).
trim
(
)).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
);
//计算的核心公式结果
BigDecimal
countResult
=
(
m1
.
add
(
m2
).
subtract
(
m3
)).
divide
(
m1
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
.
multiply
(
param100
));
...
...
@@ -71,13 +76,17 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
multiply
(
param100
).
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"SiO2"
)){
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VSiO2"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"TSiO2"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m"
))){
//毫升数
BigDecimal
VSiO2
=
getBigDecimal
(
resultMap
.
get
(
"VSiO2"
));
BigDecimal
VSiO2
=
getBigDecimal
(
resultMap
.
get
(
"VSiO2"
).
trim
(
));
//滴定度
BigDecimal
TSiO2
=
getBigDecimal
(
resultMap
.
get
(
"TSiO2"
));
BigDecimal
TSiO2
=
getBigDecimal
(
resultMap
.
get
(
"TSiO2"
).
trim
(
));
//样m
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
).
trim
(
));
//计算的核心公式结果
BigDecimal
countResult
=
VSiO2
.
multiply
(
TSiO2
).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -87,12 +96,19 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"Al2O3+TiO2"
)){
BigDecimal
TAl2O3
=
getBigDecimal
(
resultMap
.
get
(
"TAl2O3"
));
BigDecimal
VAl2O3
=
getBigDecimal
(
resultMap
.
get
(
"VAl2O3"
));
BigDecimal
K
=
getBigDecimal
(
resultMap
.
get
(
"K"
));
BigDecimal
VCuSO4_I
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(I)"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"TAl2O3"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VAl2O3"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"K"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VCuSO4(I)"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m"
))
){
BigDecimal
TAl2O3
=
getBigDecimal
(
resultMap
.
get
(
"TAl2O3"
).
trim
());
BigDecimal
VAl2O3
=
getBigDecimal
(
resultMap
.
get
(
"VAl2O3"
).
trim
());
BigDecimal
K
=
getBigDecimal
(
resultMap
.
get
(
"K"
).
trim
());
BigDecimal
VCuSO4_I
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(I)"
).
trim
());
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
TAl2O3
.
multiply
(
VAl2O3
.
subtract
(
K
.
multiply
(
VCuSO4_I
))).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -102,13 +118,21 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"Al2O3"
)){
BigDecimal
TAl2O3
=
getBigDecimal
(
resultMap
.
get
(
"TAl2O3"
));
BigDecimal
VAl2O3
=
getBigDecimal
(
resultMap
.
get
(
"VAl2O3"
));
BigDecimal
K
=
getBigDecimal
(
resultMap
.
get
(
"K"
));
BigDecimal
VCuSO4_I
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(I)"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
BigDecimal
VCuSO4_II
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(II)"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"TAl2O3"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VAl2O3"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"K"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VCuSO4(I)"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VCuSO4(II)"
))
){
BigDecimal
TAl2O3
=
getBigDecimal
(
resultMap
.
get
(
"TAl2O3"
).
trim
());
BigDecimal
VAl2O3
=
getBigDecimal
(
resultMap
.
get
(
"VAl2O3"
).
trim
());
BigDecimal
K
=
getBigDecimal
(
resultMap
.
get
(
"K"
).
trim
());
BigDecimal
VCuSO4_I
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(I)"
).
trim
());
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
).
trim
());
BigDecimal
VCuSO4_II
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(II)"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
TAl2O3
.
multiply
(
VAl2O3
.
subtract
(
K
.
multiply
(
VCuSO4_I
.
add
(
VCuSO4_II
)))).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -118,10 +142,16 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"Fe2O3"
)){
BigDecimal
TFe2O3
=
getBigDecimal
(
resultMap
.
get
(
"TFe2O3"
));
BigDecimal
VF2O3
=
getBigDecimal
(
resultMap
.
get
(
"VF2O3"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"TFe2O3"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VF2O3"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m"
))
){
BigDecimal
TFe2O3
=
getBigDecimal
(
resultMap
.
get
(
"TFe2O3"
).
trim
());
BigDecimal
VF2O3
=
getBigDecimal
(
resultMap
.
get
(
"VF2O3"
).
trim
());
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
TFe2O3
.
multiply
(
VF2O3
).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -131,10 +161,15 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"CaO"
)){
BigDecimal
TCaO
=
getBigDecimal
(
resultMap
.
get
(
"TCaO"
));
BigDecimal
VCaO
=
getBigDecimal
(
resultMap
.
get
(
"VCaO"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"TCaO"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VCaO"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m"
))
){
BigDecimal
TCaO
=
getBigDecimal
(
resultMap
.
get
(
"TCaO"
).
trim
());
BigDecimal
VCaO
=
getBigDecimal
(
resultMap
.
get
(
"VCaO"
).
trim
());
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
TCaO
.
multiply
(
VCaO
).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -144,11 +179,17 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"MgO"
)){
BigDecimal
TMgO
=
getBigDecimal
(
resultMap
.
get
(
"TMgO"
));
BigDecimal
VMgO
=
getBigDecimal
(
resultMap
.
get
(
"VMgO"
));
BigDecimal
VCaO
=
getBigDecimal
(
resultMap
.
get
(
"VCaO"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"TMgO"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VMgO"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VCaO"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m"
))
){
BigDecimal
TMgO
=
getBigDecimal
(
resultMap
.
get
(
"TMgO"
).
trim
());
BigDecimal
VMgO
=
getBigDecimal
(
resultMap
.
get
(
"VMgO"
).
trim
());
BigDecimal
VCaO
=
getBigDecimal
(
resultMap
.
get
(
"VCaO"
).
trim
());
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
TMgO
.
multiply
(
VMgO
.
subtract
(
VCaO
)).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -158,11 +199,17 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"TiO2"
)){
BigDecimal
TTiO2
=
getBigDecimal
(
resultMap
.
get
(
"TTiO2"
));
BigDecimal
VCuSO4_II
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(II)"
));
BigDecimal
K
=
getBigDecimal
(
resultMap
.
get
(
"K"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"TTiO2"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"VCuSO4(II)"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"K"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m"
))
){
BigDecimal
TTiO2
=
getBigDecimal
(
resultMap
.
get
(
"TTiO2"
).
trim
());
BigDecimal
VCuSO4_II
=
getBigDecimal
(
resultMap
.
get
(
"VCuSO4(II)"
).
trim
());
BigDecimal
K
=
getBigDecimal
(
resultMap
.
get
(
"K"
).
trim
());
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
TTiO2
.
multiply
(
VCuSO4_II
).
multiply
(
K
).
divide
(
m
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -172,19 +219,32 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"重量法_SO3"
)){
BigDecimal
m2
=
getBigDecimal
(
resultMap
.
get
(
"烧重m2"
));
BigDecimal
m1
=
getBigDecimal
(
resultMap
.
get
(
"埚重m1"
));
BigDecimal
m3
=
getBigDecimal
(
resultMap
.
get
(
"空白m3"
));
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"烧重m2"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"埚重m1"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"空白m3"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重m"
))
){
BigDecimal
m2
=
getBigDecimal
(
resultMap
.
get
(
"烧重m2"
).
trim
());
BigDecimal
m1
=
getBigDecimal
(
resultMap
.
get
(
"埚重m1"
).
trim
());
BigDecimal
m3
=
getBigDecimal
(
resultMap
.
get
(
"空白m3"
).
trim
());
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
m2
.
subtract
(
m1
).
subtract
(
m3
).
divide
(
m
,
4
).
multiply
(
new
BigDecimal
(
0.343
));
endResult
=
countResult
.
multiply
(
param100
).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
else
if
(
name
.
equals
(
"K2O"
)){
BigDecimal
CK2O
=
getBigDecimal
(
resultMap
.
get
(
"CK2O"
));
BigDecimal
V
=
getBigDecimal
(
resultMap
.
get
(
"V"
));
BigDecimal
AK2O
=
getBigDecimal
(
resultMap
.
get
(
"AK2O"
));
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"CK2O"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"V"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"AK2O"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重R2O"
))
){
BigDecimal
CK2O
=
getBigDecimal
(
resultMap
.
get
(
"CK2O"
).
trim
());
BigDecimal
V
=
getBigDecimal
(
resultMap
.
get
(
"V"
).
trim
());
BigDecimal
AK2O
=
getBigDecimal
(
resultMap
.
get
(
"AK2O"
).
trim
());
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
CK2O
.
multiply
(
V
).
multiply
(
AK2O
).
divide
(
mR20
,
4
).
divide
(
param10000
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -194,11 +254,17 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"Na2O"
)){
BigDecimal
CNa2O
=
getBigDecimal
(
resultMap
.
get
(
"CNa2O"
));
BigDecimal
V
=
getBigDecimal
(
resultMap
.
get
(
"V"
));
BigDecimal
ANa2O
=
getBigDecimal
(
resultMap
.
get
(
"ANa2O"
));
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"CNa2O"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"V"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"ANa2O"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重R2O"
))
){
BigDecimal
CNa2O
=
getBigDecimal
(
resultMap
.
get
(
"CNa2O"
).
trim
());
BigDecimal
V
=
getBigDecimal
(
resultMap
.
get
(
"V"
).
trim
());
BigDecimal
ANa2O
=
getBigDecimal
(
resultMap
.
get
(
"ANa2O"
).
trim
());
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
CNa2O
.
multiply
(
V
).
multiply
(
ANa2O
).
divide
(
mR20
,
4
).
divide
(
param10000
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -208,11 +274,18 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"MnO"
)){
BigDecimal
CMnO
=
getBigDecimal
(
resultMap
.
get
(
"CMnO"
));
BigDecimal
V
=
getBigDecimal
(
resultMap
.
get
(
"V"
));
BigDecimal
AMnO
=
getBigDecimal
(
resultMap
.
get
(
"AMnO"
));
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"CMnO"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"V"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"AMnO"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重R2O"
))
){
BigDecimal
CMnO
=
getBigDecimal
(
resultMap
.
get
(
"CMnO"
).
trim
());
BigDecimal
V
=
getBigDecimal
(
resultMap
.
get
(
"V"
).
trim
());
BigDecimal
AMnO
=
getBigDecimal
(
resultMap
.
get
(
"AMnO"
).
trim
());
BigDecimal
mR20
=
getBigDecimal
(
resultMap
.
get
(
"样重R2O"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
CMnO
.
multiply
(
V
).
multiply
(
AMnO
).
divide
(
mR20
,
4
).
divide
(
param10000
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param100
);
...
...
@@ -222,11 +295,18 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"Cl"
)){
BigDecimal
T
=
getBigDecimal
(
resultMap
.
get
(
"T"
));
BigDecimal
V2
=
getBigDecimal
(
resultMap
.
get
(
"V2"
));
BigDecimal
V1
=
getBigDecimal
(
resultMap
.
get
(
"V1"
));
BigDecimal
mCl
=
getBigDecimal
(
resultMap
.
get
(
"样重Cl"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"T"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"V2"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"V1"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重Cl"
))
){
BigDecimal
T
=
getBigDecimal
(
resultMap
.
get
(
"T"
).
trim
());
BigDecimal
V2
=
getBigDecimal
(
resultMap
.
get
(
"V2"
).
trim
());
BigDecimal
V1
=
getBigDecimal
(
resultMap
.
get
(
"V1"
).
trim
());
BigDecimal
mCl
=
getBigDecimal
(
resultMap
.
get
(
"样重Cl"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
T
.
multiply
(
V2
.
subtract
(
V1
)).
divide
(
mCl
,
4
).
divide
(
param10
,
4
);
BigDecimal
result1
=
countResult
.
multiply
(
param1000
);
...
...
@@ -236,42 +316,73 @@ public class CheckCountUtil {
}
else
{
endResult
=
countResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
3
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
}
else
if
(
name
.
equals
(
"Mad1"
)){
BigDecimal
YZ_M1
=
getBigDecimal
(
resultMap
.
get
(
"样重M1"
));
BigDecimal
MZ_M1
=
getBigDecimal
(
resultMap
.
get
(
"皿重M1"
));
BigDecimal
SZ_M1
=
getBigDecimal
(
resultMap
.
get
(
"烧重M1"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重M1"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"皿重M1"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"烧重M1"
))
){
BigDecimal
YZ_M1
=
getBigDecimal
(
resultMap
.
get
(
"样重M1"
).
trim
());
BigDecimal
MZ_M1
=
getBigDecimal
(
resultMap
.
get
(
"皿重M1"
).
trim
());
BigDecimal
SZ_M1
=
getBigDecimal
(
resultMap
.
get
(
"烧重M1"
).
trim
());
//计算的核心公式结果
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"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重M2"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"皿重M2"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"烧重M2"
))
){
BigDecimal
YZ_M2
=
getBigDecimal
(
resultMap
.
get
(
"样重M2"
).
trim
());
BigDecimal
MZ_M2
=
getBigDecimal
(
resultMap
.
get
(
"皿重M2"
).
trim
());
BigDecimal
SZ_M2
=
getBigDecimal
(
resultMap
.
get
(
"烧重M2"
).
trim
());
//计算的核心公式结果
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"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"烧重A1"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"皿重A1"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重A1"
))
){
BigDecimal
SZ_A1
=
getBigDecimal
(
resultMap
.
get
(
"烧重A1"
).
trim
());
BigDecimal
MZ_A1
=
getBigDecimal
(
resultMap
.
get
(
"皿重A1"
).
trim
());
BigDecimal
YZ_A1
=
getBigDecimal
(
resultMap
.
get
(
"样重A1"
).
trim
());
//计算的核心公式结果
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"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"烧重A2"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"皿重A2"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重A2"
))
){
BigDecimal
SZ_A2
=
getBigDecimal
(
resultMap
.
get
(
"烧重A2"
).
trim
());
BigDecimal
MZ_A2
=
getBigDecimal
(
resultMap
.
get
(
"皿重A2"
).
trim
());
BigDecimal
YZ_A2
=
getBigDecimal
(
resultMap
.
get
(
"样重A2"
).
trim
());
//计算的核心公式结果
BigDecimal
countResult
=
SZ_A2
.
subtract
(
MZ_A2
).
divide
(
YZ_A2
,
4
);
endResult
=
countResult
.
multiply
(
param100
);
}
}
else
if
(
name
.
equals
(
"焦渣"
)){
endResult
=
getBigDecimal
(
resultMap
.
get
(
"焦渣特征"
));
}
else
if
(
name
.
equals
(
"St,ad"
)
){
endResult
=
getBigDecimal
(
resultMap
.
get
(
"显示值"
));
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"焦渣特征"
))
){
endResult
=
getBigDecimal
(
resultMap
.
get
(
"焦渣特征"
).
trim
(
));
}
}
else
if
(
name
.
equals
(
"St,ad"
)){
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"显示值"
))
){
endResult
=
getBigDecimal
(
resultMap
.
get
(
"显示值"
).
trim
());
}
}
return
endResult
.
toString
();
return
endResult
==
null
?
""
:
endResult
.
toString
();
}
/**
...
...
@@ -281,15 +392,19 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countSO3
(
Map
<
String
,
String
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"重量法_SO3"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"显示值"
))&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"样重SO3"
))
){
BigDecimal
weightSO3
=
getBigDecimal
(
countMap
.
get
(
"重量法_SO3"
));
BigDecimal
displaySO3
=
getBigDecimal
(
resultMap
.
get
(
"显示值"
));
BigDecimal
mSO3
=
getBigDecimal
(
resultMap
.
get
(
"样重SO3"
));
BigDecimal
displaySO3
=
getBigDecimal
(
resultMap
.
get
(
"显示值"
).
trim
(
));
BigDecimal
mSO3
=
getBigDecimal
(
resultMap
.
get
(
"样重SO3"
).
trim
(
));
BigDecimal
elseResult
=
displaySO3
.
multiply
(
new
BigDecimal
(
2.5
));
BigDecimal
countResult
=
weightSO3
.
compareTo
(
new
BigDecimal
(
0
))==
1
?
weightSO3:
elseResult
;
BigDecimal
result1
=
countResult
.
multiply
(
param1000
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
BigDecimal
count
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
BigDecimal
jsResult
=
weightSO3
.
compareTo
(
new
BigDecimal
(
0
))==
1
?
weightSO3:
elseResult
.
multiply
(
mSO3
).
divide
(
mSO3
,
4
);
...
...
@@ -299,7 +414,8 @@ public class CheckCountUtil {
weightSO3:
elseResult
.
multiply
(
mSO3
).
divide
(
mSO3
,
4
);
count
=
osResult
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
3
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
count
.
toString
();
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -308,20 +424,20 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countHL
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
count
=
new
BigDecimal
(
0
);
List
<
String
>
list
=
new
ArrayList
<>();
list
.
add
(
countMap
.
get
(
"L.O.I"
));
list
.
add
(
countMap
.
get
(
"SiO2"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"L.O.I"
))?
"0"
:
countMap
.
get
(
"L.O.I"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"SiO2"
))?
"0"
:
countMap
.
get
(
"SiO2"
));
// list.add(countMap.get("Al2O3+TiO2"));
list
.
add
(
countMap
.
get
(
"Al2O3"
));
list
.
add
(
countMap
.
get
(
"Fe2O3"
));
list
.
add
(
countMap
.
get
(
"CaO"
));
list
.
add
(
countMap
.
get
(
"MgO"
));
list
.
add
(
countMap
.
get
(
"TiO2"
));
list
.
add
(
countMap
.
get
(
"K2O"
));
list
.
add
(
countMap
.
get
(
"Na2O"
));
list
.
add
(
countMap
.
get
(
"MnO"
));
list
.
add
(
countMap
.
get
(
"SO3"
));
BigDecimal
count
=
new
BigDecimal
(
0
);
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"Al2O3"
))?
"0"
:
countMap
.
get
(
"Al2O3"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"Fe2O3"
))?
"0"
:
countMap
.
get
(
"Fe2O3"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"CaO"
))?
"0"
:
countMap
.
get
(
"CaO"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"MgO"
))?
"0"
:
countMap
.
get
(
"MgO"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"TiO2"
))?
"0"
:
countMap
.
get
(
"TiO2"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"K2O"
))?
"0"
:
countMap
.
get
(
"K2O"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"Na2O"
))?
"0"
:
countMap
.
get
(
"Na2O"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"MnO"
))?
"0"
:
countMap
.
get
(
"MnO"
));
list
.
add
(
StringUtils
.
isEmpty
(
countMap
.
get
(
"SO3"
))?
"0"
:
countMap
.
get
(
"SO3"
));
for
(
String
s:
list
)
{
count
=
count
.
add
(
new
BigDecimal
(
s
));
}
...
...
@@ -334,13 +450,19 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countKH
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
KH
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Cao"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Al2O3+TiO2"
))&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Fe2O3"
))&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"SiO2"
))
){
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
),
4
).
divide
(
SiO2
,
4
);
return
KH
.
toString
();
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
==
null
?
""
:
KH
.
toString
();
}
/**
...
...
@@ -349,11 +471,17 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countSM
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
SM
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"SiO2"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Al2O3+TiO2"
))&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Fe2O3"
))
){
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
),
4
);
return
SM
.
toString
();
SM
=
SiO2
.
divide
(
Al2O3_TiO2
.
add
(
Fe2O3
),
4
);
}
return
SM
==
null
?
""
:
SM
.
toString
();
}
/**
...
...
@@ -362,10 +490,15 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countAM
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
AM
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Al2O3+TiO2"
))&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Fe2O3"
))
){
BigDecimal
Al2O3_TiO2
=
getBigDecimal
(
countMap
.
get
(
"Al2O3+TiO2"
));
BigDecimal
Fe2O3
=
getBigDecimal
(
countMap
.
get
(
"Fe2O3"
));
BigDecimal
AM
=
Al2O3_TiO2
.
divide
(
Fe2O3
,
4
);
return
AM
.
toString
();
AM
=
Al2O3_TiO2
.
divide
(
Fe2O3
,
4
);
}
return
AM
==
null
?
""
:
AM
.
toString
();
}
/**
...
...
@@ -375,23 +508,32 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countBurnupLevel
(
Map
<
String
,
String
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
fCaO_1450
=
getBigDecimal
(
resultMap
.
get
(
"fCaO_1450"
));
BigDecimal
KH
=
getBigDecimal
(
countMap
.
get
(
"KH"
));
String
endResult
=
""
;
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"fCaO_1450"
))&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"KH"
))
){
BigDecimal
fCaO_1450
=
getBigDecimal
(
resultMap
.
get
(
"fCaO_1450"
).
trim
());
BigDecimal
KH
=
getBigDecimal
(
countMap
.
get
(
"KH"
).
trim
());
BigDecimal
E
=
new
BigDecimal
(
45
).
multiply
(
KH
).
subtract
(
new
BigDecimal
(
37.4
));
BigDecimal
D
=
new
BigDecimal
(
35
).
multiply
(
KH
).
subtract
(
new
BigDecimal
(
29.3
));
BigDecimal
C
=
new
BigDecimal
(
26.25
).
multiply
(
KH
).
subtract
(
new
BigDecimal
(
22.15
));
BigDecimal
B
=
new
BigDecimal
(
18.75
).
multiply
(
KH
).
subtract
(
new
BigDecimal
(
16
));
if
(
fCaO_1450
.
compareTo
(
E
)
==
1
){
return
"E"
;
endResult
=
"E"
;
}
else
if
(
fCaO_1450
.
compareTo
(
D
)
==
1
){
return
"D"
;
endResult
=
"D"
;
}
else
if
(
fCaO_1450
.
compareTo
(
C
)
==
1
){
return
"C"
;
endResult
=
"C"
;
}
else
if
(
fCaO_1450
.
compareTo
(
B
)
==
1
){
return
"B"
;
endResult
=
"B"
;
}
else
{
return
"A"
;
endResult
=
"A"
;
}
}
return
endResult
;
}
/**
...
...
@@ -400,11 +542,17 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countBCMad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
BC_Mad
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Mad1"
))&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Mad2"
))
){
BigDecimal
Mad1
=
getBigDecimal
(
countMap
.
get
(
"Mad1"
));
BigDecimal
Mad2
=
getBigDecimal
(
countMap
.
get
(
"Mad2"
));
//计算Mad1 和 Mad2 的平均值
BigDecimal
BC_Mad
=
Mad1
.
add
(
Mad2
).
divide
(
new
BigDecimal
(
2
),
4
);
return
BC_Mad
.
toString
();
BC_Mad
=
Mad1
.
add
(
Mad2
).
divide
(
new
BigDecimal
(
2
),
4
);
}
return
BC_Mad
==
null
?
""
:
BC_Mad
.
toString
();
}
/**
...
...
@@ -413,17 +561,21 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countMad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Mad
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Mad"
))
){
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
//判断奇偶数的最终值
BigDecimal
result1
=
BC_Mad
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
BigDecimal
Mad
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
Mad
=
BC_Mad
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
Mad
=
BC_Mad
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
Mad
.
toString
();
}
return
Mad
==
null
?
""
:
Mad
.
toString
();
}
/**
...
...
@@ -432,11 +584,17 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countBCAad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
BC_Aad
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Aad1"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Aad2"
))
){
BigDecimal
Aad1
=
getBigDecimal
(
countMap
.
get
(
"Aad1"
));
BigDecimal
Aad2
=
getBigDecimal
(
countMap
.
get
(
"Aad2"
));
//计算Mad1 和 Mad2 的平均值
BigDecimal
BC_Aad
=
Aad1
.
add
(
Aad2
).
divide
(
new
BigDecimal
(
2
),
4
);
return
BC_Aad
.
toString
();
BC_Aad
=
Aad1
.
add
(
Aad2
).
divide
(
new
BigDecimal
(
2
),
4
);
}
return
BC_Aad
==
null
?
""
:
BC_Aad
.
toString
();
}
/**
...
...
@@ -445,17 +603,20 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countAad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Aad
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Aad"
))
){
BigDecimal
BC_Aad
=
getBigDecimal
(
countMap
.
get
(
"报出_Aad"
));
//判断奇偶数的最终值
BigDecimal
result1
=
BC_Aad
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
BigDecimal
Aad
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
Aad
=
BC_Aad
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
Aad
=
BC_Aad
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
Aad
.
toString
();
}
return
Aad
==
null
?
""
:
Aad
.
toString
();
}
/**
...
...
@@ -465,14 +626,23 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countVad1
(
Map
<
String
,
String
>
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
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"样重V1"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"皿重V1"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"烧重V1"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Mad"
))
){
BigDecimal
YZ_V1
=
getBigDecimal
(
resultMap
.
get
(
"样重V1"
).
trim
());
BigDecimal
MZ_V1
=
getBigDecimal
(
resultMap
.
get
(
"皿重V1"
).
trim
());
BigDecimal
SZ_V1
=
getBigDecimal
(
resultMap
.
get
(
"烧重V1"
).
trim
());
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
//计算的核心公式结果
BigDecimal
countResult
=
YZ_V1
.
add
(
MZ_V1
).
subtract
(
SZ_V1
).
divide
(
YZ_V1
,
4
);
BigDecimal
count
=
countResult
.
multiply
(
param100
).
subtract
(
BC_Mad
);
return
count
.
toString
();
count
=
countResult
.
multiply
(
param100
).
subtract
(
BC_Mad
);
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -482,14 +652,21 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countVad2
(
Map
<
String
,
String
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"样重V2"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"皿重V2"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"烧重V2"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Mad"
))
){
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
,
4
);
BigDecimal
count
=
countResult
.
multiply
(
param100
).
subtract
(
BC_Mad
);
return
count
.
toString
();
count
=
countResult
.
multiply
(
param100
).
subtract
(
BC_Mad
);
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -498,11 +675,16 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countBCVad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
BC_Vad
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vad1"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vad2"
))
){
BigDecimal
Vad1
=
getBigDecimal
(
countMap
.
get
(
"Vad1"
));
BigDecimal
Vad2
=
getBigDecimal
(
countMap
.
get
(
"Vad2"
));
//计算Vad1 和 Vad2 的平均值
BigDecimal
BC_Vad
=
Vad1
.
add
(
Vad2
).
divide
(
new
BigDecimal
(
2
),
4
);
return
BC_Vad
.
toString
();
BC_Vad
=
Vad1
.
add
(
Vad2
).
divide
(
new
BigDecimal
(
2
),
4
);
}
return
BC_Vad
==
null
?
""
:
BC_Vad
.
toString
();
}
/**
...
...
@@ -511,17 +693,21 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countVad
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Vad
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Vad"
))
){
BigDecimal
BC_Vad
=
getBigDecimal
(
countMap
.
get
(
"报出_Vad"
));
//判断奇偶数的最终值
BigDecimal
result1
=
BC_Vad
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
BigDecimal
Vad
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
Vad
=
BC_Vad
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
Vad
=
BC_Vad
.
subtract
(
new
BigDecimal
(
0.00000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
return
Vad
.
toString
();
}
return
Vad
==
null
?
""
:
Vad
.
toString
();
}
/**
...
...
@@ -530,11 +716,17 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countVdaf
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
Vdaf
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vad"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Mad"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Aad"
))
){
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
.
toString
();
Vdaf
=
Vad
.
multiply
(
param100
).
multiply
(
param100
.
subtract
(
Mad
).
subtract
(
Aad
));
}
return
Vdaf
==
null
?
""
:
Vdaf
.
toString
();
}
/**
...
...
@@ -543,8 +735,11 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countK1_
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
K1_
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vdaf"
))
){
BigDecimal
Vdaf
=
getBigDecimal
(
countMap
.
get
(
"Vdaf"
));
BigDecimal
K1_
=
K1_
=
Vdaf
.
compareTo
(
new
BigDecimal
(
62
))==
1
?
new
BigDecimal
(
61.5
):(
Vdaf
.
compareTo
(
new
BigDecimal
(
56
))==
1
?
new
BigDecimal
(
63
):(
Vdaf
.
compareTo
(
new
BigDecimal
(
49
))==
1
?
new
BigDecimal
(
65
):(
...
...
@@ -552,7 +747,9 @@ public class CheckCountUtil {
Vdaf
.
compareTo
(
new
BigDecimal
(
37
))==
1
?
new
BigDecimal
(
68.5
):
new
BigDecimal
(
0
)
))));
return
K1_
.
toString
();
}
return
K1_
==
null
?
""
:
K1_
.
toString
();
}
/**
...
...
@@ -562,11 +759,14 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countK
(
Map
<
String
,
String
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
String
JZTZ
=
resultMap
.
get
(
"焦渣特征"
);
String
count
=
""
;
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"焦渣特征"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vdaf"
))
){
String
JZTZ
=
resultMap
.
get
(
"焦渣特征"
).
trim
();
BigDecimal
Vdaf
=
getBigDecimal
(
countMap
.
get
(
"Vdaf"
));
//获取焦渣特征序号对应的值
Map
<
String
,
String
>
map
=
JZTZCountUtil
.
getJZTZ
(
Vdaf
);
String
count
=
""
;
if
(
JZTZ
.
equals
(
"1"
)){
count
=
map
.
get
(
JZTZ
);
}
else
if
(
JZTZ
.
equals
(
"1.5"
)){
...
...
@@ -600,6 +800,7 @@ public class CheckCountUtil {
}
else
{
count
=
"false"
;
}
}
return
count
;
}
...
...
@@ -610,9 +811,13 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countVdafPD
(
Map
<
String
,
String
>
countMap
)
{
Integer
VdafPD
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vdaf"
))
){
BigDecimal
Vdaf
=
getBigDecimal
(
countMap
.
get
(
"Vdaf"
));
Integer
VdafPD
=
Vdaf
.
compareTo
(
new
BigDecimal
(
35
))==-
1
?
1
:
0
;
return
VdafPD
.
toString
();
VdafPD
=
Vdaf
.
compareTo
(
new
BigDecimal
(
35
))==-
1
?
1
:
0
;
}
return
VdafPD
==
null
?
""
:
VdafPD
.
toString
();
}
/**
...
...
@@ -621,9 +826,13 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countMadPD
(
Map
<
String
,
String
>
countMap
)
{
Integer
MadPD
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Mad"
))
){
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
Integer
MadPD
=
BC_Mad
.
compareTo
(
new
BigDecimal
(
3
))==
1
?
1
:
0
;
return
MadPD
.
toString
();
MadPD
=
BC_Mad
.
compareTo
(
new
BigDecimal
(
3
))==
1
?
1
:
0
;
}
return
MadPD
==
null
?
""
:
MadPD
.
toString
();
}
/**
...
...
@@ -632,10 +841,15 @@ public class CheckCountUtil {
* @return
*/
public
static
String
count40Mad0Or1
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vdaf判断"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Mad判断"
))
){
BigDecimal
VdafPD
=
getBigDecimal
(
countMap
.
get
(
"Vdaf判断"
));
BigDecimal
MadPD
=
getBigDecimal
(
countMap
.
get
(
"Mad判断"
));
BigDecimal
count
=
VdafPD
.
multiply
(
MadPD
);
return
count
.
toString
();
count
=
VdafPD
.
multiply
(
MadPD
);
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -644,10 +858,15 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countAd
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Aad"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Mad"
))
){
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
),
4
);
return
count
.
toString
();
count
=
BC_Aad
.
multiply
(
param100
).
divide
(
param100
.
subtract
(
BC_Mad
),
4
);
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -656,15 +875,23 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countAdXS
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Ad"
))
){
BigDecimal
Ad
=
getBigDecimal
(
countMap
.
get
(
"Ad"
));
BigDecimal
count
=
count
=
Ad
.
compareTo
(
new
BigDecimal
(
20
))==
1
?
new
BigDecimal
(
0.1
):
new
BigDecimal
(
0
);
return
count
.
toString
();
}
return
count
==
null
?
""
:
count
.
toString
();
}
public
static
String
countVdafXS
(
Map
<
String
,
String
>
countMap
)
{
Double
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Ad"
))
){
BigDecimal
Ad
=
getBigDecimal
(
countMap
.
get
(
"Ad"
));
Double
count
=
count
=
Ad
.
compareTo
(
new
BigDecimal
(
30
))==
1
?
0.8
:(
Ad
.
compareTo
(
new
BigDecimal
(
25
))==
1
?
0.85
:(
Ad
.
compareTo
(
new
BigDecimal
(
20
))==
1
?
0.95
:(
...
...
@@ -672,7 +899,8 @@ public class CheckCountUtil {
Ad
.
compareTo
(
new
BigDecimal
(
10
))==
1
?
0.9
:
0.95
))));
return
count
.
toString
();
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -681,12 +909,20 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countV_daf
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vdaf系数0.8~0.95"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Vdaf"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Ad系数0.1或0"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"Ad"
))
){
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
.
toString
();
count
=
VdafXS
.
multiply
(
Vdaf
).
subtract
(
AdXS
.
multiply
(
Ad
));
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -695,14 +931,19 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countK0_
(
Map
<
String
,
String
>
countMap
)
{
BigDecimal
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
countMap
.
get
(
"V,daf"
))
){
BigDecimal
V_daf
=
getBigDecimal
(
countMap
.
get
(
"V,daf"
));
BigDecimal
count
=
count
=
V_daf
.
compareTo
(
new
BigDecimal
(
8
))==
1
?
new
BigDecimal
(
8500
):(
V_daf
.
compareTo
(
new
BigDecimal
(
5.5
))==
1
?
new
BigDecimal
(
8400
):(
V_daf
.
compareTo
(
new
BigDecimal
(
3
))==
1
?
new
BigDecimal
(
8300
):
new
BigDecimal
(
8200
)
));
return
count
.
toString
();
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -711,7 +952,17 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countQnet_adMJ_kg
(
Map
<
String
,
String
>
resultMap
,
Map
<
String
,
String
>
countMap
)
{
BigDecimal
YWH_123
=
getBigDecimal
(
resultMap
.
get
(
"烟无褐123"
));
BigDecimal
count
=
null
;
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"烟无褐123"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"K1,"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Mad"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Aad"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"报出_Vad"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"K"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"40Mad 0或1"
))
&&
StringUtils
.
isNotBlank
(
countMap
.
get
(
"K0,"
))
){
BigDecimal
YWH_123
=
getBigDecimal
(
resultMap
.
get
(
"烟无褐123"
).
trim
());
BigDecimal
K1_
=
getBigDecimal
(
countMap
.
get
(
"K1,"
));
BigDecimal
BC_Mad
=
getBigDecimal
(
countMap
.
get
(
"报出_Mad"
));
BigDecimal
BC_Aad
=
getBigDecimal
(
countMap
.
get
(
"报出_Aad"
));
...
...
@@ -732,8 +983,10 @@ 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
,
4
);
return
count
.
toString
();
count
=
value
.
multiply
(
new
BigDecimal
(
4.1816
)).
divide
(
param1000
,
4
);
}
return
count
==
null
?
""
:
count
.
toString
();
}
/**
...
...
@@ -742,19 +995,25 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countYMXGrade
(
Map
<
String
,
String
>
resultMap
)
{
String
count
=
""
;
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"易磨性(kWh/t)"
))
){
BigDecimal
YMX_kWh_t
=
getBigDecimal
(
resultMap
.
get
(
"易磨性(kWh/t)"
));
if
(
YMX_kWh_t
.
compareTo
(
new
BigDecimal
(
18
))==
1
){
return
"E"
;
count
=
"E"
;
}
else
if
(
YMX_kWh_t
.
compareTo
(
new
BigDecimal
(
13
))==
1
){
return
"D"
;
count
=
"D"
;
}
else
if
(
YMX_kWh_t
.
compareTo
(
new
BigDecimal
(
10
))==
1
){
return
"C"
;
count
=
"C"
;
}
else
if
(
YMX_kWh_t
.
compareTo
(
new
BigDecimal
(
8
))==
1
){
return
"B"
;
count
=
"B"
;
}
else
{
return
"A"
;
count
=
"A"
;
}
}
return
count
;
}
/**
* 求易磨性校验码
...
...
@@ -762,11 +1021,18 @@ public class CheckCountUtil {
* @return
*/
public
static
String
countYMXCode
(
Map
<
String
,
String
>
resultMap
)
{
Double
G
=
Double
.
valueOf
(
resultMap
.
get
(
"G"
));
Double
P80
=
Double
.
valueOf
(
resultMap
.
get
(
"P80"
));
Double
F80
=
Double
.
valueOf
(
resultMap
.
get
(
"F80"
));
BigDecimal
YMX_kWh_t
=
getBigDecimal
(
resultMap
.
get
(
"易磨性(kWh/t)"
));
BigDecimal
YMX_MJ_t
=
getBigDecimal
(
resultMap
.
get
(
"易磨性(MJ/t)"
));
String
count
=
""
;
if
(
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"G"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"P80"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"F80"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"易磨性(kWh/t)"
))
&&
StringUtils
.
isNotBlank
(
resultMap
.
get
(
"易磨性(MJ/t)"
))
){
Double
G
=
Double
.
valueOf
(
resultMap
.
get
(
"G"
).
trim
());
Double
P80
=
Double
.
valueOf
(
resultMap
.
get
(
"P80"
).
trim
());
Double
F80
=
Double
.
valueOf
(
resultMap
.
get
(
"F80"
).
trim
());
BigDecimal
YMX_kWh_t
=
getBigDecimal
(
resultMap
.
get
(
"易磨性(kWh/t)"
).
trim
());
BigDecimal
YMX_MJ_t
=
getBigDecimal
(
resultMap
.
get
(
"易磨性(MJ/t)"
).
trim
());
Double
countResult
=
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
);
...
...
@@ -776,11 +1042,14 @@ public class CheckCountUtil {
if
(
value1
.
compareTo
(
new
BigDecimal
(
0.5
)
)
==
-
1
&&
value2
.
compareTo
(
new
BigDecimal
(
3.5
))
==
1
&&
value2
.
compareTo
(
new
BigDecimal
(
3.7
))
==
-
1
){
return
"OK"
;
count
=
"OK"
;
}
else
{
return
"出错了"
;
count
=
"出错了"
;
}
}
return
count
;
}
/**
* 计算平行数
...
...
@@ -824,20 +1093,24 @@ public class CheckCountUtil {
minNum
=
minNum
==
null
?
valBD:
(
valBD
.
compareTo
(
minNum
)
==
-
1
?
valBD:
minNum
);
}
//平均值
BigDecimal
ResultsValue
=
null
;
if
(
resultSum
!=
null
){
BigDecimal
aveCount
=
resultSum
.
divide
(
new
BigDecimal
(
values
.
length
),
2
);
BigDecimal
result1
=
aveCount
.
multiply
(
param100
);
int
resultInt1
=
result1
.
setScale
(
0
,
BigDecimal
.
ROUND_DOWN
).
intValue
();
BigDecimal
ResultsValue
=
null
;
if
((
resultInt1
&
1
)
==
1
){
//如果结果为奇数
ResultsValue
=
aveCount
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
ResultsValue
=
aveCount
.
subtract
(
new
BigDecimal
(
0.0000000001
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
}
//最大误差值
BigDecimal
errorValue
=
maxNum
.
subtract
(
minNum
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);;
countResults
.
put
(
entry
.
getKey
(),
ResultsValue
.
toString
());
countError
.
put
(
entry
.
getKey
(),
errorValue
.
toString
());
BigDecimal
errorValue
=
null
;
if
(
maxNum
!=
null
&&
minNum
!=
null
){
errorValue
=
maxNum
.
subtract
(
minNum
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
}
countResults
.
put
(
entry
.
getKey
(),
ResultsValue
==
null
?
""
:
ResultsValue
.
toString
());
countError
.
put
(
entry
.
getKey
(),
errorValue
==
null
?
""
:
errorValue
.
toString
());
}
map
.
put
(
"countResults"
,
countResults
);
map
.
put
(
"countError"
,
countError
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/util/weixin/Global.java
View file @
2bccf2fa
...
...
@@ -10,22 +10,22 @@ package cn.wise.sc.cement.business.util.weixin;
public
interface
Global
{
//企业ID
public
final
static
String
corpId
=
"ww348f91b2573c1867"
;
//企业应用的id,整型。可在应用的设置页面查看
public
final
static
int
agentId
=
1000002
;
public
final
static
int
agentIdPC
=
1000003
;
//企业ID
public
final
static
String
corpId
=
"ww348f91b2573c1867"
;
//应用的凭证密钥
public
final
static
String
agentSecret
=
"gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o"
;
public
final
static
String
agentSecretPC
=
"itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A"
;
//编译后的回调地址
public
final
static
String
backUrl
=
"https%3a%2f%2fprogram.oxogroup.com%2flab-system"
;
//实验室管理系统链接
public
final
static
String
systemUrl
=
"<a href=\"https://open.weixin.qq.com/connect/oauth2/authorize?appid="
+
corpId
+
"&redirect_uri="
+
backUrl
+
"%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect\">天津院实验室管理系统"
+
"</a>,"
;
//应用的凭证密钥PC
public
final
static
String
agentSecretPC
=
"itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A"
;
public
final
static
String
systemUrl
=
"<a href=\"https://open.weixin.qq.com/connect/oauth2/authorize?appid="
+
corpId
+
"&redirect_uri="
+
backUrl
+
"%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect\">天津院实验室管理系统"
+
"</a>,"
;
/**
* 微信公众平台,获取AccessToken的接口地址,Https请求方式:GET
...
...
cement-business/src/main/resources/application.yml
View file @
2bccf2fa
...
...
@@ -7,8 +7,8 @@ spring:
active
:
dev
datasource
:
# 192.168.110.85 admin!@#123
#
url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
url
:
jdbc:mysql://81.68.92.175:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
url
:
jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
#
url: jdbc:mysql://81.68.92.175:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username
:
root
password
:
admin!@#123
driverClassName
:
com.mysql.cj.jdbc.Driver
...
...
cement-business/src/main/resources/fastdfs-client.properties
View file @
2bccf2fa
...
...
@@ -4,7 +4,7 @@ fastdfs.charset=UTF-8
fastdfs.http.tracker_http_port
=
8888
fastdfs.http.anti_steal_token
=
no
fastdfs.http.secret_key
=
FastDFS1234567890
fastdfs.tracker_servers
=
192.168.110.85
:22122
fastdfs.tracker_servers
=
localhost
:22122
#fastdfs.tracker_servers=localhost:22122
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