Skip to content

R
refined-platform
Commit 346e6e39 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加消息发送

parent 8b576662
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 93 deletions
refined-manager-ui/admin/src/router.js
View file @ 346e6e39
......@@ -44,6 +44,7 @@ const router = new Router({
...restBuilder('realtime/dataflow', 'realtime/dataflow'),//人员发现
...restBuilder('appointment/records', 'appointment/records'), //预约签到记录表
...restBuilder('care/records', 'care/records'),//预约关怀记录表
...restBuilder('alarm/records', 'alarm/records'),//告警信息
...restBuilder('appointment/config', 'appointment/config'), //预约签到配置
...restBuilder('appointment/config/times', 'appointment/config/times'), //预约自动签到配置时间段
...restBuilder('care/config', 'care/config'), //主动关怀配置
......
refined-manager-ui/admin/src/views/alarm/records/list.vue
View file @ 346e6e39
<template>
<div class="page">
<LayoutTable :data="tableData" :config="tableConfig">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
</LayoutTable>
......@@ -39,34 +39,29 @@
return {
config: {
search: [
{
name: "alarmTimeStart",
type: "datetime",
label: "开始时间",
},
{
name: "alarmTimeEnd",
type: "datetime",
label: "结束时间",
},
],
columns: [
{type: "selection", width: 60},
{type: "index",label: "序号",width: 50},
{label: "站点Id", prop: "siteId", formatter: this.formatter},
{label: "站点名称", prop: "siteName"},
{label: "告警时间", prop: "alarmTime", formatter: this.formatterDate},
{label: "告警类型", prop: "alarmType"},
{label: "告警级别", prop: "alarmLevel",formatter: this.formatter},
{label: "接收人员", prop: "alarmReceivePersonnel"},
{label: "接收人员电话", prop: "receivePersonnelTelephone"},
{label: "告警详细内容", prop: "alarmContent"},
......@@ -75,18 +70,9 @@
{label: "备注信息", prop: "remark"},
{
label: "操作",
width: 240,
formatter: row => {
return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
);
}
}
]
}
};
}
};
</script>
\ No newline at end of file
</script>
refined-manager-ui/admin/src/views/care/records/list.vue
View file @ 346e6e39
......@@ -116,63 +116,16 @@
{label: "排队编号", prop: "queueNo"},
{label: "监测时间", prop: "monitorTime", formatter: this.formatterDate},
{label: "排队时间", prop: "takeTime", formatter: this.formatterDate},
{label: "叫号时间", prop: "callTime", formatter: this.formatterDate},
{label: "监测设备", prop: "monitorDevice"},
{label: "办理结束时间", prop: "endTime", formatter: this.formatterDate},
{label: "最终等待时长", prop: "waitTime", formatter: this.formatter},
{label: "排队等待时长", prop: "waitTime", formatter: this.formatter},
{label: "办理时长", prop: "endDureTime", formatter: this.formatter},
{label: "办理状态", prop: "processStatus"},
{
label: "操作",
width: 240,
formatter: row => {
return (
<div>
{row.processStatus === '排队中' ? (<div>
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.reCare(row);
}}
>
再次关怀
</el-button>
<span> </span>
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.notice(row);
}}
>
通知负责人
</el-button>
</div>
) : (
""
)}
<span> </span>
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.toTrack(row);
}}
>
跟踪反馈
</el-button>
</div>
);
}
}
]
}
};
......
refined-manager-ui/admin/vue.config.js
View file @ 346e6e39
......@@ -8,8 +8,8 @@ module.exports = {
hot: true,//自动保存
proxy: {
'/refined': {
target: 'http://112.19.80.237:11080/',
// target: 'http://192.168.0.98:11080/',
//target: 'http://112.19.80.237:11080/',
target: 'http://192.168.0.98:11080/',
// target: 'http://127.0.0.1:21080',
changeOrigin: true,
secure: false,
......
refined-manager/src/main/java/com/mortals/xhx/module/alarm/model/vo/AlarmRecordsVo.java
View file @ 346e6e39
......@@ -19,5 +19,11 @@ public class AlarmRecordsVo extends BaseEntityLong {
/** 主键ID，主键，自增长列表 */
private List <Long> idList;
/** 开始 告警时间 */
private String alarmTimeStart;
/** 结束 告警时间 */
private String alarmTimeEnd;
}
\ No newline at end of file
refined-manager/src/main/java/com/mortals/xhx/module/alarm/web/AlarmRecordsController.java
View file @ 346e6e39
package com.mortals.xhx.module.alarm.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -6,44 +7,53 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.alarm.model.AlarmRecordsEntity;
import com.mortals.xhx.module.alarm.service.AlarmRecordsService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
import com.mortals.xhx.common.code.*;
/**
*
* 告警消息记录
*
* @author zxfei
* @date 2025-03-28
*/
* 告警消息记录
*
* @author zxfei
* @date 2025-03-28
*/
@RestController
@RequestMapping("alarm/records")
public class AlarmRecordsController extends BaseCRUDJsonBodyMappingController<AlarmRecordsService,AlarmRecordsEntity,Long> {
public class AlarmRecordsController extends BaseCRUDJsonBodyMappingController<AlarmRecordsService, AlarmRecordsEntity, Long> {
@Autowired
private ParamService paramService;
public AlarmRecordsController(){
super.setModuleDesc( "告警消息记录");
public AlarmRecordsController() {
super.setModuleDesc("告警消息记录");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "alarmLevel", AlarmLevelEnum.getEnumMap());
this.addDict(model, "alarmLevel", AlarmLevelEnum.getEnumMap());
this.addDict(model, "push", YesNoEnum.getEnumMap());
super.init(model, context);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment