整理

nidapeng

2024-03-26 87ec373c158f7fa4c65fb037822fe7142a6fd5e7

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

@@ -81,7 +81,7 @@
                        BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
                        if(response!=null
                                && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
                        ) {
                        ){
                            if (response.getData().getList() != null
                                    && response.getData().getList().size() > 0) {
                                TaskPersonDetailResponse model = response.getData().getList().get(0);
@@ -108,6 +108,10 @@
                                            .set(Empower::getRemark, remark)
                                            .set(Empower::getSendInfo, remark)
                                            .set(Empower::getSendStatus, Constants.EmpowerStatus.pass));
                                    if(Constants.equalsInteger(c.getMemberDeleted(), Constants.ONE)&& Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
                                        //如果是删除权限成功，检查是否删除人员
                                        checkDelMemberTask(c.getMemberId(),c.getMemberHkId());
                                    }
                                } else {
                                    empowerMapper.update(null, new UpdateWrapper<Empower>()
                                            .lambda()
@@ -119,14 +123,6 @@
                            } else {
                                //如果是已删除的数据，下发失败（防止设备离线），则尝试重新下发任务
                                if(Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
//                               && Constants.formatIntegerNum(c.getTryNum())+1 < tryNum ){
                              /*      empowerMapper.update(null, new UpdateWrapper<Empower>()
                                            .lambda()
                                            .eq(Empower::getId, c.getId())
                                            .set(Empower::getRemark,  "下发失败，等待重新删除权限")
                                            .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
                                            .set(Empower::getSendInfo, "下发失败，等待重新删除权限")
                                            .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));*/
                                    empowerMapper.update(null, new UpdateWrapper<Empower>()
                                            .lambda()
                                            .eq(Empower::getId, c.getId())
@@ -144,7 +140,15 @@
                                            .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
                                }
                            }
                            checkDelMemberTask(c.getMemberId());
                        }else if(response!=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_DOWNLOAD_ERROR)                        ){
                            empowerMapper.update(null, new UpdateWrapper<Empower>()
                                    .lambda()
                                    .eq(Empower::getId, c.getId())
                                    .set(Empower::getRemark, "下发失败")
//                                    .set(Empower::getFailFlag, Constants.ONE)//无需重发（下载任务不存在）
                                    .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
                                    .set(Empower::getSendInfo, "下发失败")
                                    .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
                        }
                    }
                }catch (Exception e){
@@ -186,7 +190,7 @@
                //标记删除成功的数据（海康对接状态为已同步，，同步失败的仍为待同步，等下一次继续处理，知道全部删除完毕）
                memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                        .set(Member::getHkStatus,Constants.ONE)//同步成功
                        .set(Member::getRemark,"同步海康删除失败")//同步失败
                        .set(Member::getRemark,"已同步")//同步失败
                        .set(Member::getHkDate,date)
                        .in(Member::getId, id));
                //删除所有绑定的卡片信息
@@ -200,17 +204,18 @@
    /**
     * 检查删除人员的权限是否都删除完成，如果权限删除完成， 进行海康人员的删除操作
     */
    private void checkDelMemberTask(Integer memberId) {
    private void checkDelMemberTask(Integer memberId,String memberHkid) {
            Date date = new Date();
            Member member = memberMapper.selectById(memberId);
            if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
//            Member member = memberMapper.selectById(memberId);
//            if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
                if(empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
                        .eq(Empower::getMemberId,member.getId())
                        .eq(Empower::getMemberId,memberId)
                        .eq(Empower::getIsdeleted,Constants.ONE)
                        .ne(Empower::getFailFlag,Constants.ONE)
                        .ne(Empower::getSendStatus,Constants.EmpowerStatus.pass)) ==0){
                    //如果权限都已经删除成功，则删除海康人员和卡片数据
                     doHkDeleteUser(member.getId(),member.getHkId(),date);
            }
                     doHkDeleteUser(memberId,memberHkid,date);
//            }
        }
    }

@@ -336,9 +341,9 @@
//                        .gt(Empower::getId,empower.getId())
//                        .last("limit 1"));
                    if(empower.getTempCouunt() ==0){
                        //如果之后时间内又重新下发记录，则跳过不做处理
                        retryIds.add(empower.getId());
                    }else{
                        //如果之后时间内又重新下发记录，则跳过不做处理
                        noIds.add(empower.getId());
                    }
            }
@@ -355,6 +360,8 @@
            if(noIds.size()>0){
                empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                        .set(Empower::getEditDate,date)
                        .set(Empower::getRemark,"下发失败，已失效~")
                        .set(Empower::getSendInfo,"下发失败，已失效~")
                        .set(Empower::getFailFlag,Constants.ONE)
                        .in(Empower::getId,noIds));
            }
@@ -680,6 +687,7 @@
        MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Empower.class);
        queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
        queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
        queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
        queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
        queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);