Skip to content

T
tianjin-cement
Commit c9c89d36 authored by 竹天卫's avatar 竹天卫
Browse files
Options

校核计算优化

parent 477f2972
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 94 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java
View file @ c9c89d36
......@@ -183,6 +183,7 @@ public class ReportController {
one.setEnclosureUrl(query.getEnclosureUrl());
one.setExtName(query.getExtName());
one.setUpdateTime(LocalDateTime.now());
one.setPdfUrl(query.getPdfUrl());
iEntityEnclosureService.updateById(one);
return BaseResponse.okData(true);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml
View file @ c9c89d36
......@@ -14,6 +14,9 @@
<if test="params.status != null">
and e.status = #{params.status}
</if>
<if test="params.reportStatus != null">
and e.status <![CDATA[>=]]> #{params.reportStatus}
</if>
<if test="params.clientName != null and params.clientName != ''">
and c.name like concat('%', #{params.clientName}, '%')
</if>
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
View file @ c9c89d36
......@@ -93,6 +93,7 @@
SELECT t.name
FROM team t
WHERE t.group_id = #{groupId} and t.status = 1
and t.remark != 'no_check'
</select>
<!--根据检测组id 获取所有检测项信息-->
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleHandleVo.java
View file @ c9c89d36
......@@ -30,6 +30,9 @@ public class SampleHandleVo {
@ApiModelProperty("项目编号")
private String projectCode;
@ApiModelProperty("样品处理项id")
private Integer handleId;
@ApiModelProperty("样品数量")
private Integer sampleNum;
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java
View file @ c9c89d36
......@@ -196,7 +196,7 @@ public class CommonServiceImpl {
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("TiO<sub>2</sub>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("重量法_SO<sub>3</sub>")){
}else if(name.equals("重量法SO<sub>3</sub>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("K<sub>2</sub>O")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
......@@ -204,7 +204,7 @@ public class CommonServiceImpl {
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("MnO")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Cl")){
}else if(name.equals("Cl<sup>-</sup>")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
}else if(name.equals("Mad1")){
countMap.put(name,CheckCountUtil.checkCount(name,resultMap));
......@@ -218,7 +218,7 @@ public class CommonServiceImpl {
countMap.put(name, CheckCountUtil.checkCount(name, resultMap));
}else if(name.equals("St,ad")){
countMap.put(name, CheckCountUtil.checkCount(name, resultMap));
}else if(name.equals("易磨性等级")){
}else if(name.equals("易磨性")){
countMap.put(name, CheckCountUtil.countYMXGrade(resultMap));
}else if(name.equals("易磨性校验码")){
countMap.put(name, CheckCountUtil.countYMXCode(resultMap));
......@@ -241,9 +241,6 @@ public class CommonServiceImpl {
}else if(name.equals("AM")){
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")){
String countBCMad = CheckCountUtil.countBCMad(countMap);
countMap.put(name, countBCMad);
......@@ -277,6 +274,9 @@ public class CommonServiceImpl {
}else if(name.equals("Ad")) {
String countAd = CheckCountUtil.countAd(countMap);
countMap.put(name, countAd);
}else if(name.equals("易烧性")){
String burnupLevel = CheckCountUtil.countBurnupLevel(resultMap,countMap);
countMap.put(name, burnupLevel);
}
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ c9c89d36
......@@ -427,18 +427,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
List<EntrustApproval> approvalList = approvalMapper.selectList(approvalWrapper);
EntrustApproval approval = approvalList.get(0);
entrustVo.setOpinion(approval.getOpinion());
//查询报告,如果有上传的委托报告，用户可已进行下载
QueryWrapper<EntityEnclosure> wrapper = new QueryWrapper<>();
wrapper.eq("entity_type", EntityEnclosure.EntityType.ENTRUST_REPORT);
wrapper.eq("entity_id", entrustVo.getId());
wrapper.eq("is_deleted", 1);
List<EntityEnclosure> entityEnclosureList = entityEnclosureMapper.selectList(wrapper);
if(entityEnclosureList != null && entityEnclosureList.size()>0 ){
EntityEnclosure entityEnclosure = entityEnclosureList.get(0);
entrustVo.setAlias(entityEnclosure.getAlias());
entrustVo.setEnclosureUrl(entityEnclosure.getPdfUrl());
entrustVo.setExtName(entityEnclosure.getExtName());
}
} else {
QueryWrapper<SampleTmp> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("entrust_id", entrustVo.getId());
......@@ -623,6 +611,19 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
}
entrustVo.setSampleList(sampleVoList);//样品列表（展示平行样样品）
//查询报告,如果有上传的委托报告，用户可已进行下载
QueryWrapper<EntityEnclosure> wrapper = new QueryWrapper<>();
wrapper.eq("entity_type", EntityEnclosure.EntityType.ENTRUST_REPORT);
wrapper.eq("entity_id", entrustVo.getId());
wrapper.eq("is_deleted", 1);
List<EntityEnclosure> entityEnclosureList = entityEnclosureMapper.selectList(wrapper);
if(entityEnclosureList != null && entityEnclosureList.size()>0 ){
EntityEnclosure entityEnclosure = entityEnclosureList.get(0);
entrustVo.setAlias(entityEnclosure.getAlias());
entrustVo.setEnclosureUrl(entityEnclosure.getPdfUrl());
entrustVo.setExtName(entityEnclosure.getExtName());
}
}
return BaseResponse.okData(entrustVo);
}
......@@ -1206,7 +1207,14 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.errorMsg("接受或完成的状态信息错误");
}
handleStatus = shVo.getStatus() == 1 ? 1 : (shVo.getStatus() == 2 ? 2 : 0);
String contentName = "";
Handle handle = handleMapper.selectById(shVo.getHandleId());
if (handle == null) {
return BaseResponse.errorMsg("选择的处理项信息有误");
}
String contentName = handle.getName();
/* String contentName = "";
if (shVo.getContent() != null) {
String[] handIdS = shVo.getContent().split("、");
List<SampleHandleEnclosure> sampleHandleEnclosureList = new ArrayList<>();
......@@ -1217,7 +1225,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
contentName = contentName.equals("") ? handle.getName() : contentName + "、" + handle.getName();
}
}
}*/
shVo.setContentName(contentName);
}
}
......@@ -2473,7 +2481,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
Map<String, Object> params = new HashMap<>();
params.put("startDate", startDate);
params.put("endDate", endDate);
params.put("status", 8);
params.put("reportStatus", 4);
params.put("clientId", clientId);
params.put("projectName", projectName);
params.put("projectCode", projectCode);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java
View file @ c9c89d36
......@@ -103,7 +103,8 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
return BaseResponse.errorMsg(query.getName() + "已存在");
}
BeanUtils.copyProperties(query, create);
create.setStatus(1).setCreateTime(LocalDateTime.now());
//no_check 标识校核计算的时候不显示计算的结果，因为没有公式
create.setStatus(1).setCreateTime(LocalDateTime.now()).setRemark("no_check");
teamMapper.insert(create);
return BaseResponse.okData(create);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java
View file @ c9c89d36
......@@ -77,14 +77,14 @@ public class CheckCountUtil {
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"))&&
}else if(name.equals("SiO<sub>2</sub>")){
if( StringUtils.isNotBlank(resultMap.get("VSiO<sub>2</sub>")) &&
StringUtils.isNotBlank(resultMap.get("TSiO<sub>2</sub>"))&&
StringUtils.isNotBlank(resultMap.get("样重m"))){
//毫升数
BigDecimal VSiO2 = getBigDecimal(resultMap.get("VSiO2").trim());
BigDecimal VSiO2 = getBigDecimal(resultMap.get("VSiO<sub>2</sub>").trim());
//滴定度
BigDecimal TSiO2 = getBigDecimal(resultMap.get("TSiO2").trim());
BigDecimal TSiO2 = getBigDecimal(resultMap.get("TSiO<sub>2</sub>").trim());
//样m
BigDecimal m = getBigDecimal(resultMap.get("样重m").trim());
//计算的核心公式结果
......@@ -97,17 +97,17 @@ public class CheckCountUtil {
endResult = countResult.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
}
}else if(name.equals("Al2O3+TiO2")){
if( StringUtils.isNotBlank(resultMap.get("TAl2O3")) &&
StringUtils.isNotBlank(resultMap.get("VAl2O3"))&&
}else if(name.equals("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>")){
if( StringUtils.isNotBlank(resultMap.get("TAl<sub>2</sub>O<sub>3</sub>")) &&
StringUtils.isNotBlank(resultMap.get("VAl<sub>2</sub>O<sub>3</sub>"))&&
StringUtils.isNotBlank(resultMap.get("K"))&&
StringUtils.isNotBlank(resultMap.get("VCuSO4(I)"))&&
StringUtils.isNotBlank(resultMap.get("VCuSO<sub>4</sub>(I)"))&&
StringUtils.isNotBlank(resultMap.get("样重m"))
){
BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl2O3").trim());
BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl2O3").trim());
BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl<sub>2</sub>O<sub>3</sub>").trim());
BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl<sub>2</sub>O<sub>3</sub>").trim());
BigDecimal K = getBigDecimal(resultMap.get("K").trim());
BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO4(I)").trim());
BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO<sub>4</sub>(I)").trim());
BigDecimal m = getBigDecimal(resultMap.get("样重m").trim());
//计算的核心公式结果
BigDecimal countResult = TAl2O3.multiply(VAl2O3.subtract(K.multiply(VCuSO4_I))).divide(m,4);
......@@ -119,20 +119,20 @@ public class CheckCountUtil {
endResult = countResult.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
}
}else if(name.equals("Al2O3")){
if( StringUtils.isNotBlank(resultMap.get("TAl2O3")) &&
StringUtils.isNotBlank(resultMap.get("VAl2O3"))&&
}else if(name.equals("Al<sub>2</sub>O<sub>3</sub>")){
if( StringUtils.isNotBlank(resultMap.get("TAl<sub>2</sub>O<sub>3</sub>")) &&
StringUtils.isNotBlank(resultMap.get("VAl<sub>2</sub>O<sub>3</sub>"))&&
StringUtils.isNotBlank(resultMap.get("K"))&&
StringUtils.isNotBlank(resultMap.get("VCuSO4(I)"))&&
StringUtils.isNotBlank(resultMap.get("VCuSO<sub>4</sub>(I)"))&&
StringUtils.isNotBlank(resultMap.get("样重m"))&&
StringUtils.isNotBlank(resultMap.get("VCuSO4(II)"))
StringUtils.isNotBlank(resultMap.get("VCuSO<sub>4</sub>(II)"))
){
BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl2O3").trim());
BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl2O3").trim());
BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl<sub>2</sub>O<sub>3</sub>").trim());
BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl<sub>2</sub>O3").trim());
BigDecimal K = getBigDecimal(resultMap.get("K").trim());
BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO4(I)").trim());
BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO<sub>4</sub>(I)").trim());
BigDecimal m = getBigDecimal(resultMap.get("样重m").trim());
BigDecimal VCuSO4_II = getBigDecimal(resultMap.get("VCuSO4(II)").trim());
BigDecimal VCuSO4_II = getBigDecimal(resultMap.get("VCuSO<sub>4</sub>(II)").trim());
//计算的核心公式结果
BigDecimal countResult = TAl2O3.multiply(VAl2O3.subtract(K.multiply(VCuSO4_I.add(VCuSO4_II)))).divide(m,4);
BigDecimal result1 = countResult.multiply(param100);
......@@ -143,14 +143,14 @@ public class CheckCountUtil {
endResult = countResult.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
}
}else if(name.equals("Fe2O3")){
}else if(name.equals("Fe<sub>2</sub>O<sub>3</sub>")){
if( StringUtils.isNotBlank(resultMap.get("TFe2O3")) &&
StringUtils.isNotBlank(resultMap.get("VF2O3"))&&
if( StringUtils.isNotBlank(resultMap.get("TFe<sub>2</sub>O<sub>3</sub>")) &&
StringUtils.isNotBlank(resultMap.get("VF<sub>2</sub>O<sub>3</sub>"))&&
StringUtils.isNotBlank(resultMap.get("样重m"))
){
BigDecimal TFe2O3 = getBigDecimal(resultMap.get("TFe2O3").trim());
BigDecimal VF2O3 = getBigDecimal(resultMap.get("VF2O3").trim());
BigDecimal TFe2O3 = getBigDecimal(resultMap.get("TFe<sub>2</sub>O<sub>3</sub>").trim());
BigDecimal VF2O3 = getBigDecimal(resultMap.get("VF<sub>2</sub>O<sub>3</sub>").trim());
BigDecimal m = getBigDecimal(resultMap.get("样重m").trim());
//计算的核心公式结果
BigDecimal countResult = TFe2O3.multiply(VF2O3).divide(m,4);
......@@ -200,14 +200,14 @@ public class CheckCountUtil {
endResult = countResult.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
}
}else if(name.equals("TiO2")){
if( StringUtils.isNotBlank(resultMap.get("TTiO2")) &&
StringUtils.isNotBlank(resultMap.get("VCuSO4(II)"))&&
}else if(name.equals("TiO<sub>2</sub>")){
if( StringUtils.isNotBlank(resultMap.get("TTiO<sub>2</sub>")) &&
StringUtils.isNotBlank(resultMap.get("VCuSO<sub>4</sub>(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 TTiO2 = getBigDecimal(resultMap.get("TTiO<sub>2</sub>").trim());
BigDecimal VCuSO4_II = getBigDecimal(resultMap.get("VCuSO<sub>4</sub>(II)").trim());
BigDecimal K = getBigDecimal(resultMap.get("K").trim());
BigDecimal m = getBigDecimal(resultMap.get("样重m").trim());
//计算的核心公式结果
......@@ -221,7 +221,7 @@ public class CheckCountUtil {
}
}
}else if(name.equals("重量法_SO3")){
}else if(name.equals("重量法SO<sub>3</sub>")){
if( StringUtils.isNotBlank(resultMap.get("烧重m2")) &&
StringUtils.isNotBlank(resultMap.get("埚重m1"))&&
StringUtils.isNotBlank(resultMap.get("空白m3"))&&
......@@ -235,15 +235,15 @@ public class CheckCountUtil {
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")){
if( StringUtils.isNotBlank(resultMap.get("CK2O")) &&
}else if(name.equals("K<sub>2</sub>O")){
if( StringUtils.isNotBlank(resultMap.get("CK<sub>2</sub>O")) &&
StringUtils.isNotBlank(resultMap.get("V"))&&
StringUtils.isNotBlank(resultMap.get("AK2O"))&&
StringUtils.isNotBlank(resultMap.get("AK<sub>2</sub>O"))&&
StringUtils.isNotBlank(resultMap.get("样重R2O"))
){
BigDecimal CK2O = getBigDecimal(resultMap.get("CK2O").trim());
BigDecimal CK2O = getBigDecimal(resultMap.get("CK<sub>2</sub>O").trim());
BigDecimal V = getBigDecimal(resultMap.get("V").trim());
BigDecimal AK2O = getBigDecimal(resultMap.get("AK2O").trim());
BigDecimal AK2O = getBigDecimal(resultMap.get("AK<sub>2</sub>O").trim());
BigDecimal mR20 = getBigDecimal(resultMap.get("样重R2O").trim());
//计算的核心公式结果
BigDecimal countResult = CK2O.multiply(V).multiply(AK2O).divide(mR20,4).divide(param10000,4);
......@@ -255,15 +255,15 @@ public class CheckCountUtil {
endResult = countResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
}
}
}else if(name.equals("Na2O")){
if( StringUtils.isNotBlank(resultMap.get("CNa2O")) &&
}else if(name.equals("Na<sub>2</sub>O")){
if( StringUtils.isNotBlank(resultMap.get("CNa<sub>2</sub>O")) &&
StringUtils.isNotBlank(resultMap.get("V"))&&
StringUtils.isNotBlank(resultMap.get("ANa2O"))&&
StringUtils.isNotBlank(resultMap.get("ANa<sub>2</sub>O"))&&
StringUtils.isNotBlank(resultMap.get("样重R2O"))
){
BigDecimal CNa2O = getBigDecimal(resultMap.get("CNa2O").trim());
BigDecimal CNa2O = getBigDecimal(resultMap.get("CNa<sub>2</sub>O").trim());
BigDecimal V = getBigDecimal(resultMap.get("V").trim());
BigDecimal ANa2O = getBigDecimal(resultMap.get("ANa2O").trim());
BigDecimal ANa2O = getBigDecimal(resultMap.get("ANa<sub>2</sub>O").trim());
BigDecimal mR20 = getBigDecimal(resultMap.get("样重R2O").trim());
//计算的核心公式结果
BigDecimal countResult = CNa2O.multiply(V).multiply(ANa2O).divide(mR20,4).divide(param10000,4);
......@@ -297,7 +297,7 @@ public class CheckCountUtil {
}
}
}else if(name.equals("Cl")){
}else if(name.equals("Cl<sup>-</sup>")){
if( StringUtils.isNotBlank(resultMap.get("T")) &&
StringUtils.isNotBlank(resultMap.get("V2"))&&
StringUtils.isNotBlank(resultMap.get("V1"))&&
......@@ -393,13 +393,13 @@ public class CheckCountUtil {
*/
public static String countSO3(Map<String, String> resultMap, Map<String, String> countMap) {
BigDecimal count = null;
if( StringUtils.isNotBlank(resultMap.get("重量法_SO3")) &&
if( StringUtils.isNotBlank(resultMap.get("重量法SO<sub>2</sub>")) &&
StringUtils.isNotBlank(resultMap.get("显示值"))&&
StringUtils.isNotBlank(resultMap.get("样重SO3"))
StringUtils.isNotBlank(resultMap.get("样重SO<sub>3</sub>"))
){
BigDecimal weightSO3 = getBigDecimal(countMap.get("重量法_SO3"));
BigDecimal weightSO3 = getBigDecimal(countMap.get("重量法SO<sub>2</sub>"));
BigDecimal displaySO3= getBigDecimal(resultMap.get("显示值").trim());
BigDecimal mSO3= getBigDecimal(resultMap.get("样重SO3").trim());
BigDecimal mSO3= getBigDecimal(resultMap.get("样重SO<sub>3</sub>").trim());
BigDecimal elseResult = displaySO3.multiply(new BigDecimal(2.5));
BigDecimal countResult = weightSO3.compareTo(new BigDecimal(0))==1?
weightSO3:elseResult;
......@@ -427,17 +427,17 @@ public class CheckCountUtil {
BigDecimal count = new BigDecimal(0);
List<String> list = new ArrayList<>();
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(StringUtils.isEmpty(countMap.get("SiO<sub>2</sub>"))?"0":countMap.get("SiO<sub>2</sub>"));
// list.add(countMap.get("Al2O3+TiO2"));
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("Al<sub>2</sub>O<sub>3</sub>"))?"0":countMap.get("Al<sub>2</sub>O<sub>3</sub>"));
list.add(StringUtils.isEmpty(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"))?"0":countMap.get("Fe<sub>2</sub>O<sub>3</sub>"));
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("TiO<sub>2</sub>"))?"0":countMap.get("TiO<sub>2</sub>"));
list.add(StringUtils.isEmpty(countMap.get("K<sub>2</sub>O"))?"0":countMap.get("K<sub>2</sub>O"));
list.add(StringUtils.isEmpty(countMap.get("Na<sub>2</sub>O"))?"0":countMap.get("Na<sub>2</sub>O"));
list.add(StringUtils.isEmpty(countMap.get("MnO"))?"0":countMap.get("MnO"));
list.add(StringUtils.isEmpty(countMap.get("SO3"))?"0":countMap.get("SO3"));
list.add(StringUtils.isEmpty(countMap.get("SO<sub>3</sub>"))?"0":countMap.get("SO<sub>3</sub>"));
for(String s:list) {
count = count.add(new BigDecimal(s));
}
......@@ -451,15 +451,15 @@ public class CheckCountUtil {
*/
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"))
if( StringUtils.isNotBlank(countMap.get("Ca0")) &&
StringUtils.isNotBlank(countMap.get("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>"))&&
StringUtils.isNotBlank(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"))&&
StringUtils.isNotBlank(countMap.get("SiO<sub>2</sub>"))
){
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 CaO = getBigDecimal(countMap.get("CaO"));
BigDecimal Al2O3_TiO2= getBigDecimal(countMap.get("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>"));
BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"));
BigDecimal SiO2 = getBigDecimal(countMap.get("SiO<sub>2</sub>"));
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();
......@@ -472,13 +472,13 @@ public class CheckCountUtil {
*/
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"))
if( StringUtils.isNotBlank(countMap.get("SiO<sub>2</sub>")) &&
StringUtils.isNotBlank(countMap.get("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>"))&&
StringUtils.isNotBlank(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"))
){
BigDecimal SiO2 = getBigDecimal(countMap.get("SiO2"));
BigDecimal Al2O3_TiO2= getBigDecimal(countMap.get("Al2O3+TiO2"));
BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe2O3"));
BigDecimal SiO2 = getBigDecimal(countMap.get("SiO<sub>2</sub>"));
BigDecimal Al2O3_TiO2= getBigDecimal(countMap.get("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>"));
BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"));
SM = SiO2.divide(Al2O3_TiO2.add(Fe2O3),4);
}
return SM==null?"":SM.toString();
......@@ -491,11 +491,11 @@ public class CheckCountUtil {
*/
public static String countAM(Map<String, String> countMap) {
BigDecimal AM = null;
if( StringUtils.isNotBlank(countMap.get("Al2O3+TiO2"))&&
StringUtils.isNotBlank(countMap.get("Fe2O3"))
if( StringUtils.isNotBlank(countMap.get("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>"))&&
StringUtils.isNotBlank(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"))
){
BigDecimal Al2O3_TiO2= getBigDecimal(countMap.get("Al2O3+TiO2"));
BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe2O3"));
BigDecimal Al2O3_TiO2= getBigDecimal(countMap.get("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>"));
BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"));
AM = Al2O3_TiO2.divide(Fe2O3,4);
}
return AM==null?"":AM.toString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment