From 8301f6d0b8b9f631a317ef20dac01fa0909e1d5f Mon Sep 17 00:00:00 2001
From: ForwithyNew <2008nmj@sina.com>
Date: Fri, 7 Jun 2024 14:02:04 +0800
Subject: [PATCH] =?UTF-8?q?WarnMsgFB:=E5=88=A0=E9=99=A4=E8=87=AA=E5=A2=9EI?=
 =?UTF-8?q?D=E5=B1=9E=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/whdc/controller/QXWarnController.java |  4 ++--
 .../java/com/whdc/model/entity/WarnMsgFB.java |  3 ---
 src/main/resources/application.yml            | 20 +++++++++----------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java
index a351fe6..d26defd 100644
--- a/src/main/java/com/whdc/controller/QXWarnController.java
+++ b/src/main/java/com/whdc/controller/QXWarnController.java
@@ -61,8 +61,8 @@ public class QXWarnController {
             @RequestBody GroupWarningDto dto) {
 
         ApiDto apiDto = new ApiDto();
-//        apiDto.setStartTime(dto.getStartTime());//！！！！！！需要注释掉！！！！！！
-//        apiDto.setEndTime(dto.getEndTime());//！！！！！！需要注释掉！！！！！！
+        apiDto.setStartTime(dto.getStartTime());//！！！！！！需要注释掉！！！！！！
+        apiDto.setEndTime(dto.getEndTime());//！！！！！！需要注释掉！！！！！！
         apiDto.setPageNumber(dto.getPageNumber());
         apiDto.setPageSize(dto.getPageSize());
         ArrayList<ApiDto.Filter> filter = Lists.newArrayList();
diff --git a/src/main/java/com/whdc/model/entity/WarnMsgFB.java b/src/main/java/com/whdc/model/entity/WarnMsgFB.java
index 64cdb6b..59d19cf 100644
--- a/src/main/java/com/whdc/model/entity/WarnMsgFB.java
+++ b/src/main/java/com/whdc/model/entity/WarnMsgFB.java
@@ -16,9 +16,6 @@ import java.util.Date;
 @JsonInclude(JsonInclude.Include.NON_NULL) // 表示序列化非null属性
 @TableName("FXKH_TXL.WARNMSG_FEEDBACK")
 public class WarnMsgFB {
-    @TableField("ID")
-    @ApiModelProperty(value = "预警叫应反馈信息ID")
-    private Integer id;
 
     @TableField("WARNID")
     @ApiModelProperty(value = "预警信息ID")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3e87f50..8e932c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,12 +10,12 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: dm.jdbc.driver.DmDriver
-#    url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL
-#    username: SYSDBA
-#    password: SYSDBA001
-    url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL
-    username: SHZH
-    password: Shzh_890
+    url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL
+    username: SYSDBA
+    password: SYSDBA001
+#    url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL
+#    username: SHZH
+#    password: Shzh_890
     druid:
       initialSize: 5
       minIdle: 5
@@ -39,11 +39,11 @@ spring:
   # Redis
   redis:
     database: 5
-    host: 10.42.6.75
-#    host: 127.0.0.1
+#    host: 10.42.6.75
+    host: 127.0.0.1
     port: 6379
-#    password:
-    password: Whdc_890
+    password:
+#    password: Whdc_890
 
   servlet:
     multipart: