1、消防控制室 消防救援队 消防水源 消防泵房加上数据权限

web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/ControlRoomController.java

@@ -15,6 +15,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,6 +41,7 @@ public class ControlRoomController {
 
     @ApiOperation("分页")
     @PostMapping("/list")
+    @PreAuthorize("@pms.hasAnyPermission('xjkzs')")
     public PageResponse<ControlRoomCO> page(@RequestBody ControlRoomPageQry qry) {
         return controlRoomService.listPage(qry);
     }

web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/PumpRoomController.java

@@ -15,6 +15,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,6 +41,7 @@ public class PumpRoomController {
 
     @ApiOperation("分页")
     @PostMapping("/list")
+    @PreAuthorize("@pms.hasAnyPermission('xfbf')")
     public PageResponse<PumpRoomCO> page(@RequestBody PumpRoomPageQry qry) {
         return pumpRoomService.listPage(qry);
     }

web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/RescueTeamController.java

@@ -15,6 +15,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,6 +41,7 @@ public class RescueTeamController {
 
     @ApiOperation("分页")
     @PostMapping("/list")
+    @PreAuthorize("@pms.hasAnyPermission('xfjyd')")
     public PageResponse<RescueTeamCO> page(@RequestBody RescueTeamPageQry qry) {
         return rescueTeamService.listPage(qry);
     }

web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/WaterSourceController.java

@@ -15,6 +15,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,6 +41,7 @@ public class WaterSourceController {
 
     @ApiOperation("分页")
     @PostMapping("/list")
+    @PreAuthorize("@pms.hasAnyPermission('xfsy')")
     public PageResponse<WaterSourceCO> page(@RequestBody WaterSourcePageQry qry) {
         return waterSourceService.listPage(qry);
     }

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/mapper/ControlRoomMapper.java

@@ -1,8 +1,13 @@
 package com.zcloud.zcGbsServicer.persistence.mapper;
 
-import com.zcloud.zcGbsServicer.persistence.dataobject.ControlRoomDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
+import com.zcloud.zcGbsServicer.persistence.dataobject.ControlRoomDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * web-infrastructure
@@ -10,7 +15,13 @@ import org.apache.ibatis.annotations.Mapper;
 * @Date 2026-01-21 17:21:49
 */
 @Mapper
+@DataScopes({
+        @DataScope(method = "selectPageSql",  menuPerms = "xjkzs")
+})
 public interface ControlRoomMapper extends BaseMapper<ControlRoomDO> {
 
-    }
+    IPage<ControlRoomDO> selectPageSql(IPage<ControlRoomDO> page,
+                                      @Param("ew") QueryWrapper<ControlRoomDO> queryWrapper,
+                                      @Param("menuPerms") String menuPerms);
+}
 

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/mapper/PumpRoomMapper.java

@@ -1,8 +1,14 @@
 package com.zcloud.zcGbsServicer.persistence.mapper;
 
-import com.zcloud.zcGbsServicer.persistence.dataobject.PumpRoomDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
+import com.zcloud.zcGbsServicer.persistence.dataobject.PumpRoomDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 
 /**
 * web-infrastructure
@@ -10,7 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
 * @Date 2026-01-21 17:22:16
 */
 @Mapper
+@DataScopes({
+        @DataScope(method = "selectPageSql", menuPerms = "xfbf")
+})
 public interface PumpRoomMapper extends BaseMapper<PumpRoomDO> {
 
-    }
+    IPage<PumpRoomDO> selectPageSql(IPage<PumpRoomDO> page,
+                                   @Param("ew") QueryWrapper<PumpRoomDO> queryWrapper,
+                                   @Param("menuPerms") String menuPerms);
+}
 

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/mapper/RescueTeamMapper.java

@@ -1,8 +1,14 @@
 package com.zcloud.zcGbsServicer.persistence.mapper;
 
-import com.zcloud.zcGbsServicer.persistence.dataobject.RescueTeamDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
+import com.zcloud.zcGbsServicer.persistence.dataobject.RescueTeamDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 
 /**
 * web-infrastructure
@@ -10,7 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
 * @Date 2026-01-21 17:23:00
 */
 @Mapper
+@DataScopes({
+        @DataScope(method = "selectPageSql", menuPerms = "xfjyd")
+})
 public interface RescueTeamMapper extends BaseMapper<RescueTeamDO> {
 
-    }
+    IPage<RescueTeamDO> selectPageSql(IPage<RescueTeamDO> page,
+                                     @Param("ew") QueryWrapper<RescueTeamDO> queryWrapper,
+                                     @Param("menuPerms") String menuPerms);
+}
 

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/mapper/WaterSourceMapper.java

@@ -1,8 +1,14 @@
 package com.zcloud.zcGbsServicer.persistence.mapper;
 
-import com.zcloud.zcGbsServicer.persistence.dataobject.WaterSourceDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
+import com.zcloud.zcGbsServicer.persistence.dataobject.WaterSourceDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 
 /**
 * web-infrastructure
@@ -10,7 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
 * @Date 2026-01-21 17:23:50
 */
 @Mapper
+@DataScopes({
+        @DataScope(method = "selectPageSql", menuPerms = "xfsy")
+})
 public interface WaterSourceMapper extends BaseMapper<WaterSourceDO> {
 
-    }
+    IPage<WaterSourceDO> selectPageSql(IPage<WaterSourceDO> page,
+                                      @Param("ew") QueryWrapper<WaterSourceDO> queryWrapper,
+                                      @Param("menuPerms") String menuPerms);
+}
 

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/ControlRoomRepositoryImpl.java

@@ -29,12 +29,12 @@ public class ControlRoomRepositoryImpl extends BaseRepositoryImpl<ControlRoomMap
         IPage<ControlRoomDO> iPage = new Query<ControlRoomDO>().getPage(params);
         QueryWrapper<ControlRoomDO> queryWrapper = new QueryWrapper<>();
         Object corpId = params == null ? null : params.remove("eqCorpId");
+        String menuPerms = params == null ? null : (String) params.remove("menuPerms");
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
         if (corpId != null) {
             queryWrapper.eq("tenant_id", corpId);
         }
-        queryWrapper.orderByDesc("create_time");
+        IPage<ControlRoomDO> result = controlRoomMapper.selectPageSql(iPage, queryWrapper, menuPerms);
-        IPage<ControlRoomDO> result = controlRoomMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/PumpRoomRepositoryImpl.java

@@ -29,12 +29,12 @@ public class PumpRoomRepositoryImpl extends BaseRepositoryImpl<PumpRoomMapper, P
     IPage<PumpRoomDO> iPage = new Query<PumpRoomDO>().getPage(params);
         QueryWrapper<PumpRoomDO> queryWrapper = new QueryWrapper<>();
         Object corpId = params == null ? null : params.remove("eqCorpId");
+        String menuPerms = params == null ? null : (String) params.remove("menuPerms");
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
         if (corpId != null) {
             queryWrapper.eq("tenant_id", corpId);
         }
-        queryWrapper.orderByDesc("create_time");
+        IPage<PumpRoomDO> result = pumpRoomMapper.selectPageSql(iPage, queryWrapper, menuPerms);
-        IPage<PumpRoomDO> result = pumpRoomMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/RescueTeamRepositoryImpl.java

@@ -1,6 +1,5 @@
 package com.zcloud.zcGbsServicer.persistence.repository.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.zcloud.zcGbsServicer.persistence.dataobject.RescueTeamDO;
 import com.zcloud.zcGbsServicer.persistence.mapper.RescueTeamMapper;
@@ -14,8 +13,6 @@ import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,12 +30,12 @@ public class RescueTeamRepositoryImpl extends BaseRepositoryImpl<RescueTeamMappe
     IPage<RescueTeamDO> iPage = new Query<RescueTeamDO>().getPage(params);
         QueryWrapper<RescueTeamDO> queryWrapper = new QueryWrapper<>();
         Object corpId = params == null ? null : params.remove("eqCorpId");
+        String menuPerms = params == null ? null : (String) params.remove("menuPerms");
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
         if (corpId != null) {
             queryWrapper.eq("tenant_id", corpId);
         }
-        queryWrapper.orderByDesc("create_time");
+        IPage<RescueTeamDO> result = rescueTeamMapper.selectPageSql(iPage, queryWrapper, menuPerms);
-        IPage<RescueTeamDO> result = rescueTeamMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/WaterSourceRepositoryImpl.java

@@ -29,12 +29,12 @@ public class WaterSourceRepositoryImpl extends BaseRepositoryImpl<WaterSourceMap
         IPage<WaterSourceDO> iPage = new Query<WaterSourceDO>().getPage(params);
         QueryWrapper<WaterSourceDO> queryWrapper = new QueryWrapper<>();
         Object corpId = params == null ? null : params.remove("eqCorpId");
+        String menuPerms = params == null ? null : (String) params.remove("menuPerms");
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
         if (corpId != null) {
             queryWrapper.eq("tenant_id", corpId);
         }
-        queryWrapper.orderByDesc("create_time");
+        IPage<WaterSourceDO> result = waterSourceMapper.selectPageSql(iPage, queryWrapper, menuPerms);
-        IPage<WaterSourceDO> result = waterSourceMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 }

web-infrastructure/src/main/resources/mapper/ControlRoomMapper.xml

@@ -4,5 +4,19 @@
 
 <mapper namespace="com.zcloud.zcGbsServicer.persistence.mapper.ControlRoomMapper">
 
+    <select id="selectPageSql" resultType="com.zcloud.zcGbsServicer.persistence.dataobject.ControlRoomDO">
+        SELECT
+        *
+        FROM
+        control_room
+        <where>
+            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+                AND ${ew.sqlSegment}
+            </if>
+        </where>
+        ORDER BY
+        create_time DESC
+    </select>
+
 </mapper>
 

web-infrastructure/src/main/resources/mapper/FireResourceMapper.xml

@@ -15,6 +15,9 @@
         FROM
         corp_info ci
         <where>
+            ci.delete_enum = 'false'
+            AND
+            ci.type IN(0, 1, 6)
             <if test="corpName != null and corpName != ''">
                 AND ci.corp_name LIKE CONCAT('%', #{corpName}, '%')
             </if>

web-infrastructure/src/main/resources/mapper/PumpRoomMapper.xml

@@ -4,5 +4,19 @@
 
 <mapper namespace="com.zcloud.zcGbsServicer.persistence.mapper.PumpRoomMapper">
 
+    <select id="selectPageSql" resultType="com.zcloud.zcGbsServicer.persistence.dataobject.PumpRoomDO">
+        SELECT
+        *
+        FROM
+        pump_room
+        <where>
+            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+                AND ${ew.sqlSegment}
+            </if>
+        </where>
+        ORDER BY
+        create_time DESC
+    </select>
+
 </mapper>
 

web-infrastructure/src/main/resources/mapper/RescueTeamMapper.xml

@@ -4,5 +4,19 @@
 
 <mapper namespace="com.zcloud.zcGbsServicer.persistence.mapper.RescueTeamMapper">
 
+    <select id="selectPageSql" resultType="com.zcloud.zcGbsServicer.persistence.dataobject.RescueTeamDO">
+        SELECT
+        *
+        FROM
+        rescue_team
+        <where>
+            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+                AND ${ew.sqlSegment}
+            </if>
+        </where>
+        ORDER BY
+        create_time DESC
+    </select>
+
 </mapper>
 

web-infrastructure/src/main/resources/mapper/WaterSourceMapper.xml

@@ -4,5 +4,19 @@
 
 <mapper namespace="com.zcloud.zcGbsServicer.persistence.mapper.WaterSourceMapper">
 
+    <select id="selectPageSql" resultType="com.zcloud.zcGbsServicer.persistence.dataobject.WaterSourceDO">
+        SELECT
+        *
+        FROM
+        water_source
+        <where>
+            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+                AND ${ew.sqlSegment}
+            </if>
+        </where>
+        ORDER BY
+        create_time DESC
+    </select>
+
 </mapper>