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

首页报警信息列表中报警时间改为首次报警时间

Browse Source
This commit is contained in:
xusd 2024-09-27 15:37:45 +08:00
parent 1f6595630d
commit 3f1445f2dc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ public class ImtIndexAlarmListVO {
private String customerName; private String customerName;
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
private Date lastAlarmTime; private Date firstAlarmTime;
private String equipNo; private String equipNo;

4
imt-server/imt-module-system/imt-module-system-biz/src/main/resources/mapper/alarm/AlarmDataMapper.xml
View File

@ -26,7 +26,7 @@
<resultMap id="selectListTop3" type="com.inspur.module.system.controller.imtIndex.vo.ImtIndexAlarmListVO"> <resultMap id="selectListTop3" type="com.inspur.module.system.controller.imtIndex.vo.ImtIndexAlarmListVO">
<result property="content" column="content" /> <result property="content" column="content" />
<result property="lastAlarmTime" column="last_alarm_time" /> <result property="firstAlarmTime" column="first_alarm_time" />
<result property="customerName" column="customer_name" /> <result property="customerName" column="customer_name" />
<result property="equipNo" column="equip_no" /> <result property="equipNo" column="equip_no" />
</resultMap> </resultMap>
@ -69,7 +69,7 @@
<include refid="selectAlarmDataVo"/> <include refid="selectAlarmDataVo"/>
where ad.status = 0 where ad.status = 0
and ad.deleted = '0' and ad.deleted = '0'
ORDER BY ad.last_alarm_time desc ORDER BY ad.first_alarm_time desc
limit 3 limit 3
</select> </select>
<select id="getAlarmDataTimeLineByEquipId" <select id="getAlarmDataTimeLineByEquipId"

2
imt-ui/src/views/imtIndex.vue
View File

@ -121,7 +121,7 @@
<el-table-column label="客户名称" align="center" prop="customerName" :show-overflow-tooltip="true" /> <el-table-column label="客户名称" align="center" prop="customerName" :show-overflow-tooltip="true" />
<el-table-column label="设备编号" align="center" prop="equipNo" :show-overflow-tooltip="true" /> <el-table-column label="设备编号" align="center" prop="equipNo" :show-overflow-tooltip="true" />
<el-table-column label="报警信息" align="center" prop="content" :show-overflow-tooltip="true" /> <el-table-column label="报警信息" align="center" prop="content" :show-overflow-tooltip="true" />
<el-table-column label="报警时间" align="center" prop="lastAlarmTime" width="180" :show-overflow-tooltip="true" /> <el-table-column label="报警时间" align="center" prop="firstAlarmTime" width="180" :show-overflow-tooltip="true" />
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>