数据分析从数据中台实时查询与系统的参数结合 测试通过1

src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java

@@ -102,6 +102,9 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame
             engineModelPojos = queryResult.stream().filter(dataEntryEngineModelPojo -> {
                 String engineCapacity = dataEntryEngineModelPojo.getEngineCapacity();
                 Double ec = extractDisplacement(engineCapacity);
+                if (ec == null){
+                    return false;
+                }
                 return (Double.compare(ec, engineCapacityMin) >= 0 && Double.compare(ec, engineCapacityMax) < 0);
             }).collect(Collectors.toList());
         }
@@ -114,7 +117,9 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame
             List<EngineParamDetailPojo> pojoList = engineParamDetailService.selectByModelNewVersion(engineModelPojo.getId());
 //            编号&&零部件名称-参数
             ArrayList<EngineParamDetailPojo> engineParamDetailPojos = tcDataQueryService.tcDataSelectAllByproductNumber(engineModelPojo);
+            if (ObjectUtils.isNotEmpty(engineParamDetailPojos)) {
                 pojoList.addAll(engineParamDetailPojos);
+            }
             pojoList = pojoList.stream().filter(x -> ObjectUtils.isNotEmpty(x.getParameterValue()) && isNumber(x.getParameterValue())).collect(Collectors.toList());
             analysisModelParamterView.setModelID(engineModelPojo.getId());
             analysisModelParamterView.setModelName(engineModelPojo.getModelName());

src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java

@@ -55,6 +55,9 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
     public ArrayList<EngineParamDetailPojo> tcDataSelectAllByproductNumber(DataEntryEngineModelPojo engineModelPojo) {
         String productNumber = engineModelPojo.getProductNumber();
         HashMap<String, List<ClassificationAttribute>> stringListHashMap = new HashMap<>();
+        if (ObjectUtils.isEmpty(productNumber)) {
+            return null;
+        }
         List<EnginePartsCollection> partsCollections = bd.getTCDatabase()
                 .eq("ztj", productNumber)
                 .doQuery(EnginePartsCollection.class);
@@ -121,7 +124,6 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
                     .doQuery(EnginePartsCollection.class);
             if (ObjectUtils.isEmpty(lbjmcs)) {
                 log.error("根据零部件未找到状态机图号列表");
-                return null;
             }
             for (EnginePartsCollection lbjmc : lbjmcs) {
                 //获取图号
@@ -146,7 +148,8 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
                                 EngineParamDetailPojo engineParamDetailPojo = new EngineParamDetailPojo();
                                 engineParamDetailPojo.setEngineModelId(dataEntryEngineModelPojo.getId());
                                 engineParamDetailPojo.setPartsName(x.getPartsName());
-                                engineParamDetailPojo.setParameterName(x.getSubsystemName());
+                                engineParamDetailPojo.setSubsystemName(x.getSubsystemName());
+                                engineParamDetailPojo.setParameterName(x.getParameterName());
                                 engineParamDetailPojo.setParameterValue(fieldvalue);
                                 return engineParamDetailPojo;
                             }).collect(Collectors.toList());

src/main/resources/application-s.properties

@@ -155,6 +155,11 @@ mpaas.datasource[2].password=123456
 mpaas.datasource[2].type=mysql
 mpaas.datasource[2].url=jdbc:mysql://127.0.0.1:3306/yc_datasource_2?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf-8
 mpaas.datasource[2].username=root
+mpaas.datasource[3].name=yc_lrs_test_relsult
+mpaas.datasource[3].password=123456
+mpaas.datasource[3].type=mysql
+mpaas.datasource[3].url=jdbc:mysql://127.0.0.1:3306/yc_lrs_test_relsult?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf-8
+mpaas.datasource[3].username=root
 mpaas.query.bigdatathresholdvalue=100000
 mpaas.query.dbadatper=mysql
 mpaas.query.dbvendor=mysql