From 078a5c4ced367fdbd5a16c27c8bada6e44e632d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 16:00:33 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java |   67 ++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
index ee20fc4..62c7d9b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,94 +21,116 @@
 @TableName("`warning_event`")
 public class WarningEvent {
 
+    @TableId(type = IdType.AUTO)
     @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="鍒涘缓鏃堕棿")
+    //@ExcelColumn(name="鍒涘缓鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+    //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
     private Integer editor;
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
-    @ExcelColumn(name="鏇存柊鏃堕棿")
+    //@ExcelColumn(name="鏇存柊鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     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 = "浜嬩欢缂栫爜锛堝叧鑱攚arning)", example = "1")
-    @ExcelColumn(name="浜嬩欢缂栫爜锛堝叧鑱攚arning)")
+    //@ExcelColumn(name="浜嬩欢缂栫爜锛堝叧鑱攚arning)")
     private Integer warningId;
 
     @ApiModelProperty(value = "浜嬩欢鏍囬")
-    @ExcelColumn(name="浜嬩欢鏍囬")
+    @ExcelColumn(name="浜嬩欢绫诲瀷",width=10,index = 2)
     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="鐘舵�� 0鏈帹閫� 1鎺ㄩ�佹垚鍔�2鎺ㄩ�佸け璐�")
     private Integer status;
 
     @ApiModelProperty(value = "鎵�鍦ㄤ綅缃�")
-    @ExcelColumn(name="鎵�鍦ㄤ綅缃�")
+    @ExcelColumn(name="鎵�鍦ㄤ綅缃�",width=10,index = 5)
     private String region;
 
     @ApiModelProperty(value = "鍞竴鏍囪瘑")
-    @ExcelColumn(name="鍞竴鏍囪瘑")
+    //@ExcelColumn(name="鍞竴鏍囪瘑")
     private String eventId;
 
     @ApiModelProperty(value = "浜嬩欢绫诲瀷")
-    @ExcelColumn(name="浜嬩欢绫诲瀷")
+    //@ExcelColumn(name="浜嬩欢绫诲瀷")
     private String eventType;
 
     @ApiModelProperty(value = "浜嬩欢绛夌骇锛�             0-鏈厤缃�             1-浣�             2-涓�             3-楂�             娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷")
-    @ExcelColumn(name="浜嬩欢绛夌骇锛�             0-鏈厤缃�             1-浣�             2-涓�             3-楂�             娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷")
+    //@ExcelColumn(name="浜嬩欢绛夌骇锛�             0-鏈厤缃�             1-浣�             2-涓�             3-楂�             娉ㄦ剰锛屾澶勪簨浠剁瓑绾ф槸鎸囧湪浜嬩欢鑱斿姩涓厤缃殑绛夌骇锛岄渶瑕侀厤缃簡浜嬩欢鑱斿姩锛屾墠杩斿洖杩欎釜瀛楁浜嬩欢绫诲瀷")
     private String eventLevel;
 
     @ApiModelProperty(value = "浜嬩欢鍙戠敓浜嬩欢")
-    @ExcelColumn(name="浜嬩欢鍙戠敓浜嬩欢")
+    @ExcelColumn(name="鍙戠敓鏃堕棿",width=10,index = 1)
     private String happenTime;
 
     @ApiModelProperty(value = "浜嬩欢鍥剧墖鏈嶅姟缂栧彿")
-    @ExcelColumn(name="浜嬩欢鍥剧墖鏈嶅姟缂栧彿")
+    //@ExcelColumn(name="浜嬩欢鍥剧墖鏈嶅姟缂栧彿")
     private String imgServeCode;
 
     @ApiModelProperty(value = "浜嬩欢鍥剧墖")
-    @ExcelColumn(name="浜嬩欢鍥剧墖")
+    //@ExcelColumn(name="浜嬩欢鍥剧墖")
     private String imgurl;
 
     @ApiModelProperty(value = "鎶ユ枃")
-    @ExcelColumn(name="鎶ユ枃")
+    //@ExcelColumn(name="鎶ユ枃")
     private String jsonContent;
 
     @ApiModelProperty(value = "浜嬩欢婧愬敮涓�鏍囪瘑")
-    @ExcelColumn(name="浜嬩欢婧愬敮涓�鏍囪瘑")
+    //@ExcelColumn(name="浜嬩欢婧愬敮涓�鏍囪瘑")
     private String srcIndex;
 
     @ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
-    @ExcelColumn(name="浜嬩欢婧愮被鍨�")
+    //@ExcelColumn(name="浜嬩欢婧愮被鍨�")
     private String srcType;
 
     @ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
-    @ExcelColumn(name="浜嬩欢婧愬悕绉�")
+    //@ExcelColumn(name="浜嬩欢婧愬悕绉�")
     private String srcName;
+    @ApiModelProperty(value = "浜嬩欢鍒嗙被 0=瀹夐槻浜嬩欢锛�1=娑堥槻浜嬩欢锛�2=杞﹁浇浜嬩欢锛�3=閽ュ寵鏌滀簨浠讹紱 4=澶╂皵棰勮锛�", example = "1")
+    @ExcelColumn(name="浜嬩欢鍒嗙被",valueMapping = "0=瀹夐槻浜嬩欢;1=娑堥槻浜嬩欢;2=杞﹁浇浜嬩欢;3=閽ュ寵鏌滀簨浠�;4=澶╂皵棰勮;",width=10,index = 3)
+    @TableField(exist = false)
+    private Integer warningType;
+    @ApiModelProperty(value = "浜嬩欢绫诲瀷", example = "1")
+//    @ExcelColumn(name="浜嬩欢绫诲瀷",width=10,index = 2)
+    @TableField(exist = false)
+    private String warningName;
+    @ApiModelProperty(value = "浜嬩欢绛夌骇 0浣� 1涓� 2楂�", example = "1")
+    @ExcelColumn(name="浜嬩欢绛夌骇",valueMapping = "0=浣�;1=涓�;2=楂�;",width=10,index = 4)
+    @TableField(exist = false)
+    private Integer warningLevel;
 
+
+
+    @ApiModelProperty(value = "鏌ヨ鏃堕棿寮�濮�  ")
+    @TableField(exist = false)
+    private Date queryStarttime;
+
+    @ApiModelProperty(value = "鏌ヨ鏃堕棿缁撴潫  ")
+    @TableField(exist = false)
+    private Date queryEndtime;
 }

--
Gitblit v1.9.3