Merge remote-tracking branch 'origin/master'

@@ -56,7 +56,7 @@ public class AlarmCustomRecordHistoryServiceImpl extends ServiceImpl<AlarmRecord
     private IAlarmCustomRuleRepositoryService alarmCustomRuleRepositoryService;
     private IAlarmCustomRuleRepositoryService alarmCustomRuleRepositoryService;
     @Autowired
     @Autowired
     private IAlarmRuleConfigPublicTabService alarmRuleConfigPublicTabService;
     private IAlarmRuleConfigPublicTabService alarmRuleConfigPublicTabService;
-    
+
     @Override
     @Override
     public Page<AlarmRecordHistoryVO> queryCustomPageList(Page<AlarmRecordHistoryVO> pageList, AlarmRecordHistoryVO alarmRecordHistoryVO) {
     public Page<AlarmRecordHistoryVO> queryCustomPageList(Page<AlarmRecordHistoryVO> pageList, AlarmRecordHistoryVO alarmRecordHistoryVO) {
     	Page<AlarmRecordHistoryVO> pagelist = pageList.setRecords(alarmCustomRecordHistoryMapper.queryCustomPageList(pageList, alarmRecordHistoryVO));
     	Page<AlarmRecordHistoryVO> pagelist = pageList.setRecords(alarmCustomRecordHistoryMapper.queryCustomPageList(pageList, alarmRecordHistoryVO));
@@ -76,29 +76,32 @@ public class AlarmCustomRecordHistoryServiceImpl extends ServiceImpl<AlarmRecord
     	for(AlarmRuleConfigPublicTab alarmRuleTypeInfo : alarmRuleTypeList) {
     	for(AlarmRuleConfigPublicTab alarmRuleTypeInfo : alarmRuleTypeList) {
     		typeDictMap.put(alarmRuleTypeInfo.getId(), alarmRuleTypeInfo.getTabName());
     		typeDictMap.put(alarmRuleTypeInfo.getId(), alarmRuleTypeInfo.getTabName());
     	}
     	}
-    	
+
     	List<AlarmRecordHistoryVO> recordList = pagelist.getRecords();
     	List<AlarmRecordHistoryVO> recordList = pagelist.getRecords();
     	if(recordList!=null&&recordList.size()>0) {
     	if(recordList!=null&&recordList.size()>0) {
     		for(AlarmRecordHistoryVO record : recordList) {
     		for(AlarmRecordHistoryVO record : recordList) {
-    			String alarmCustomRuleTypeTreepath = record.getAlarmCustomRuleTypeTreepath();
-    			String[] customRuleTypeArray = alarmCustomRuleTypeTreepath.split(",");
-    			String customRuleTypeTreepathName = "";
-    			for(String type : customRuleTypeArray) {
-    				customRuleTypeTreepathName = customRuleTypeTreepathName+"/"+customDictMap.get(type);
-    			}
-    			if(StringUtils.isNotEmpty(customRuleTypeTreepathName)) {
-    				record.setAlarmCustomRuleTypeTreepathName(customRuleTypeTreepathName.substring(1));
-    			}
-    			
-    			String alarmRuleTypeTreepath = record.getAlarmRuleTypeTreepath();
-    			String[] ruleTypeArray = alarmRuleTypeTreepath.split(",");
-    			String alarmRuleTypeTreepathName = "";
-    			for(String type : ruleTypeArray) {
-    				alarmRuleTypeTreepathName = alarmRuleTypeTreepathName+"/"+typeDictMap.get(type);
-    			}
-    			if(StringUtils.isNotEmpty(alarmRuleTypeTreepathName)) {
-    				record.setAlarmRuleTypeTreepathName(alarmRuleTypeTreepathName.substring(1));
-    			}
+				if(ConvertUtils.isNotEmpty(record.getAlarmCustomRuleTypeTreepath())){
+					String alarmCustomRuleTypeTreepath = record.getAlarmCustomRuleTypeTreepath();
+					String[] customRuleTypeArray = alarmCustomRuleTypeTreepath.split(",");
+					String customRuleTypeTreepathName = "";
+					for(String type : customRuleTypeArray) {
+						customRuleTypeTreepathName = customRuleTypeTreepathName+"/"+customDictMap.get(type);
+					}
+					if(StringUtils.isNotEmpty(customRuleTypeTreepathName)) {
+						record.setAlarmCustomRuleTypeTreepathName(customRuleTypeTreepathName.substring(1));
+					}
+				}
+				if(ConvertUtils.isNotEmpty(record.getAlarmRuleTypeTreepath())){
+					String alarmRuleTypeTreepath = record.getAlarmRuleTypeTreepath();
+					String[] ruleTypeArray = alarmRuleTypeTreepath.split(",");
+					String alarmRuleTypeTreepathName = "";
+					for(String type : ruleTypeArray) {
+						alarmRuleTypeTreepathName = alarmRuleTypeTreepathName+"/"+typeDictMap.get(type);
+					}
+					if(StringUtils.isNotEmpty(alarmRuleTypeTreepathName)) {
+						record.setAlarmRuleTypeTreepathName(alarmRuleTypeTreepathName.substring(1));
+					}
+				}
     		}
     		}
     	}
     	}
     	//添加流程信息
     	//添加流程信息
@@ -131,7 +134,7 @@ public class AlarmCustomRecordHistoryServiceImpl extends ServiceImpl<AlarmRecord
   				vo.setFlow(flow);
   				vo.setFlow(flow);
   			}
   			}
   		}
   		}
-    	
+
     	return pagelist;
     	return pagelist;
     }
     }
     @Override
     @Override
@@ -153,7 +156,7 @@ public class AlarmCustomRecordHistoryServiceImpl extends ServiceImpl<AlarmRecord
 		Map<String,Object> noResponseMap = new HashMap<String,Object>();
 		Map<String,Object> noResponseMap = new HashMap<String,Object>();
 		noResponseMap.put("count", noResponseCount);
 		noResponseMap.put("count", noResponseCount);
 		noResponseMap.put("responseState", "0");
 		noResponseMap.put("responseState", "0");
-		
+
 		resultMap.put("totalMap", totalMap);
 		resultMap.put("totalMap", totalMap);
 		resultMap.put("responseMap", responseMap);
 		resultMap.put("responseMap", responseMap);
 		resultMap.put("noResponseMap", noResponseMap);
 		resultMap.put("noResponseMap", noResponseMap);
@@ -179,4 +182,4 @@ public class AlarmCustomRecordHistoryServiceImpl extends ServiceImpl<AlarmRecord
 	public void readAlarmBatch(AlarmRecordHistoryVO alarmRecordHistoryVO) {
 	public void readAlarmBatch(AlarmRecordHistoryVO alarmRecordHistoryVO) {
 		alarmCustomRecordHistoryMapper.readAlarmBatch(alarmRecordHistoryVO);
 		alarmCustomRecordHistoryMapper.readAlarmBatch(alarmRecordHistoryVO);
 	}
 	}
-}
\ No newline at end of file
+}

@@ -274,6 +274,13 @@ public class EquipmentInfo {
     @ApiModelProperty(value = "报废日期")
     @ApiModelProperty(value = "报废日期")
     private String scrapDate;
     private String scrapDate;
 
 
+    @ApiModelProperty(value = "性能分数")
+    private String performanceScore;
+    @ApiModelProperty(value = "设备健康度")
+    private String equipmentHealthLevel;
+    @ApiModelProperty(value = "设备健康状态")
+    private String equipmentHealthStatus;
+
     //检测机构
     //检测机构
     @ApiModelProperty(value = "检测机构")
     @ApiModelProperty(value = "检测机构")
     private String testingDepart;
     private String testingDepart;