Merge remote-tracking branch 'origin/master'

linwei

2026-01-31 0570e8de9ba479d67dfcfdeebe1cfccc4a56f812

Merge remote-tracking branch 'origin/master'

 Dockerfile

New file
@@ -0,0 +1,8 @@
FROM maven:3.6-jdk-11

# Set working dir
WORKDIR /data

COPY */target/*.jar /data/

CMD echo 1

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

@@ -55,6 +55,12 @@
    private String areaType;

    /**
     * 区域类型key集合（逗号分隔）
     */
    @ApiModelProperty(value = "区域类型key集合（逗号分隔）")
    private String areaTypeKeys;

    /**
     * 场景类型
     */
    @ApiModelProperty(value = "场景类型")
@@ -108,4 +114,7 @@

    @ApiModelProperty(value = "部门集合",hidden = true)
    private List<Long> deptList;

    @ApiModelProperty(value = "区域类型key集合", hidden = true)
    private List<String> areaTypeKeyList;
}

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

@@ -23,6 +23,7 @@
    <resultMap id="fwAreaDivideStatisticsResultMap" type="org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO">
        <result column="id" property="id"/>
        <result column="area_name" property="areaName"/>
        <result column="area_type_keys" property="areaTypeKeys"/>
        <result column="scene_name" property="sceneName"/>
        <result column="scene_type" property="sceneType"/>
        <result column="device_count" property="deviceCount"/>
@@ -236,6 +237,7 @@
        select
            stats.id,
            stats.area_name,
            stats.area_type_keys,
            stats.scene_name,
            stats.scene_type,
            stats.device_count,
@@ -252,15 +254,18 @@
            select
            ad.id,
            ad.area_name,
            ad.area_type_keys,
            (
                select group_concat(distinct ds.scene_name)
                from ja_fw_defense_scene ds
                join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
                where ds.is_deleted = 0
                  and find_in_set(ad.id, ds.area_divide_ids)
            ) as scene_name,
            (
                select group_concat(distinct ds.scene_type)
                from ja_fw_defense_scene ds
                join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
                where ds.is_deleted = 0
                  and find_in_set(ad.id, ds.area_divide_ids)
            ) as scene_type,
@@ -302,6 +307,13 @@
            from ja_fw_area_divide ad
            <where>
                ad.is_deleted = 0
                and exists (
                    select 1
                    from ja_fw_defense_scene ds
                    join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
                    where ds.is_deleted = 0
                      and find_in_set(ad.id, ds.area_divide_ids)
                )
                <if test="param2.id != null and param2.id != ''">
                    and ad.id = #{param2.id}
                </if>
@@ -320,6 +332,13 @@
                <if test="param2.areaCode != null and param2.areaCode != ''">
                    and ad.area_code = #{param2.areaCode}
                </if>
                <if test="param2.areaTypeKeyList != null and param2.areaTypeKeyList.size > 0">
                    and (
                        <foreach collection="param2.areaTypeKeyList" item="key" separator=" or ">
                            find_in_set(#{key}, ad.area_type_keys)
                        </foreach>
                    )
                </if>
                <if test="param2.deptList != null and param2.deptList.size > 0">
                    and ad.create_dept in
                    <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
@@ -334,6 +353,7 @@
        select
        stats.id,
        stats.area_name,
        stats.area_type_keys,
        stats.scene_name,
        stats.scene_type,
        stats.device_count,
@@ -350,6 +370,7 @@
        select
        ad.id,
        ad.area_name,
        ad.area_type_keys,
        (
            select group_concat(distinct ds.scene_name)
            from ja_fw_defense_scene ds

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

@@ -204,6 +204,7 @@
                                                                            FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
        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

@@ -93,6 +93,7 @@
     */
    @Override
    public boolean deleteFwDefenseSceneManage(List<Long> longList) {
        //删除场景管理
        boolean b = deleteLogic(longList);
        if (b) {
            // 1.遍历所有删除的场景管理ID
@@ -102,6 +103,9 @@
                List<Long> deviceIdList = baseMapper.selectDeviceId(sceneManageId);
                AllDeviceId.addAll(deviceIdList);
            }
            if (AllDeviceId == null || AllDeviceId.isEmpty()) {
                return true;
            }
            // 3.禁用设备
            return fwDeviceService.update(Wrappers.<FwDeviceEntity>lambdaUpdate()
                .set(FwDeviceEntity::getIsEnabled, 0)

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

@@ -47,10 +47,10 @@
    private String areaName;

    /**
     * 区域类型
     * 区域类型key集合（逗号分隔）
     */
    @ApiModelProperty(value = "区域类型")
    private String areaType;
    @ApiModelProperty(value = "区域类型key集合（逗号分隔）")
    private String areaTypeKeys;

    /**
     * 场景名称