Merge remote-tracking branch 'origin/master'

k94314517

2024-03-21 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90

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

@@ -52,33 +52,29 @@
     * 定时查询权限下发任务进度执行结果
     */
    @Override
    public  void syncEmpowerDetailData(){
        if(Constants.DEALING_HK_EMPOWER_DETAIL){
            return   ;
        }
        Constants.DEALING_HK_EMPOWER_DETAIL = true;
        try {
    public  Integer   syncEmpowerDetailData(Integer endId){
//        if(Constants.DEALING_HK_EMPOWER_DETAIL){
//            return   ;
//        }
//        Constants.DEALING_HK_EMPOWER_DETAIL = true;
            //查询所有完成下载，待查询结果的数据记录
            List<Empower>  list = getDealListDetail();
            List<Empower>  list = getDealListDetail(endId);
           if(list == null || list.size() ==0){
               return;
               return null;
           }
            Thread t1=new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
        Thread t1=new Thread(new Runnable() {
            @Override
            public void run() {
                try {
                    for(Empower c : list){
                        TaskPersonDetailRequest param = new TaskPersonDetailRequest();
                        param.setPageNo(1);
                        param.setPageSize(100);
//               param.setPersonIds(new ArrayList<>());

                        param.setPageSize(10);
                        param.setPersonIds(new String[]{c.getMemberHkId()});
                        param.setTaskId(c.getHkId());
                        TaskDataAdditionResourceRequest rec = new TaskDataAdditionResourceRequest();
                        rec.setResourceIndexCode(c.getDeviceIndexCode());
                        rec.setResourceType(c.getDeviceType());
//               rec.setChannelNos(c.getDeviceChannelNo().split(","));
                        param.setResourceInfo(rec);
                        //查询下发状态
                        BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
@@ -123,15 +119,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())
@@ -150,21 +144,19 @@
                            checkDelMemberTask(c.getMemberId());
                        }
                    }
                    }catch (Exception e){
                }catch (Exception e){

                    }finally {
                        Constants.DEALING_HK_EMPOWER_DETAIL=false;
                    }
                }finally {
//                    Constants.DEALING_HK_EMPOWER_DETAIL=false;
                }
            });
            t1.start();


        }catch (Exception e){
            e.printStackTrace();
        }
            }
        });
        t1.start();
         return list.get(list.size()-1).getId();

    }


    /**
     * 对海康删除组织信息
     * @param id
@@ -226,7 +218,7 @@
        Constants.DEALING_HK_EMPOWER_DETAIL = true;
        try {
            //查询所有完成下载，待查询结果的数据记录
            List<Empower>  list = getDealListDetail();
            List<Empower>  list = getDealListDetail(0);
           if(list == null || list.size() ==0){
               return;
           }
@@ -272,16 +264,15 @@
     * 定时查询权限下发任务进度执行结果
     */
    @Override
    public  void syncEmpowerResultData(){
        if(Constants.DEALING_HK_EMPOWER_RESULT){
            return   ;
        }
        Constants.DEALING_HK_EMPOWER_RESULT=true;
        try {
    public  Integer syncEmpowerResultData(Integer endId){
//        if(Constants.DEALING_HK_EMPOWER_RESULT){
//            return  null ;
//        }
//        Constants.DEALING_HK_EMPOWER_RESULT=true;
            //查询所有执行中得数据
            List<Empower>  list = getIngTaskListResult();
         List<Empower>  list = getIngTaskListResult(Constants.formatIntegerNum(endId));
           if(list == null || list.size() ==0){
               return;
               return null;
           }
            Thread t1=new Thread(new Runnable() {
                @Override
@@ -315,9 +306,8 @@
                }
            });
            t1.start();
        }catch (Exception e){
            e.printStackTrace();
        }
            return list.get(list.size()-1).getId();

    }


@@ -331,7 +321,6 @@
//            return  null ;
//        }
//        Constants.DEALING_HK_EMPOWER =true;
        try {
            //先删除所有需要取消授权的数据
            List<Empower> allList =getAllWaitDealList( endId);
            if(allList !=null && allList.size()>0){
@@ -360,12 +349,6 @@
                t1.start();
                return allList.get(allList.size()-1).getId();
            }

        }catch (Exception e){
            e.printStackTrace();
        }finally {
//            Constants.DEALING_HK_EMPOWER =false;
        }
        return null;
    }
    @Override
@@ -631,7 +614,7 @@
        List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
        return list;
    }
    private List<Empower> getDealListDetail() {
    private List<Empower> getDealListDetail(int endId ) {
        MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Empower.class);
        queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
@@ -642,17 +625,23 @@
        queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
        queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.downloaded);
        queryWrapper.isNotNull(Member::getHkId) ;
        queryWrapper.gt(Empower::getId,endId);
        queryWrapper.orderByAsc(Empower::getSendDate);
        queryWrapper.last("limit 100");//每次限制下发100个
        List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
        return list;
    }
    private List<Empower> getIngTaskListResult() {
    private List<Empower> getIngTaskListResult(int endId) {
        MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Empower.class);
        queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.ing);
        queryWrapper.gt(Empower::getId,endId);
        queryWrapper.groupBy(Empower::getHkId);
        List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
        queryWrapper.orderByAsc(Empower::getSendDate);
        queryWrapper.last("limit 100");//每次限制下发100个
        List<Empower> list = empowerMapper.selectList(queryWrapper);
        return list;
    }


}