diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index 35e89e7..d72e609 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -1,6 +1,6 @@ sdk: server: - app-key: 7175521477324657a82fd7774917f28c + app-key: 4420c5c763574ea5bf71f82913fb7d00 client: gateway: url: ${common.gateway.network.http.external} diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java index dd5e754..d4b71ed 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java @@ -13,6 +13,7 @@ import com.zcloud.fire.check.dto.clientobject.FireCheckListCO; 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,7 +41,7 @@ public class FireCheckListController { @ApiOperation("消防点检分页") @PostMapping("/list") - // @PreAuthorize("@pms.hasAnyPermission('xfdjjl')") +// @PreAuthorize("@pms.hasAnyPermission('xfdjb')") public PageResponse page(@RequestBody FireCheckListPageQry qry) { return fireCheckListService.listPage(qry); } @@ -88,7 +89,7 @@ public class FireCheckListController { } @ApiOperation("PC端-点位检查记录分页") @PostMapping("/checkListRecordList") - // @PreAuthorize("@pms.hasAnyPermission('dwjcjl')") +// @PreAuthorize("@pms.hasAnyPermission('dwjcjl')") public PageResponse checkListRecordList(@RequestBody FireCheckListRecordPageQry qry) { return fireCheckListService.checkListRecordList(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java index c1569c5..0c21753 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java @@ -15,6 +15,7 @@ import com.zcloud.fire.check.dto.clientobject.FireCheckRecordInfoCO; 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.*; @@ -59,6 +60,7 @@ public class FireCheckRecordController { @ApiOperation("股份端-分公司消防检查记录") @PostMapping("/corpCheckRecordList") +// @PreAuthorize("@pms.hasAnyPermission('fgsxfjcjl')") public PageResponse corpCheckRecordList(@RequestBody CorpStatisticsPageQry qry) { return fireCheckRecordService.corpCheckRecordList(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java index e82f684..f748cf6 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java @@ -16,6 +16,7 @@ import com.zcloud.fire.check.dto.clientobject.FireCheckStandardCO; 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.*; import org.springframework.web.multipart.MultipartFile; @@ -44,6 +45,7 @@ public class FireCheckStandardController { @ApiOperation("消防检查标准分页") @PostMapping("/list") +// @PreAuthorize("@pms.hasAnyPermission('xfqcjcbz')") public PageResponse page(@RequestBody FireCheckStandardPageQry qry) { return fireCheckStandardService.listPage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java index fdecd50..322d63f 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java @@ -16,6 +16,7 @@ import com.zcloud.fire.check.dto.clientobject.RiskDistributionStasticCO; 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.*; import org.springframework.web.multipart.MultipartFile; @@ -45,7 +46,7 @@ public class FireDeviceController { @ApiOperation("消防器材分页") @PostMapping("/list") - // @PreAuthorize("@pms.hasAnyPermission('xfqc')") +// @PreAuthorize("@pms.hasAnyPermission('xfqcgl')") public PageResponse page(@RequestBody FireDevicePageQry qry) { return fireDeviceService.listPage(qry); } @@ -94,11 +95,13 @@ public class FireDeviceController { @ApiOperation("股份端-消防器材统计汇总首页分页") @PostMapping("/corpStatisticslist") +// @PreAuthorize("@pms.hasAnyPermission('xfqctjhz')") public PageResponse corpStatisticslist(@RequestBody CorpStatisticsPageQry qry) { return fireDeviceService.corpStatisticslist(qry); } @ApiOperation("股份端-消防器材统计汇总首页总数") @GetMapping("/corpStatisticsTotal") +// @PreAuthorize("@pms.hasAnyPermission('xfqctjhz')") public SingleResponse corpStatisticsTotal() { return SingleResponse.of(fireCheckListService.riskDistributionStatistic()); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java index a8ca24f..3ace523 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java @@ -13,6 +13,7 @@ import com.zcloud.fire.check.dto.clientobject.FirePointCO; 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,7 +41,7 @@ public class FirePointController { @ApiOperation("分页") @PostMapping("/list") - // @PreAuthorize("@pms.hasAnyPermission('xfdw')") +// @PreAuthorize("@pms.hasAnyPermission('xfdwwh')") public PageResponse page(@RequestBody FirePointPageQry qry) { return firePointService.listPage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java index 0850cad..c5e5368 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java @@ -40,7 +40,7 @@ public class FireRegionController { @ApiOperation("消防区域列表分页") @PostMapping("/list") -// @PreAuthorize("@pms.hasAnyPermission('xfqy')") +// @PreAuthorize("@pms.hasAnyPermission('xfqywh')") public PageResponse page(@RequestBody FireRegionPageQry qry) { return fireRegionService.listPage(qry); } diff --git a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java index 9119920..47e82cf 100644 --- a/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java +++ b/web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java @@ -13,15 +13,21 @@ import java.util.stream.Collectors; @Getter public enum MenuEnum { //消防区域 - XFQY("/risk/container/riskControl/branchCompany/riskPoint/list", "xfqy"), + XFQYWH("/fireCheck/container/branchCompany/fireRegion", "xfqywh"), //消防点位 - XFDW("/risk/container/riskControl/branchCompany/identifyPart/list", "xfdw"), + XFDWWH("/fireCheck/container/branchCompany/firePoint", "xfdwwh"), //消防器材 - XFQC("/risk/container/riskControl/branchCompany/riskIedger/list", "xfqc"), + XFQCGL("/fireCheck/container/branchCompany/fireDevice", "xfqcgl"), //消防点检记录 - XFDJJL("/risk/container/riskControl/branchCompany/accidentLedger/list", "xfdjjl"), + XFDJB("/fireCheck/container/branchCompany/fireCheckList/list", "xfdjb"), //点位检查记录 - DWJCJL("/risk/container/hiddenDanger/branchCompany/hazardChecklist/list", "dwjcjl"), + DWJCJL("/fireCheck/container/branchCompany/fireCheckRecord/list", "dwjcjl"), + //消防器材检查标准 + XFQCJCBZ("/fireCheck/container/supervision/fireCheckStandard", "xfqcjcbz"), + //消防器材统计汇总 + XFQCTJHZ("/fireCheck/container/supervision/fireDeviceRecord/list", "xfqctjhz"), + //分公司消防检查记录 + FGSXFJCJL("/fireCheck/container/supervision/fireRecords/list", "fgsxfjcjl"), ; diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java index aa9b9b4..fca8489 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java @@ -1,9 +1,14 @@ package com.zcloud.fire.check.persistence.mapper; 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.fire.check.persistence.dataobject.CorpInfoDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Map; + /** * web-infrastructure * @@ -11,7 +16,11 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-29 16:02:16 */ @Mapper +@DataScopes({ + @DataScope(method = "listPage", menuPerms = ""), +}) public interface CorpInfoMapper extends BaseMapper { + IPage listPage(IPage iPage, Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java index 6d4d9e9..bd1b16e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java @@ -2,6 +2,8 @@ package com.zcloud.fire.check.persistence.mapper; 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.fire.check.domain.model.DateTimeE; import com.zcloud.fire.check.persistence.FireCheckPointListDO; import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO; @@ -19,11 +21,15 @@ import java.util.Map; * @Date 2025-11-28 10:32:09 */ @Mapper +@DataScopes({ + @DataScope(method = "listPage", menuPerms = ""), + @DataScope(method = "checkListRecordList", menuPerms = ""), +}) public interface FireCheckListMapper extends BaseMapper { FireCheckListDO getInfoById(Long id); - IPage listPage(IPage iPage, Map params); + IPage listPage(IPage iPage, Map params, String menuPerms); IPage appCheckList(IPage iPage, Map params, DateTimeE dateTimeE); @@ -35,8 +41,7 @@ public interface FireCheckListMapper extends BaseMapper { IPage getBackChecKList(IPage iPage, Map params); - - IPage checkListRecordList(IPage iPage, Map params, DateTimeE dateTimeE); + IPage checkListRecordList(IPage iPage, Map params, DateTimeE dateTimeE, String menuPerms); IPage getCheckListRecord(IPage iPage, Map params, DateTimeE dateTimeE); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java index 2d6b8a2..46101b3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java @@ -1,11 +1,15 @@ package com.zcloud.fire.check.persistence.mapper; 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.fire.check.persistence.dataobject.FireCheckStandardDO; import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardStatisticDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * web-infrastructure @@ -14,8 +18,13 @@ import java.util.List; * @Date 2025-11-26 10:12:15 */ @Mapper +@DataScopes({ + @DataScope(method = "listPage", menuPerms = ""), +}) public interface FireCheckStandardMapper extends BaseMapper { List getDeviceStandardList(String fireCheckId); + + IPage listPage(IPage iPage, Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java index 8e0146f..582b9d3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java @@ -2,6 +2,8 @@ package com.zcloud.fire.check.persistence.mapper; 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.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO; import com.zcloud.fire.check.persistence.dataobject.FireDeviceStatisticDO; @@ -18,11 +20,14 @@ import java.util.Map; * @Date 2025-11-26 10:12:34 */ @Mapper +@DataScopes({ + @DataScope(method = "getFireDevicePage", menuPerms = ""), +}) public interface FireDeviceMapper extends BaseMapper { List countByFireRegionIdIn(List firePointIds); - IPage getFireDevicePage(IPage iPage, Map params); + IPage getFireDevicePage(IPage iPage, Map params, String menuPerms); List getAllList(@Param("params")Map params); diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java index 1395a6c..51df857 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java @@ -2,6 +2,8 @@ package com.zcloud.fire.check.persistence.mapper; 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.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FirePointDO; import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO; @@ -17,11 +19,14 @@ import java.util.Map; * @Date 2025-11-26 10:12:55 */ @Mapper +@DataScopes({ + @DataScope(method = "getFirePointPage", menuPerms = ""), +}) public interface FirePointMapper extends BaseMapper { List countByFireRegionIdIn(List fireRegionIds); - IPage getFirePointPage(IPage iPage, Map params); + IPage getFirePointPage(IPage iPage, Map params, String menuPerms); FirePointDO getInfoById(Long id); diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java index 1818864..862a3e7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java @@ -2,6 +2,8 @@ package com.zcloud.fire.check.persistence.mapper; 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.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FireRegionDO; import org.apache.ibatis.annotations.Mapper; @@ -16,9 +18,12 @@ import java.util.Map; * @Date 2025-11-26 10:13:09 */ @Mapper +@DataScopes({ + @DataScope(method = "getFireRegionPage", menuPerms = ""), +}) public interface FireRegionMapper extends BaseMapper { - IPage getFireRegionPage(IPage iPage, Map params); + IPage getFireRegionPage(IPage iPage, Map params, String menuPerms); List countByCorpinfoIds(List corpinfoIds); diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java index ac41876..0af881d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -8,6 +8,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.fire.check.domain.enums.CommonFlagEnum; +import com.zcloud.fire.check.domain.enums.MenuEnum; import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO; import com.zcloud.fire.check.persistence.mapper.CorpInfoMapper; import com.zcloud.fire.check.persistence.repository.CorpInfoRepository; @@ -33,10 +34,11 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByAsc("corp_order").orderByDesc("create_time"); - IPage result = corpInfoMapper.selectPage(iPage, queryWrapper); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = corpInfoMapper.listPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java index 10d7427..1b2764e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.MenuEnum; import com.zcloud.fire.check.domain.model.CorpInfoE; import com.zcloud.fire.check.domain.model.DateTimeE; import com.zcloud.fire.check.domain.model.FireCheckListE; @@ -54,7 +55,11 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl result = fireCheckListMapper.listPage(iPage, params); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = fireCheckListMapper.listPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -129,7 +134,11 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl result = fireCheckListMapper.checkListRecordList(iPage, params,dateTimeE); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = fireCheckListMapper.checkListRecordList(iPage, params,dateTimeE,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java index 4b00500..d5cfb7b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.fire.check.domain.enums.MenuEnum; import com.zcloud.fire.check.domain.model.FireCheckStandardE; import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO; import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardStatisticDO; @@ -32,10 +33,11 @@ public class FireCheckStandardRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("device_name").orderByDesc("fire_device_type").orderByDesc("create_time"); - IPage result = fireCheckStandardMapper.selectPage(iPage, queryWrapper); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = fireCheckStandardMapper.listPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java index 57052a8..b216fa5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java @@ -7,6 +7,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.fire.check.domain.enums.CorpTypeEnum; +import com.zcloud.fire.check.domain.enums.MenuEnum; import com.zcloud.fire.check.domain.enums.UserTypeEnum; import com.zcloud.fire.check.persistence.dataobject.*; import com.zcloud.fire.check.persistence.mapper.FireDeviceMapper; @@ -43,7 +44,11 @@ public class FireDeviceRepositoryImpl extends BaseRepositoryImpl result = fireDeviceMapper.getFireDevicePage(iPage, params); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = fireDeviceMapper.getFireDevicePage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java index 03abe45..be05ffd 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java @@ -8,6 +8,7 @@ import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.fire.check.domain.enums.CorpTypeEnum; import com.zcloud.fire.check.domain.enums.FireRegionStateEnum; +import com.zcloud.fire.check.domain.enums.MenuEnum; import com.zcloud.fire.check.domain.enums.UserTypeEnum; import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO; import com.zcloud.fire.check.persistence.dataobject.FirePointDO; @@ -49,7 +50,11 @@ public class FirePointRepositoryImpl extends BaseRepositoryImpl result = firePointMapper.getFirePointPage(iPage, params); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = firePointMapper.getFirePointPage(iPage, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java index 7683ac3..d49dabc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java @@ -46,12 +46,11 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); - /* String menuPerms = ""; + String menuPerms = ""; if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); - }*/ - - IPage result =fireRegionMapper.getFireRegionPage(iPage,params); + } + IPage result =fireRegionMapper.getFireRegionPage(iPage,params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @Override diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index 110ceca..180bd1c 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -4,5 +4,14 @@ + diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml index 5c3c067..6594239 100644 --- a/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml @@ -13,5 +13,21 @@ and cli.delete_enum='FALSE' group by cli.fire_device_id + + diff --git a/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml b/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml index 916949d..d579b92 100644 --- a/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml @@ -8,6 +8,7 @@ select fr.*,d.name AS departmentName from fire_region fr left join department d on fr.department_id=d.id + left join corp_info c on fr.corpinfo_id = c.id fr.delete_enum = 'FALSE'