数采bug调整

Crunchy

2024-07-26 c1b7868762ef7d596325877627720ca75e45ba09

数采bug调整

 cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java

@@ -18,5 +18,5 @@

    List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId);

    List<DataConfig> deleteDataConfig();
    List<Integer> deleteDataConfig();
}

 cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java

@@ -18,5 +18,5 @@

    List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId);

    List<DataConfig> deleteDataConfig();
    void deleteDataConfig();
}

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java

@@ -32,7 +32,10 @@
    }

    @Override
    public List<DataConfig> deleteDataConfig() {
        return dataConfigMapper.deleteDataConfig();
    public void deleteDataConfig() {
        List<Integer> integers = dataConfigMapper.deleteDataConfig();
        if (!integers.isEmpty()) {
            dataConfigMapper.deleteBatchIds(integers);
        }
    }
}

 cnas-server/src/main/resources/mapper/DataConfigMapper.xml

@@ -35,8 +35,8 @@
        where d.id = #{deviceId}
    </select>

    <select id="deleteDataConfig" resultType="com.yuanchu.mom.pojo.DataConfig">
        SELECT ddc.*
    <select id="deleteDataConfig" resultType="integer">
        SELECT ddc.id
        FROM device d
                 left join structure_item_parameter ip on not FIND_IN_SET(ip.id, d.ins_product_ids)
                 inner join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id