From f51c9e1bc0e82cbebd0e05130fb9a754317cbfa2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:44 +0800
Subject: [PATCH] 月台自动叫号处理问题
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 355 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
index 4a7fca1..e61de7d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.doumee.biz.system.SystemDictDataBiz;
@@ -12,7 +13,12 @@
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.dao.admin.request.JkOrdersImport;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dto.TelecomLineInfoDTO;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.TelecomCategoryDataVO;
+import com.doumee.dao.business.vo.TelecomJkLineListVO;
+import com.doumee.dao.business.vo.TelecomLineCountVO;
+import com.doumee.dao.business.vo.TelecomLineDataVO;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -38,6 +44,7 @@
import java.util.*;
import java.util.Date;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* 浜ゆ帶-绾胯矾浼樺寲璁板綍淇℃伅琛⊿ervice瀹炵幇
@@ -179,6 +186,7 @@
.selectAs(JkLine::getMaxCustomer,JkSketchLine::getMaxCustomer)
.leftJoin(JkLine.class,JkLine::getId,JkOrders::getLineId )
.eq(JkSketchLine::getSketchId,jkSketch.getId())
+ .eq(JkSketchLine::getType, Constants.formatIntegerNum(model.getOptStatus()))
.eq(JkSketchLine::getIsdeleted,Constants.ZERO));
if(lineList ==null ||lineList.size() ==0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠绾胯矾涓嶆弧瓒充紭鍖栨柟妗堣皟鏁存潯浠讹紒");
@@ -239,7 +247,6 @@
}
checkJketchCustomerLocation(model,true);
model.setEditDate(new Date());
- model.setEditor(jkSketch.getLoginUserInfo().getId());
model.setDistance(model.getOriginDistance());
jkSketchMapper.updateById(model);
return model;
@@ -442,6 +449,11 @@
c.setCustomerList(customerList);
return c;
}
+
+ /**
+ * 寮�濮嬪紓姝ユ墽琛岀嚎璺紭鍖栦换鍔�
+ * @param model
+ */
@Override
@Async
public void startUpdateLineAsync(JkSketch model) {
@@ -493,6 +505,11 @@
}
@Override
@Async
+ public void startInitOriginDistanceBatch( JkSketch model) {
+ initOriginDistance(model);
+ }
+ @Override
+ @Async
public void startEditSketchLineAsync(JkSketch model) {
boolean success = true;
int totalDistance = 0;
@@ -508,6 +525,7 @@
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
.selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
+ .eq(JkSketchCustomer::getType, Constants.equalsInteger(model.getOptStatus(),Constants.ONE)?1:0)
.eq(JkSketchCustomer::getSketchId, model.getId())
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
.orderByAsc(JkSketchCustomer::getSortnum);
@@ -754,6 +772,7 @@
tModel.setTotalNum(new BigDecimal(0));
tModel.setOrderNum(routes.size()-2);
tModel.setDateInfo(model.getDateInfo());
+ tModel.setType(Constants.ONE);
tModel.setSortnum(sketchLineList.size()+1);
tModel.setEditDate(tModel.getCreateDate());
tModel.setEditor(tModel.getCreator());
@@ -772,6 +791,7 @@
cModel.setCreator(tModel.getCreator());
cModel.setOrderId(customer.getOrderId());
cModel.setCreateDate(tModel.getCreateDate());
+ cModel.setType(Constants.ONE);
cModel.setTotalNum(customer.getTotalNum());
cModel.setDateInfo(model.getDateInfo());
cModel.setSortnum(tModel.getCustomerList().size()+1);
@@ -789,10 +809,12 @@
jkSketchLineMapper.update(null,new UpdateWrapper<JkSketchLine>().lambda()
.set(JkSketchLine::getIsdeleted,Constants.ONE)
.eq(JkSketchLine::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchLine::getType,Constants.ONE)
.eq(JkSketchLine::getDateInfo,model.getDateInfo()));
jkSketchCustomerMapper.update(null,new UpdateWrapper<JkSketchCustomer>().lambda()
.set(JkSketchCustomer::getIsdeleted,Constants.ONE)
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchCustomer::getType,Constants.ONE)
.eq(JkSketchCustomer::getDateInfo,model.getDateInfo()));
if(sketchLineList.size()>0){
jkSketchLineMapper.insert(sketchLineList);
@@ -812,6 +834,7 @@
.eq(JkSketch::getId,model.getId() )
.eq(JkSketch::getJobId,model.getJobId() )
.set(JkSketch::getLineNum,sketchLineList.size() )
+ .set(JkSketch::getOptStatus,Constants.ONE)//宸茬敓鎴愪紭鍖栫嚎璺�
.set(JkSketch::getDistance,totalDistance)
.set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栨垚鍔燂紝浼樺寲鍚庢�昏窛绂伙細"+(totalDistance/1000)+"鍏噷锛�")
.set(JkSketch::getStatus,Constants.TWO)
@@ -838,6 +861,7 @@
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
.selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
+ .eq(JkSketchCustomer::getType, Constants.formatIntegerNum(model.getOptStatus()))
.eq(JkSketchCustomer::getSketchId, model.getId())
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
.orderByAsc(JkSketchCustomer::getSortnum);
@@ -866,6 +890,7 @@
queryWrapper1.selectAll(JkSketchLine.class )
.eq(JkSketchLine::getSketchId, model.getId())
.eq(JkSketchLine::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchLine::getType, Constants.formatIntegerNum(model.getOptStatus()))
.orderByAsc(JkSketchLine::getSortnum);
List<JkSketchLine> lineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper1);
initCustomerDistance(lineList,model,updateLineDistance);
@@ -1079,6 +1104,7 @@
tModel.setTotalNum(orders.getNum());
tModel.setDateInfo(orders.getDateInfo());
tModel.setSortnum(list.size()+1);
+ tModel.setType(Constants.ZERO);
tModel.setEditDate(tModel.getCreateDate());
tModel.setEditor(tModel.getCreator());
tModel.setIsdeleted(Constants.ZERO);
@@ -1101,6 +1127,7 @@
initOrderAndTotalNum(tModel,line.getId(),newOrderList);
tModel.setDateInfo(newList.get(0).getDateInfo());
tModel.setSortnum(list.size()+1);
+ tModel.setType(Constants.ZERO);
tModel.setEditDate(tModel.getCreateDate());
tModel.setEditor(tModel.getCreator());
tModel.setIsdeleted(Constants.ZERO);
@@ -1156,6 +1183,7 @@
tModel.setCreateDate(orders.getCreateDate());
tModel.setCategoryId(orders.getCategoryId());
tModel.setTotalNum(orders.getNum());
+ tModel.setOptStatus(Constants.ZERO);
tModel.setOrderNum(1);
tModel.setDateInfo(orders.getDateInfo());
tModel.setSortnum(list.size()+1);
@@ -1277,4 +1305,330 @@
}
return null;
}
+
+
+
+ @Override
+ public List<TelecomJkLineListVO> getLineForTelecom(TelecomLineInfoDTO telecomLineInfoDTO){
+ if(StringUtils.isBlank(telecomLineInfoDTO.getDateInfo())){
+ telecomLineInfoDTO.setDateInfo(DateUtil.getDate(new Date(),"yyyy-MM-dd"));
+ }
+ MPJLambdaWrapper<JkSketchLine> queryWrapper = new MPJLambdaWrapper<JkSketchLine>().selectAll(JkSketchLine.class )
+ .selectAs(Cars::getCode,JkSketchLine::getCarCode)
+ .selectAs(Category::getName,JkSketchLine::getCategoryName)
+ .selectAs(JkLine::getName,JkSketchLine::getLineName)
+ .select(" ifnull((select count(1) from jk_sketch_customer jc where jc.ISDELETED= 0 and jc.SKETCH_LINE_ID = t.id),0)" ,JkSketchLine::getMaxCustomer)
+ .leftJoin(JkSketch.class,JkSketch::getId,JkSketchLine::getSketchId)
+ .leftJoin(JkLine.class,JkLine::getId,JkSketchLine::getLineId)
+ .leftJoin(Category.class,Category::getId,JkLine::getCategoryId )
+ .leftJoin(Cars.class,Cars::getId,JkLine::getCarId)
+ .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())
+ .eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkLine::getCategoryId, telecomLineInfoDTO.getCategoryId())
+ .eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkLine::getId, telecomLineInfoDTO.getLineId());
+
+ List<JkSketchLine> jkSketchLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);
+ List<TelecomJkLineListVO> telecomJkLineListVOList = new ArrayList<>();
+
+ if(org.apache.commons.collections.CollectionUtils.isNotEmpty(jkSketchLineList)){
+ //浼樺寲鍓嶆暟鎹�
+ List<JkSketchLine> beforeList = jkSketchLineList.stream()
+ .filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
+ //浼樺寲鍚庢暟鎹�
+ List<JkSketchLine> afterList = jkSketchLineList.stream()
+ .filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
+
+ for (JkSketchLine sketchLine:beforeList) {
+ 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);
+ }
+ TelecomJkLineListVO telecomJkLineListVO = new TelecomJkLineListVO();
+ telecomJkLineListVO.setCategoryName(sketchLine.getCategoryName());
+ telecomJkLineListVO.setName(sketchLine.getLineName());
+ telecomJkLineListVO.setCarCode(sketchLine.getCarCode());
+ telecomJkLineListVO.setCustomerNum(sketchLine.getMaxCustomer());
+ telecomJkLineListVOList.add(telecomJkLineListVO);
+ }
+
+ }
+ return telecomJkLineListVOList;
+ }
+
+ @Override
+ public TelecomLineCountVO getTelecomLineCount(TelecomLineInfoDTO telecomLineInfoDTO){
+ if(StringUtils.isBlank(telecomLineInfoDTO.getDateInfo())){
+ telecomLineInfoDTO.setDateInfo(DateUtil.getDate(new Date(),"yyyy-MM-dd"));
+ }
+ TelecomLineCountVO telecomLineCountVO = new TelecomLineCountVO();
+ telecomLineCountVO.setLineNum(Constants.ZERO);
+ telecomLineCountVO.setCategoryNum(Constants.ZERO);
+ 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_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());
+ List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
+ if(CollectionUtils.isEmpty(sketchList)){
+ return telecomLineCountVO;
+ }
+ MPJLambdaWrapper<JkSketchLine> queryWrapper = new MPJLambdaWrapper<JkSketchLine>().selectAll(JkSketchLine.class )
+ .selectAs(Cars::getCode,JkSketchLine::getCarCode)
+ .selectAs(Category::getName,JkSketchLine::getCategoryName)
+ .selectAs(JkLine::getName,JkSketchLine::getLineName)
+ .select(" ifnull((select count(1) from jk_sketch_customer jc where jc.ISDELETED= 0 and jc.SKETCH_LINE_ID = t.id),0)" ,JkSketchLine::getMaxCustomer)
+ .leftJoin(JkSketch.class,JkSketch::getId,JkSketchLine::getSketchId)
+ .leftJoin(JkLine.class,JkLine::getId,JkSketchLine::getLineId)
+ .leftJoin(Category.class,Category::getId,JkLine::getCategoryId )
+ .leftJoin(Cars.class,Cars::getId,JkLine::getCarId)
+ .in(JkSketchLine::getSketchId,sketchList.stream().map(i->i.getId()).collect(Collectors.toList()));
+ List<JkSketchLine> jkSketchLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);
+
+ telecomLineCountVO.setCategoryNum(sketchList.size());
+ telecomLineCountVO.setLineNum(sketchList.stream().map(i->i.getBeforeLineNum()).reduce(Constants.ZERO,Integer::sum));
+
+ List<TelecomCategoryDataVO> telecomCategoryDataVOList = new ArrayList<>();
+ for (JkSketch jkSketch:sketchList) {
+ TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
+ telecomCategoryDataVO.setId(jkSketch.getCategoryId());
+ telecomCategoryDataVO.setName(jkSketch.getCategoryName());
+ telecomCategoryDataVO.setCustomerNum(jkSketch.getCustomerNum());
+ List<JkSketchLine> childLineList = jkSketchLineList.stream().filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())).collect(Collectors.toList());
+ //浼樺寲鍓嶆暟鎹�
+ List<JkSketchLine> beforeList = childLineList.stream()
+ .filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
+ //浼樺寲鍚庢暟鎹�
+ List<JkSketchLine> afterList = childLineList.stream()
+ .filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
+ List<TelecomLineDataVO> telecomLineDataVOList = new ArrayList<>();
+ for (JkSketchLine sketchLine:beforeList) {
+ 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);
+ telecomLineCountVO.setCustomerNum(
+ telecomLineCountVO.getCustomerNum() + sketchLine.getMaxCustomer()
+ );
+ }
+ telecomCategoryDataVO.setTelecomLineDataVOList(telecomLineDataVOList);
+ telecomCategoryDataVOList.add(telecomCategoryDataVO);
+ }
+ telecomLineCountVO.setTelecomCategoryDataVOList(telecomCategoryDataVOList);
+ return telecomLineCountVO;
+ }
+
+
+
+ @Override
+ public List<TelecomCategoryDataVO> getTelecomLineDistance(TelecomLineInfoDTO telecomLineInfoDTO){
+ if(StringUtils.isBlank(telecomLineInfoDTO.getDateInfo())){
+ telecomLineInfoDTO.setDateInfo(DateUtil.getDate(new Date(),"yyyy-MM-dd"));
+ }
+ 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());
+ List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
+ if(CollectionUtils.isEmpty(sketchList)){
+ return new ArrayList<TelecomCategoryDataVO>();
+ }
+ MPJLambdaWrapper<JkSketchLine> queryWrapper = new MPJLambdaWrapper<JkSketchLine>().selectAll(JkSketchLine.class )
+ .selectAs(Cars::getCode,JkSketchLine::getCarCode)
+ .selectAs(Category::getName,JkSketchLine::getCategoryName)
+ .selectAs(JkLine::getName,JkSketchLine::getLineName)
+ .leftJoin(JkSketch.class,JkSketch::getId,JkSketchLine::getSketchId)
+ .leftJoin(JkLine.class,JkLine::getId,JkSketchLine::getLineId)
+ .leftJoin(Category.class,Category::getId,JkLine::getCategoryId )
+ .leftJoin(Cars.class,Cars::getId,JkLine::getCarId)
+ .in(JkSketchLine::getSketchId,sketchList.stream().map(i->i.getId()).collect(Collectors.toList()));
+ 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)
+ );
+ //浼樺寲鍚庢暟鎹�
+ 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(org.apache.commons.collections.CollectionUtils.isEmpty(afterList)){
+ telecomCategoryDataVO.setDistanceAfter(telecomCategoryDataVO.getDistance());
+ }else if(beforeList.size()>afterList.size()){
+ Long distanceAfter = 0L;
+ for (JkSketchLine jkSketchLine:beforeList) {
+ List<JkSketchLine> afterSelectList = afterList.stream().filter(i->Constants.equalsInteger(i.getLineId(),jkSketchLine.getLineId())).collect(Collectors.toList());
+ if(afterSelectList.size()>Constants.ZERO){
+ distanceAfter = distanceAfter + afterSelectList.get(Constants.ZERO).getDistance();
+ }else{
+ distanceAfter = distanceAfter + jkSketchLine.getDistance();
+ }
+ }
+ telecomCategoryDataVO.setDistanceAfter(distanceAfter);
+ }else{
+ telecomCategoryDataVO.setDistanceAfter(
+ afterList.stream().map(i->i.getDistance()).reduce(Long.valueOf(0),Long::sum)
+ );
+ }
+ telecomCategoryDataVOList.add(telecomCategoryDataVO);
+ }
+ return telecomCategoryDataVOList;
+ }
+
+
+ @Override
+ public List<TelecomLineDataVO> getTelecomLineInfo(TelecomLineInfoDTO telecomLineInfoDTO){
+ if(StringUtils.isBlank(telecomLineInfoDTO.getDateInfo())){
+ telecomLineInfoDTO.setDateInfo(DateUtil.getDate(new Date(),"yyyy-MM-dd"));
+ }
+ MPJLambdaWrapper<JkSketchLine> queryWrapper = new MPJLambdaWrapper<JkSketchLine>().selectAll(JkSketchLine.class )
+ .selectAs(Cars::getCode,JkSketchLine::getCarCode)
+ .selectAs(Category::getName,JkSketchLine::getCategoryName)
+ .selectAs(JkLine::getName,JkSketchLine::getLineName)
+ .leftJoin(JkSketch.class,JkSketch::getId,JkSketchLine::getSketchId)
+ .leftJoin(JkLine.class,JkLine::getId,JkSketchLine::getLineId)
+ .leftJoin(Category.class,Category::getId,JkLine::getCategoryId )
+ .leftJoin(Cars.class,Cars::getId,JkLine::getCarId)
+ .eq(JkSketchLine::getIsdeleted,Constants.ZERO)
+ .eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkSketchLine::getCategoryId,telecomLineInfoDTO.getCategoryId())
+ .eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkSketchLine::getLineId,telecomLineInfoDTO.getLineId())
+ .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
+ List<JkSketchLine> jkSketchLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);
+
+ //浼樺寲鍓嶆暟鎹�
+ List<JkSketchLine> beforeList = jkSketchLineList.stream()
+ .filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
+
+ //浼樺寲鍚庢暟鎹�
+ List<JkSketchLine> afterList = jkSketchLineList.stream()
+ .filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
+
+ List<JkSketchLine> returnLineList = new ArrayList<>();
+ for (JkSketchLine jkSketchLine:beforeList) {
+ List<JkSketchLine> afterSelectList = afterList.stream().filter(i->Constants.equalsInteger(i.getLineId(),jkSketchLine.getLineId())).collect(Collectors.toList());
+ if(afterSelectList.size()>Constants.ZERO){
+ returnLineList.add(afterList.get(Constants.ZERO));
+ }else{
+ returnLineList.add(jkSketchLine);
+ }
+ }
+ List<TelecomLineDataVO> dataVOList = new ArrayList<>();
+ if(org.apache.commons.collections.CollectionUtils.isNotEmpty(returnLineList)){
+ //鑾峰彇鎵�鏈夊湴鍥剧粡绾害鏁版嵁
+ MPJLambdaWrapper<JkSketchCustomer> jkSketchCustomerMPJLambdaWrapper = new MPJLambdaWrapper<>();
+ jkSketchCustomerMPJLambdaWrapper.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 )
+ .eq( JkSketchCustomer::getIsdeleted,Constants.ZERO)
+ .in( JkSketchCustomer::getSketchLineId,returnLineList.stream().map(i->i.getId()).collect(Collectors.toList()));
+
+ List<JkSketchCustomer> allList = jkSketchCustomerMapper.selectJoinList(JkSketchCustomer.class,jkSketchCustomerMPJLambdaWrapper);
+ 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){
+ }
+ for (JkSketchLine line:returnLineList) {
+ TelecomLineDataVO telecomLineDataVO = new TelecomLineDataVO();
+ telecomLineDataVO.setId(line.getLineId());
+ telecomLineDataVO.setName(line.getLineName());
+ List<JkSketchCustomer> sketchCustomerList = allList.stream().filter(i->Constants.equalsInteger(i.getSketchLineId(),line.getId())).collect(Collectors.toList());
+ if(org.apache.commons.collections.CollectionUtils.isNotEmpty(sketchCustomerList)){
+ telecomLineDataVO.setNavigationList(this.dealLineCustomerInfo(cLatitude,cLongitude,comLocation,sketchCustomerList));
+ }
+ dataVOList.add(telecomLineDataVO);
+ }
+ }
+ return dataVOList;
+ }
+
+
+
+ public List<JkCustomerNavigation> dealLineCustomerInfo(BigDecimal cLatitude,BigDecimal cLongitude,String comLocation,List<JkSketchCustomer> allList){
+ List<JkCustomerNavigation> list = new ArrayList<>();
+ 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())){
+ 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")
+ );
+ if(tt==null){
+ //鍙湁璧锋鐐�
+ tt = new JkCustomerNavigation();
+ tt.setStartLatitude(start.getLatitude());
+ tt.setStartLogitude(start.getLongitude());
+ tt.setEndLatitude(end.getLatitude());
+ tt.setEndLogitude(end.getLongitude());
+ }
+ 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;
+
+
+ }
+
}
--
Gitblit v1.9.3