提交代码

.idea/workspace.xml

@@ -5,27 +5,24 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b5706414-aab4-4b84-9189-e0bf939b95e1" name="Changes" comment="提交代码">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAboutUsController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAreaController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MBuildingController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MCourtyardNetworkManagementController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MEmergencyRepairController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MExplainController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MNoticeController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MRegulatorBoxController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MRotationController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MUnitController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MWarningPileController.java" afterDir="false" />
       <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-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java" 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" />
@@ -172,7 +169,7 @@
       <workItem from="1698281101623" duration="8631000" />
       <workItem from="1698301838507" duration="2817000" />
       <workItem from="1698308761171" duration="1767000" />
-      <workItem from="1698367022283" duration="6034000" />
+      <workItem from="1698367022283" duration="12961000" />
     </task>
     <task id="LOCAL-00001" summary="提交代码">
       <option name="closed" value="true" />
@@ -198,7 +195,15 @@
       <option name="project" value="LOCAL" />
       <updated>1698303204305</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="提交代码">
+      <option name="closed" value="true" />
+      <created>1698376313155</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1698376313155</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

logs/sys-user.log

@@ -24,3 +24,14 @@
 2023-10-27 11:00:53 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
 2023-10-27 11:03:46 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
 2023-10-27 11:07:47 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 12:47:23 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 12:50:04 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 13:10:08 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 13:14:10 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 13:27:09 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 13:27:43 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 13:27:54 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 13:27:56 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 13:50:30 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 13:51:11 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-27 15:40:02 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====

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

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.GNotice;
 import com.ruoyi.gas.domain.bo.GNoticeBo;
 import com.ruoyi.gas.domain.vo.GNoticeVo;
 import com.ruoyi.gas.service.IGNoticeService;
@@ -53,6 +54,16 @@ public class MNoticeController extends BaseController {
     }
 
     /**
+     * 查询公告管理列表
+     */
+    @ApiOperation("查询公告管理列表")
+    @PreAuthorize("@ss.hasPermi('gas:notice:list')")
+    @GetMapping("/getNotice")
+    public List<GNotice> getNotice() {
+        return iGNoticeService.getNotice();
+    }
+
+    /**
      * 导出公告管理列表
      */
     @ApiOperation("导出公告管理列表")

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

@@ -4,7 +4,6 @@ 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;
@@ -48,8 +47,8 @@ public class MWarningPileController extends BaseController {
     @ApiOperation("查询警示桩列表")
     @PreAuthorize("@ss.hasPermi('gas:warningPile:list')")
     @GetMapping("/list")
-    public TableDataInfo<GWarningPileVo> list(@Validated(QueryGroup.class) GWarningPileBo bo) {
-        return iGWarningPileService.queryPageList(bo);
+    public List<GWarningPileVo> list(@Validated(QueryGroup.class) GWarningPileBo bo) {
+        return iGWarningPileService.getList(bo);
     }
 
     /**

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

@@ -135,7 +135,7 @@ security:
     - /mobile/building/**
     - /mobile/courtyardNetworkManagement/**
     - /mobile/emergencyRepair/**
-    - /mobile/notice/list
+    - /mobile/notice/**
     - /mobile/regulatorBox/**
     - /mobile/rotation/**
     - /mobile/unit/**
@@ -143,7 +143,7 @@ security:
     - /mobile/warningPile/**
   # 用户放行
   permit-all:
-
+  - /mobile/**/**
 # 重复提交
 repeat-submit:
   # 全局间隔时间(毫秒)

ruoyi-admin/target/classes/application.yml

@@ -135,7 +135,7 @@ security:
     - /mobile/building/**
     - /mobile/courtyardNetworkManagement/**
     - /mobile/emergencyRepair/**
-    - /mobile/notice/list
+    - /mobile/notice/**
     - /mobile/regulatorBox/**
     - /mobile/rotation/**
     - /mobile/unit/**
@@ -143,7 +143,7 @@ security:
     - /mobile/warningPile/**
   # 用户放行
   permit-all:
-
+  - /mobile/**/**
 # 重复提交
 repeat-submit:
   # 全局间隔时间(毫秒)

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -19,6 +19,8 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 import org.springframework.security.web.authentication.logout.LogoutFilter;
 import org.springframework.web.filter.CorsFilter;
 
+import java.util.Arrays;
+
 /**
  * spring security配置
  * 
@@ -114,6 +116,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .anyRequest().authenticated()
                 .and()
                 .headers().frameOptions().disable();
+        System.out.println(Arrays.toString(securityProperties.getAnonymous()));
         httpSecurity.logout().logoutUrl(securityProperties.getLogoutUrl()).logoutSuccessHandler(logoutSuccessHandler);
         // 添加JWT filter
         httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGNoticeService.java

@@ -26,6 +26,7 @@ public interface IGNoticeService extends IServicePlus<GNotice, GNoticeVo> {
 	 * 查询列表
 	 */
     TableDataInfo<GNoticeVo> queryPageList(GNoticeBo bo);
+	List<GNotice> getNotice();
 
 	/**
 	 * 查询列表

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGWarningPileService.java

@@ -27,6 +27,8 @@ public interface IGWarningPileService extends IServicePlus<GWarningPile, GWarnin
 	 */
     TableDataInfo<GWarningPileVo> queryPageList(GWarningPileBo bo);
 
+	List<GWarningPileVo> getList(GWarningPileBo bo);
+
 	/**
 	 * 查询列表
 	 */

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GNoticeServiceImpl.java

@@ -1,23 +1,23 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.gas.domain.GNotice;
 import com.ruoyi.gas.domain.bo.GNoticeBo;
 import com.ruoyi.gas.domain.vo.GNoticeVo;
-import com.ruoyi.gas.domain.GNotice;
 import com.ruoyi.gas.mapper.GNoticeMapper;
 import com.ruoyi.gas.service.IGNoticeService;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 公告管理Service业务层处理
@@ -44,6 +44,13 @@ public class GNoticeServiceImpl extends ServicePlusImpl<GNoticeMapper, GNotice,
         return listVo(buildQueryWrapper(bo));
     }
 
+    @Override
+    public List<GNotice> getNotice() {
+        QueryWrapper<GNotice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().last(" ORDER BY time LIMIT 3");
+        return baseMapper.selectList(queryWrapper);
+    }
+
     private LambdaQueryWrapper<GNotice> buildQueryWrapper(GNoticeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<GNotice> lqw = Wrappers.lambdaQuery();

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GWarningPileServiceImpl.java

@@ -1,23 +1,23 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GWarningPile;
 import com.ruoyi.gas.domain.bo.GWarningPileBo;
 import com.ruoyi.gas.domain.vo.GWarningPileVo;
-import com.ruoyi.gas.domain.GWarningPile;
 import com.ruoyi.gas.mapper.GWarningPileMapper;
 import com.ruoyi.gas.service.IGWarningPileService;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 警示桩Service业务层处理
@@ -40,6 +40,14 @@ public class GWarningPileServiceImpl extends ServicePlusImpl<GWarningPileMapper,
     }
 
     @Override
+    public List<GWarningPileVo> getList(GWarningPileBo bo) {
+        LambdaQueryWrapper<GWarningPile> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getUserId()), GWarningPile::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), GWarningPile::getName, bo.getName());
+        return this.listVo(lqw);
+    }
+
+    @Override
     public List<GWarningPileVo> queryList(GWarningPileBo bo) {
         return listVo(buildQueryWrapper(bo));
     }