整理

nidapeng

2024-03-22 720c137ef8bb03b84ca8a8444a39642762ab29fc

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

@@ -21,6 +21,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -119,15 +120,13 @@
                                //如果是已删除的数据，下发失败（防止设备离线），则尝试重新下发任务
                                if(Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
//                               && Constants.formatIntegerNum(c.getTryNum())+1 < tryNum ){
                                    empowerMapper.update(null, new UpdateWrapper<Empower>()
                              /*      empowerMapper.update(null, new UpdateWrapper<Empower>()
                                            .lambda()
                                            .eq(Empower::getId, c.getId())
                                            .set(Empower::getRemark,  "下发失败，等待重新删除权限")
//                                   .set(Empower::getHkId,null)
//                                   .set(Empower::getSendDate,null)
                                            .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
                                            .set(Empower::getSendInfo, "下发失败，等待重新删除权限")
                                            .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));
                                            .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));*/
                                    empowerMapper.update(null, new UpdateWrapper<Empower>()
                                            .lambda()
                                            .eq(Empower::getId, c.getId())
@@ -318,6 +317,41 @@
     * 处理人员授权数据，定时下发
     */
    @Override
    public  Integer syncEmpowerFailData(Integer endId) {
        List<Empower> allList =getAllFailDealList( endId);
        if(allList!=null && allList.size()>0){
            Date date = new Date();
            for(Empower empower:allList){
                if(Constants.equalsObject(empower.getIsdeleted(),Constants.ONE)){
                    //如果是删除的权限下发，查询是否伺候有下发成功的数据，如果有，则不处理
                    Empower param = empowerMapper.selectOne(new QueryWrapper<Empower>().lambda()
                            .eq(Empower::getMemberId,empower.getMemberId())
                            .eq(Empower::getDeviceId,empower.getDeviceId() )
                            .gt(Empower::getId,empower.getId())
                            .last("limit 1"));
                    if(empower ==null || Constants.equalsInteger(empower.getIsdeleted(),Constants.ONE)){
//                        addIds.add(did);
                    }
                }
                //更新重新下发次数
                empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                        .eq(Empower::getEditDate,date)
                        .setSql("try_num = ifnull(tyr_num,0) +1" )
                        .set(Empower::getSendStatus,Constants.EmpowerStatus.wait)
                        .set(Empower::getSendDate,null)
                        .set(Empower::getEditDate,date)
                        .set(Empower::getRemark,"下发失败，待重新下发~")
                        .set(Empower::getRemark,"下发失败，待重新下发~")
                        .eq(Empower::getId,empower.getId()));
            }
            return allList.get(allList.size()-1).getId();
        }
        return null;
    }
    /**
     * 处理人员授权数据，定时下发
     */
    @Override
    public  Integer syncEmpowerData(Integer endId) {
//        if(Constants.DEALING_HK_EMPOWER){
//            return  null ;
@@ -363,6 +397,7 @@
        }catch (Exception e){
            e.printStackTrace();
        }finally {

        }
    }

@@ -596,6 +631,25 @@
        List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
        return list;
    }
    private List<Empower> getAllFailDealList(int endId   ) {
        MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Empower.class);
        queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
        queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
        queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
        queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
        queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
        queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
        queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
        queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
        queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.fail);
        queryWrapper.gt(Empower::getId,endId);
        queryWrapper.orderByAsc(Empower::getId );
//      queryWrapper.orderByAsc(Empower::getCreateDate );
        queryWrapper.last("limit 100");//每次限制下发100个
        List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
        return list;
    }

    private List<Empower> getDealList(int del ,int start,int end) {
        MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();