|
@@ -3,6 +3,7 @@ package com.szwl.controller;
|
|
|
|
|
|
import cn.com.crbank.ommo.bean.ResultMessage;
|
|
|
import cn.com.crbank.ommo.esUtil.BeanUtils;
|
|
|
+import cn.hutool.core.util.NumberUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
@@ -232,17 +233,24 @@ public class TEquipmentController {
|
|
|
}
|
|
|
// 分组ID
|
|
|
if (StringUtils.isNotEmpty(labelId)) {
|
|
|
- TLabel label = labelService.getById(labelId);
|
|
|
- String equipmentIds = label.getEquipmentIds();
|
|
|
- equipmentIds = equipmentIds.replace("\"", "").replace("[", "").replace("]", "");
|
|
|
- String[] split = equipmentIds.split(",");
|
|
|
- query.in(TEquipment::getId, split);
|
|
|
+ if (NumberUtil.isInteger(labelId)) {
|
|
|
+ TLabel label = labelService.getById(labelId);
|
|
|
+ String equipmentIds = label.getEquipmentIds();
|
|
|
+ equipmentIds = equipmentIds.replace("\"", "").replace("[", "").replace("]", "");
|
|
|
+ String[] split = equipmentIds.split(",");
|
|
|
+ query.in(TEquipment::getId, split);
|
|
|
+ } else if (ConfigConsts.ABNORMAL.equals(labelId)) {
|
|
|
+ query.eq(TEquipment::getIsAlarm, 1);
|
|
|
+ } else if (ConfigConsts.ON.equals(labelId)) {
|
|
|
+ query.eq(TEquipment::getEqeStatus, 1);
|
|
|
+ } else if (ConfigConsts.OFF.equals(labelId)) {
|
|
|
+ query.eq(TEquipment::getEqeStatus, 0);
|
|
|
+ }
|
|
|
}
|
|
|
query.orderByDesc(TEquipment::getCreateDate);
|
|
|
Page<TEquipment> page = new Page<>(current, size, true);
|
|
|
IPage<TEquipment> iPage = tEquipmentService.page(page, query);
|
|
|
- Page<TEquipmentDTO> pageDTO = new Page<>(current, size, true);
|
|
|
- IPage<TEquipmentDTO> iPageDTO = pageDTO;
|
|
|
+ IPage<TEquipmentDTO> iPageDTO = new Page<>(current, size, true);
|
|
|
iPageDTO.setCurrent(iPage.getCurrent());
|
|
|
iPageDTO.setPages(iPage.getPages());
|
|
|
iPageDTO.setSize(iPage.getSize());
|
|
@@ -254,45 +262,19 @@ public class TEquipmentController {
|
|
|
return equipmentDTO;
|
|
|
}).collect(Collectors.toList());
|
|
|
for (TEquipmentDTO equipmentDTO : equipmentDTOList) {
|
|
|
-// Date date = new Date();
|
|
|
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
-// Date date = null;
|
|
|
-// try {
|
|
|
-// date = sdf.parse(todayDate);
|
|
|
-// } catch (ParseException e) {
|
|
|
-// e.printStackTrace();
|
|
|
-// }
|
|
|
LocalDateTime dateTime = LocalDateTime.parse(todayDate + "T00:00:00");
|
|
|
// 获取前一天的0点时间
|
|
|
LocalDateTime startDateTime = dateTime.minusDays(1).with(LocalTime.MIN);
|
|
|
// 获取当天的24点时间
|
|
|
LocalDateTime endDateTime = dateTime.with(LocalTime.MAX);
|
|
|
-// Calendar calendar = new GregorianCalendar();
|
|
|
-// Calendar calendarEnd = new GregorianCalendar();
|
|
|
-// calendar.setTime(date);
|
|
|
-// calendarEnd.setTime(date);
|
|
|
-//
|
|
|
-// calendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
-// calendar.set(Calendar.MINUTE, 0);
|
|
|
-// calendar.set(Calendar.SECOND, 0);
|
|
|
-// calendar.set(Calendar.MILLISECOND, 0);
|
|
|
-//
|
|
|
-// calendarEnd.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
-// calendarEnd.set(Calendar.MINUTE, 59);
|
|
|
-// calendarEnd.set(Calendar.SECOND, 59);
|
|
|
-// calendarEnd.set(Calendar.MILLISECOND, 999);
|
|
|
-// Date date_start = calendar.getTime();
|
|
|
-// Date date_end = calendarEnd.getTime();
|
|
|
LambdaQueryWrapper<TAlarmRecord> query1 = Wrappers.lambdaQuery();
|
|
|
query1.eq(TAlarmRecord::getEquipmentId, equipmentDTO.getId());
|
|
|
query1.eq(TAlarmRecord::getIsEliminate, 0);
|
|
|
query1.gt(TAlarmRecord::getOccurrenceTime, startDateTime);
|
|
|
query1.le(TAlarmRecord::getOccurrenceTime, endDateTime);
|
|
|
-// query1.gt(TAlarmRecord::getCreateDate, date_start);
|
|
|
-// query1.le(TAlarmRecord::getCreateDate, date_end);
|
|
|
query1.orderByDesc(TAlarmRecord::getLevel).orderByDesc(TAlarmRecord::getOccurrenceTime);
|
|
|
List<TAlarmRecord> alarmRecordList = tAlarmRecordService.list(query1);
|
|
|
- if (alarmRecordList.size() > 0) {
|
|
|
+ if (!alarmRecordList.isEmpty()) {
|
|
|
equipmentDTO.setHasTodayAlarm(true);
|
|
|
equipmentDTO.setAlarmList(alarmRecordList);
|
|
|
} else {
|
|
@@ -727,9 +709,7 @@ public class TEquipmentController {
|
|
|
return R.fail(A0001, "设备不存在");
|
|
|
}
|
|
|
String machineType = equipment.getMachineType();
|
|
|
- if (StringUtils.isNotEmpty(machineType) && machineType.equals("2")) {
|
|
|
-// tAlarmRecord.setIsEliminate(1);
|
|
|
-// tAlarmRecordService.updateById(tAlarmRecord);
|
|
|
+ if (StringUtils.isNotEmpty(machineType) && "2".equals(machineType)) {
|
|
|
// 消除过往的报警
|
|
|
LambdaUpdateWrapper<TAlarmRecord> wrapper = Wrappers.lambdaUpdate();
|
|
|
wrapper.eq(TAlarmRecord::getClientId, tAlarmRecord.getClientId());
|
|
@@ -737,6 +717,9 @@ public class TEquipmentController {
|
|
|
wrapper.le(TAlarmRecord::getCreateDate, new Date());
|
|
|
wrapper.set(TAlarmRecord::getIsEliminate, 1);
|
|
|
tAlarmRecordService.update(wrapper);
|
|
|
+ // 更改机器状态
|
|
|
+ equipment.setIsAlarm(false);
|
|
|
+ tEquipmentService.updateById(equipment);
|
|
|
} else {
|
|
|
JSONObject kindData = new JSONObject();
|
|
|
kindData.put("id", param.getId());
|