Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-30 dc47b7074e738339181563ec5f25cddd46cd22fa

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

@@ -135,7 +135,7 @@
                //再插入最新的在厂人员
                retentionMapper.insert(retentionList);
            }
            log.error("【海康门禁事件推送】========成功=======");
            log.info("【海康门禁事件推送】========成功=======");
        }catch (Exception e) {
            log.error("【海康门禁事件推送】========失败=======：\n" + e.getMessage());
        }finally {
@@ -325,7 +325,7 @@
                //再插入最新的在厂人员
                retentionMapper.insert(retentionList);
            }
            log.error("【海康访客事件推送】========成功=======");
            log.info("【海康访客事件推送】========成功=======");
        }catch (Exception e){

            log.error("【海康访客事件推送】========失败=======：\n"+e.getMessage());
@@ -379,7 +379,7 @@
                //再插入最新的在厂人员
                retentionMapper.insert(retentionList);
            }
            log.error("【海康访客事件推送】========成功=======");
            log.info("【海康访客事件推送】========成功=======");
        }catch (Exception e){
            log.error("【海康访客事件推送】========失败=======：\n"+e.getMessage());
        }
@@ -674,7 +674,7 @@
                //再插入最新的在厂人员
                retentionMapper.insert(retentionList);
            }
            log.error("【海康停车场事件推送】========成功=======");
            log.info("【海康停车场事件推送】========成功=======");
        }catch (Exception e){

            log.error("【海康停车场事件推送】========失败=======：\n"+e.getMessage());
@@ -735,7 +735,6 @@
            event.setReleaseResult(request.getData().getInResult().getRlsResult().getReleaseResult());
            event.setReleaseResultEx(request.getData().getInResult().getRlsResult().getReleaseResultEx());
        }

        if(request.getData().getPicUrl()!=null){
            //车辆和和车牌照片
            event.setVehiclePicUrl(getHkImgUrl(request.getData().getPicUrl().getVehiclePicUrl()));
@@ -770,9 +769,7 @@
                delRetentionList.add(event.getPlateNos());
            }
        }

        return event;

    }

    private Retention getRetentionModelByParkRequest(EventParkInfoRequest request) {
@@ -783,7 +780,6 @@
        retention.setType(Constants.THREE);
//        retention.setDeviceName(request.getSrcName());
//        retention.setDeviceIndex(request.getSrcIndex());

        return retention;
    }

@@ -843,7 +839,7 @@
                    }
            }
            result = "成功";
            log.error("【海康月台工作状态事件推送】========成功=======");
            log.info("【海康月台工作状态事件推送】========成功=======");
        }catch (Exception e) {
            result = "失败"+e.getMessage();
            log.error("【海康月台工作状态事件推送】========失败=======：\n" + e.getMessage());
@@ -941,7 +937,7 @@
                platformEventMapper.insert(eventList);
            }
            result = "成功";
            log.error("【海康月台车辆状态事件推送】========成功=======");
            log.info("【海康月台车辆状态事件推送】========成功=======");
        }catch (Exception e) {
            result = "失败"+e.getMessage();
            log.error("【海康月台车辆状态事件推送】========失败=======：\n" + e.getMessage());
@@ -1062,6 +1058,7 @@
        content = content.replace("${param2}",model.getCarCodeFront());
        List<String> broadcastList = new ArrayList<>();
        List<String> ledList = new ArrayList<>();
        String bNames = "";
        List<PlatformBroadcastLog> logList = new ArrayList<>();
        for(PlatformDevice device : deviceList){
            if(StringUtils.isNotBlank(device.getHkId())){
@@ -1075,6 +1072,7 @@
                log.setHkDate(new Date());
                log.setObjType(Constants.ONE);
                log.setIds(device.getHkNo());
                log.setRemark(device.getName());
                log.setInfo(content);
                log.setNum(Constants.ONE);
                BaseResponse response = dealLedContentBiz(device.getHkNo(),content,speed,1);
@@ -1091,6 +1089,7 @@
                ledList.add(device.getHkId());
            }else  if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
                //如果是广播点
                bNames += device.getName()+";";
                broadcastList.add(device.getHkId());
            }
        }
@@ -1104,6 +1103,7 @@
            log.setHkDate(new Date());
            log.setObjType(Constants.ONE);
            log.setInfo(content1);
            log.setRemark(bNames);
            log.setNum(Constants.ONE);
            log.setIds(String.join(",",broadcastList));
            CustomBroadcastRequest request = new CustomBroadcastRequest();