最新版本541200007

doum

昨天 2fd6e6eda3be29e5d77519fd0ca75ae172a11c46

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

@@ -2,6 +2,8 @@

import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.tsp.DistanceCalculator;
import com.doumee.core.tsp.DistanceMapParam;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.JkCustomerNavigationMapper;
import com.doumee.dao.business.JkSketchMapper;
@@ -138,8 +140,110 @@
            startmodel.setEndLatitude(allList.get(0).getLatitude());
            startmodel.setEndLogitude(allList.get(0).getLongitude());
            startmodel.setDistance(allList.get(0).getStartDistance());
//            startmodel.setSteps(allList.get(0).getStartSteps());
            if(StringUtils.isBlank(startmodel.getSteps())){
                // (BigDecimal lat1, BigDecimal lon1, BigDecimal lat2, BigDecimal lon2)
                startmodel.setDistance(DistanceCalculator.calculateDistanceDecinal(startmodel.getStartLatitude(),startmodel.getStartLogitude(),startmodel.getEndLatitude(),startmodel.getEndLogitude()));
                startmodel.setSteps(comLocation +";"+allList.get(0).getLongitude()+","+allList.get(0).getLatitude());
            }
            list.add(startmodel);

            for (int i = 0; i < allList.size(); i++) {
                if(allList.size() == i+1){
                    JkCustomerNavigation endmodel = new JkCustomerNavigation();
                    endmodel.setStartId(-1);
                    endmodel.setLocation(allList.get(i).getLocation());
                    endmodel.setName(allList.get(i).getName());
//                    endmodel.setSteps(allList.get(i).getEndSteps());
                    endmodel.setStartLatitude(allList.get(i).getLatitude());
                    endmodel.setStartLogitude(allList.get(i).getLongitude());
                    endmodel.setDistance(allList.get(0).getEndDistance());
                    endmodel.setEndLatitude(cLatitude);
                    endmodel.setEndLogitude(cLongitude);
                    if(StringUtils.isBlank(startmodel.getSteps())){
                        startmodel.setSteps(allList.get(i).getLongitude()+","+allList.get(i).getLatitude()+";"+comLocation);
                    }
                    list.add(endmodel);
                    break;
                }
                JkSketchCustomer start = allList.get(i);
                JkSketchCustomer end = allList.get(i+1);
             /*   JkCustomerNavigation tt = jkCustomerNavigationMapper.selectOne(new QueryWrapper<JkCustomerNavigation>().lambda()
                        .eq(JkCustomerNavigation::getIsdeleted,Constants.ZERO)
                        .eq(JkCustomerNavigation::getIdIndex, allList.get(i).getCustomerId()+"-"+ allList.get(i+1).getCustomerId())
                        .orderByDesc(JkCustomerNavigation::getId)
                        .last("limit 1")
                );*/
                JkCustomerNavigation tt = null;
                if(tt==null){
                    //只有起止点
                    tt = new JkCustomerNavigation();
                    tt.setStartLatitude(start.getLatitude());
                    tt.setStartLogitude(start.getLongitude());
                    tt.setEndLatitude(end.getLatitude());
                    tt.setEndLogitude(end.getLongitude());
                    tt.setDistance(DistanceCalculator.calculateDistanceDecinal(tt.getStartLatitude(),tt.getStartLogitude(),tt.getEndLatitude(),tt.getEndLogitude()));
                    //  //====标记==忽略交通规划距离=====
                   /* List<DistanceMapParam> distanceMapParamList  =JkSketchServiceImpl.getListFromJsonStr(start.getDistanceJson());
                    DistanceMapParam param = JkSketchServiceImpl.getParamByCustomerIds( end.getId(),distanceMapParamList);
                    if(param!=null && param.getDistance()!=0){//如果之前已经获取过
                        tt.setDistance(param.getDistance());
                    }else{
                        tt.setDistance(DistanceCalculator.calculateDistanceDecinal(tt.getStartLatitude(),tt.getStartLogitude(),tt.getEndLatitude(),tt.getEndLogitude()));
                    }*/
                }
                tt.setLocation(allList.get(i).getLocation());
                tt.setName(allList.get(i).getName());
                if(StringUtils.isBlank(tt.getSteps())){
                    tt.setSteps(start.getLongitude()+","+end.getLatitude()+";"+end.getLongitude()+","+end.getLatitude());
                }
                list.add(tt);
            }
        }
        return list;
    }
    public List<JkCustomerNavigation>  allMapListOld(JkSketchCustomer jkSketchCustomer) {
        List<JkCustomerNavigation> list = new ArrayList<>();
        MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
        jkSketchCustomer.setIsdeleted(Constants.ZERO);
        queryWrapper.selectAll(JkSketchCustomer.class )
                .selectAs(JkCustomer::getName,JkSketchCustomer::getName)
                .selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
                .selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
                .selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)
                .selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
                .selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
                .selectAs(JkCustomer::getStartSteps,JkSketchCustomer::getStartSteps)
                .selectAs(JkCustomer::getEndSteps,JkSketchCustomer::getEndSteps)
                .selectAs(JkCustomer::getLocation,JkSketchCustomer::getLocation)
                .leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId ) ;
        queryWrapper.eq( JkSketchCustomer::getSketchLineId,jkSketchCustomer.getSketchLineId())
                    .eq( JkSketchCustomer::getIsdeleted,Constants.ZERO);

        BigDecimal cLatitude =new BigDecimal(0);
        BigDecimal cLongitude =new BigDecimal(0);

        String comLocation = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_LOCATION).getCode();
        try {
            String[] ss = comLocation.split(",");
            cLongitude = new BigDecimal(ss[0]);
            cLatitude =  new BigDecimal(ss[1]);
        }catch (Exception e){
        }
        List<JkSketchCustomer> allList =  jkSketchCustomerMapper.selectJoinList(JkSketchCustomer.class,queryWrapper);
        if(allList !=null && allList.size()>0){
            JkCustomerNavigation startmodel = new JkCustomerNavigation();
            startmodel.setStartId(-1);
            startmodel.setName("园区");
            startmodel.setStartLatitude(cLatitude);
            startmodel.setStartLogitude(cLongitude);
            startmodel.setEndLatitude(allList.get(0).getLatitude());
            startmodel.setEndLogitude(allList.get(0).getLongitude());
            startmodel.setDistance(allList.get(0).getStartDistance());
            startmodel.setSteps(allList.get(0).getStartSteps());
            if(StringUtils.isBlank(startmodel.getSteps())){
                // (BigDecimal lat1, BigDecimal lon1, BigDecimal lat2, BigDecimal lon2)
                startmodel.setDistance(DistanceCalculator.calculateDistanceDecinal(startmodel.getStartLatitude(),startmodel.getStartLogitude(),startmodel.getEndLatitude(),startmodel.getEndLogitude()));
                startmodel.setSteps(comLocation +";"+allList.get(0).getLongitude()+","+allList.get(0).getLatitude());
            }
            list.add(startmodel);
@@ -177,6 +281,15 @@
                    tt.setStartLogitude(start.getLongitude());
                    tt.setEndLatitude(end.getLatitude());
                    tt.setEndLogitude(end.getLongitude());
                    tt.setDistance(DistanceCalculator.calculateDistanceDecinal(tt.getStartLatitude(),tt.getStartLogitude(),tt.getEndLatitude(),tt.getEndLogitude()));
                    //  //====标记==忽略交通规划距离=====
                   /* List<DistanceMapParam> distanceMapParamList  =JkSketchServiceImpl.getListFromJsonStr(start.getDistanceJson());
                    DistanceMapParam param = JkSketchServiceImpl.getParamByCustomerIds( end.getId(),distanceMapParamList);
                    if(param!=null && param.getDistance()!=0){//如果之前已经获取过
                        tt.setDistance(param.getDistance());
                    }else{
                        tt.setDistance(DistanceCalculator.calculateDistanceDecinal(tt.getStartLatitude(),tt.getStartLogitude(),tt.getEndLatitude(),tt.getEndLogitude()));
                    }*/
                }
                tt.setLocation(allList.get(i).getLocation());
                tt.setName(allList.get(i).getName());
@@ -188,6 +301,7 @@
        }
        return list;
    }

    @Override
    public List<JkSketchCustomer> findList(JkSketchCustomer jkSketchCustomer) {
   /*     if(jkSketchCustomer.getSketchId()!=null){