最新版本541200007

doum

2 天以前 d042b8ec4197c6f2f1052138dddea37adc2c9bfb

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

@@ -156,8 +156,9 @@
            }
            if(delRetentionLis.size()>0){
                //先删除原有的在场人员(内部人员）
                //@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部员工 3车辆信息 4相关方人员 5货运司机  ")
                retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
//                        .eq(Retention::getType,Constants.memberType.internal)
                        .ne(Retention::getType,Constants.THREE)
                        .in(Retention::getMemberId,delRetentionLis));
            }
            if(retentionList.size()>0){
@@ -482,7 +483,7 @@
            for(EventBaseInfoRequest request : events){
                Warning warning = warningMapper.selectOne(new QueryWrapper<Warning>().lambda()
                        .eq(Warning::getIsdeleted,Constants.ZERO)
                        .eq(Warning::getCode, request.getSrcType()).last("limit 1"));
                        .eq(Warning::getCode, request.getEventType()).last("limit 1"));

                Constants.WarningConfig warningConfig = Constants.WarningConfig.getConfig(request.getEventType());
                
@@ -501,12 +502,13 @@
                    warningEvent.setSrcIndex(request.getSrcIndex());
                    warningEvent.setSrcType(request.getSrcType());
                    warningEvent.setSrcName(request.getSrcName());
                    warningEvent.setWarningId(warning.getId());
                    warningEventMapper.insert(warningEvent);

                    if(Objects.nonNull(warningConfig)){
                        List<Integer> ruleIdList =  impl.processWarnFront(warningConfig);

                        Boolean falg = false;
                        Boolean falg = true;
                        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ruleIdList)){
                            for (Integer ruleId:ruleIdList) {
                                WarningRule warningRule = warningRuleMapper.selectById(ruleId);
@@ -544,31 +546,21 @@
                                        //                dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
//                                  warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
                                    }
                                    warningPushMapper.insert(warningPush);
                                    impl.sendDeviceNotice(warningRule);
                                    warningPushMapper.insert(warningPush);

                                    falg = true;
                                }catch (Exception e){
                                    falg = false;
                                    warningEvent.setStatus(Constants.TWO);
                                    warningEventMapper.updateById(warningEvent);
                                }
                            }
                        }
                        if(falg){
                        if(!falg){
                            warningEvent.setStatus(Constants.ONE);
                            warningEventMapper.updateById(warningEvent);
                        }






                    }




                }

            }