Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.调整终端周期检测功能

Browse Source
This commit is contained in:
chendaofei
2026-07-10 12:07:57 +08:00
parent def4c066fe
commit 4a04c8f764
11 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/AlarmMapper.java
View File

@@ -3,6 +3,7 @@ package com.njcn.device.pq.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pq.pojo.param.TerminalCheckParam;
import com.njcn.device.pq.pojo.po.Alarm;
import com.njcn.device.pq.pojo.vo.TerminalAlarmVO;
import com.njcn.device.pq.pojo.vo.TerminalCheckVO;
@@ -44,6 +45,6 @@ public interface AlarmMapper extends BaseMapper<Alarm> {
boolean updateAlarmInfo(@Param("type")String type,@Param("devLineId")String devLineId,@Param("processTime")LocalDateTime processTime,@Param("userIndex")String userIndex);
Page<TerminalCheckVO> terminalCheckPage(Page<TerminalCheckVO> page);
Page<TerminalCheckVO> terminalCheckPage(Page<TerminalCheckVO> page, @Param("terminalCheckParam")TerminalCheckParam terminalCheckParam);
}

19
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
View File

@@ -162,10 +162,10 @@ ORDER BY
SELECT
dev.id AS devId,
dev.NAME AS devName,
dept.NAME AS areaName,
users.city AS areaName,
bd.name AS bdName,
detail.obj_id AS objId,
detail.obj_name AS objName,
users.project_name AS objName,
dev_detail.this_time_check AS thisCheckTime,
dev_detail.next_time_check AS nextCheckTime,
dev_detail.login_time AS loginDate,
@@ -190,10 +190,17 @@ ORDER BY
INNER JOIN pq_line dev ON bus.pid = dev.id
INNER JOIN pq_device dev_detail ON dev.id = dev_detail.id
INNER JOIN pq_line bd ON dev.pid = bd.id
INNER JOIN pq_dept_line dept_line ON line.id = dept_line.line_id
INNER JOIN sys_dept dept ON dept_line.id = dept.id AND dept.type = 0
LEFT JOIN SUPERVISION_USER_REPORT_FILE files on detail.obj_id = files.id
order by overdueDay desc
LEFT JOIN SUPERVISION_USER_REPORT users ON users.id = detail.obj_id
LEFT JOIN SUPERVISION_USER_REPORT_FILE files on users.id = files.id
<where>
<if test="terminalCheckParam.city!=null and terminalCheckParam.city !=''">
users.city = #{terminalCheckParam.city}
</if>
<if test="terminalCheckParam.searchValue!=null and terminalCheckParam.searchValue !=''">
and users.project_name like concat('%',#{terminalCheckParam.searchValue},'%')
</if>
</where>
order by checkStatus desc,loginDate desc
</select>

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
@Override
public Page<TerminalCheckVO> terminalCheckPage(TerminalCheckParam terminalCheckParam) {
Page<TerminalCheckVO> page = new Page<>(PageFactory.getPageNum(terminalCheckParam),PageFactory.getPageSize(terminalCheckParam));
Page<TerminalCheckVO> pageResult = alarmMapper.terminalCheckPage(page);
Page<TerminalCheckVO> pageResult = alarmMapper.terminalCheckPage(page,terminalCheckParam);
return pageResult;
}
}