From a74d1c8d6808124298c66132d6783e5235c79257 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 09 十二月 2025 14:45:35 +0800
Subject: [PATCH] 处理设备消息推送
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java
index 33fbff5..03eda6c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -9,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 鎶ヨ瑙勫垯閰嶇疆琛�
@@ -18,9 +21,10 @@
@Data
@ApiModel("鎶ヨ瑙勫垯閰嶇疆琛�")
@TableName("`warning_rule`")
-public class WarningRule {
+public class WarningRule extends LoginUserModel {
@ApiModelProperty(value = "涓婚敭", example = "1")
+ @TableId(type = IdType.AUTO)
@ExcelColumn(name="涓婚敭")
private Integer id;
@@ -30,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -39,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -49,10 +51,13 @@
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String info;
+ @ApiModelProperty(value = "瑙勫垯鏍囬")
+ @ExcelColumn(name="瑙勫垯鏍囬")
+ private String title;
- @ApiModelProperty(value = "鍐呴儴浜哄憳缂栫爜锛堝叧鑱攎ember)", example = "1")
- @ExcelColumn(name="鍐呴儴浜哄憳缂栫爜锛堝叧鑱攎ember)")
- private Integer memberId;
+ @ApiModelProperty(value = "鍐呴儴浜哄憳缂栫爜闆嗗悎锛堝叧鑱攎ember)锛屽涓嫳鏂囬�楀彿闅斿紑", example = "1")
+ @ExcelColumn(name="鍐呴儴浜哄憳缂栫爜闆嗗悎锛堝叧鑱攎ember)")
+ private String memberIds;
@ApiModelProperty(value = "澶氳鍒欓棿闅旀椂闂�(绉掞級", example = "1")
@ExcelColumn(name="澶氳鍒欓棿闅旀椂闂�(绉掞級")
@@ -65,9 +70,31 @@
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+ @ApiModelProperty(value = "鏄惁浜哄憳閫氱煡 0鍚� 1鏄�", example = "1")
+ private Integer memberNotice;
+ @ApiModelProperty(value = "鏄惁骞挎挱閫氱煡 0鍚� 1鏄�", example = "1")
+ private Integer deviceNotice;
@ApiModelProperty(value = "鎶ヨ绫诲瀷缂栫爜(鍏宠仈warning锛�", example = "1")
@ExcelColumn(name="鎶ヨ绫诲瀷缂栫爜(鍏宠仈warning锛�")
private Integer warningId;
+ @ApiModelProperty(value = "閫氱煡浜哄憳-閮ㄩ棬闆嗗悎锛屽涓嫳鏂囧垎鍙烽殧寮�", example = "1")
+ private String memberNames;
+
+
+ @ApiModelProperty(value = "骞挎挱缂栫爜闆嗗悎锛堝叧鑱攄evice)锛屽涓嫳鏂囬�楀彿闅斿紑", example = "1")
+ private String deviceIds;
+ @ApiModelProperty(value = "骞挎挱鍚嶇О闆嗗悎锛屽涓嫳鏂囧垎鍙烽殧寮�", example = "1")
+ private String deviceNames;
+ @ApiModelProperty(value = "骞挎挱鎾姤鍐呭", example = "1")
+ private String deviceNoticeContent;
+
+ @ApiModelProperty(value = "浜哄憳閮ㄩ棬", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "浜哄憳閮ㄩ棬", example = "1")
+ @TableField(exist = false)
+ private List<WarningRuleDetail> detailList;
+
}
--
Gitblit v1.9.3