反无驾驶舱优化

linwei

2026-02-04 f789ce14f7b7790f20fc4894eacdf452b7228497

反无驾驶舱优化

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java

@@ -74,19 +74,6 @@
        FwPoliceStationEntity detail = fwPoliceStationService.getById(id);
        return R.data(FwPoliceStationWrapper.build().entityVO(detail));
    }
    // /**
    // * 派出所信息表 分页
    // */
    // @GetMapping("/list")
    // @ApiOperationSupport(order = 2)
    // @ApiOperation(value = "分页", notes = "传入fwPoliceStation")
    // public R<IPage<FwPoliceStationVO>> list(@ApiIgnore @RequestParam Map<String,
    // Object> fwPoliceStation, Query query) {
    // IPage<FwPoliceStationEntity> pages =
    // fwPoliceStationService.page(Condition.getPage(query),
    // Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class));
    // return R.data(FwPoliceStationWrapper.build().pageVO(pages));
    // }

    /**
     * 派出所信息表 列表
@@ -111,26 +98,6 @@
            param);
        return R.data(pages);
    }

    // /**
    // * 派出所信息表 新增
    // */
    // @PostMapping("/save")
    // @ApiOperationSupport(order = 4)
    // @ApiOperation(value = "新增", notes = "传入fwPoliceStation")
    // public R save(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
    // return R.status(fwPoliceStationService.save(fwPoliceStation));
    // }
    //
    // /**
    // * 派出所信息表 修改
    // */
    // @PostMapping("/update")
    // @ApiOperationSupport(order = 5)
    // @ApiOperation(value = "修改", notes = "传入fwPoliceStation")
    // public R update(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
    // return R.status(fwPoliceStationService.updateById(fwPoliceStation));
    // }

    /**
     * 派出所信息表 新增或修改

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml

@@ -101,7 +101,13 @@
        from ja_fw_area_divide ad
        left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
        <where>
            ad.is_deleted = 0
                ad.is_deleted = 0
            <if test="deptList != null and deptList.size > 0">
                and ad.create_dept in
                <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
            <if test="isSetSceneManage != null and isSetSceneManage == 1">
                and exists (
                    select 1

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.java

@@ -52,7 +52,11 @@
     * @param sceneManageId
     * @return
     */
    List<FwDefenseSceneVO> selectFwDefenseSceneList(@Param("filterSelected") Integer filterSelected, @Param("zoneId") Long zoneId, @Param("areaId") Long areaId, @Param("unbound") Integer unbound, @Param("sceneManageId") Long sceneManageId);
    List<FwDefenseSceneVO> selectFwDefenseSceneList(@Param("filterSelected") Integer filterSelected,
                                                    @Param("zoneId") Long zoneId, @Param("areaId")
                                                    Long areaId, @Param("unbound") Integer unbound,
                                                    @Param("sceneManageId") Long sceneManageId,
                                                    @Param("deptList") List<Long> deptList);


    /**

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml

@@ -50,9 +50,18 @@
    </select>

    <select id="selectFwDefenseSceneList" resultMap="fwDefenseSceneResultMap">
        select ds.* from ja_fw_defense_scene ds
        select
            ds.*
        from
            ja_fw_defense_scene ds
        <where>
            ds.is_deleted = 0
                ds.is_deleted = 0
            <if test="deptList != null and deptList.size > 0">
                and ds.create_dept in
                <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
            <if test="unbound != null and unbound == 1">
                and (
                    not exists (

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java

@@ -57,8 +57,10 @@

    @Override
    public IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwAreaDivide.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwAreaDivide.setDeptList(deptList);
        }
        fwAreaDivide.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivide.getAreaTypeKeys()));

        List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDividePage(page, fwAreaDivide);
@@ -82,7 +84,10 @@
        param.setFlyTime(flyTime);
        // 解析区域类型键值列表
        param.setAreaTypeKeyList(parseAreaTypeKeyList(areaTypeKeys));

        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            param.setDeptList(deptList);
        }
        // 调用Mapper方法，传入参数对象
        List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(param);
        // 获取面数据
@@ -230,8 +235,10 @@
    @Override
    public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page,
                                                                            FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwAreaDivideStatistics.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwAreaDivideStatistics.setDeptList(deptList);
        }
        fwAreaDivideStatistics.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivideStatistics.getAreaTypeKeys()));
        return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
    }

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java

@@ -53,8 +53,10 @@

    @Override
    public IPage<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage<FwDefenseSceneManageVO> page, FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwDefenseSceneManagePageParam.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwDefenseSceneManagePageParam.setDeptList(deptList);
        }
        return page.setRecords(baseMapper.selectFwDefenseSceneManagePage(page, fwDefenseSceneManagePageParam));
    }

@@ -99,7 +101,7 @@
     */
    @Override
    public boolean deleteFwDefenseSceneManage(List<Long> longList) {
        //删除场景管理
        // 删除场景管理
        boolean b = deleteLogic(longList);
        if (b) {
            // 1.遍历所有删除的场景管理ID

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java

@@ -65,8 +65,10 @@

    @Override
    public IPage<FwDefenseSceneVO> selectFwDefenseScenePage(IPage<FwDefenseSceneVO> page, FwDefenseSceneVO fwDefenseScene) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwDefenseScene.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwDefenseScene.setDeptList(deptList);
        }
        IPage<FwDefenseSceneVO> result = page.setRecords(baseMapper.selectFwDefenseScenePage(page, fwDefenseScene));
        List<FwDefenseSceneVO> records = result.getRecords();
        if (records == null || records.isEmpty()) {
@@ -138,7 +140,11 @@

    @Override
    public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId, Integer unbound, Long sceneManageId) {
        return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId, unbound, sceneManageId);
        List<Long> deptList = new ArrayList<>();
        if (!AuthUtil.isAdministrator()) {
            deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        }
        return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId, unbound, sceneManageId, deptList);
    }

    private List<Long> parseIdList(String ids) {
@@ -166,9 +172,6 @@
    @Override
    public List<FwDefenseSceneExcel> exportFwDefenseScene(Wrapper<FwDefenseSceneEntity> queryWrapper) {
        List<FwDefenseSceneExcel> fwDefenseSceneList = baseMapper.exportFwDefenseScene(queryWrapper);
        //fwDefenseSceneList.forEach(fwDefenseScene -> {
        //    fwDefenseScene.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwDefenseScene.getType()));
        //});
        return fwDefenseSceneList;
    }


 drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java

@@ -73,7 +73,6 @@

    @Override
    public List<DeviceStatisticsVO> statisticalDeviceType() {
        // List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
        Region byCode = RegionCache.getByCode(dept.getAreaCode());
        return fwDeviceService.statisticalDeviceType(HeaderUtils.formatAreaCode(byCode.getCode()), AuthUtil.getDeptId());
@@ -120,7 +119,6 @@

    @Override
    public AlarmStatisticsVO statisticsAlarmsAndDeviceRecords() {
        // List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
        Region byCode = RegionCache.getByCode(dept.getAreaCode());
        String regionCode = HeaderUtils.formatAreaCode(byCode.getCode());

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java

@@ -42,8 +42,10 @@

    @Override
    public IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalParam fwEffectEval) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwEffectEval.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwEffectEval.setDeptList(deptList);
        }
        fwEffectEval.setCurrentDeptId(AuthUtil.getDeptId());
        return page.setRecords(baseMapper.selectFwEffectEvalPage(page, fwEffectEval));
    }
@@ -52,9 +54,6 @@
    @Override
    public List<FwEffectEvalExcel> exportFwEffectEval(Wrapper<FwEffectEvalEntity> queryWrapper) {
        List<FwEffectEvalExcel> fwEffectEvalList = baseMapper.exportFwEffectEval(queryWrapper);
        //fwEffectEvalList.forEach(fwEffectEval -> {
        //    fwEffectEval.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwEffectEval.getType()));
        //});
        return fwEffectEvalList;
    }


 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java

@@ -42,8 +42,10 @@

    @Override
    public IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskSchedulePageParam fwTaskSchedule) {
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwTaskSchedule.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwTaskSchedule.setDeptList(deptList);
        }
        return page.setRecords(baseMapper.selectFwTaskSchedulePage(page, fwTaskSchedule));
    }

@@ -51,9 +53,6 @@
    @Override
    public List<FwTaskScheduleExcel> exportFwTaskSchedule(Wrapper<FwTaskScheduleEntity> queryWrapper) {
        List<FwTaskScheduleExcel> fwTaskScheduleList = baseMapper.exportFwTaskSchedule(queryWrapper);
        //fwTaskScheduleList.forEach(fwTaskSchedule -> {
        //    fwTaskSchedule.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwTaskSchedule.getType()));
        //});
        return fwTaskScheduleList;
    }


 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml

@@ -44,7 +44,7 @@
        from
            ja_fw_device
        <where>
            is_deleted = 0
                is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceMaintainPlanServiceImpl.java

@@ -51,8 +51,10 @@
    @Override
    public IPage<FwDeviceMaintainPlanVO> selectFwDeviceMaintainPlanPage(IPage<FwDeviceMaintainPlanVO> page, FwDeviceMaintainPlanDTO fwDeviceMaintainPlan) {
        // 按当前部门及下级部门范围过滤数据
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwDeviceMaintainPlan.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwDeviceMaintainPlan.setDeptList(deptList);
        }
        return page.setRecords(baseMapper.selectFwDeviceMaintainPlanPage(page, fwDeviceMaintainPlan));
    }

@@ -60,9 +62,6 @@
    @Override
    public List<FwDeviceMaintainPlanExcel> exportFwDeviceMaintainPlan(Wrapper<FwDeviceMaintainPlanEntity> queryWrapper) {
        List<FwDeviceMaintainPlanExcel> fwDeviceMaintainPlanList = baseMapper.exportFwDeviceMaintainPlan(queryWrapper);
        //fwDeviceMaintainPlanList.forEach(fwDeviceMaintainPlan -> {
        //    fwDeviceMaintainPlan.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwDeviceMaintainPlan.getType()));
        //});
        return fwDeviceMaintainPlanList;
    }

@@ -75,7 +74,7 @@
        // 批量把计划调整为未维护状态
        LambdaUpdateWrapper<FwDeviceMaintainPlanEntity> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.in(FwDeviceMaintainPlanEntity::getId, planIds)
                .set(FwDeviceMaintainPlanEntity::getMaintainStatus, 0); // 未维护状态
            .set(FwDeviceMaintainPlanEntity::getMaintainStatus, 0); // 未维护状态

        // 执行批量更新
        update(updateWrapper);

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java

@@ -72,8 +72,10 @@
    @Override
    public IPage<FwDeviceScrapVO> selectFwDeviceScrapPage(IPage<FwDeviceScrapVO> page, FwDeviceScrapDTO fwDeviceScrap) {
        // 按当前部门及下级部门范围过滤数据
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwDeviceScrap.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwDeviceScrap.setDeptList(deptList);
        }
        return page.setRecords(baseMapper.selectFwDeviceScrapPage(page, fwDeviceScrap));
    }

@@ -81,9 +83,6 @@
    @Override
    public List<FwDeviceScrapExcel> exportFwDeviceScrap(Wrapper<FwDeviceScrapEntity> queryWrapper) {
        List<FwDeviceScrapExcel> fwDeviceScrapList = baseMapper.exportFwDeviceScrap(queryWrapper);
        //fwDeviceScrapList.forEach(fwDeviceScrap -> {
        //    fwDeviceScrap.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwDeviceScrap.getType()));
        //});
        return fwDeviceScrapList;
    }


 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -16,40 +16,39 @@
 */
package org.sxkj.fw.device.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.common.utils.HeaderUtils;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service;
import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.dto.FwDevicePolygonQueryDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.mapper.FwDeviceMapper;
import org.sxkj.fw.device.param.FwDevicePageParam;
import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.mapper.FwDeviceMapper;
import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.system.cache.RegionCache;
import org.sxkj.system.cache.SysCache;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.entity.Region;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;

/**
 * 设备表 服务实现类
@@ -72,11 +71,13 @@
    public IPage<FwDeviceVO> selectFwDevicePageVo(FwDevicePageParam fwDevice, Query query) {
        FwDeviceDTO fwDeviceDTO = GenericConverter.convert(fwDevice, FwDeviceDTO.class);
        // 按当前部门及下级部门范围过滤数据
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        fwDeviceDTO.setDeptList(deptList);
        if (!AuthUtil.isAdministrator()) {
            List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
            fwDeviceDTO.setDeptList(deptList);
        }
        fwDeviceDTO.setCurrentDeptId(AuthUtil.getDeptId());
        // 按区域范围过滤数据
         IPage<FwDeviceEntity> pages = selectFwDevicePage(Condition.getPage(query), fwDeviceDTO);
        IPage<FwDeviceEntity> pages = selectFwDevicePage(Condition.getPage(query), fwDeviceDTO);
        IPage<FwDeviceVO> result = FwDeviceWrapper.build().pageVO(pages);
        List<FwDeviceVO> records = result.getRecords();
        if (records != null && !records.isEmpty()) {
@@ -145,7 +146,10 @@
    @Override
    public List<DeviceTypeStatisticsVO> getDeviceTypeStatistics() {
        // 统计范围限定在当前部门及下级部门
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        List<Long> deptList = new ArrayList<>();
        if (!AuthUtil.isAdministrator()) {
            deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        }
        List<DeviceTypeStatisticsVO> deviceTypeStatistics = baseMapper.getDeviceTypeStatistics(deptList, AuthUtil.getDeptId());
        return deviceTypeStatistics;
    }
@@ -153,14 +157,20 @@
    @Override
    public List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull) {
        // 统计范围限定在当前部门及下级部门
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        List<Long> deptList = new ArrayList<>();
        if (!AuthUtil.isAdministrator()) {
            deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        }
        return baseMapper.getDeviceOutStatistics(effectiveRangeKmIsNotNull, deptList, AuthUtil.getDeptId());
    }

    @Override
    public List<DeviceStatisticsVO> getDeviceManufacturerStatistics() {
        // 统计范围限定在当前部门及下级部门
        List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        List<Long> deptList = new ArrayList<>();
        if (!AuthUtil.isAdministrator()) {
            deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        }
        return baseMapper.getDeviceManufacturerStatistics(deptList);
    }

@@ -209,7 +219,7 @@
     * 查询非本部门区域的设备
     *
     * @param regionCode 区域编码，用于查询不在该区域内的设备
     * @param deptId 机构ID，用于限定查询范围
     * @param deptId     机构ID，用于限定查询范围
     * @return 设备列表
     */
    @Override

 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java

@@ -60,11 +60,6 @@
        fwDroneAlarmRecord.setRegionName(byCode.getName());
        fwDroneAlarmRecord.setCurrentDeptId(AuthUtil.getDeptId());
        fwDroneAlarmRecord.setRegionCode(HeaderUtils.formatAreaCode(byCode.getCode()));
        // 获取当前部门及其子部门列表
        // List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
        // fwDroneAlarmRecord.setDeptList(deptList);
        // 获取共享给当前部门的设备编号列表
        // 执行查询
        return page.setRecords(baseMapper.selectFwDroneAlarmRecordPage(page, fwDroneAlarmRecord));
    }