TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: TuringsMachine:c1d3eed3421b86249f68917d1901c49ba37b8f5d
Branches Tags
TuringsMachine:master
TuringsMachine:zjw
TuringsMachine:xusd
..
compare: TuringsMachine:b388f0cc4344e8b467892bff48c53e5d6bd22ba2
Branches Tags
TuringsMachine:master
TuringsMachine:zjw
TuringsMachine:xusd

No commits in common. "c1d3eed3421b86249f68917d1901c49ba37b8f5d" and "b388f0cc4344e8b467892bff48c53e5d6bd22ba2" have entirely different histories.
c1d3eed342 ... b388f0cc43

8 changed files with 8 additions and 70 deletions
Show Stats Expand all files Collapse all files

2
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/inspection/vo/InspectionInfoSaveReqVO.java
View File

@ -40,6 +40,4 @@ public class InspectionInfoSaveReqVO {
@Schema(description = "定制化点检反馈")
private String exclusiveInspectionFeedback;
private Boolean closeAlarm;
}

2
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/EquipAlarmDataMapper.java
View File

@ -55,7 +55,7 @@ public interface EquipAlarmDataMapper extends BaseMapperX<EquipAlarmDataDO> {
.leftJoin(ModelInfoDO.class, ModelInfoDO::getModelId, EquipInfoDO::getModelId)
.leftJoin(CustomerInfoDO.class, CustomerInfoDO::getCustomerId, EquipInfoDO::getCustomerId)
.leftJoin(ComponentInfoDO.class, ComponentInfoDO::getComponentId, EquipAlarmDataDO::getComponentId)
.ne(EquipAlarmDataDO::getStatus, 1)
.eq(EquipAlarmDataDO::getStatus, 0)
.eqIfExists(EquipAlarmDataDO::getEquipId, reqVO.getEquipId())
.eqIfExists(EquipAlarmDataDO::getComponentId, reqVO.getComponentId())
.eqIfExists(EquipAlarmDataDO::getAlarmLevel, reqVO.getAlarmLevel())

41
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/inspection/InspectionInfoServiceImpl.java
View File

@ -16,14 +16,12 @@ import com.inspur.module.system.controller.admin.inspection.vo.InspectionPlanLis
import com.inspur.module.system.controller.baseData.vo.CustomerInfoSelectionVO;
import com.inspur.module.system.controller.equip.vo.EquipSelectionVO;
import com.inspur.module.system.controller.inspection.vo.*;
import com.inspur.module.system.dal.dataobject.alarm.EquipAlarmDataDO;
import com.inspur.module.system.dal.dataobject.baseData.CustomerInfoDO;
import com.inspur.module.system.dal.dataobject.inspection.InspectionFeedbackDO;
import com.inspur.module.system.dal.dataobject.inspection.InspectionInfoDO;
import com.inspur.module.system.dal.dataobject.inspection.InspectionPlanDO;
import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceOrderDO;
import com.inspur.module.system.dal.dataobject.notify.NotifyMessageDO;
import com.inspur.module.system.dal.mysql.alarm.EquipAlarmDataMapper;
import com.inspur.module.system.dal.mysql.inspection.InspectionInfoMapper;
import com.inspur.module.system.service.alarm.AlarmDataService;
import com.inspur.module.system.service.baseData.CustomerInfoService;
@ -78,9 +76,6 @@ public class InspectionInfoServiceImpl implements InspectionInfoService {
@Resource
private InspectionPlanService inspectionPlanService;
@Resource
private EquipAlarmDataMapper equipAlarmDataMapper;
@Override
@TenantIgnore
@Transactional
@ -98,11 +93,6 @@ public class InspectionInfoServiceImpl implements InspectionInfoService {
inspectionInfo.setStatus(0);
inspectionInfoMapper.insert(inspectionInfo);
//修改报警状态
if (StrUtil.isNotBlank(createReqVO.getAlarmId())){
equipAlarmDataMapper.updateById(new EquipAlarmDataDO().setEquipAlarmId(createReqVO.getAlarmId()).setStatus(2));
}
//消息推送
NotifyMessageDO noticeMessageDO = new NotifyMessageDO()
.setOrderId(inspectionInfo.getInspectionId())
@ -114,6 +104,7 @@ public class InspectionInfoServiceImpl implements InspectionInfoService {
.setTemplateNickname(SecurityFrameworkUtils.getLoginUserNickname())
.setTenantId(inspectionInfo.getTenantId());
notifyMessageService.createNotifyMessage(noticeMessageDO);
// 返回
return inspectionInfo.getInspectionId();
}
@ -126,15 +117,7 @@ public class InspectionInfoServiceImpl implements InspectionInfoService {
InspectionInfoDO validateInfo = validateInspectionInfoExists(updateReqVO.getInspectionId());
// 更新
InspectionInfoDO updateObj = BeanUtils.toBean(updateReqVO, InspectionInfoDO.class);
if (updateReqVO.getCloseAlarm()) {
alarmDataService.closeAllAlarmDataByEquipAlarmId(updateReqVO.getAlarmId(),false);
}
inspectionInfoMapper.updateById(updateObj);
//修改报警状态
if (StrUtil.isNotBlank(updateReqVO.getExclusiveInspection())){
equipAlarmDataMapper.updateById(new EquipAlarmDataDO().setEquipAlarmId(updateReqVO.getAlarmId()).setStatus(4));
}
//消息推送
NotifyMessageDO noticeMessageDO = new NotifyMessageDO()
.setOrderId(updateObj.getInspectionId())
@ -223,17 +206,6 @@ public class InspectionInfoServiceImpl implements InspectionInfoService {
alarmDataService.closeAllAlarmDataByEquipAlarmId(vo.getAlarmId(),false);
}
int i = inspectionInfoMapper.updateById(inspectionInfoDO);
//修改报警状态
int alarmStatus;
//未解决
if(vo.getStatus().equals(1)){
alarmStatus = 3;
}else {
alarmStatus = 1;
}
equipAlarmDataMapper.updateById(new EquipAlarmDataDO().setEquipAlarmId(vo.getAlarmId()).setStatus(alarmStatus));
//点检树新增
if (CollUtil.isNotEmpty(vo.getFeedbackList())){
List<InspectionFeedbackDO> feedbackList = vo.getFeedbackList();
@ -249,17 +221,6 @@ public class InspectionInfoServiceImpl implements InspectionInfoService {
if (vo.getCloseAlarm()) {
alarmDataService.closeAllAlarmDataByEquipAlarmId(vo.getAlarmId(),false);
}
//修改报警状态
int alarmStatus;
//未解决
if(vo.getStatus().equals(4)){
alarmStatus = 5;
}else {
alarmStatus = 1;
}
equipAlarmDataMapper.updateById(new EquipAlarmDataDO().setEquipAlarmId(vo.getAlarmId()).setStatus(alarmStatus));
return inspectionInfoMapper.updateById(inspectionInfoDO) > 0;
}

8
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java
View File

@ -20,7 +20,6 @@ import com.inspur.module.system.controller.equip.vo.ComponentSelectionVO;
import com.inspur.module.system.controller.equip.vo.EquipSelectionVO;
import com.inspur.module.system.controller.inspection.vo.InspectionInfoSaveReqVO;
import com.inspur.module.system.controller.maintenance.vo.*;
import com.inspur.module.system.dal.dataobject.alarm.EquipAlarmDataDO;
import com.inspur.module.system.dal.dataobject.baseData.CustomerInfoDO;
import com.inspur.module.system.dal.dataobject.equip.EquipInfoDO;
import com.inspur.module.system.dal.dataobject.equip.EquipInfoDetailsDTO;
@ -29,7 +28,6 @@ import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceOrderDO;
import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceReportDO;
import com.inspur.module.system.dal.dataobject.notify.NotifyMessageDO;
import com.inspur.module.system.dal.dataobject.user.AdminUserDO;
import com.inspur.module.system.dal.mysql.alarm.EquipAlarmDataMapper;
import com.inspur.module.system.dal.mysql.maintenance.MaintenanceOrderMapper;
import com.inspur.module.system.dal.mysql.maintenance.MaintenanceOrderRecordMapper;
import com.inspur.module.system.dal.mysql.maintenance.MaintenanceReportMapper;
@ -96,10 +94,10 @@ public class MaintenanceOrderServiceImpl implements MaintenanceOrderService {
private TaskService taskService;
@Resource
private NotifyMessageService notifyMessageService;
private AlarmDataService alarmDataService;
@Resource
private EquipAlarmDataMapper equipAlarmDataMapper;
private NotifyMessageService notifyMessageService;
/**
* OA 请假对应的流程定义 KEY
@ -130,7 +128,7 @@ public class MaintenanceOrderServiceImpl implements MaintenanceOrderService {
}
maintenanceOrderMapper.insert(remoteMaintenanceOrder);
if ("0".equals(createReqVO.getSubmitFlag()) && StrUtil.isNotBlank(createReqVO.getAlarmId())) {
equipAlarmDataMapper.updateById(new EquipAlarmDataDO().setEquipAlarmId(createReqVO.getAlarmId()).setStatus(6));
alarmDataService.closeAllAlarmDataByEquipAlarmId(createReqVO.getAlarmId(),false);
}
//设置点检工单状态
if (StrUtil.isNotBlank(createReqVO.getInspectionId())){

5
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/listener/MaintenanceSpringExpressionExecutionListener.java
View File

@ -5,7 +5,6 @@ import com.inspur.framework.security.core.util.SecurityFrameworkUtils;
import com.inspur.module.system.dal.dataobject.equip.EquipInfoDO;
import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceOrderDO;
import com.inspur.module.system.dal.mysql.equip.EquipInfoMapper;
import com.inspur.module.system.service.alarm.AlarmDataService;
import com.inspur.module.system.service.maintenance.MaintenanceOrderService;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.delegate.DelegateExecution;
@ -30,9 +29,6 @@ public class MaintenanceSpringExpressionExecutionListener {
@Resource
private EquipInfoMapper equipInfoMapper;
@Resource
private AlarmDataService alarmDataService;
/**
* 派单
*/
@ -101,7 +97,6 @@ public class MaintenanceSpringExpressionExecutionListener {
equipInfoDO.setRunStatus(0);
equipInfoMapper.updateById(equipInfoDO);
}
alarmDataService.closeAllAlarmDataByEquipAlarmId(maintenanceOrder.getAlarmId(),false);
}
log.info("listenerEvaluate评价方法调用，参数：{}", execution);
}

15
imt-ui/src/views/system/alarm/alarmdata/index.vue
View File

@ -53,16 +53,6 @@
:value="alarmLevel"
/></span>
</div>
<div
class="info"
style="margin-right:2px"
>
<span class="title">状态：</span>
<span class="content"><dict-tag
:type="DICT_TYPE.EQU_ALARM_STATUS"
:value="status"
/></span>
</div>
</div>
<!-- <div class="content-info">
<div
@ -392,7 +382,6 @@
>
维修工单提交</el-button>
<el-button
v-if="status === '0' || status === '6'"
type="primary"
@click="handelClose"
>
@ -630,7 +619,6 @@ export default {
modelName: null,
equipNo: null,
alarmLevel: null,
status:null,
// 查询参数
dataQueryParams: {
equipId: null,
@ -665,7 +653,6 @@ export default {
this.modelName = this.$route.query.modelName;
this.equipNo = this.$route.query.equipNo;
this.alarmLevel = this.$route.query.alarmLevel;
this.status = this.$route.query.status;
},
methods: {
//判断显示维修工单提交还是显示点检方案提交
@ -687,7 +674,7 @@ export default {
} else if (res.data.status === 1 && !res.data.isExclusive) {
this.inspectionId = res.data.inspectionId;
this.showExclusivePatrolPlanSubmit = true;
} else if (res.data.status === 4) {
} else if (res.data.status === 1 && res.data.isExclusive) {
this.inspectionId = res.data.inspectionId;
this.showMaintanenceSubmit = true;
}

3
imt-ui/src/views/system/alarm/equipalarmdata/index.vue
View File

@ -257,8 +257,7 @@
modelName: scope.row.modelName,
equipNo: scope.row.equipNo,
alarmLevel: scope.row.alarmLevel,
equipAlarmId: scope.row.equipAlarmId,
status: scope.row.status
equipAlarmId: scope.row.equipAlarmId
},
}">
<el-button

2
imt-ui/src/views/system/inspection/inspectionInfo/index.vue
View File

@ -329,7 +329,7 @@
>
<el-radio-group v-model="exclusiveInspectionFeedbackData.inspectionFeedbackStatus">
<el-radio :label="3">是</el-radio>
<el-radio :label="4">否</el-radio>
<el-radio :label="1">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item