提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MNoticeController.java

@@ -24,7 +24,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -120,4 +122,16 @@ public class MNoticeController extends BaseController {
                                        @PathVariable Long[] ids) {
         return toAjax(iGNoticeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
+
+    /**
+     * 获取公告管理详细信息
+     */
+    @ApiOperation("获取系统时间")
+    @GetMapping("/getDate")
+    public String getDate() {
+        Date date = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String formattedDate = sdf.format(date);
+        return formattedDate;
+    }
 }

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

@@ -51,15 +51,12 @@ spring:
         # 主库数据源
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://localhost:3306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#          username: root
-#          password: 123456
-#          url: jdbc:mysql://123.249.30.140:3307/gas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#          username: root
-#          password: szrqwx123456
-          url: jdbc:mysql://49.232.253.249:3306/zdsz_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://192.168.10.15:63306/zdsz_xx?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: Lanyuxinxi@88.com
+          password: sooka1a2b3c4d%...
+#          url: jdbc:mysql://49.232.253.249:3306/zdsz_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+#          username: root
+#          password: Lanyuxinxi@88.com
 #          url: jdbc:mysql://121.37.40.217:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
 #          username: zdsz
 #          password: ZDSZ1a2b3c4d%...
@@ -123,13 +120,13 @@ spring:
 spring:
   redis:
     # 地址
-    host: 49.232.253.249
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 16379
     # 数据库索引
     database: 0
     # 密码
-    password: Lanyuxinxi@88.com
+    password: sooka123456
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -173,8 +170,7 @@ huawei:
     upload:
       endPoint: obs.cn-south-1.myhuaweicloud.com
     access:
-      endPoint: https://zdsz.obs.cn-south-1.myhuaweicloud.com
-    bucketName: zdsz
-
+      endPoint: https://zdszdaz.obs.cn-south-1.myhuaweicloud.com
+    bucketName: zdszdaz
 # 临时文件路径
 filePath: D:/

ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DISTINCT
         a.*
         FROM
-        g_area as a join g_network_relation as b on a.id = b.regulator_box_id AND b.del_flag = '0'
+        g_area as a left join g_network_relation as b on a.id = b.regulator_box_id AND b.del_flag = '0'
         <if test="userId != null and userId != ''">
             and b.user_id like CONCAT('%',#{userId},'%')
         </if>