From 6cc6a2ef6369bb25414aa977e886d08cf8f80207 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 09:57:29 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java | 106 +----------------------------------------------------
1 files changed, 2 insertions(+), 104 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java
index e221f77..4f1aaeb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java
@@ -140,106 +140,6 @@
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)
@@ -281,15 +181,13 @@
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());
+ 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());
--
Gitblit v1.9.3