提交代码

.idea/workspace.xml

@@ -5,24 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b5706414-aab4-4b84-9189-e0bf939b95e1" name="Changes" comment="提交代码">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/sys-console.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-console.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/sys-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-error.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/sys-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-info.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/sys-user.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-user.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MNoticeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MNoticeController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MWarningPileController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MWarningPileController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/config/SecurityConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/config/SecurityConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGNoticeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGNoticeService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGWarningPileService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGWarningPileService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GNoticeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GNoticeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GWarningPileServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GWarningPileServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/IGNoticeService.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/IGNoticeService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GNoticeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GNoticeServiceImpl.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -169,7 +155,7 @@
       <workItem from="1698281101623" duration="8631000" />
       <workItem from="1698301838507" duration="2817000" />
       <workItem from="1698308761171" duration="1767000" />
-      <workItem from="1698367022283" duration="12961000" />
+      <workItem from="1698367022283" duration="13482000" />
     </task>
     <task id="LOCAL-00001" summary="提交代码">
       <option name="closed" value="true" />
@@ -203,7 +189,15 @@
       <option name="project" value="LOCAL" />
       <updated>1698376313155</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="提交代码">
+      <option name="closed" value="true" />
+      <created>1698392421241</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1698392421241</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

logs/sys-info.log

@@ -3549,3 +3549,35 @@
 2023-10-27 15:40:02 [SpringApplicationShutdownHook] INFO  c.alibaba.druid.pool.DruidDataSource - {dataSource-1} closing ...
 2023-10-27 15:40:02 [SpringApplicationShutdownHook] INFO  c.alibaba.druid.pool.DruidDataSource - {dataSource-1} closed
 2023-10-27 15:40:02 [SpringApplicationShutdownHook] INFO  c.b.d.d.DynamicRoutingDataSource - dynamic-datasource all closed success,bye
+2023-10-27 15:40:11 [background-preinit] INFO  o.h.validator.internal.util.Version - HV000001: Hibernate Validator 6.2.0.Final
+2023-10-27 15:40:11 [main] INFO  com.ruoyi.RuoYiApplication - Starting RuoYiApplication using Java 1.8.0_202 on DESKTOP-QGKPIJM with PID 27320 (D:\project\java\zhendashizheng\ruoyi-admin\target\classes started by Administrator in D:\project\java\zhendashizheng)
+2023-10-27 15:40:11 [main] INFO  com.ruoyi.RuoYiApplication - The following profiles are active: dev
+2023-10-27 15:40:13 [main] INFO  org.redisson.Version - Redisson 3.16.3
+2023-10-27 15:40:13 [redisson-netty-2-32] INFO  o.r.c.p.MasterPubSubConnectionPool - 1 connections initialized for 49.232.253.249/49.232.253.249:16379
+2023-10-27 15:40:13 [redisson-netty-2-3] INFO  o.r.c.pool.MasterConnectionPool - 32 connections initialized for 49.232.253.249/49.232.253.249:16379
+2023-10-27 15:40:13 [main] INFO  c.ruoyi.framework.config.RedisConfig - 初始化 redis 配置
+2023-10-27 15:40:14 [main] INFO  io.undertow.servlet - Initializing Spring embedded WebApplicationContext
+2023-10-27 15:40:14 [main] INFO  c.b.d.d.DynamicRoutingDataSource - dynamic-datasource detect P6SPY plugin and enabled it
+2023-10-27 15:40:15 [main] INFO  c.alibaba.druid.pool.DruidDataSource - {dataSource-1,master} inited
+2023-10-27 15:40:15 [main] INFO  c.b.d.d.DynamicRoutingDataSource - dynamic-datasource - add a datasource named [slave] success
+2023-10-27 15:40:15 [main] INFO  c.b.d.d.DynamicRoutingDataSource - dynamic-datasource - add a datasource named [master] success
+2023-10-27 15:40:15 [main] INFO  c.b.d.d.DynamicRoutingDataSource - dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
+2023-10-27 15:40:20 [main] INFO  c.r.framework.config.JacksonConfig - 初始化 jackson 配置
+2023-10-27 15:40:20 [main] INFO  c.r.s.s.impl.SysOssConfigServiceImpl - 发布刷新OSS配置 => minio
+2023-10-27 15:40:20 [main] INFO  c.r.s.s.impl.SysOssConfigServiceImpl - 发布刷新OSS配置 => qiniu
+2023-10-27 15:40:20 [main] INFO  c.r.s.s.impl.SysOssConfigServiceImpl - 发布刷新OSS配置 => aliyun
+2023-10-27 15:40:20 [main] INFO  c.r.s.s.impl.SysOssConfigServiceImpl - 发布刷新OSS配置 => qcloud
+2023-10-27 15:40:20 [main] INFO  c.r.s.s.impl.SysOssConfigServiceImpl - 发布刷新OSS配置 => hw
+2023-10-27 15:40:21 [main] INFO  com.ruoyi.job.config.XxlJobConfig - >>>>>>>>>>> xxl-job config init.
+2023-10-27 15:40:22 [main] INFO  c.x.job.core.executor.XxlJobExecutor - >>>>>>>>>>> xxl-job register jobhandler success, name:demoJobHandler, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@4bb0063a[class com.ruoyi.job.service.SampleService#demoJobHandler]
+2023-10-27 15:40:22 [main] INFO  c.x.job.core.executor.XxlJobExecutor - >>>>>>>>>>> xxl-job register jobhandler success, name:demoJobHandler2, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@64c2543[class com.ruoyi.job.service.SampleService#demoJobHandler2]
+2023-10-27 15:40:22 [main] INFO  c.x.job.core.executor.XxlJobExecutor - >>>>>>>>>>> xxl-job register jobhandler success, name:httpJobHandler, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@6e605c34[class com.ruoyi.job.service.SampleService#httpJobHandler]
+2023-10-27 15:40:22 [main] INFO  c.x.job.core.executor.XxlJobExecutor - >>>>>>>>>>> xxl-job register jobhandler success, name:shardingJobHandler, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@45ed6e0a[class com.ruoyi.job.service.SampleService#shardingJobHandler]
+2023-10-27 15:40:22 [main] INFO  c.x.job.core.executor.XxlJobExecutor - >>>>>>>>>>> xxl-job register jobhandler success, name:commandJobHandler, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@e27215b[class com.ruoyi.job.service.SampleService#commandJobHandler]
+2023-10-27 15:40:23 [Thread-43] INFO  com.xxl.job.core.server.EmbedServer - >>>>>>>>>>> xxl-job remoting server start success, nettype = class com.xxl.job.core.server.EmbedServer, port = 9101
+2023-10-27 15:40:23 [main] INFO  io.undertow - starting server: Undertow - 2.2.12.Final
+2023-10-27 15:40:23 [main] INFO  org.xnio - XNIO version 3.8.4.Final
+2023-10-27 15:40:23 [main] INFO  org.xnio.nio - XNIO NIO Implementation Version 3.8.4.Final
+2023-10-27 15:40:23 [main] INFO  org.jboss.threads - JBoss Threads version 3.1.0.Final
+2023-10-27 15:40:24 [main] INFO  com.ruoyi.RuoYiApplication - Started RuoYiApplication in 12.963 seconds (JVM running for 15.003)
+2023-10-27 15:40:24 [RMI TCP Connection(1)-192.168.4.20] INFO  io.undertow.servlet - Initializing Spring DispatcherServlet 'dispatcherServlet'

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
@@ -47,7 +48,17 @@ public class MWarningPileController extends BaseController {
     @ApiOperation("查询警示桩列表")
     @PreAuthorize("@ss.hasPermi('gas:warningPile:list')")
     @GetMapping("/list")
-    public List<GWarningPileVo> list(@Validated(QueryGroup.class) GWarningPileBo bo) {
+    public TableDataInfo<GWarningPileVo> list(@Validated(QueryGroup.class) GWarningPileBo bo) {
+        return iGWarningPileService.queryPageList(bo);
+    }
+
+    /**
+     * 查询警示桩列表
+     */
+    @ApiOperation("查询警示桩列表")
+    @PreAuthorize("@ss.hasPermi('gas:warningPile:list')")
+    @GetMapping("/getList")
+    public List<GWarningPileVo> getList(@Validated(QueryGroup.class) GWarningPileBo bo) {
         return iGWarningPileService.getList(bo);
     }