From 9b849587816ec31c960d066302d580fb8eb0adcc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 20 十一月 2025 17:52:57 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchCustomerServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 338bd2e..d059939 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
@@ -2,8 +2,11 @@
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;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -37,6 +40,8 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private JkSketchCustomerMapper jkSketchCustomerMapper;
+ @Autowired
+ private JkSketchMapper jkSketchMapper;
@Autowired
private JkCustomerNavigationMapper jkCustomerNavigationMapper;
@@ -137,6 +142,8 @@
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.getEndLatitude()));
startmodel.setSteps(comLocation +";"+allList.get(0).getLongitude()+","+allList.get(0).getLatitude());
}
list.add(startmodel);
@@ -174,6 +181,13 @@
tt.setStartLogitude(start.getLongitude());
tt.setEndLatitude(end.getLatitude());
tt.setEndLogitude(end.getLongitude());
+ 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.getEndLatitude()));
+ }
}
tt.setLocation(allList.get(i).getLocation());
tt.setName(allList.get(i).getName());
@@ -185,8 +199,15 @@
}
return list;
}
+
@Override
public List<JkSketchCustomer> findList(JkSketchCustomer jkSketchCustomer) {
+ /* if(jkSketchCustomer.getSketchId()!=null){
+ JkSketch sketch = jkSketchMapper.selectById(jkSketchCustomer.getSketchId());
+ if(sketch!=null){
+ jkSketchCustomer.setType(Constants.formatIntegerNum(sketch.getOptStatus()));
+ }
+ }*/
MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
jkSketchCustomer.setIsdeleted(Constants.ZERO);
queryWrapper.selectAll(JkSketchCustomer.class )
@@ -198,11 +219,9 @@
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId ) ;
queryWrapper.like(jkSketchCustomer.getCode()!=null,JkCustomer::getCode,jkSketchCustomer.getCode());
queryWrapper.like(jkSketchCustomer.getName()!=null,JkCustomer::getName,jkSketchCustomer.getName());
+ queryWrapper.eq(jkSketchCustomer.getType() != null,JkSketchCustomer::getType,jkSketchCustomer.getType());
if (jkSketchCustomer.getId() != null) {
queryWrapper.eq(JkSketchCustomer::getId,jkSketchCustomer.getId());
- }
- if (jkSketchCustomer.getCreator() != null) {
- queryWrapper.eq(JkSketchCustomer::getCreator,jkSketchCustomer.getCreator());
}
if (jkSketchCustomer.getCreateDate() != null) {
queryWrapper.ge(JkSketchCustomer::getCreateDate, Utils.Date.getStart(jkSketchCustomer.getCreateDate()));
@@ -243,6 +262,12 @@
@Override
public PageData<JkSketchCustomer> findPage(PageWrap<JkSketchCustomer> pageWrap) {
+ if(pageWrap.getModel().getSketchId()!=null){
+ JkSketch sketch = jkSketchMapper.selectById(pageWrap.getModel().getSketchId());
+ if(sketch!=null){
+ pageWrap.getModel().setType(Constants.formatIntegerNum(sketch.getOptStatus()));
+ }
+ }
IPage<JkSketchCustomer> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -258,6 +283,7 @@
.leftJoin(JkSketchLine.class,JkSketchLine::getId,JkSketchCustomer::getSketchLineId )
.leftJoin(JkLine.class,JkLine::getId,JkSketchLine::getLineId )
.leftJoin(Category.class,Category::getId,JkLine::getCategoryId );
+ queryWrapper.eq( pageWrap.getModel().getType()!=null,JkSketchCustomer::getType, pageWrap.getModel().getType());
queryWrapper.eq( pageWrap.getModel().getCategoryId()!=null,JkLine::getCategoryId, pageWrap.getModel().getCategoryId());
queryWrapper.eq( pageWrap.getModel().getDateInfo()!=null,JkSketchCustomer::getDateInfo, pageWrap.getModel().getDateInfo());
queryWrapper.like( pageWrap.getModel().getCode()!=null,JkCustomer::getCode, pageWrap.getModel().getCode());
--
Gitblit v1.9.3