Skip to content

A
amos-boot-biz
Commit 3109496d authored by KeYong's avatar KeYong
Browse files
Options

Merge branch 'develop_station' into developer

# Conflicts: # amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java # amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
parents dffbdf9f 7a38866b
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 3 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java
View file @ 3109496d
......@@ -105,9 +105,13 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
@Autowired
private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
@Autowired
private EquipmentSpecificAlarmLogMapper equipmentSpecificAlarmLogMapper;
@Autowired
private ISignalClassifyService signalClassifyService;
@Override
......@@ -124,6 +128,11 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
return res;
}
EquipmentSpecificAlarmLog specificAlarm = confirmAlarmMapper.getDetailsById(alarmId, equipId);
if (!ObjectUtils.isEmpty(specificAlarm.getConfirmType())) {
String handleTypeName = ConfirmAlamEnum.getTypeByCode(String.valueOf(specificAlarm.getConfirmType()));
specificAlarm.setConfirmTypeName(StringUtil.isNotEmpty(handleTypeName)
? handleTypeName : signalClassifyService.getTypeNameByCode(String.valueOf(specificAlarm.getConfirmType())).getTypeName());
}
List<AlamVideoVO> videoBySpeId;
if (specificAlarm == null) {
videoBySpeId = videoMapper.getVideoBySpeId(equipId);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java
View file @ 3109496d
......@@ -23,6 +23,7 @@ import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
import com.yeejoin.equipmanage.common.vo.*;
import com.yeejoin.equipmanage.fegin.JcsFeign;
import com.yeejoin.equipmanage.service.*;
import liquibase.pro.packaged.x;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.PageImpl;
......@@ -134,7 +135,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
alarmDownloadVO.setCleanStatus(alarm.get("cleanStatus").toString());
// 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
if (ObjectUtils.isEmpty(alarm.get("handleType"))) {
alarmDownloadVO.setHandleType("");
} else {
String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType")));
alarmDownloadVO.setHandleType(StringUtil.isNotEmpty(handleType)
? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(alarm.get("handleType"))).getTypeName());
}
alarmDownloadVO.setResolveResult(StringUtil.isNotEmpty(alarm.get("resolveResult")) ? alarm.get("resolveResult").toString() : "");
alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?alarm.get("confirmDate").toString().replace("T", " ") : "");
alarmDownloadVO.setAlarmReason(StringUtil.isNotEmpty(alarm.get("alarmReason")) ? alarm.get("alarmReason").toString() : "");
......@@ -160,7 +167,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
alarmDownloadVO.setCleanStatus(alarm.get("cleanStatus").toString());
// 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
if (ObjectUtils.isEmpty(alarm.get("handleType"))) {
alarmDownloadVO.setHandleType("");
} else {
String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType")));
alarmDownloadVO.setHandleType(StringUtil.isNotEmpty(handleType)
? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(alarm.get("handleType"))).getTypeName());
}
alarmDownloadVO.setResolveResult(StringUtil.isNotEmpty(alarm.get("resolveResult")) ? alarm.get("resolveResult").toString() : "");
alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?alarm.get("confirmDate").toString().replace("T", " ") : "");
alarmDownloadVO.setAlarmReason(StringUtil.isNotEmpty(alarm.get("alarmReason")) ? alarm.get("alarmReason").toString() : "");
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
View file @ 3109496d
......@@ -391,7 +391,6 @@ WHERE wles.id=#{id}
si.id,
si.equipment_specific_id AS equipmentId,
(case when si.value_label is null or trim(si.value_label) ='' then si.`value` else si.value_label end )AS 'value',
<!-- IFNULL(si.value_label, si.`value`) AS 'value', -->
si.create_date,
si.update_date
FROM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment