整合yml文件、优化围栏返回Vo样式

ruoyi-admin/src/main/resources/application-dev.yml

@@ -1,3 +1,6 @@
+# 开发环境配置
+server:
+    port: 8088
 # 数据源配置
 spring:
     datasource:
@@ -5,20 +8,10 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-#            master:
-#                url: jdbc:mysql://42.193.106.113:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: zhonghui0123
-
             master:
-                url: jdbc:mysql://43.138.30.29:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: yyky
-                password: yiyikangyang
-
-#            master:
-#                url: jdbc:mysql://localhost:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: yiyikangyang
+                url: jdbc:mysql://192.168.56.10:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -68,4 +61,27 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+
+    # redis 配置
+    redis:
+        # 地址
+        host: 192.168.56.10
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: redis
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms

ruoyi-admin/src/main/resources/application-druid.yml

@@ -1,3 +1,6 @@
+# 开发环境配置
+server:
+    port: 8080
 # 数据源配置
 spring:
     datasource:
@@ -6,13 +9,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://42.193.106.113:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: zhonghui0123
-#            master:
-#                url: jdbc:mysql://localhost:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: yiyikangyang
+                url: jdbc:mysql://43.138.30.29:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: yyky
+                password: yiyikangyang
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -62,4 +61,27 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+
+    # redis 配置
+    redis:
+        # 地址
+        host: localhost
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: yyky@2023
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms

ruoyi-admin/src/main/resources/application-test.yml

@@ -1,3 +1,6 @@
+# 开发环境配置
+server:
+    port: 8088
 # 数据源配置
 spring:
     datasource:
@@ -5,20 +8,10 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-#            master:
-#                url: jdbc:mysql://42.193.106.113:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: zhonghui0123
-
             master:
-                url: jdbc:mysql://43.138.30.29:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: yyky
-                password: yiyikangyang
-
-#            master:
-#                url: jdbc:mysql://localhost:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: yiyikangyang
+                url: jdbc:mysql://192.168.56.10:3306/yyky?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -49,7 +42,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -68,4 +61,27 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+
+    # redis 配置
+    redis:
+        # 地址
+        host: 192.168.56.10
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: redis
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms

ruoyi-admin/src/main/resources/application.yml

@@ -10,7 +10,7 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /www/wwwroot/yyky/uploadPath
-#  profile: D:/ruoyi/uploadPath
+  #  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: true
   # 验证码类型 math 数字计算 char 字符验证
@@ -18,8 +18,6 @@ ruoyi:
 
 # 开发环境配置
 server:
-  # 服务器的HTTP端口，默认为8080
-  port: 8088
   servlet:
     # 应用的访问路径
     context-path: /
@@ -55,7 +53,13 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
+    # 测试环境
+    #    active: test
+    # 开发环境
+    active: dev
+    # 生产环境
+#    active: druid
+
   # 文件上传
   servlet:
     multipart:
@@ -68,30 +72,6 @@ spring:
     restart:
       # 热部署开关
       enabled: true
-  # redis 配置
-  redis:
-    # 地址
-#    host: localhost
-    host: 192.168.56.10
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 0
-    # 密码
-    password: redis
-#    password: yyky@2023
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
 
 # token配置
 token:

ruoyi-system/src/main/java/com/ruoyi/system/domain/TElectronicFence.java

@@ -31,15 +31,15 @@ public class TElectronicFence extends BaseEntity {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "开始时间", width = 30, dateFormat = "HH:mm")
     private Date startTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "结束时间", width = 30, dateFormat = "HH:mm")
     private Date endTime;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AMapFenceVo.java

@@ -56,14 +56,12 @@ public class AMapFenceVo implements Serializable {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "HH:mm")
-    private Date startTime;
+    private Long startTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "HH:mm")
-    private Date endTime;
+    private Long endTime;
 
     /**
      * 围栏状态：（0：关闭 1：开启）
@@ -136,19 +134,19 @@ public class AMapFenceVo implements Serializable {
         this.name = name;
     }
 
-    public Date getStartTime() {
+    public Long getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date startTime) {
+    public void setStartTime(Long startTime) {
         this.startTime = startTime;
     }
 
-    public Date getEndTime() {
+    public Long getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(Long endTime) {
         this.endTime = endTime;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TElectronicFenceServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ruoyi.system.service.impl;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -159,8 +161,8 @@ public class TElectronicFenceServiceImpl implements ITElectronicFenceService {
                     aMapFenceVo.setUserId(tElectronicFence.getUserId());
                     aMapFenceVo.setDeviceId(tElectronicFence.getDeviceId());
                     aMapFenceVo.setName(tElectronicFence.getName());
-                    aMapFenceVo.setStartTime(tElectronicFence.getStartTime());
-                    aMapFenceVo.setEndTime(tElectronicFence.getEndTime());
+                    aMapFenceVo.setStartTime(convertToCurrentDateTimestamp(tElectronicFence.getStartTime().getTime()));
+                    aMapFenceVo.setEndTime(convertToCurrentDateTimestamp(tElectronicFence.getEndTime().getTime()));
                     aMapFenceVo.setState(tElectronicFence.geteState());
                     aMapFenceVo.setType(tElectronicFence.geteType());
                     aMapFenceVo.setDesc(tElectronicFence.geteDesc());
@@ -170,6 +172,18 @@ public class TElectronicFenceServiceImpl implements ITElectronicFenceService {
         return electronicFenceVos;
     }
 
+    public static Long convertToCurrentDateTimestamp(long timestamp) {
+        // 将时间戳转换为LocalDateTime对象
+        LocalDateTime dateTime = LocalDateTime.ofEpochSecond(timestamp, 0, ZoneOffset.UTC);
+        // 获取当前日期
+        LocalDateTime currentDate = LocalDateTime.now().withHour(dateTime.getHour())
+                .withMinute(dateTime.getMinute())
+                .withSecond(dateTime.getSecond());
+        // 将当前日期转换为时间戳
+        long currentTimestamp = currentDate.toEpochSecond(ZoneOffset.UTC);
+        return currentTimestamp;
+    }
+
     @Override
     public int updateTElectronicFenceEditVo(ElectronicFenceVo tElectronicFenceEditVo) {
         //校验围栏类型是否为空