|
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
+import com.ozs.HazardApplication;
|
|
import com.ozs.common.core.controller.BaseController;
|
|
import com.ozs.common.core.controller.BaseController;
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
import com.ozs.common.utils.StringUtils;
|
|
import com.ozs.common.utils.StringUtils;
|
|
@@ -14,8 +15,10 @@ import com.ozs.service.entity.vo.HistoricalAlarmVo;
|
|
import com.ozs.service.entity.vo.MsgAlarmVo;
|
|
import com.ozs.service.entity.vo.MsgAlarmVo;
|
|
import com.ozs.service.service.MsgAlarmFrequencyService;
|
|
import com.ozs.service.service.MsgAlarmFrequencyService;
|
|
import com.ozs.service.service.MsgAlarmService;
|
|
import com.ozs.service.service.MsgAlarmService;
|
|
|
|
+import com.ozs.web.core.config.WebSocketService;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
+import org.springframework.boot.SpringApplication;
|
|
import org.springframework.util.ObjectUtils;
|
|
import org.springframework.util.ObjectUtils;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
@@ -47,6 +50,24 @@ public class MsgAlarmController extends BaseController {
|
|
@Resource
|
|
@Resource
|
|
MsgAlarmFrequencyService msgAlarmFrequencyService;
|
|
MsgAlarmFrequencyService msgAlarmFrequencyService;
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 测试消息推送
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("/push")
|
|
|
|
+ @ApiOperation(value = "预报警信息分页")
|
|
|
|
+ public AjaxResult insertDate(String[] args) {
|
|
|
|
+ // 模拟需要推送的用户群
|
|
|
|
+ ArrayList<String> ids = new ArrayList<>();
|
|
|
|
+ ids.add("001");
|
|
|
|
+ ids.add("002");
|
|
|
|
+ ids.add("003");
|
|
|
|
+ ids.add("004");
|
|
|
|
+ ids.add("005");
|
|
|
|
+
|
|
|
|
+ WebSocketService webSocketService = new WebSocketService();
|
|
|
|
+ webSocketService.sendMsgToUsers(ids);
|
|
|
|
+ return AjaxResult.success("推送成功");
|
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
/**
|
|
* 报警信息分页
|
|
* 报警信息分页
|
|
@@ -111,7 +132,7 @@ public class MsgAlarmController extends BaseController {
|
|
@ApiOperation("报警消息详情历史报警次数信息")
|
|
@ApiOperation("报警消息详情历史报警次数信息")
|
|
public AjaxResult alarmHistoricalAlarm(@PathVariable Long alarmId) {
|
|
public AjaxResult alarmHistoricalAlarm(@PathVariable Long alarmId) {
|
|
QueryWrapper<MsgAlarmFrequency> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<MsgAlarmFrequency> wrapper = new QueryWrapper<>();
|
|
- wrapper.eq("alarm_id",alarmId);
|
|
|
|
|
|
+ wrapper.eq("alarm_id", alarmId);
|
|
wrapper.orderByDesc("alarm_time");
|
|
wrapper.orderByDesc("alarm_time");
|
|
List<MsgAlarmFrequency> list = msgAlarmFrequencyService.list(wrapper);
|
|
List<MsgAlarmFrequency> list = msgAlarmFrequencyService.list(wrapper);
|
|
return AjaxResult.success(list);
|
|
return AjaxResult.success(list);
|
|
@@ -121,7 +142,7 @@ public class MsgAlarmController extends BaseController {
|
|
@ApiOperation("视频服务历史报警信息")
|
|
@ApiOperation("视频服务历史报警信息")
|
|
public AjaxResult videoHistoricalAlarm(@PathVariable Long alarmCamera) {
|
|
public AjaxResult videoHistoricalAlarm(@PathVariable Long alarmCamera) {
|
|
QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
|
|
- wrapper.eq("alarm_camera",alarmCamera);
|
|
|
|
|
|
+ wrapper.eq("alarm_camera", alarmCamera);
|
|
wrapper.orderByDesc("alarm_time");
|
|
wrapper.orderByDesc("alarm_time");
|
|
List<MsgAlarm> list = msgAlarmService.list(wrapper);
|
|
List<MsgAlarm> list = msgAlarmService.list(wrapper);
|
|
return AjaxResult.success(list);
|
|
return AjaxResult.success(list);
|