最新版本

nidapeng

2024-04-23 5072f33b5c54142f00991d0dafc9ea75af696b81

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

@@ -343,6 +343,15 @@
                                            .set(Empower::getSendStatus,Constants.EmpowerStatus.downloaded) );

                                }
                            }else if(response!=null
                                    && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)
                                    && response.getData()==null){
                                empowerMapper.update(null,new UpdateWrapper<Empower>()
                                        .lambda()
                                        .eq(Empower::getHkId,c.getHkId() )
                                        .set(Empower::getSendInfo,"任务已被删除，下发失败" )
                                        .set(Empower::getRemark,"任务已被删除，下发失败" )
                                        .set(Empower::getSendStatus,Constants.EmpowerStatus.fail) );
                            }
                        }
                    }catch (Exception e1){
@@ -541,10 +550,18 @@
        String taskId = hkTaskAddtion();
        List<Empower> successList = new ArrayList<>();
        List<Empower> errorList = new ArrayList<>();
        List<Empower> cacenList = new ArrayList<>();
        List<Empower> waitList = new ArrayList<>();
        List<Empower> faceErrorList = new ArrayList<>();
        for(Empower c : list) {
            //向任务添加人员、设备信息数据
            if((Constants.equalsInteger(c.getMemberDeleted(),1) &&
                    Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE))
                    ||  Constants.equalsInteger(c.getDeviceDeleted(),1)){
                //如果人員或者設備删除，取消下发
                cacenList.add(c);
                continue;
            }
            if(c.getDeviceOnline() !=null && Constants.equalsInteger(c.getDeviceOnline(),0)){
                waitList.add(c);
                continue;
@@ -606,6 +623,19 @@
                empowerMapper.updateById(update);
            }
        }
        if(cacenList.size()>0){
            for(Empower model : cacenList){
                Empower update = new Empower();
                update.setId(model.getId());
                update.setSendDate(date);
                update.setEditDate(date);
                update.setHkId(taskId);
                update.setSendStatus(Constants.EmpowerStatus.cancel);
                update.setRemark( "设备或人员已删除，自动取消");
                update.setSendInfo( "设备或人员已删除，自动取消");
                empowerMapper.updateById(update);
            }
        }
        if(faceErrorList.size()>0){
            for(Empower model : faceErrorList){
                Empower update = new Empower();