最新版本541200007

doum

19 小时以前 fbd762b2bde8af760cd4c1f3595ed94b6f40f9c6

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

@@ -261,7 +261,6 @@
            Date date = new Date();
            BigDecimal cLatitude =new BigDecimal(0);
            BigDecimal cLongitude =new BigDecimal(0);

            String location = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_LOCATION).getCode();
            try {
                String[] ss = location.split(",");
@@ -269,49 +268,86 @@
                cLatitude =  new BigDecimal(ss[1]);
            }catch (Exception e){
            }
            int index =0;
            for(JkCustomer c : customerList){
                try {
                    log.info("交通规划========"+c.getName()+"==========="+index++);
                    dealDistancePerCustomer(c,url,date,cLatitude,cLongitude,customerList);
                }catch (Exception e){

                }
            int circle = customerList.size()/100;//
            if(customerList.size()%100>0){
                circle +=1;
            }

            boolean[] results = new boolean[circle] ;
            for (int i = 0; i < circle; i++) {
                final  int start =i*100;
                final int end = (i+1)*100 > customerList.size()? customerList.size(): (i+1)*100;
                results[i] =false;
                BigDecimal finalCLatitude = cLatitude;
                BigDecimal finalCLongitude = cLongitude;
                log.error("交通规划====线程circle："+i+"====start:"+start+"===========end:"+end);
                int finalI = i;
                Thread t1=new Thread(() -> {
                    try {
                        int index =0;
                        for (int j = start; j < end; j++) {
                            try {
                                log.error("交通规划========"+cate.getId()+"/"+cate.getName()+"/"+customerList.get(j).getName()+"=======cirle/index:"+finalI+"/"+index++);
                                dealDistancePerCustomer(customerList.get(j),url,date, finalCLatitude, finalCLongitude,customerList);
                            }catch (Exception e){

                            }
                        }
                    }catch (Exception e){
                    }finally {
                        results[finalI] =true;
                        boolean isDone = false;
                        for(boolean t : results){
                            isDone = isDone&&t;
                        }
                        if(isDone){
                            cate.setStatus(Constants.ZERO);
                            categoryMapper.updateById(cate);//更新任务执行状态
                        }
                    }

                });
                t1.start();
            }
        }catch (Exception e){
            e.printStackTrace();
        }finally {
            cate.setStatus(Constants.ZERO);
            categoryMapper.updateById(cate);//更新任务执行状态

        }
    }

    private void dealDistancePerCustomer(JkCustomer c, String url, Date date, BigDecimal cLatitude, BigDecimal cLongitude, List<JkCustomer> customerList) {
    private void dealDistancePerCustomer(JkCustomer c, String url, Date date, BigDecimal cLatitude, BigDecimal cLongitude, List<JkCustomer> customerList) throws InterruptedException {
        List<JkCustomer> updateCustomerList = new ArrayList<>();
        List<JkCustomerNavigation> navigationList = new ArrayList<>();
        List<DistanceMapParam> tmpList = new ArrayList<>();
        List<DistanceMapParam> distanceMapParamList  = getListFromJsonStr(c.getDistance());
        boolean isNew = false;
        boolean isNew = false,hasError =false;
        JkCustomer u =new JkCustomer();
        DistanceMapParam t0 = new DistanceMapParam();
        t0.setId(-2);//表示返回园区
        t0.setDistance(Constants.formatLongNum(c.getStartDistance()) );
        if(Constants.formatLongNum(c.getStartDistance()) <= 0){
            //园区前往该客户的距离，如果之前未获取过
            //园区前往该客户的距离，如果之前未获取
            isNew = true;
            JkCustomer start = new JkCustomer();
            start.setId(-1);
            start.setLongitude(cLongitude);
            start.setLatitude(cLatitude);
            DistanceCustomerModel dm = DistanceCalculator.calculateDistanceGaode(url,start,c);
            c.setStartDistance(dm.getDistance() );
            t0.setDistance(dm.getDistance());
            u.setStartDistance(dm.getDistance());
            if(dm.getLocations().size()>0){
                //如果有路径信息
                u.setStartSteps(dm.getPolyline());
            if(dm.getCode() == 1){
                //规划失败
                log.error("==============客户交通规划成功起点:"+c.getName());
                c.setStartDistance(dm.getDistance() );
                t0.setDistance(dm.getDistance());
                u.setStartDistance(dm.getDistance());
                if(dm.getLocations().size()>0){
                    //如果有路径信息
                    u.setStartSteps(dm.getPolyline());
                }
            }else{
                hasError=true;
            }

        }
        tmpList.add(t0);
        for(JkCustomer cm : customerList){
@@ -319,7 +355,7 @@
            DistanceMapParam t = new DistanceMapParam();
            t.setId(cm.getId());
            DistanceMapParam param = getParamByCustomerIds( cm.getId(),distanceMapParamList);
            if(param!=null){//如果之前已经获取过
            if(param!=null && param.getDistance()!=0){//如果之前已经获取过
                t = param;
            }else{
                JkCustomerNavigation navigation = new JkCustomerNavigation();
@@ -338,10 +374,15 @@
                }else{
                    DistanceCustomerModel dm = DistanceCalculator.calculateDistanceGaode(url,c,cm);
                    t.setDistance(dm.getDistance() );
                    if(dm.getLocations().size()>0){
                        //如果有路径信息
                        navigation.setSteps(dm.getPolyline());
                    if(dm.getCode() == 1){
                        if(dm.getLocations().size()>0){
                            //如果有路径信息
                            navigation.setSteps(dm.getPolyline());
                        }
                    }else{
                        hasError=true;
                    }

                }
                navigation.setIdIndex(c.getId()+"-"+cm.getId());
                navigation.setDistance(t.getDistance());
@@ -359,19 +400,25 @@
            start.setId(-1);
            start.setLongitude(cLongitude);
            start.setLatitude(cLatitude);

            DistanceCustomerModel dm = DistanceCalculator.calculateDistanceGaode(url,c,start);
            c.setEndDistance(dm.getDistance() );
            tt.setDistance(dm.getDistance());
            u.setEndDistance(dm.getDistance());
            if(dm.getLocations().size()>0){
                //如果有路径信息
                u.setEndSteps(dm.getPolyline());
            if(dm.getCode()== 1){
                //规划失败
                log.error("==============客户交通规划成功2:"+c.getName());
                c.setEndDistance(dm.getDistance() );
                tt.setDistance(dm.getDistance());
                u.setEndDistance(dm.getDistance());
                if(dm.getLocations().size()>0){
                    //如果有路径信息
                    u.setEndSteps(dm.getPolyline());
                }
            }else{
                hasError=true;
            }

        }
        tmpList.add(tt);
        if(isNew){//
            u.setDistanceStatus(Constants.ONE);
            u.setDistanceStatus(hasError?Constants.ZERO:Constants.ONE);//所有都成功才标注已规划
            u.setId(c.getId());
            u.setDistance(JSONObject.toJSONString(tmpList));
            updateCustomerList.add(u);
@@ -431,8 +478,8 @@
                .eq(JkCustomer::getIsdeleted,Constants.ZERO)
                .eq(JkLine::getCategoryId,model.getCategoryId() );
        List<JkCustomer> customerList = jkCustomerMapper.selectJoinList(JkCustomer.class,queryWrapper1);
        List<JkCustomer> needList =checkNeedDistanceDo(customerList);
        if(needList == null || needList.size() == 0){
         List<JkCustomer> needList =checkNeedDistanceDo(customerList);
        if(Constants.equalsInteger(model.getForceUpdate(),0)&& (needList == null || needList.size() == 0)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该主线下无需要进行距离计算的客户信息！");
        }
        String errorMsg ="";
@@ -446,7 +493,7 @@
        }
        c.setStatus(Constants.TWO);
        categoryMapper.updateById(c);//更新任务执行状态
        c.setCustomerList(customerList);
        c.setCustomerList(Constants.equalsInteger(model.getForceUpdate(),0)?needList:customerList);
        return  c;
    }

@@ -463,6 +510,7 @@
            TspSolver.DataModel dataModel = new TspSolver.DataModel();
            int vehicleNumber1 = lineList.size();//线路数量
            long[] vehicleCapacities1=new long[lineList.size()];//每辆车的最大订单量限制
            long[] vehicleMaxNodes=new long[lineList.size()];//每辆车的最大订单量限制
            long[] demands1 = new long[customerList.size()+1]; //各个点的订单量
            long[][] distanceMatrix1 = new long[customerList.size()+1][customerList.size()+1];
            distanceMatrix1[0][0] = 0;
@@ -488,9 +536,10 @@
            }
            for (int i = 0; i < lineList.size(); i++) {
                vehicleCapacities1[i] = lineList.get(i).getMaxOrder();//每辆车的最大订单量限制
                vehicleMaxNodes[i] =lineList.get(i).getMaxCustomer();//最大客户数
            }
            //构造优化数据模型
            dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1);
            dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
            TspSolver.startSearch(dataModel);
            dealSearchSolution(model,dataModel);
        }catch (Exception e){
@@ -553,6 +602,7 @@
                TspSolver.DataModel dataModel = new TspSolver.DataModel();
                int vehicleNumber1 = 1;//线路数量
                long[] vehicleCapacities1=new long[]{line.getMaxOrder()};//每辆车的最大订单量限制
                long[] vehicleMaxNodes=new long[]{line.getMaxCustomer()};//每辆车的最大订单量限制
                long[] demands1 = new long[customerListParam.size()+1]; //各个点的订单量
                long[][] distanceMatrix1 = new long[customerListParam.size()+1][customerListParam.size()+1];
                distanceMatrix1[0][0] = 0;
@@ -567,7 +617,7 @@
                    }
                }
                //构造优化数据模型
                dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1);
                dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
                TspSolver.startSearch(dataModel);
                if(dataModel.getSolutions()==null || dataModel.getSolutions().size()==0){
                    throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"线路【"+line.getLineName()+"】调整失败 ，未获得最优交通规划方案！");
@@ -975,7 +1025,7 @@
            queryWrapper.eq(JkSketch::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getDateInfo() != null) {
            queryWrapper.eq(JkSketch::getDateInfo,  pageWrap.getModel().getDateInfo());
            queryWrapper.like(JkSketch::getDateInfo,  DateUtil.dateToString(pageWrap.getModel().getDateInfo(),"yyyy-MM-dd"));
        }
        if (pageWrap.getModel().getJobId() != null) {
            queryWrapper.eq(JkSketch::getJobId, pageWrap.getModel().getJobId());
@@ -1322,8 +1372,9 @@
                .leftJoin(JkLine.class,JkLine::getId,JkSketchLine::getLineId)
                .leftJoin(Category.class,Category::getId,JkLine::getCategoryId )
                .leftJoin(Cars.class,Cars::getId,JkLine::getCarId)
                .eq(JkSketch::getIsdeleted,Constants.ZERO)
                .and(StringUtils.isNotBlank(telecomLineInfoDTO.getSearchInfo()),i->i.like(Cars::getCode,telecomLineInfoDTO.getSearchInfo()).or().like(JkLine::getName,telecomLineInfoDTO.getSearchInfo()))
                .eq(StringUtils.isNotBlank(telecomLineInfoDTO.getDateInfo()),JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo())
                .like(StringUtils.isNotBlank(telecomLineInfoDTO.getDateInfo()),JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo())
                .eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkLine::getCategoryId, telecomLineInfoDTO.getCategoryId())
                .eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkLine::getId, telecomLineInfoDTO.getLineId());

@@ -1367,10 +1418,11 @@
        telecomLineCountVO.setCustomerNum(Constants.ZERO);
        MPJLambdaWrapper<JkSketch> sketchMPJLambdaWrapper = new MPJLambdaWrapper<JkSketch>().selectAll(JkSketch.class )
                .selectAs(Category::getName,JkSketch::getCategoryName)
                .select(" ifnull((select count(1) from jk_sketch_customer jc where jc.ISDELETED= 0 and  jc.SKETCH_ID = t.id),0)" ,JkSketch::getCustomerNum)
                .select(" ifnull((select count(1) from jk_sketch_customer jc where jc.ISDELETED = 0 and  jc.SKETCH_ID = t.id),0)" ,JkSketch::getCustomerNum)
                .select(" ifnull((select count(1) from jk_sketch_line jc where   jc.TYPE = 0  and  jc.SKETCH_ID = t.id),0)" ,JkSketch::getBeforeLineNum)
                .leftJoin(Category.class,Category::getId,JkSketch::getCategoryId )
                .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
                .eq(JkSketch::getIsdeleted,Constants.ZERO)
                .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
        List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
        if(CollectionUtils.isEmpty(sketchList)){
            return telecomLineCountVO;
@@ -1396,10 +1448,10 @@
            TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
            telecomCategoryDataVO.setId(jkSketch.getCategoryId());
            telecomCategoryDataVO.setName(jkSketch.getCategoryName());
            telecomCategoryDataVO.setCustomerNum(jkSketch.getCustomerNum());
            telecomCategoryDataVO.setCustomerNum(Constants.ZERO);
            List<JkSketchLine> childLineList = jkSketchLineList.stream().filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())).collect(Collectors.toList());
            //优化前数据
            List<JkSketchLine> beforeList = childLineList.stream()
            List<JkSketchLine> beforeList = jkSketchLineList.stream()
                    .filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
            //优化后数据
            List<JkSketchLine> afterList = childLineList.stream()
@@ -1408,15 +1460,11 @@
            lineNum = lineNum + (Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)?beforeList.size():afterList.size());
            List<TelecomLineDataVO> telecomLineDataVOList = new ArrayList<>();
            for (JkSketchLine sketchLine: Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)?beforeList:afterList) {
//                JkSketchLine finalSketchLine = sketchLine;
//                List<JkSketchLine> afterSelectList = afterList.stream().filter(i->Constants.equalsInteger(i.getLineId(), finalSketchLine.getLineId())).collect(Collectors.toList());
//                if(afterSelectList.size()>Constants.ZERO){
//                    sketchLine = afterSelectList.get(Constants.ZERO);
//                }
                TelecomLineDataVO telecomLineDataVO = new TelecomLineDataVO();
                telecomLineDataVO.setId(sketchLine.getId());
                telecomLineDataVO.setName(sketchLine.getLineName());
                telecomLineDataVOList.add(telecomLineDataVO);
                telecomCategoryDataVO.setCustomerNum(telecomCategoryDataVO.getCustomerNum() +  sketchLine.getMaxCustomer());
                telecomLineCountVO.setCustomerNum(
                        telecomLineCountVO.getCustomerNum() + sketchLine.getMaxCustomer()
                );
@@ -1439,7 +1487,8 @@
        MPJLambdaWrapper<JkSketch> sketchMPJLambdaWrapper = new MPJLambdaWrapper<JkSketch>().selectAll(JkSketch.class )
                .selectAs(Category::getName,JkSketch::getCategoryName)
                .leftJoin(Category.class,Category::getId,JkSketch::getCategoryId )
                .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
                .eq(JkSketch::getIsdeleted,Constants.ZERO)
                .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
        List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
        if(CollectionUtils.isEmpty(sketchList)){
            return new ArrayList<TelecomCategoryDataVO>();
@@ -1456,31 +1505,33 @@
        List<JkSketchLine> jkSketchLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);

        List<TelecomCategoryDataVO> telecomCategoryDataVOList = new ArrayList<>();
        for (JkSketch jkSketch:sketchList) {
            TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
            telecomCategoryDataVO.setId(jkSketch.getCategoryId());
            telecomCategoryDataVO.setName(jkSketch.getCategoryName());
            //优化前数据
            List<JkSketchLine> beforeList = jkSketchLineList.stream()
                    .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())&&Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
            telecomCategoryDataVO.setDistance(
                    beforeList.stream().map(i->i.getDistance()).reduce(Long.valueOf(0),Long::sum)
            );
            if(Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)){
                telecomCategoryDataVO.setDistanceAfter(telecomCategoryDataVO.getDistance());
            }else{
                //优化后数据
                List<JkSketchLine> afterList = jkSketchLineList.stream()
                        .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())&&Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
        if(sketchList!=null){
            for (JkSketch jkSketch:sketchList) {
                TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
                telecomCategoryDataVO.setId(jkSketch.getCategoryId());
                telecomCategoryDataVO.setName(jkSketch.getCategoryName());
                //优化前数据
                List<JkSketchLine> beforeList = jkSketchLineList.stream()
                        .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())&&Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
                telecomCategoryDataVO.setDistance(
                        beforeList.stream().map(i->i.getDistance()).reduce(Long.valueOf(0),Long::sum)
                );
                if(Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)){
                    telecomCategoryDataVO.setDistanceAfter(telecomCategoryDataVO.getDistance());
                }else{
                    //优化后数据
                    List<JkSketchLine> afterList = jkSketchLineList.stream()
                            .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())&&Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());

                Long distanceAfter = 0L;
                for (JkSketchLine jkSketchLine:afterList) {
                    Long distanceAfter = 0L;
                    for (JkSketchLine jkSketchLine:afterList) {
                        distanceAfter = distanceAfter + jkSketchLine.getDistance();
                }
                telecomCategoryDataVO.setDistanceAfter(distanceAfter);
                    }
                    telecomCategoryDataVO.setDistanceAfter(distanceAfter);

                }
                telecomCategoryDataVOList.add(telecomCategoryDataVO);
            }
            telecomCategoryDataVOList.add(telecomCategoryDataVO);
        }
        return telecomCategoryDataVOList;
    }
@@ -1503,7 +1554,7 @@
                .eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkSketchLine::getCategoryId,telecomLineInfoDTO.getCategoryId())
                .eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkSketchLine::getLineId,telecomLineInfoDTO.getLineId())
                .apply(" ( t.TYPE = t1.OPT_STATUS ) ")
                .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
                .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
        List<JkSketchLine> returnLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);

//        //优化前数据