huanghongfa
2021-10-08 57cd8d8bf2c8b77dade86efa1ac51dae72c7656c
Merge remote-tracking branch 'origin/test' into test
2个文件已修改
8 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java
@@ -79,7 +79,8 @@
        if ("abort".equals(deviceInfo.getStatus()) || checkFlag) {
            logger.info("收到设备报警信息:{}", message);
            ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
            comPropertyAlarm.setSerialNo(deviceInfo.getUserid());
            comPropertyAlarm.setSerialNo(deviceInfo.getOri_number());
            comPropertyAlarm.setReceiveNo(deviceInfo.getUserid());
            comPropertyAlarm.setStatus(0);
            comPropertyAlarm.setCreateTime(new Date());
            comPropertyAlarm.setType(1);
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java
@@ -98,6 +98,11 @@
     */
    @ApiModelProperty("处理图片")
    private String solveUrl;
    /**
     *接收人
     */
    private  String receiveNo;
    /**
     * 报警类型 1一键报警 2长时间无应答报警
     */