From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java | 75 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 22 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java
index 77dc897..11d4da6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningPush.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;
@@ -18,77 +20,106 @@
@Data
@ApiModel("鎶ヨ鎺ㄩ�佽褰�")
@TableName("`warning_push`")
-public class WarningPush {
+public class WarningPush extends LoginUserModel {
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+ //@ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍙戠敓浜嬩欢",dateFormat = "yyyy-MM-dd HH:mm:ss",index = 1)
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎ember)", example = "1")
- @ExcelColumn(name="浜哄憳缂栫爜锛堝叧鑱攎ember)")
+ //@ExcelColumn(name="浜哄憳缂栫爜锛堝叧鑱攎ember)")
private Integer memberId;
@ApiModelProperty(value = "浜嬩欢缂栫爜(鍏宠仈warning锛�", example = "1")
- @ExcelColumn(name="浜嬩欢缂栫爜(鍏宠仈warning锛�")
+ //@ExcelColumn(name="浜嬩欢缂栫爜(鍏宠仈warning锛�")
private Integer warningId;
@ApiModelProperty(value = "鎶ヨ鏍囬")
- @ExcelColumn(name="鎶ヨ鏍囬")
+ //@ExcelColumn(name="鎶ヨ鏍囬")
private String title;
@ApiModelProperty(value = "鎶ヨ鍐呭")
- @ExcelColumn(name="鎶ヨ鍐呭")
+ //@ExcelColumn(name="鎶ヨ鍐呭")
private String content;
@ApiModelProperty(value = "鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�", example = "1")
- @ExcelColumn(name="鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�")
+ @ExcelColumn(name="閫氱煡鐘舵��",valueMapping = "0=鏈�氱煡;1=閫氱煡鎴愬姛;2=閫氱煡澶辫触;",index = 7)
private Integer status;
@ApiModelProperty(value = "鎺ㄩ�佺粨鏋�", example = "1")
- @ExcelColumn(name="鎺ㄩ�佺粨鏋�")
+ //@ExcelColumn(name="鎺ㄩ�佺粨鏋�")
private Integer pushInfo;
@ApiModelProperty(value = "浜嬩欢鍐呭")
- @ExcelColumn(name="浜嬩欢鍐呭")
+ //@ExcelColumn(name="浜嬩欢鍐呭")
private String eventInfo;
- @ApiModelProperty(value = "鎺ㄩ�佹爣璇�")
- @ExcelColumn(name="鎺ㄩ�佹爣璇�")
+ @ApiModelProperty(value = "鎵�鍦ㄤ綅缃�")
+ //@ExcelColumn(name="鎺ㄩ�佹爣璇�")
private String pushId;
+ @ApiModelProperty(value = "鎺ㄩ�佹爣璇�")
+ @ExcelColumn(name="鎵�鍦ㄤ綅缃�",index = 5)
+ private String region;
@ApiModelProperty(value = "鎺ㄩ�佹椂闂�")
- @ExcelColumn(name="鎺ㄩ�佹椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="鎺ㄩ�佹椂闂�")
private Date pushDate;
@ApiModelProperty(value = "鎺ㄩ�佹柟寮� 0閽夐拤閫氱煡", example = "1")
- @ExcelColumn(name="鎺ㄩ�佹柟寮� 0閽夐拤閫氱煡")
+ //@ExcelColumn(name="鎺ㄩ�佹柟寮� 0閽夐拤閫氱煡")
private Integer pushType;
+ @ApiModelProperty(value = "浜嬩欢鍒嗙被 0=瀹夐槻浜嬩欢锛�1=娑堥槻浜嬩欢锛�2=杞﹁浇浜嬩欢锛�3=閽ュ寵鏌滀簨浠讹紱 4=澶╂皵棰勮锛�", example = "1")
+ @ExcelColumn(name="浜嬩欢鍒嗙被",valueMapping = "0=瀹夐槻浜嬩欢;1=娑堥槻浜嬩欢;2=杞﹁浇浜嬩欢;3=閽ュ寵鏌滀簨浠�;4=澶╂皵棰勮;",index = 3)
+ @TableField(exist = false)
+ private Integer warningType;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷", example = "1")
+ @ExcelColumn(name="浜嬩欢绫诲瀷",index = 2)
+ @TableField(exist = false)
+ private String warningName;
+ @ApiModelProperty(value = "浜嬩欢绛夌骇 0浣� 1涓� 2楂�", example = "1")
+ @ExcelColumn(name="浜嬩欢绛夌骇",valueMapping = "0=浣�;1=涓�;2=楂�;",index = 4)
+ @TableField(exist = false)
+ private Integer warningLevel;
+ @ApiModelProperty(value = "閫氱煡浜哄憳", example = "1")
+ @ExcelColumn(name="閫氱煡浜哄憳",index = 6)
+ @TableField(exist = false)
+ private String memberName;
+
+
+
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮� 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryStarttime;
+
+ @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫 鏃ユ湡鏍煎紡锛歽yyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryEndtime;
+
}
--
Gitblit v1.9.3