Merge remote-tracking branch 'origin/master'

k94314517

2024-09-26 a8c8e4281c0298ce9a946b1d65166a2fe438ce1c

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java

@@ -692,7 +692,7 @@
    private boolean isDeletedLedDevice(Device device, List<LedRecordsInfoResponse> allHkList) {
        if(allHkList.size()>0){
            for(LedRecordsInfoResponse r : allHkList){
                if(StringUtils.equals(device.getDoorId(), r.getModel_data_id())){
                if(StringUtils.equals(device.getHkId(), r.getModel_data_id())){
                    //表示未删除
                    return  false;
                }
@@ -704,7 +704,7 @@
    private boolean isDeletedBroadcastDevice(Device device, List<FetchAudioChannelInfoResponse> allHkList) {
        if(allHkList.size()>0){
            for(FetchAudioChannelInfoResponse r : allHkList){
                if(StringUtils.equals(device.getDoorId(), r.getAudioChannelIndexCode())){
                if(StringUtils.equals(device.getHkId(), r.getAudioChannelIndexCode())){
                    //表示未删除
                    return  false;
                }