Merge remote-tracking branch 'origin/master'

@@ -80,6 +80,7 @@ public class AlarmCustomRecordHistoryServiceImpl extends ServiceImpl<AlarmRecord
     	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) {
+				if(ConvertUtils.isNotEmpty(record.getAlarmCustomRuleTypeTreepath())){
 					String alarmCustomRuleTypeTreepath = record.getAlarmCustomRuleTypeTreepath();
 					String alarmCustomRuleTypeTreepath = record.getAlarmCustomRuleTypeTreepath();
 					String[] customRuleTypeArray = alarmCustomRuleTypeTreepath.split(",");
 					String[] customRuleTypeArray = alarmCustomRuleTypeTreepath.split(",");
 					String customRuleTypeTreepathName = "";
 					String customRuleTypeTreepathName = "";
@@ -89,7 +90,8 @@ public class AlarmCustomRecordHistoryServiceImpl extends ServiceImpl<AlarmRecord
 					if(StringUtils.isNotEmpty(customRuleTypeTreepathName)) {
 					if(StringUtils.isNotEmpty(customRuleTypeTreepathName)) {
 						record.setAlarmCustomRuleTypeTreepathName(customRuleTypeTreepathName.substring(1));
 						record.setAlarmCustomRuleTypeTreepathName(customRuleTypeTreepathName.substring(1));
 					}
 					}
-    			
+				}
+				if(ConvertUtils.isNotEmpty(record.getAlarmRuleTypeTreepath())){
 					String alarmRuleTypeTreepath = record.getAlarmRuleTypeTreepath();
 					String alarmRuleTypeTreepath = record.getAlarmRuleTypeTreepath();
 					String[] ruleTypeArray = alarmRuleTypeTreepath.split(",");
 					String[] ruleTypeArray = alarmRuleTypeTreepath.split(",");
 					String alarmRuleTypeTreepathName = "";
 					String alarmRuleTypeTreepathName = "";
@@ -101,6 +103,7 @@ public class AlarmCustomRecordHistoryServiceImpl extends ServiceImpl<AlarmRecord
 					}
 					}
 				}
 				}
     		}
     		}
+    	}
     	//添加流程信息
     	//添加流程信息
     	//获取流程实例id集合
     	//获取流程实例id集合
   		Set<String> processInstanceIdSet = new HashSet<String>();
   		Set<String> processInstanceIdSet = new HashSet<String>();

@@ -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;