Merge remote-tracking branch 'origin/master'

jiangping

2024-08-09 249a271a867df4802a8d59371e0ff10d3eb54298

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

@@ -99,7 +99,7 @@
            }
            if(list.size()>0){
                //插入门禁记录
                deviceEventMapper.insertBatchSomeColumn(list);
                deviceEventMapper.insert(list);
            }
            if(delRetentionLis.size()>0){
                //先删除原有的在场人员(内部人员）
@@ -109,7 +109,7 @@
            }
            if(retentionList.size()>0){
                //再插入最新的在厂人员
                retentionMapper.insertBatchSomeColumn(retentionList);
                retentionMapper.insert(retentionList);
            }
            log.error("【海康门禁事件推送】========成功=======");
        }catch (Exception e) {
@@ -289,7 +289,7 @@
            }
            if(list.size()>0){
                //插入门禁记录
                visitEventMapper.insertBatchSomeColumn(list);
                visitEventMapper.insert(list);
            }
            if(delRetentionLis.size()>0){
                //先删除原有的在场人员(普通访客）
@@ -299,7 +299,7 @@
            }
            if(retentionList.size()>0){
                //再插入最新的在厂人员
                retentionMapper.insertBatchSomeColumn(retentionList);
                retentionMapper.insert(retentionList);
            }
            log.error("【海康访客事件推送】========成功=======");
        }catch (Exception e){
@@ -461,7 +461,7 @@
            }
            if(list.size()>0){
                //插入门禁记录
                carEventMapper.insertBatchSomeColumn(list);
                carEventMapper.insert(list);
            }
            if(delRetentionList.size()>0){
                //先删除原有的在场人员(内部人员）
@@ -471,7 +471,7 @@
            }
            if(retentionList.size()>0){
                //再插入最新的在厂人员
                retentionMapper.insertBatchSomeColumn(retentionList);
                retentionMapper.insert(retentionList);
            }
            log.error("【海康停车场事件推送】========成功=======");
        }catch (Exception e){