启动profile修复2

cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java

@@ -112,13 +112,15 @@ public class ReportController {
         //煤的工业分析
         List<IndustrialReport> list3 = iEntrustService.getIndustrialList(entrustId);
         beanParams.put("list3", list3);
-
         //工艺性能
         List<CraftReport> list4 = iEntrustService.getCraftList(entrustId);
         beanParams.put("list4", list4);
 
 
 
+
+
+
         //物理性能
         //颗粒分析
 

cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java

@@ -40,9 +40,9 @@ public class WeiXinController {
         log.debug("=============================================");
         try {
             //测试服务器
-            return weiXinService.getTestToken(code);
+//            return weiXinService.getTestToken(code);
             //正式服务器
-//            return weiXinService.getToken(code, "APP");
+            return weiXinService.getToken(code, "APP");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }
@@ -54,9 +54,9 @@ public class WeiXinController {
     public BaseResponse getPCToken(String code) {
         try {
             //测试服务器
-            return weiXinService.getTestToken(code);
+//            return weiXinService.getTestToken(code);
             //正式服务器
-//            return weiXinService.getToken(code, "PC");
+            return weiXinService.getToken(code, "PC");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -5070,7 +5070,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			Map<String,ElementReport> reportMap = entry.getValue().stream().collect(Collectors.toMap(ElementReport::getTeamName, item -> item));
 			//工业分析结果拆分
 			String gyfxLastResult = reportMap.get(ElementKey.Gyfx.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Gyfx.getKey()).getLastResult())?"":reportMap.get(ElementKey.Gyfx.getKey()).getLastResult();
-			if(StringUtils.isNotBlank(gyfxLastResult)){
+			if(StringUtils.isNotBlank(gyfxLastResult) && gyfxLastResult.contains("=")){
 				Map<String,String> gyfxMap = splitLastResult(gyfxLastResult);
 				report.setMad(gyfxMap==null || org.springframework.util.StringUtils.isEmpty(gyfxMap.get("Mad")) ?"—":gyfxMap.get("Mad"));
 				report.setAad(gyfxMap==null || org.springframework.util.StringUtils.isEmpty(gyfxMap.get("Aad")) ?"—":gyfxMap.get("Aad"));
@@ -5089,7 +5089,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 			//可磨性结果拆分
 			String kmLastResult = reportMap.get(ElementKey.Km.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Km.getKey()).getLastResult())?"":reportMap.get(ElementKey.Km.getKey()).getLastResult();
-			if(StringUtils.isNotBlank(kmLastResult)){
+			if(StringUtils.isNotBlank(kmLastResult) && kmLastResult.contains("=")){
 				Map<String,String> kmMap = splitLastResult(kmLastResult);
 				report.setHgi(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("HGI")) ?"—":kmMap.get("HGI"));
 				report.setCyl(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("出样率(%)")) ?"—":kmMap.get("出样率(%)"));
@@ -5141,7 +5141,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 			//易磨性结果拆分
 			String ymxLastResult = reportMap.get(ElementKey.Ymx.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Ymx.getKey()).getLastResult())?"":reportMap.get(ElementKey.Ymx.getKey()).getLastResult();
-			if(StringUtils.isNotBlank(ymxLastResult)){
+			if(StringUtils.isNotBlank(ymxLastResult) && ymxLastResult.contains("=")){
 				Map<String,String> ymxMap = splitLastResult(ymxLastResult);
 				report.setMjt(ymxMap==null || org.springframework.util.StringUtils.isEmpty(ymxMap.get("易磨性(MJ/t)")) ?"—":ymxMap.get("易磨性(MJ/t)"));
 				report.setKwht(ymxMap==null || org.springframework.util.StringUtils.isEmpty(ymxMap.get("易磨性值")) ?"—":ymxMap.get("易磨性值"));
@@ -5152,7 +5152,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 			//磨蚀性结果拆分
 			String fsxLastResult = reportMap.get(ElementKey.Fsx.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Fsx.getKey()).getLastResult())?"":reportMap.get(ElementKey.Fsx.getKey()).getLastResult();
-			if(StringUtils.isNotBlank(fsxLastResult)){
+			if(StringUtils.isNotBlank(fsxLastResult) && fsxLastResult.contains("=")){
 				Map<String,String> fsxMap = splitLastResult(fsxLastResult);
 				report.setAi(fsxMap==null || org.springframework.util.StringUtils.isEmpty(fsxMap.get("Ai(g)")) ?"—":fsxMap.get("Ai(g)"));
 			}else{
@@ -5161,7 +5161,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 			//可磨性结果拆分
 			String kmLastResult = reportMap.get(ElementKey.Km.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Km.getKey()).getLastResult())?"":reportMap.get(ElementKey.Km.getKey()).getLastResult();
-			if(StringUtils.isNotBlank(kmLastResult)){
+			if(StringUtils.isNotBlank(kmLastResult) && kmLastResult.contains("=")){
 				Map<String,String> kmMap = splitLastResult(kmLastResult);
 				report.setHgi(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("HGI")) ?"—":kmMap.get("HGI"));
 				report.setCyl(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("出样率(%)")) ?"—":kmMap.get("出样率(%)"));
@@ -5172,7 +5172,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 			//辊磨结果拆分
 			String gmLastResult = reportMap.get(ElementKey.Gm.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Gm.getKey()).getLastResult())?"":reportMap.get(ElementKey.Gm.getKey()).getLastResult();
-			if(StringUtils.isNotBlank(gmLastResult)){
+			if(StringUtils.isNotBlank(gmLastResult) && gmLastResult.contains("=")){
 				Map<String,String> gmMap = splitLastResult(gmLastResult);
 				report.setTmf(gmMap==null || org.springframework.util.StringUtils.isEmpty(gmMap.get("TMF")) ?"—":gmMap.get("TMF"));
 				report.setTwf(gmMap==null || org.springframework.util.StringUtils.isEmpty(gmMap.get("TWF(kg/t)")) ?"—":gmMap.get("TWF(kg/t)"));