Merge remote-tracking branch 'origin/master'

linwei

2026-02-11 dbc7e62be76ff48b26461ffaef9c3fc87be018cb

Merge remote-tracking branch 'origin/master'

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

@@ -83,7 +83,8 @@
    /**
     *
     * @param fwBaseInfo
     * @param time
     * @return
     */
    List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(FwBaseInfo fwBaseInfo);
    List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(@Param("fwBaseInfo") FwBaseInfo fwBaseInfo, @Param("time") Date time);
}

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

@@ -125,12 +125,12 @@
                    d.is_deleted = 0
                    AND d.is_enabled = 1
                    AND d.final_outbound_area IS NOT NULL
                <if test="regionCode != null and regionCode != ''">
                    and ( d.final_outbound_area_code like concat(#{regionCode},'%')
                    <if test="currentDeptId != null and currentDeptId != '' ">
        <if test="fwBaseInfo.regionCode != null and fwBaseInfo.regionCode != ''">
            and ( d.final_outbound_area_code like concat(#{fwBaseInfo.regionCode},'%')
            <if test="fwBaseInfo.currentDeptId != null and fwBaseInfo.currentDeptId != '' ">
                        or d.id in (
                        SELECT device_id FROM ja_fw_device_per_share
                        WHERE loan_to_dept_id = #{currentDeptId}
                WHERE loan_to_dept_id = #{fwBaseInfo.currentDeptId}
                        AND is_deleted = 0
                        )
                    </if>
@@ -141,6 +141,10 @@
            ) dd on find_in_set(dd.id, ad.device_ids)
        <where>
            dsm.is_deleted = 0
            <if test="time != null">
                and (dsm.effective_date_start is null or dsm.effective_date_start &lt;= #{time})
                and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{time})
            </if>
        </where>
    </select>


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

@@ -93,7 +93,8 @@
    /**
     *
     * @param fwBaseInfo
     * @param time
     * @return
     */
    List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(FwBaseInfo fwBaseInfo);
    List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(FwBaseInfo fwBaseInfo, Date time);
}

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

@@ -134,7 +134,7 @@
    }

    @Override
    public List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(FwBaseInfo fwBaseInfo) {
        return baseMapper.selectFwDefenseSceneManageCockpitList(fwBaseInfo);
    public List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(FwBaseInfo fwBaseInfo, Date time) {
        return baseMapper.selectFwDefenseSceneManageCockpitList(fwBaseInfo, time);
    }
}

 drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java

@@ -105,8 +105,10 @@
    @GetMapping("/sceneManageStatistics")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "场景管理统计", notes = "返回场景管理数量与区域数量")
    public R<SceneManageStatisticsVO> getSceneManageStatistics() {
        SceneManageStatisticsVO statistics = cockpitService.statisticsSceneManageAndArea();
    public R<SceneManageStatisticsVO> getSceneManageStatistics(
        @ApiParam(value = "时间筛选（yyyy-MM-dd HH:mm:ss）") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date time) {
        Date filterTime = time == null ? new Date() : time;
        SceneManageStatisticsVO statistics = cockpitService.statisticsSceneManageAndArea(filterTime);
        return R.data(statistics);
    }


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

@@ -81,7 +81,8 @@
    /**
     * 场景管理与区域数量统计
     *
     * @param filterTime 过滤时间
     * @return
     */
    SceneManageStatisticsVO statisticsSceneManageAndArea();
    SceneManageStatisticsVO statisticsSceneManageAndArea(Date filterTime);
}

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

@@ -166,8 +166,8 @@
    }

    @Override
    public SceneManageStatisticsVO statisticsSceneManageAndArea() {
        List<FwDefenseSceneManageVO> sceneManageList = iFwDefenseSceneManageService.selectFwDefenseSceneManageCockpitList(buildFwBaseInfo());
    public SceneManageStatisticsVO statisticsSceneManageAndArea(Date filterTime) {
        List<FwDefenseSceneManageVO> sceneManageList = iFwDefenseSceneManageService.selectFwDefenseSceneManageCockpitList(buildFwBaseInfo(), filterTime);
        SceneManageStatisticsVO statisticsVO = new SceneManageStatisticsVO();
        if (sceneManageList == null || sceneManageList.isEmpty()) {
            statisticsVO.setSceneManageCount(0);