|
@@ -157,11 +157,26 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
|
|
|
List<InterlockDetailAddDTO> interlockDetailAddDTOList = interlockAddDTO.getInterlockDetailAddDTOList();
|
|
|
|
|
|
- String interlockStatus = InterlockAllStatus.INTERLOCK_STATUS_TY;// 联锁状态 0未投用1投用
|
|
|
- String loopHealthLevel = "";// 回路健康级别
|
|
|
+ // 系统设置的各状态
|
|
|
+ InterlockBase base = interlockBaseService.getById(interlockAddDTO.getInterlockSystemId());
|
|
|
+ // 控制系统状态(输入卡件状态、输出卡件状态、MP状态)
|
|
|
+ String controlSystemStatusNormal = base.getControlSystemStatusNormal(); // 正常
|
|
|
+ String controlSystemStatusAbnormal = editStatus(base.getControlSystemStatusNormal()); // 非正常
|
|
|
+ // 旁路状态
|
|
|
+ String bypassYes = base.getBypassYes(); // 是
|
|
|
+ // 仪表状态
|
|
|
+ String instrumentStatusNormal = base.getInstrumentStatusNormal(); // 正常
|
|
|
+ String instrumentStatusAbnormal = editStatus(base.getInstrumentStatusNormal()); // 正常
|
|
|
+ // 联锁状态
|
|
|
+ String interlockStatusTy = base.getInterlockStatusTy(); // 投用
|
|
|
+ String interlockStatusWty = editStatus(base.getInterlockStatusTy()); // 未投用
|
|
|
+
|
|
|
+
|
|
|
+ String interlockStatus = interlockStatusTy;;// 先设置为 联锁状态-投用
|
|
|
+ String loopHealthLevel = "A";// 回路健康级别
|
|
|
|
|
|
- String controlSystemStatus = InterlockAllStatus.CONTROL_SYSTEM_STATUS_NORMAL;// 总体 控制系统状态 0正常1非正常
|
|
|
- String instrumentStatus = InterlockAllStatus.INSTRUMENT_STATUS_NORMAL;// 总体 仪表状态 0正常1故障
|
|
|
+ String controlSystemStatus = controlSystemStatusNormal;// 总体 先设置为 控制系统状态-正常
|
|
|
+ String instrumentStatus = instrumentStatusNormal;// 总体 先设置为 仪表状态-正常
|
|
|
|
|
|
|
|
|
//删除该联锁的所有联锁详细信息的所有点位
|
|
@@ -183,49 +198,25 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
|
|
|
for (InterlockDetailAddDTO dto : interlockDetailAddDTOList){
|
|
|
|
|
|
- // 将根据点位获得的各状态转化成对应的数据字典的状态(0 1)
|
|
|
- InterlockBase base = interlockBaseService.getById(interlockAddDTO.getInterlockSystemId());
|
|
|
- // 输入卡件状态
|
|
|
- if( !InterlockAllStatus.INPUT_STATUS_NORMAL.equals(base.getInputStatusNormal()) ){
|
|
|
- dto.setInputStatus(editStatus(dto.getInputStatus()));
|
|
|
- }
|
|
|
- // 输出卡件状态 outputStatus
|
|
|
- if( !InterlockAllStatus.OUTPUT_STATUS_NORMAL.equals(base.getOutputStatusNormal()) ){
|
|
|
- dto.setOutputStatus(editStatus(dto.getOutputStatus()));
|
|
|
- }
|
|
|
- // MP状态
|
|
|
- if( !InterlockAllStatus.MP_STATUS_NORMAL.equals(base.getMpStatusNormal()) ){
|
|
|
- dto.setMpStatus(editStatus(dto.getMpStatus()));
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
dto.setThresholdTimeUnit("s"); // TODO 暂定单位为秒
|
|
|
dto.setSummaryid(summaryId);
|
|
|
|
|
|
|
|
|
- if(dto.getIfBypass() != null && InterlockAllStatus.IF_BY_PASS_YES.equals(dto.getIfBypass())) {
|
|
|
- // 旁路状态
|
|
|
- if( !InterlockAllStatus.BY_PASS_YES.equals(base.getBypassYes()) ){
|
|
|
- dto.setBypass(editStatus(dto.getBypass()));
|
|
|
- }
|
|
|
- }
|
|
|
- //联锁状态 0未投用1投用; 旁路状态是多个的话,任何一个旁路是1(是),则联锁状态是0未投用。
|
|
|
- if(dto.getBypass()!=null && InterlockAllStatus.BY_PASS_YES.equals(dto.getBypass())) interlockStatus = InterlockAllStatus.INTERLOCK_STATUS_WTY;
|
|
|
+ //联锁状态; 旁路状态是多个的话,任何一个旁路状态为“是”,则联锁状态是“未投用(摘除)”,旁路状态都为“否”,则联锁状态是“投用”。
|
|
|
+ if(dto.getBypass()!=null && bypassYes.equals(dto.getBypass())) interlockStatus = interlockStatusWty;
|
|
|
|
|
|
- //仪表状态:0正常1故障
|
|
|
+ //仪表状态
|
|
|
if(dto.getInstrumentStatusJuge()!=null){
|
|
|
if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE0.equals(dto.getInstrumentStatusJuge())){
|
|
|
//0直接读取位号
|
|
|
- if( !InterlockAllStatus.INSTRUMENT_STATUS_NORMAL.equals(base.getInstrumentStatusNormal()) ){
|
|
|
- dto.setInstrumentStatus(editStatus(dto.getInstrumentStatusValue()));
|
|
|
- }
|
|
|
+ dto.setInstrumentStatus(dto.getInstrumentStatusValue());
|
|
|
} else if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE1.equals(dto.getInstrumentStatusJuge())){
|
|
|
//1高低限判断
|
|
|
BigDecimal ysmnlValue = new BigDecimal(dto.getYsmnlValue());
|
|
|
BigDecimal lowerLimit = new BigDecimal(dto.getLowerLimit());
|
|
|
BigDecimal upperLimit = new BigDecimal(dto.getUpperLimit());
|
|
|
- if(ysmnlValue.compareTo(lowerLimit) >= 0 && ysmnlValue.compareTo(upperLimit) <= 0) dto.setInstrumentStatus(InterlockAllStatus.INSTRUMENT_STATUS_NORMAL); //正常
|
|
|
- else dto.setInstrumentStatus(InterlockAllStatus.INSTRUMENT_STATUS_GZ); //故障
|
|
|
+ if(ysmnlValue.compareTo(lowerLimit) >= 0 && ysmnlValue.compareTo(upperLimit) <= 0) dto.setInstrumentStatus(instrumentStatusNormal); // 正常
|
|
|
+ else dto.setInstrumentStatus(instrumentStatusAbnormal); // 故障
|
|
|
|
|
|
} else if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE2.equals(dto.getInstrumentStatusJuge())){ //2突变超限判断
|
|
|
//通过判断原始模拟量位号突变(与iotedge_collect_data表的数据进行比较)超过某阈值得出值
|
|
@@ -255,23 +246,23 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
BigDecimal number = upperLimit.subtract(lowerLimit);
|
|
|
BigDecimal newYz = number.multiply(new BigDecimal(yz));
|
|
|
if ((num.divide(beginValue).compareTo(newYz)) > 0){
|
|
|
- dto.setInstrumentStatus(InterlockAllStatus.INSTRUMENT_STATUS_GZ); //仪表状态(0正常1故障)
|
|
|
- }else dto.setInstrumentStatus(InterlockAllStatus.INSTRUMENT_STATUS_NORMAL); //正常
|
|
|
+ dto.setInstrumentStatus(instrumentStatusAbnormal); // 故障
|
|
|
+ }else dto.setInstrumentStatus(instrumentStatusNormal); // 正常
|
|
|
}
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
- if(dto.getInstrumentStatus()!=null && dto.getInstrumentStatus().equals(InterlockAllStatus.INSTRUMENT_STATUS_GZ)) instrumentStatus = InterlockAllStatus.INSTRUMENT_STATUS_GZ;
|
|
|
+ if(dto.getInstrumentStatus()!=null && dto.getInstrumentStatus().equals(instrumentStatusAbnormal)) instrumentStatus = instrumentStatusAbnormal;
|
|
|
}
|
|
|
|
|
|
//控制系统状态 —— MP状态、输入卡件状态、输出卡件状态任何一个非正常则控制系统状态非正常。
|
|
|
- if(InterlockAllStatus.MP_STATUS_ABNORMAL.equals(dto.getMpStatus()) || InterlockAllStatus.MP_STATUS_ABNORMAL.equals(dto.getInputStatus()) || InterlockAllStatus.OUTPUT_STATUS_ABNORMAL.equals(dto.getOutputStatus())) {
|
|
|
- dto.setControlSystemStatus(InterlockAllStatus.CONTROL_SYSTEM_STATUS_ABNORMAL); // 非正常
|
|
|
- controlSystemStatus = InterlockAllStatus.CONTROL_SYSTEM_STATUS_ABNORMAL;
|
|
|
- } else dto.setControlSystemStatus(InterlockAllStatus.CONTROL_SYSTEM_STATUS_NORMAL); // 正常
|
|
|
+ if(controlSystemStatusAbnormal.equals(dto.getMpStatus()) || controlSystemStatusAbnormal.equals(dto.getInputStatus()) || controlSystemStatusAbnormal.equals(dto.getOutputStatus())) {
|
|
|
+ dto.setControlSystemStatus(controlSystemStatusAbnormal); // 非正常
|
|
|
+ controlSystemStatus = controlSystemStatusAbnormal;
|
|
|
+ } else dto.setControlSystemStatus(controlSystemStatusNormal); // 正常
|
|
|
|
|
|
- InterlockDetail detail = InterlockDetailConvert.INSTANCE.toEntity(dto, interlockAddDTO.getInterlockName(),formattedDateTime);
|
|
|
+ InterlockDetail detail = InterlockDetailConvert.INSTANCE.toEntity(dto, interlockAddDTO.getInterlockName(),formattedDateTime, interlockAddDTO.getInterlockSystemId());
|
|
|
|
|
|
//新增联锁详细信息表数据
|
|
|
interlockDetailMapper.insert(detail);
|
|
@@ -284,7 +275,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
}
|
|
|
|
|
|
//回路健康等级
|
|
|
- loopHealthLevel = getLHL(instrumentStatus, interlockStatus, controlSystemStatus);
|
|
|
+ loopHealthLevel = getLHL(instrumentStatus, instrumentStatusAbnormal,interlockStatus, interlockStatusWty, controlSystemStatus, controlSystemStatusAbnormal);
|
|
|
|
|
|
InterlockSummary interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary1(interlockAddDTO,interlockStatus,loopHealthLevel);
|
|
|
//修改联锁总表数据
|
|
@@ -306,11 +297,26 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
|
|
|
List<InterlockDetailAddDTO> interlockDetailAddDTOList = interlockAddDTO.getInterlockDetailAddDTOList();
|
|
|
|
|
|
- String interlockStatus = InterlockAllStatus.INTERLOCK_STATUS_TY;// 联锁状态 0未投用1投用
|
|
|
+ // 系统设置的各状态
|
|
|
+ InterlockBase base = interlockBaseService.getById(interlockAddDTO.getInterlockSystemId());
|
|
|
+ // 控制系统状态(输入卡件状态、输出卡件状态、MP状态)
|
|
|
+ String controlSystemStatusNormal = base.getControlSystemStatusNormal(); // 正常
|
|
|
+ String controlSystemStatusAbnormal = editStatus(base.getControlSystemStatusNormal()); // 非正常
|
|
|
+ // 旁路状态
|
|
|
+ String bypassYes = base.getBypassYes(); // 是
|
|
|
+ // 仪表状态
|
|
|
+ String instrumentStatusNormal = base.getInstrumentStatusNormal(); // 正常
|
|
|
+ String instrumentStatusAbnormal = editStatus(base.getInstrumentStatusNormal()); // 正常
|
|
|
+ // 联锁状态
|
|
|
+ String interlockStatusTy = base.getInterlockStatusTy(); // 投用
|
|
|
+ String interlockStatusWty = editStatus(base.getInterlockStatusTy()); // 未投用
|
|
|
+
|
|
|
+
|
|
|
+ String interlockStatus = interlockStatusTy;;// 先设置为 联锁状态-投用
|
|
|
String loopHealthLevel = "";// 回路健康级别
|
|
|
|
|
|
- String controlSystemStatus = InterlockAllStatus.CONTROL_SYSTEM_STATUS_NORMAL;// 总体 控制系统状态 0正常1非正常
|
|
|
- String instrumentStatus = InterlockAllStatus.INSTRUMENT_STATUS_NORMAL;// 总体 仪表状态 0正常1故障
|
|
|
+ String controlSystemStatus = controlSystemStatusNormal;// 总体 先设置为 控制系统状态-正常
|
|
|
+ String instrumentStatus = instrumentStatusNormal;// 总体 先设置为 仪表状态-正常
|
|
|
|
|
|
//新增——联锁总表数据
|
|
|
InterlockSummary interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary(interlockAddDTO,interlockStatus,loopHealthLevel);
|
|
@@ -323,50 +329,26 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
|
|
|
for (InterlockDetailAddDTO dto : interlockDetailAddDTOList){
|
|
|
|
|
|
- // 将根据点位获得的各状态转化成对应的数据字典的状态(0 1)
|
|
|
- InterlockBase base = interlockBaseService.getById(interlockAddDTO.getInterlockSystemId());
|
|
|
- // 输入卡件状态
|
|
|
- if( !InterlockAllStatus.INPUT_STATUS_NORMAL.equals(base.getInputStatusNormal()) ){
|
|
|
- dto.setInputStatus(editStatus(dto.getInputStatus()));
|
|
|
- }
|
|
|
- // 输出卡件状态 outputStatus
|
|
|
- if( !InterlockAllStatus.OUTPUT_STATUS_NORMAL.equals(base.getOutputStatusNormal()) ){
|
|
|
- dto.setOutputStatus(editStatus(dto.getOutputStatus()));
|
|
|
- }
|
|
|
- // MP状态
|
|
|
- if( !InterlockAllStatus.MP_STATUS_NORMAL.equals(base.getMpStatusNormal()) ){
|
|
|
- dto.setMpStatus(editStatus(dto.getMpStatus()));
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
dto.setThresholdTimeUnit("s"); // TODO 暂定单位为秒
|
|
|
dto.setSummaryid(summaryId);
|
|
|
|
|
|
|
|
|
- if(dto.getIfBypass() != null && InterlockAllStatus.IF_BY_PASS_YES.equals(dto.getIfBypass())) {
|
|
|
- // 旁路状态
|
|
|
- if( !InterlockAllStatus.BY_PASS_YES.equals(base.getBypassYes()) ){
|
|
|
- dto.setBypass(editStatus(dto.getBypass()));
|
|
|
- }
|
|
|
- }
|
|
|
- //联锁状态 0未投用1投用; 旁路状态是多个的话,任何一个旁路是1(是),则联锁状态是0未投用。
|
|
|
- if(dto.getBypass()!=null && InterlockAllStatus.BY_PASS_YES.equals(dto.getBypass())) interlockStatus = InterlockAllStatus.INTERLOCK_STATUS_WTY;
|
|
|
+ //联锁状态; 旁路状态是多个的话,任何一个旁路状态为“是”,则联锁状态是“未投用(摘除)”,旁路状态都为“否”,则联锁状态是“投用”。
|
|
|
+ if(dto.getBypass()!=null && bypassYes.equals(dto.getBypass())) interlockStatus = interlockStatusWty;
|
|
|
|
|
|
- //仪表状态:0正常1故障
|
|
|
+ //仪表状态
|
|
|
if(dto.getInstrumentStatusJuge()!=null){
|
|
|
|
|
|
if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE0.equals(dto.getInstrumentStatusJuge())){
|
|
|
//0直接读取位号
|
|
|
- if( !InterlockAllStatus.INSTRUMENT_STATUS_NORMAL.equals(base.getInstrumentStatusNormal()) ){
|
|
|
- dto.setInstrumentStatus(editStatus(dto.getInstrumentStatusValue()));
|
|
|
- }
|
|
|
+ dto.setInstrumentStatus(dto.getInstrumentStatusValue());
|
|
|
} else if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE1.equals(dto.getInstrumentStatusJuge())){
|
|
|
//1高低限判断
|
|
|
BigDecimal ysmnlValue = new BigDecimal(dto.getYsmnlValue());
|
|
|
BigDecimal lowerLimit = new BigDecimal(dto.getLowerLimit());
|
|
|
BigDecimal upperLimit = new BigDecimal(dto.getUpperLimit());
|
|
|
- if(ysmnlValue.compareTo(lowerLimit) >= 0 && ysmnlValue.compareTo(upperLimit) <= 0) dto.setInstrumentStatus(InterlockAllStatus.INSTRUMENT_STATUS_NORMAL); //正常
|
|
|
- else dto.setInstrumentStatus(InterlockAllStatus.INSTRUMENT_STATUS_GZ); //故障
|
|
|
+ if(ysmnlValue.compareTo(lowerLimit) >= 0 && ysmnlValue.compareTo(upperLimit) <= 0) dto.setInstrumentStatus(instrumentStatusNormal); // 正常
|
|
|
+ else dto.setInstrumentStatus(instrumentStatusAbnormal); // 故障
|
|
|
|
|
|
} else if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE2.equals(dto.getInstrumentStatusJuge())){ //2突变超限判断
|
|
|
//通过判断原始模拟量位号突变(与iotedge_collect_data表的数据进行比较)超过某阈值得出值
|
|
@@ -396,21 +378,21 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
BigDecimal number = upperLimit.subtract(lowerLimit);
|
|
|
BigDecimal newYz = number.multiply(new BigDecimal(yz));
|
|
|
if ((num.divide(beginValue).compareTo(newYz)) > 0){
|
|
|
- dto.setInstrumentStatus(InterlockAllStatus.INSTRUMENT_STATUS_GZ); //仪表状态(0正常1故障)
|
|
|
- }else dto.setInstrumentStatus(InterlockAllStatus.INSTRUMENT_STATUS_NORMAL); //正常
|
|
|
+ dto.setInstrumentStatus(instrumentStatusAbnormal); // 故障
|
|
|
+ }else dto.setInstrumentStatus(instrumentStatusNormal); // 正常
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(dto.getInstrumentStatus()!=null && dto.getInstrumentStatus().equals(InterlockAllStatus.INSTRUMENT_STATUS_GZ)) instrumentStatus = InterlockAllStatus.INSTRUMENT_STATUS_GZ;
|
|
|
+ if(dto.getInstrumentStatus()!=null && dto.getInstrumentStatus().equals(instrumentStatusAbnormal)) instrumentStatus = instrumentStatusAbnormal;
|
|
|
}
|
|
|
|
|
|
//控制系统状态 —— MP状态、输入卡件状态、输出卡件状态任何一个非正常则控制系统状态非正常。
|
|
|
- if(InterlockAllStatus.MP_STATUS_ABNORMAL.equals(dto.getMpStatus()) || InterlockAllStatus.MP_STATUS_ABNORMAL.equals(dto.getInputStatus()) || InterlockAllStatus.OUTPUT_STATUS_ABNORMAL.equals(dto.getOutputStatus())) {
|
|
|
- dto.setControlSystemStatus(InterlockAllStatus.CONTROL_SYSTEM_STATUS_ABNORMAL); // 非正常
|
|
|
- controlSystemStatus = InterlockAllStatus.CONTROL_SYSTEM_STATUS_ABNORMAL;
|
|
|
- } else dto.setControlSystemStatus(InterlockAllStatus.CONTROL_SYSTEM_STATUS_NORMAL); // 正常
|
|
|
+ if(controlSystemStatusAbnormal.equals(dto.getMpStatus()) || controlSystemStatusAbnormal.equals(dto.getInputStatus()) || controlSystemStatusAbnormal.equals(dto.getOutputStatus())) {
|
|
|
+ dto.setControlSystemStatus(controlSystemStatusAbnormal); // 非正常
|
|
|
+ controlSystemStatus = controlSystemStatusAbnormal;
|
|
|
+ } else dto.setControlSystemStatus(controlSystemStatusNormal); // 正常
|
|
|
|
|
|
- InterlockDetail detail = InterlockDetailConvert.INSTANCE.toEntity(dto,interlockAddDTO.getInterlockName(), formattedDateTime);
|
|
|
+ InterlockDetail detail = InterlockDetailConvert.INSTANCE.toEntity(dto, interlockAddDTO.getInterlockName(), formattedDateTime, interlockAddDTO.getInterlockSystemId());
|
|
|
//新增联锁详细信息表数据
|
|
|
interlockDetailMapper.insert(detail);
|
|
|
//新增联锁详细信息表临时表数据
|
|
@@ -422,7 +404,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
}
|
|
|
|
|
|
//回路健康等级
|
|
|
- loopHealthLevel = getLHL(instrumentStatus, interlockStatus, controlSystemStatus);
|
|
|
+ loopHealthLevel = getLHL(instrumentStatus, instrumentStatusAbnormal,interlockStatus, interlockStatusWty, controlSystemStatus, controlSystemStatusAbnormal);
|
|
|
|
|
|
|
|
|
interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary2(interlockSummary,interlockStatus,loopHealthLevel);
|
|
@@ -435,38 +417,42 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
|
|
|
|
|
|
private List<InterlockTag> toTagList(InterlockDetailAddDTO dto,String interlockConditionId,String interlockSummaryId){
|
|
|
List<InterlockTag> interlockTagList = new ArrayList<>();
|
|
|
- //联锁条件
|
|
|
+ //联锁条件(当前值)
|
|
|
interlockTagList.add(createInterlockTag(dto.getInterlockConditionDeviceId(), dto.getInterlockConditionModuleName(), dto.getInterlockConditionTag(), dto.getInterlockCondition(), InterlockConstants.INTERLOCK_CONDITION,interlockConditionId,interlockSummaryId));
|
|
|
- //仪表状态、仪表状态值 0直接读取位号
|
|
|
- if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE0.equals(dto.getInstrumentStatusJuge())){
|
|
|
+ //仪表状态 0直接读取位号
|
|
|
+ if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE0.equals(dto.getInstrumentStatusJuge()) && dto.getInstrumentStatusTag() != null){
|
|
|
interlockTagList.add(createInterlockTag(dto.getInstrumentStatusDeviceId(), dto.getInstrumentStatusModuleName(), dto.getInstrumentStatusTag(), dto.getInstrumentStatus(), InterlockConstants.INSTRUMENT_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
- interlockTagList.add(createInterlockTag(dto.getInstrumentStatusDeviceId(), dto.getInstrumentStatusModuleName(), dto.getInstrumentStatusTag(), dto.getInstrumentStatus(), InterlockConstants.INSTRUMENT_STATUS_VALUE,interlockConditionId,interlockSummaryId));
|
|
|
}
|
|
|
//原始模拟量
|
|
|
- if(InterlockAllStatus.INSTRUMENT_STATUS_JUDGE1.equals(dto.getInstrumentStatusJuge()) || InterlockAllStatus.INSTRUMENT_STATUS_JUDGE2.equals(dto.getInstrumentStatusJuge())){
|
|
|
+ if((InterlockAllStatus.INSTRUMENT_STATUS_JUDGE1.equals(dto.getInstrumentStatusJuge()) || InterlockAllStatus.INSTRUMENT_STATUS_JUDGE2.equals(dto.getInstrumentStatusJuge())) && dto.getYsmnlTag() != null){
|
|
|
interlockTagList.add(createInterlockTag(dto.getYsmnlDeviceId(),dto.getYsmnlModuleName(),dto.getYsmnlTag(),dto.getYsmnlValue(),InterlockConstants.ORIGINAL_ANALOG_VALUE,interlockConditionId,interlockSummaryId));
|
|
|
}
|
|
|
- //当前值
|
|
|
- interlockTagList.add(createInterlockTag(dto.getCurrentValueDeviceId(),dto.getCurrentValueModuleName(),dto.getCurrentValueTag(),dto.getCurrentValue(),InterlockConstants.CURRENT_VALUE,interlockConditionId,interlockSummaryId));
|
|
|
//旁路状态
|
|
|
- //TODO
|
|
|
- interlockTagList.add(createInterlockTag(dto.getBypassDeviceId(),dto.getBypassModuleName(),dto.getBypassTag(),dto.getBypass(),InterlockConstants.BYPASS_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
+ if(dto.getIfBypass().equals(InterlockAllStatus.IF_BY_PASS_YES) && dto.getBypassTag()!=null){
|
|
|
+ interlockTagList.add(createInterlockTag(dto.getBypassDeviceId(),dto.getBypassModuleName(),dto.getBypassTag(),dto.getBypass(),InterlockConstants.BYPASS_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
+ }
|
|
|
//输入卡件状态
|
|
|
- interlockTagList.add(createInterlockTag(dto.getInputStatusDeviceId(),dto.getInputStatusModuleName(),dto.getInputStatusTag(),dto.getInputStatus(),InterlockConstants.INPUT_CARD_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
+ if(dto.getInputStatusTag()!=null){
|
|
|
+ interlockTagList.add(createInterlockTag(dto.getInputStatusDeviceId(),dto.getInputStatusModuleName(),dto.getInputStatusTag(),dto.getInputStatus(),InterlockConstants.INPUT_CARD_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
+ }
|
|
|
//输出卡件状态
|
|
|
- interlockTagList.add(createInterlockTag(dto.getOutputStatusDeviceId(),dto.getOutputStatusModuleName(),dto.getOutputStatusTag(),dto.getOutputStatus(),InterlockConstants.OUTPUT_CARD_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
+ if(dto.getOutputStatusTag()!=null){
|
|
|
+ interlockTagList.add(createInterlockTag(dto.getOutputStatusDeviceId(),dto.getOutputStatusModuleName(),dto.getOutputStatusTag(),dto.getOutputStatus(),InterlockConstants.OUTPUT_CARD_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
+ }
|
|
|
//MP状态
|
|
|
- interlockTagList.add(createInterlockTag(dto.getMpStatusDeviceId(),dto.getMpStatusModuleName(),dto.getMpStatusTag(),dto.getMpStatus(),InterlockConstants.MP_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
+ if(dto.getMpStatusTag()!=null){
|
|
|
+ interlockTagList.add(createInterlockTag(dto.getMpStatusDeviceId(),dto.getMpStatusModuleName(),dto.getMpStatusTag(),dto.getMpStatus(),InterlockConstants.MP_STATUS,interlockConditionId,interlockSummaryId));
|
|
|
+ }
|
|
|
|
|
|
return interlockTagList;
|
|
|
}
|
|
|
|
|
|
|
|
|
- private String getLHL(String instrumentStatus, String interlockStatus, String controlSystemStatus){
|
|
|
+ private String getLHL(String instrumentStatus, String instrumentStatusAbnormal, String interlockStatus, String interlockStatusWty, String controlSystemStatus, String controlSystemStatusAbnormal){
|
|
|
int i = 0;
|
|
|
- if(InterlockAllStatus.INSTRUMENT_STATUS_GZ.equals(instrumentStatus)) i++; // 仪表状态 0正常1故障
|
|
|
- if(InterlockAllStatus.INTERLOCK_STATUS_WTY.equals(interlockStatus)) i++; // TODO 联锁状态 0未投用1投用 哪个算不正常状态 先按0未投用不正常算
|
|
|
- if(InterlockAllStatus.CONTROL_SYSTEM_STATUS_ABNORMAL.equals(controlSystemStatus)) i++; // 控制系统状态 0正常1非正常
|
|
|
+ if(instrumentStatusAbnormal.equals(instrumentStatus)) i++; // 仪表状态-故障
|
|
|
+ if(interlockStatusWty.equals(interlockStatus)) i++; // TODO 联锁状态 未投用、投用 哪个算不正常状态 先按0未投用不正常算
|
|
|
+ if(controlSystemStatusAbnormal.equals(controlSystemStatus)) i++; // 控制系统状态-非正常
|
|
|
if(i==0) return "A";
|
|
|
else if(i==1) return "B";
|
|
|
else if(i==2) return "C";
|