Compare commits
No commits in common. "3d1b94c8d72f3e769b82f3fa48d62c3516b894f2" and "2dd6eff5d7c2626d540c8b3cfb0efa84cef40421" have entirely different histories.
3d1b94c8d7
...
2dd6eff5d7
@ -181,7 +181,7 @@ public class DeviceAlarmRecordServiceImpl extends ServiceImpl<DeviceAlarmRecordM
|
|||||||
.set(DeviceAlarmRecord::getStatus, "09")
|
.set(DeviceAlarmRecord::getStatus, "09")
|
||||||
.set(DeviceAlarmRecord::getFixTime, LocalDateTime.now());
|
.set(DeviceAlarmRecord::getFixTime, LocalDateTime.now());
|
||||||
//故障消除时间
|
//故障消除时间
|
||||||
this.update(null, queryWrapper);
|
deviceAlarmRecordMapper.update(null, queryWrapper);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ public class WeatherLogController {
|
|||||||
@Resource
|
@Resource
|
||||||
private IWeatherLogService weatherLogService;
|
private IWeatherLogService weatherLogService;
|
||||||
|
|
||||||
@GetMapping("/getWeatherLog")
|
@GetMapping("/getWeatherLogList")
|
||||||
@ApiOperation("查询环境信息")
|
@ApiOperation("查询环境信息")
|
||||||
public ResponseResult getWeatherLogList(String stationId) {
|
public ResponseResult getWeatherLogList(String stationId) {
|
||||||
|
|
||||||
|
@ -59,10 +59,9 @@ public class AlarmLogController {
|
|||||||
if (StrUtil.isBlank(stationId)) {
|
if (StrUtil.isBlank(stationId)) {
|
||||||
return ResponseResult.error("未传变电站信息");
|
return ResponseResult.error("未传变电站信息");
|
||||||
}
|
}
|
||||||
//TODO 整合辅控告警
|
List<String> idList = Arrays.asList(stationId.split(","));
|
||||||
LambdaQueryWrapper<AlarmLog> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<AlarmLog> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(AlarmLog::getStationId, stationId).eq(AlarmLog::getDatastatus, "1").eq(AlarmLog::getCheckFlag
|
queryWrapper.in(AlarmLog::getStationId, idList).eq(AlarmLog::getDatastatus, "1").eq(AlarmLog::getCheckFlag, 0).select(AlarmLog::getId,
|
||||||
, 0).select(AlarmLog::getId,
|
|
||||||
AlarmLog::getContent, AlarmLog::getAlarmLevel, AlarmLog::getAlarmDate, AlarmLog::getStationName).orderByDesc(AlarmLog::getAlarmDate);
|
AlarmLog::getContent, AlarmLog::getAlarmLevel, AlarmLog::getAlarmDate, AlarmLog::getStationName).orderByDesc(AlarmLog::getAlarmDate);
|
||||||
List<Map<String, Object>> maps = alarmLogService.listMaps(queryWrapper);
|
List<Map<String, Object>> maps = alarmLogService.listMaps(queryWrapper);
|
||||||
return ResponseResult.successData(maps);
|
return ResponseResult.successData(maps);
|
||||||
|
@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.yfd.platform.modules.patroltask.domain.AlarmLog;
|
import com.yfd.platform.modules.patroltask.domain.AlarmLog;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -35,11 +34,10 @@ public interface AlarmLogMapper extends BaseMapper<AlarmLog> {
|
|||||||
* 参数说明 monitorType
|
* 参数说明 monitorType
|
||||||
* 参数说明 startDate
|
* 参数说明 startDate
|
||||||
* 参数说明 endDate
|
* 参数说明 endDate
|
||||||
* 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page<java.util.Map<java.lang.String,java.lang
|
* 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page<java.util.Map<java.lang.String,java.lang.Object>>
|
||||||
* .Object>>
|
|
||||||
***********************************/
|
***********************************/
|
||||||
Page<Map<String, Object>> getAlarmListPage(Page<Map<String, Object>> page, String patrolDeviceCode,
|
Page<Map<String, Object>> getAlarmListPage(Page<Map<String, Object>> page, String patrolDeviceCode, String monitorType, String startDate, String endDate);
|
||||||
String monitorType, String startDate, String endDate);
|
|
||||||
|
|
||||||
/**********************************
|
/**********************************
|
||||||
* 用途说明: 告警准确率统计
|
* 用途说明: 告警准确率统计
|
||||||
@ -48,10 +46,4 @@ public interface AlarmLogMapper extends BaseMapper<AlarmLog> {
|
|||||||
***********************************/
|
***********************************/
|
||||||
Map<String, Object> getConfirmationRate(String stationId);
|
Map<String, Object> getConfirmationRate(String stationId);
|
||||||
|
|
||||||
/**********************************
|
|
||||||
* 用途说明: 查询报警信息
|
|
||||||
* 参数说明 stationId
|
|
||||||
* 返回值说明: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
|
|
||||||
***********************************/
|
|
||||||
List<Map<String, Object>> getAlarmLogList(String stationId);
|
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,6 @@ import com.yfd.platform.modules.patroltask.domain.AlarmLog;
|
|||||||
import com.yfd.platform.modules.patroltask.domain.TaskResult;
|
import com.yfd.platform.modules.patroltask.domain.TaskResult;
|
||||||
|
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -70,11 +69,4 @@ public interface IAlarmLogService extends IService<AlarmLog> {
|
|||||||
***********************************/
|
***********************************/
|
||||||
Map<String, Object> getConfirmationRate(String stationId);
|
Map<String, Object> getConfirmationRate(String stationId);
|
||||||
|
|
||||||
/**********************************
|
|
||||||
* 用途说明: 查询报警信息
|
|
||||||
* 参数说明 stationId
|
|
||||||
* 返回值说明: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
|
|
||||||
***********************************/
|
|
||||||
List<Map<String, Object>> getAlarmLogList(String stationId);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -403,16 +403,6 @@ public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> i
|
|||||||
return alarmLogMapper.getConfirmationRate(stationId);
|
return alarmLogMapper.getConfirmationRate(stationId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**********************************
|
|
||||||
* 用途说明: 查询报警信息
|
|
||||||
* 参数说明 stationId
|
|
||||||
* 返回值说明: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
|
|
||||||
***********************************/
|
|
||||||
@Override
|
|
||||||
public List<Map<String, Object>> getAlarmLogList(String stationId) {
|
|
||||||
return alarmLogMapper.getAlarmLogList(stationId);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**********************************
|
/**********************************
|
||||||
* 用途说明: 设置任务结果数据
|
* 用途说明: 设置任务结果数据
|
||||||
* 参数说明 taskResult
|
* 参数说明 taskResult
|
||||||
|
@ -74,25 +74,4 @@
|
|||||||
AND station_id = #{stationId}
|
AND station_id = #{stationId}
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
<select id="getAlarmLogList" resultType="java.util.Map">
|
|
||||||
(
|
|
||||||
SELECT
|
|
||||||
record_id AS id,
|
|
||||||
station_id,
|
|
||||||
alarm_message AS content,
|
|
||||||
alarm_time AS alarm_date
|
|
||||||
FROM `fk_device_alarm_record`
|
|
||||||
)
|
|
||||||
UNION ALL
|
|
||||||
(
|
|
||||||
SELECT
|
|
||||||
id,
|
|
||||||
station_id,
|
|
||||||
content,
|
|
||||||
alarm_date
|
|
||||||
FROM iis_alarm_log
|
|
||||||
)
|
|
||||||
|
|
||||||
ORDER BY alarm_date DESC;
|
|
||||||
</select>
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
Loading…
Reference in New Issue
Block a user