最新版本541200007

doum

2025-10-15 9852b16ec51c85fd808dc68b75eadfebd117a27e

最新版本541200007

 admin/src/api/business/jkLine.js

@@ -35,7 +35,7 @@

// åˆ é™¤
export function deleteById (id) {
  return request.get(`/business/jkLine/delete/${id}`)
  return request.get(`/visitsAdmin/cloudService/business/jkLine/delete/${id}`)
}

// æ‰¹é‡åˆ é™¤

 admin/src/api/business/jkSketch.js

@@ -39,7 +39,12 @@
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/business/jkSketch/updateById', data)
}

export function initOriginDistance (data) {
  return request.post('/visitsAdmin/cloudService/business/jkSketch/initOriginDistance', data)
}
export function distanceCustomer (data) {
  return request.post('/visitsAdmin/cloudService/business/jkSketch/distanceCustomer', data)
}
// åˆ é™¤
export function deleteById (id) {
  return request.get(`/business/jkSketch/delete/${id}`)

 admin/src/views/business/categoryJkLine.vue

@@ -25,16 +25,25 @@
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" show-overflow-tooltip label="主线路" min-width="120px"></el-table-column>
        <el-table-column prop="lineNum" show-overflow-tooltip label="线路数" min-width="120px"></el-table-column>
        <el-table-column prop="customerNum" show-overflow-tooltip label="客户交通规划（已完成/全部）" align="center" min-width="200px">
          <template slot-scope="{row}">
            <span class="green"> {{row.customerDoneNum || 0}}/</span>
            <span  > {{row.customerNum || 0}}</span>
            <span v-if="row.status == 2 " class="red" style="margin-left: 10px; ">(规划中)</span>
          </template>
        </el-table-column>
        <el-table-column prop="sortnum" label="排序码"  min-width="70px"></el-table-column>
        <el-table-column prop="editDate" label="操作时间" width="160px"></el-table-column>
        <el-table-column
            v-if="containPermissions(['business:category:update', 'business:category:delete' ])"
            label="操作"
            min-width="140"
            min-width="180"
            fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryJkLineWindow.open('编辑主线路',row)" v-permissions="['business:category:update']">编辑</el-button>
            <el-button  type="text"  icon="el-icon-edit" @click="distanceDo(row)"  v-if="row.status !=2 && row.customerDoneNum < row.customerNum " v-permissions="['business:category:update']">交通规划</el-button>
            <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:category:delete']">删除</el-button>
          </template>
        </el-table-column>
@@ -56,6 +65,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCategoryJkLineWindow from '@/components/business/OperaCategoryJkLineWindow'
import { distanceCustomer } from '@/api/business/jkSketch'
export default {
  name: 'areaSet',
  extends: BaseTable,
@@ -79,6 +89,22 @@
    this.search()
  },
  methods: {
    distanceDo (row) {
      var that = this
      this.$confirm('确定进行该主线路下客户距离计算吗?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        distanceCustomer({ categoryId: row.id })
          .then(res => {
            this.$tip.apiSuccess('交通规划任务正在后台执行，可能需要一段时间，请等待任务完成后查看结果')
            that.search()
          })
      }).catch(() => {
        this.$tip.apiSuccess('操作失败')
      })
    }
  }
}
</script>

 admin/src/views/business/jkLine.vue

@@ -28,7 +28,7 @@
      <ul class="toolbar" v-permissions="['business:jkline:create', 'business:jkline:delete']">
        <li><el-button type="primary" @click="$refs.operaJkLineWindow.open('新建交控-线路信息表')" icon="el-icon-plus" v-permissions="['business:jkline:create']">新建</el-button></li>
        <li><el-button icon="el-icon-upload"  type="primary" @click="$refs.OperaJkLineImportWindowRef.open('线路导入')"  v-permissions="['business:jkline:create']">线路导入</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline:delete']">删除</el-button></li>
        <li><el-button type="danger"  @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline:delete']">删除</el-button></li>
      </ul>
      <el-table

@@ -55,7 +55,7 @@
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaJkLineWindow.open('编辑交控-线路信息表', row)" icon="el-icon-edit" v-permissions="['business:jkline:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkline:delete']">删除</el-button>
            <el-button type="text" class="red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkline:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>

 admin/src/views/business/jkSketch.vue

@@ -58,13 +58,13 @@
        <el-table-column
          v-if="containPermissions(['business:jksketch:update', 'business:jksketch:delete'])"
          label="操作"
          min-width="120"
          min-width="140"
          align="left"
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaJkSketchWindow.open('线路优化', row)" icon="el-icon-edit" v-permissions="['business:jksketch:update']">线路优化</el-button>
            <el-button type="text" @click="$refs.OperaJkSketchResultWindow.open('优化结果微调-', row)" icon="el-icon-edit" v-if="row.status ==2" >优化结果微调</el-button>
            <el-button type="text" class="red" @click="$refs.OperaJkSketchResultWindow.open('优化结果微调-', row)" icon="el-icon-edit" v-if="row.status ==2" >优化结果微调</el-button>
          </template>
        </el-table-column>
      </el-table>

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java

@@ -4,7 +4,10 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.JkCustomer;
import com.doumee.dao.business.model.JkSketch;
import com.doumee.service.business.JkSketchService;
@@ -72,6 +75,24 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID重新计算当前线路的距离")
    @PostMapping("/initOriginDistance")
    @CloudRequiredPermission("business:jksketch:update")
    public ApiResponse<JkSketch> initOriginDistance(@RequestBody JkSketch jkSketch, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        jkSketch.setLoginUserInfo(this.getLoginUser(token));
        JkSketch model = jkSketchService.initOriginDistance(jkSketch);
        return ApiResponse.success(model);
    }
    @ApiOperation("主线路客户距离计算")
    @PostMapping("/distanceCustomer")
    @CloudRequiredPermission("business:jksketch:update")
    public ApiResponse distanceCustomer(@RequestBody JkSketch model, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        model.setLoginUserInfo(this.getLoginUser(token));
        Category category =  jkSketchService.checkDataValid(model);//异步计算
        jkSketchService.distanceCustomer(category);//异步计算
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:jksketch:query")

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java

@@ -25,6 +25,56 @@
        System.out.println(calculateDistance(39.326638d,116.363312d,31.326606,118.363272));
    }

    public static DistanceCustomerModel calculateDistanceGaode(String urlStr, JkCustomer c1, JkCustomer c2) {
        DistanceCustomerModel r =new DistanceCustomerModel();
        r.setStart(c1);
        r.setEnd(c2);
        r.setDistance(0);
        r.setCode(0);
        r.setLocations( new ArrayList<>());
        try {
            String url  =urlStr.replace("${lat1}", Constants.formatBigdecimalScale(c1.getLatitude(),6)+"")
                    .replace("${lat2}",Constants.formatBigdecimalScale(c2.getLatitude(),6)+"")
                    .replace("${long1}",Constants.formatBigdecimalScale(c1.getLongitude(),6)+"")
                    .replace("${long2}",Constants.formatBigdecimalScale(c2.getLongitude(),6)+"");
            String result = HttpsUtil.get(url ,true);
            JSONObject json = JSONObject.parseObject(result);
            if(json!=null
                    && json.getInteger("status")!=null
                    && json.getInteger("status") ==1
                    && json.getJSONObject("route")!=null
                    && json.getJSONObject("route").getJSONArray("paths") !=null
                    && json.getJSONObject("route").getJSONArray("paths") .size()>0 ){
                JSONArray array = json.getJSONObject("route").getJSONArray("paths");
                JSONObject model = array.getJSONObject(0);//取第一个
               Long distance = Long.parseLong(model.getString("distance"));
               r.setDistance(distance);
               JSONArray steps = model.getJSONArray("steps");
               String tl = "";
               if(steps!=null && steps.size()>0){
                   for (int i = 0; i < steps.size(); i++) {
                       if(StringUtils.isBlank(steps.getJSONObject(i).getString("polyline" ))){
                           continue;
                       }
                       if(!tl.equals("") &&!tl.endsWith(";")){
                           tl += ";";
                       }
                       tl+= steps.getJSONObject(i).getString("polyline" );
                   }
               }
               r.setPolyline(tl);
               r.setLocations(Arrays.asList(tl.split(";")));
               r.setCode(1);
               log.error("获取交通规划线路信息成功==============");
            }else{
                log.error("获取交通规划线路信息成功=====失败！！=========");
            }
        }catch (Exception e){
            log.error("获取交通规划线路信息成功=====失败==========");
        }

        return r ;
    }
    public static DistanceModel calculateDistanceGaode(String urlStr, JkSketchCustomer c1, JkSketchCustomer c2) {
        DistanceModel r =new DistanceModel();
        r.setStart(c1);

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCustomerModel.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.doumee.core.tsp;

import com.doumee.dao.business.model.JkCustomer;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import java.util.List;

@Slf4j
@Data
public class DistanceCustomerModel {
     private long distance;
     private List<String> locations;
     private String polyline;
     private JkCustomer start;
     private JkCustomer end;
     private int code;//0失败 1成功



}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java

@@ -108,6 +108,9 @@
    @ApiModelProperty(value = "子集分类")
    @TableField(exist = false)
    private List<Category> childCategoryList;
    @ApiModelProperty(value = "客户集合")
    @TableField(exist = false)
    private List<JkCustomer> customerList;


}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java

@@ -127,6 +127,10 @@
    //@ExcelColumn(name="状态 0正常 ç¦ç”¨")
    @TableField(exist = false)
    private Long  startDistance;
    @ApiModelProperty(value = "客户是否完成交通规划", example = "1")
    //@ExcelColumn(name="状态 0正常 ç¦ç”¨")
    @TableField(exist = false)
    private Integer  distanceStatus;
    @ApiModelProperty(value = "该客户返回园区的距离（米）", example = "1")
    @TableField(exist = false)
    //@ExcelColumn(name="状态 0正常 ç¦ç”¨")
@@ -139,9 +143,6 @@
    //@ExcelColumn(name="状态 0正常 ç¦ç”¨")
    @TableField(exist = false)
    private String  endSteps;
    @ApiModelProperty(value = "同班组间客户位置距离数组，[{a:12,b:100},{a:13,b:200},...],a：客户编码，b：与客户a之间的距离")
    @TableField(exist = false)
    private List<Map<String,Object>> distanceList;
    @ApiModelProperty(value = "同班组间客户位置距离数组，[{a:12,b:100},{a:13,b:200},...],a：客户编码，b：与客户a之间的距离")
    @TableField(exist = false)
    private List<DistanceMapParam> distanceMapParamList;

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

@@ -1,5 +1,7 @@
package com.doumee.service.business;

import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.JkCustomer;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -50,6 +52,7 @@
     * @param jkSketch å®žä½“对象
     */
    JkSketch updateById(JkSketch jkSketch );
    JkSketch initOriginDistance(JkSketch jkSketch );

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
@@ -101,4 +104,8 @@
    List<JkSketch> importBatch(MultipartFile file, String dateInfo, LoginUserInfo loginUser);

    void startUpdateLineAsync(JkSketch model);

    void distanceCustomer(Category model );

    Category   checkDataValid(JkSketch model);
}

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

@@ -3,6 +3,8 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.JkLineMapper;
import com.doumee.dao.business.model.JkLine;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -44,6 +46,8 @@
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private CategoryMapper categoryMapper;
    @Autowired
    private JkLineMapper jkLineMapper;

    @Override
    @Transactional(rollbackFor = {Exception.class, BindException.class})
@@ -81,6 +85,17 @@

    @Override
    public void deleteById(Integer id) {
        Category c = categoryMapper.selectById(id);
        if(c == null||Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(Constants.equalsInteger(c.getType(),Constants.FOUR)){
            //如果是新线路，检查是否有子线路，有则不允许删除
            if(jkLineMapper.selectCount(new MPJLambdaWrapper<JkLine>().eq(JkLine::getIsdeleted,Constants.ZERO)
                    .eq(JkLine::getCategoryId,id)) >0){
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"主线路【"+c.getName()+"】下已存在子线路，不允许删除！");
            }
        }
        categoryMapper.update(null,new UpdateWrapper<Category>().lambda().set(Category::getIsdeleted,Constants.ONE)
                .eq(Category::getId,id)
        );
@@ -97,7 +112,20 @@
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        categoryMapper.update(null,new UpdateWrapper<Category>().lambda().set(Category::getIsdeleted,Constants.ONE)
        for(Integer id :ids){
            Category c = categoryMapper.selectById(id);
            if(c == null ||Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
                continue;
            }
            if(Constants.equalsInteger(c.getType(),Constants.FOUR)){
                //如果是新线路，检查是否有子线路，有则不允许删除
                if(jkLineMapper.selectCount(new MPJLambdaWrapper<JkLine>().eq(JkLine::getIsdeleted,Constants.ZERO)
                        .eq(JkLine::getCategoryId,id)) >0){
                    throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"主线路【"+c.getName()+"】下已存在子线路，不允许删除！");
                }
            }
        }
       categoryMapper.update(null,new UpdateWrapper<Category>().lambda().set(Category::getIsdeleted,Constants.ONE)
                .in(Category::getId,ids)
        );
    }
@@ -167,7 +195,7 @@
            //如果是主线路，查询线路数和客户数
            queryWrapper.select( "(select count(1) from jk_line b where b.isdeleted=0 and b.CATEGORY_ID = t.id)",Category::getLineNum);
            queryWrapper.select( "(select count(1) from jk_customer b left join jk_line c on b.line_id=c.id where c.isdeleted=0 and b.isdeleted=0 and c.CATEGORY_ID = t.id)",Category::getCustomerNum);
            queryWrapper.select( "(select count(1) from jk_customer b left join jk_line c on b.line_id=c.id where c.isdeleted=0 and b.isdeleted=0 and c.CATEGORY_ID = t.id b.DISTANCE_STATUS = 1)",Category::getCustomerDoneNum);
            queryWrapper.select( "(select count(1) from jk_customer b left join jk_line c on b.line_id=c.id where c.isdeleted=0 and b.isdeleted=0 and c.CATEGORY_ID = t.id and b.DISTANCE_STATUS = 1)",Category::getCustomerDoneNum);
        }
        queryWrapper.eq(Category::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())

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

@@ -156,6 +156,7 @@
                .selectAs(Category::getName,JkCustomer::getCategoryName)
                .leftJoin(JkLine.class,JkLine::getId,JkCustomer::getLineId )
                .leftJoin(Category.class,Category::getId,JkLine::getCategoryId );
        queryWrapper.eq( pageWrap.getModel().getDistanceStatus()!=null,JkCustomer::getDistanceStatus, pageWrap.getModel().getDistanceStatus());
        queryWrapper.eq( pageWrap.getModel().getCategoryId()!=null,JkLine::getCategoryId, pageWrap.getModel().getCategoryId());
        queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getLineWeeks()),JkLine::getWeeks, pageWrap.getModel().getLineWeeks());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCategoryName()),Category::getName, pageWrap.getModel().getCategoryName());
@@ -236,6 +237,7 @@
        try {
            LambdaQueryWrapper<JkCustomer> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.isNotNull(JkCustomer::getLocation);
            queryWrapper.isNotNull(JkCustomer::getLocation);
            queryWrapper.and(wrapper ->{
                wrapper.isNull(JkCustomer::getLatitude)
                        .or().isNull(JkCustomer::getLongitude); });
@@ -247,7 +249,9 @@
            String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GAODE_LOCATION_GEOAPI_URL).getCode();
            for(JkCustomer c : list){
                try {
                    String result = HttpsUtil.get(url.replace("${param}",c.getLocation()),true);
                    String urlStr =url.replace("${param}"
                            ,c.getLocation().replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]", ""));
                    String result = HttpsUtil.get(urlStr,true);
                    JSONObject json = JSONObject.parseObject(result);
                    if(json!=null
                            && json.getInteger("status")!=null
@@ -271,7 +275,7 @@
                        }
                    }else{
                        log.error("更新交控中心客户经纬度信息=====获取json=========="+json);
                        log.error("更新交控中心客户经纬度信息=====获取失败=========="+c.getName()+"-"+c.getLocation());
                        log.error("更新交控中心客户经纬度信息=====获取失败=========="+urlStr+c.getName()+"-"+c.getLocation());
                    }
                }catch (Exception e){
                    log.error("更新交控中心客户经纬度信息=====失败=========="+c.getName()+"-"+c.getLocation());

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

@@ -10,6 +10,7 @@
import com.doumee.dao.admin.request.JkLineImport;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.CategoryMapper;
import com.doumee.dao.business.JkCustomerMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
@@ -22,6 +23,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -51,6 +53,8 @@
    @Autowired
    private CategoryMapper categoryMapper;
    @Autowired
    private JkCustomerMapper jkCustomerMapper;
    @Autowired
    private CarsMapper carsMapper;

    @Override
@@ -78,6 +82,15 @@

    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        JkLine c = jkLineMapper.selectById(id);
        if(c == null||Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        //如果是新线路，检查是否有子线路，有则不允许删除
        if(jkCustomerMapper.selectCount(new MPJLambdaWrapper<JkCustomer>().eq(JkCustomer::getIsdeleted,Constants.ZERO)
                .eq(JkCustomer::getLineId,id)) >0){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"线路【"+c.getName()+"】下已存在客户信息，不允许删除！");
        }
        jkLineMapper.update(null,new UpdateWrapper<JkLine>().lambda()
                .set(JkLine::getIsdeleted,Constants.ONE)
                .set(JkLine::getEditor,user.getId())
@@ -97,6 +110,17 @@
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        for(Integer id :ids){
            JkLine c = jkLineMapper.selectById(id);
            if(c == null||Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
               continue;
            }
            //如果是新线路，检查是否有子线路，有则不允许删除
            if(jkCustomerMapper.selectCount(new MPJLambdaWrapper<JkCustomer>().eq(JkCustomer::getIsdeleted,Constants.ZERO)
                    .eq(JkCustomer::getLineId,id)) >0){
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"线路【"+c.getName()+"】下已存在客户信息，不允许删除！");
            }
        }
        jkLineMapper.update(null,new UpdateWrapper<JkLine>().lambda()
                .set(JkLine::getIsdeleted,Constants.ONE)
                .set(JkLine::getEditor,user.getId())

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

@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import netscape.javascript.JSObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,10 +44,13 @@
 * @date 2025/09/28 09:01
 */
@Service
@Slf4j
public class JkSketchServiceImpl implements JkSketchService {

    @Autowired
    private JkSketchMapper jkSketchMapper;
    @Autowired
    private CategoryMapper categoryMapper;
    @Autowired
    private JkSketchLineMapper jkSketchLineMapper;
    @Autowired
@@ -126,7 +130,7 @@
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"该线路订单送货量超过了线路总送货量限制，无法进行优化！");
        }
        model.setLineList(lineList);//线路集合
        model.setCustomerList(checkJketchCustomerLocation(model));//订单集合
        model.setCustomerList(checkJketchCustomerLocation(model,false));//订单集合
        model.setStatus(Constants.ONE);
        model.setPlanLineNum(lineList.size());
        model.setEditDate(new Date());
@@ -138,12 +142,224 @@
        jkSketchMapper.updateById(model);
        return model;
    }
    @Override
    public JkSketch initOriginDistance(JkSketch jkSketch ) {
        JkSketch model = jkSketchMapper.selectById(jkSketch.getId());
        if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO) ){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路已被优化，已无法计算原始路线路程数");
        }
        checkJketchCustomerLocation(model,true);
        model.setEditDate(new Date());
        model.setEditor(jkSketch.getLoginUserInfo().getId());
        model.setDistance(model.getOriginDistance());
        jkSketchMapper.updateById(model);
        return model;
    }

    @Override
    @Async
    public  void distanceCustomer( Category cate) {
        try {
            List<JkCustomer> customerList = cate.getCustomerList();
            String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GAODE_DISTANCE_GEOAPI_URL).getCode();
            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(",");
                cLongitude = new BigDecimal(ss[0]);
                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){

                }
            }

        }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) {
        List<JkCustomer> updateCustomerList = new ArrayList<>();
        List<JkCustomerNavigation> navigationList = new ArrayList<>();
        List<DistanceMapParam> tmpList = new ArrayList<>();
        List<DistanceMapParam> distanceMapParamList  = getListFromJsonStr(c.getDistance());
        boolean isNew = 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());
            }
        }
        tmpList.add(t0);
        for(JkCustomer cm : customerList){
            //客户和客户之间的距离信息
            DistanceMapParam t = new DistanceMapParam();
            t.setId(cm.getId());
            DistanceMapParam param = getParamByCustomerIds( cm.getId(),distanceMapParamList);
            if(param!=null){//如果之前已经获取过
                t = param;
            }else{
                JkCustomerNavigation navigation = new JkCustomerNavigation();
                navigation.setStartId(c.getId());
                navigation.setEndId(cm.getId());
                navigation.setIsdeleted(Constants.ZERO);
                navigation.setCreateDate(date);
                navigation.setEditDate(date);
                navigation.setEndLatitude(cm.getLatitude());
                navigation.setEndLogitude(cm.getLongitude());
                navigation.setStartLatitude(c.getLatitude());
                navigation.setStartLogitude(c.getLongitude());
                isNew = true;
                if(Constants.equalsInteger(c.getId(),cm.getId())){
                    t.setDistance(0l);
                }else{
                    DistanceCustomerModel dm = DistanceCalculator.calculateDistanceGaode(url,c,cm);
                    t.setDistance(dm.getDistance() );
                    if(dm.getLocations().size()>0){
                        //如果有路径信息
                        navigation.setSteps(dm.getPolyline());
                    }
                }
                navigation.setIdIndex(c.getId()+"-"+cm.getId());
                navigation.setDistance(t.getDistance());
                navigationList.add(navigation);
            }
            tmpList.add(t);
        }
        DistanceMapParam tt = new DistanceMapParam();
        tt.setId(-2);//表示返回园区
        tt.setDistance(Constants.formatLongNum(c.getEndDistance()));
        if(Constants.formatLongNum(c.getEndDistance()) <= 0){
            //该客户返回园区的距离 ,如果之前未获取过
            isNew = true;
            JkCustomer start = new JkCustomer();
            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());
            }
        }
        tmpList.add(tt);
        if(isNew){//
            u.setDistanceStatus(Constants.ONE);
            u.setId(c.getId());
            u.setDistance(JSONObject.toJSONString(tmpList));
            updateCustomerList.add(u);
        }
        if(updateCustomerList.size()>0){
            for(JkCustomer c1 : updateCustomerList){
                jkCustomerMapper.updateById(c1);//更新客户与其他点之间的距离
            }
        }
        if(navigationList.size()>0){
            jkCustomerNavigationMapper.delete(new UpdateWrapper<JkCustomerNavigation>().lambda()
                    .eq(JkCustomerNavigation::getStartId,c.getId()));//删除历史数据
            jkCustomerNavigationMapper.insert(navigationList);//插入最新数据
        }
    }

    private  List<JkCustomer>  checkNeedDistanceDo( List<JkCustomer> customerList) {
        if(customerList==null || customerList.size()==0){
            return null;
        }
        boolean need = false;
        List<JkCustomer> list = new ArrayList<>();
        for(JkCustomer jk : customerList){
            if(Constants.equalsInteger(jk.getDistanceStatus(),Constants.ZERO)){
                need = true;
                list.add(jk);
            }
        }
        if(!need){//如果无需进行处理
            return null;
        }
        return  list;

    }

    @Override
    public  Category checkDataValid(JkSketch model) {
        if(model.getCategoryId() == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        MPJLambdaWrapper<Category> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Category.class )
                .eq(Category::getIsdeleted,Constants.ZERO)
                .eq(Category::getType,Constants.FOUR)
                .eq(Category::getId,model.getCategoryId() );
        Category c = categoryMapper.selectJoinOne(Category.class,queryWrapper);
        if(c==null){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(Constants.equalsInteger(c.getStatus(),Constants.TWO)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该主线正在进行客户距离计算任务，请耐心等待任务完成！");
        }

        MPJLambdaWrapper<JkCustomer> queryWrapper1 = new MPJLambdaWrapper<>();
        queryWrapper1.selectAll(JkCustomer.class )
                .leftJoin(JkLine.class,JkLine::getId,JkCustomer::getLineId)
                .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){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该主线下无需要进行距离计算的客户信息！");
        }
        String errorMsg ="";
        for(JkCustomer c1 : customerList){
            if(c1.getLatitude()==null || c1.getLongitude() ==null){
                errorMsg += c.getName()+"-"+c.getName()+" | ";
            }
        }
        if(StringUtils.isNotBlank(errorMsg)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路客户:【"+errorMsg+"】定位信息不完整，不满足距离计算条件！");
        }
        c.setStatus(Constants.TWO);
        categoryMapper.updateById(c);//更新任务执行状态
        c.setCustomerList(customerList);
        return  c;
    }
    @Override
    @Async
    public void startUpdateLineAsync(JkSketch model) {
        try {
            initCustomerDistance(model);
            List<JkSketchCustomer> customerList = model.getCustomerList();
            List<JkLine> lineList = model.getLineList();
            TspSolver.DataModel dataModel = new TspSolver.DataModel();
@@ -187,80 +403,28 @@

    }

    private void initCustomerDistance(JkSketch model) {
        String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GAODE_DISTANCE_GEOAPI_URL).getCode();
        List<JkCustomer> updateCustomerList = new ArrayList<>();
        List<JkCustomerNavigation> navigationList = new ArrayList<>();
    private void initCustomerDistance( List<JkSketchLine> lineList,JkSketch model,boolean updateLineDistance) {
        List<JkSketchCustomer> customerList = model.getCustomerList();

        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(",");
            cLongitude = new BigDecimal(ss[0]);
            cLatitude =  new BigDecimal(ss[1]);
        }catch (Exception e){
        }
        for(JkSketchCustomer c : customerList){
            List<DistanceMapParam> tmpList = new ArrayList<>();
            List<DistanceMapParam> distanceMapParamList  = getListFromJsonStr(c.getDistanceJson());
            boolean isNew = 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;
                JkSketchCustomer start = new JkSketchCustomer();
                start.setId(-1);
                start.setLongitude(cLongitude);
                start.setLatitude(cLatitude);
                DistanceModel 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());
                }
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路客户:"+c.getName()+"交通规划尚未完成，不满足优化条件！");
            }
            tmpList.add(t0);
            for(JkSketchCustomer cm : customerList){
                //客户和客户之间的距离信息
                DistanceMapParam t = new DistanceMapParam();
                t.setId(cm.getId());
                DistanceMapParam param = getParamByCustomerIds( cm.getId(),distanceMapParamList);
                t.setId(cm.getCustomerId());
                DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
                if(param!=null){//如果之前已经获取过
                    t = param;
                }else{
                    JkCustomerNavigation navigation = new JkCustomerNavigation();
                    navigation.setStartId(c.getId());
                    navigation.setEndId(cm.getId());
                    navigation.setIsdeleted(Constants.ZERO);
                    navigation.setCreateDate(date);
                    navigation.setEditDate(date);
                    navigation.setEndLatitude(cm.getLatitude());
                    navigation.setEndLogitude(cm.getLongitude());
                    navigation.setStartLatitude(c.getLatitude());
                    navigation.setStartLogitude(c.getLongitude());
                    isNew = true;
                    if(Constants.equalsInteger(c.getCustomerId(),cm.getCustomerId())){
                        t.setDistance(0l);
                    }else{
                        DistanceModel dm = DistanceCalculator.calculateDistanceGaode(url,c,cm);
                        t.setDistance(dm.getDistance() );
                        if(dm.getLocations().size()>0){
                            //如果有路径信息
                            navigation.setSteps(dm.getPolyline());
                        }
                    }
                    navigation.setIdIndex(c.getId()+"-"+cm.getId());
                    navigation.setDistance(t.getDistance());
                    navigationList.add(navigation);
                    throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路客户:"+c.getName()+"交通规划尚未完成，不满足路程计算条件！");
                }
                tmpList.add(t);
            }
@@ -269,37 +433,45 @@
            tt.setDistance(Constants.formatLongNum(c.getEndDistance()));
            if(Constants.formatLongNum(c.getEndDistance()) <= 0){
                //该客户返回园区的距离 ,如果之前未获取过
                isNew = true;
                JkSketchCustomer start = new JkSketchCustomer();
                start.setId(-1);
                start.setLongitude(cLongitude);
                start.setLatitude(cLatitude);

                DistanceModel 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());
                }
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路客户:"+c.getName()+"交通规划尚未完成，不满足路程计算条件！");
            }
            tmpList.add(tt);
            if(isNew){//
                u.setId(c.getCustomerId());
                u.setDistance(JSONObject.toJSONString(tmpList));
                updateCustomerList.add(u);
            }
            c.setDistanceMapParamList(tmpList);
        }
        if(updateCustomerList.size()>0){
            for(JkCustomer c : updateCustomerList){
                jkCustomerMapper.updateById(c);//更新客户与其他点之间的距离
        if(lineList!=null){
            long totalDistance = 0;
            for (JkSketchLine line :lineList){
                long lineDistance = 0;
                List<JkSketchCustomer> customers = getCustomerListByLineId(line.getId(),customerList);
                for(JkSketchCustomer c : customers){
                    lineDistance+= Constants.formatLongNum(c.getStartDistance());
                    lineDistance+= Constants.formatLongNum(c.getEndDistance());
                    for(JkSketchCustomer cm : customers){
                        DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),getListFromJsonStr(c.getDistanceJson()));
                        lineDistance += param.getDistance();
                    }
                }
                if(updateLineDistance && Constants.equalsInteger(model.getStatus(),Constants.ZERO) ){
                    line.setDistance(lineDistance);
                    jkSketchLineMapper.updateById(line);
                }
                totalDistance += lineDistance;
            }
            if(Constants.equalsInteger(model.getStatus(),Constants.ZERO) ||Constants.formatLongNum(model.getOriginDistance()) <= 0l ){
                //如果首次优化或者之前没有计算过，设置优化前原始路径
                model.setOriginDistance(totalDistance);
            }
        }
        if(navigationList.size()>0){
            jkCustomerNavigationMapper.insert(navigationList);
    }

    private List<JkSketchCustomer> getCustomerListByLineId(Integer id, List<JkSketchCustomer> customerList) {
        List<JkSketchCustomer> list = new ArrayList<>();
        for (JkSketchCustomer c :customerList){
            if(Constants.equalsInteger(c.getSketchLineId(),id)){
                list.add(c);
            }
        }
        return list;
    }

    private DistanceMapParam getParamByCustomerIds(  Integer id1, List<DistanceMapParam> distanceMapParamList) {
@@ -416,11 +588,12 @@
        }
    }

    private   List<JkSketchCustomer>  checkJketchCustomerLocation(JkSketch model) {
    private   List<JkSketchCustomer>  checkJketchCustomerLocation(JkSketch model,boolean updateLineDistance) {
        MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(JkSketchCustomer.class )
                .selectAs(JkCustomer::getName,JkSketchCustomer::getName)
                .selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
                .selectAs(JkCustomer::getDistanceStatus,JkSketchCustomer::getDistanceStatus)
                .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
                .selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
                .selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
@@ -435,83 +608,29 @@
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路客户信息为空，不满足优化条件！");
        }
        String errorMsg ="";
        String errorMsg1 ="";
        for(JkSketchCustomer c : customerList){
            if(c.getLatitude()==null || c.getLongitude() ==null){
                errorMsg += c.getName()+"-"+c.getName()+"；";
                errorMsg += c.getName()+"-"+c.getName()+" | ";
            }
            if(!Constants.equalsInteger(c.getDistanceStatus(),Constants.ONE)){
                errorMsg1 += c.getName()+"-"+c.getName()+" | ";
            }
        }
        if(StringUtils.isNotBlank(errorMsg)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路客户:"+errorMsg+"定位信息不完整，不满足优化条件！");
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路客户:【"+errorMsg+"】定位信息不完整，不满足优化条件！");
        }
       /* for(JkSketchCustomer c : customerList){
            List<Map<String,Object>> tmpList = new ArrayList<>();
            for(JkSketchCustomer cm : customerList){
                Map<String,Object> t = new HashMap<>();
                t.put("a",cm.getId());
                if(Constants.equalsInteger(c.getCustomerId(),cm.getCustomerId())){
                    t.put("b",0l);
                }else{
                    t.put("b", DistanceCalculator.calculateDistance(
                            Constants.formatBigdecimal(c.getLatitude()).doubleValue(),
                            Constants.formatBigdecimal(c.getLongitude()).doubleValue(),
                            Constants.formatBigdecimal(cm.getLatitude()).doubleValue(),
                            Constants.formatBigdecimal(cm.getLongitude()).doubleValue()));
                }
                tmpList.add(t);
            }
            c.setDistanceList(tmpList);
        if(StringUtils.isNotBlank(errorMsg1)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该线路客户:【"+errorMsg1+"】交通规划尚未完成，不满足优化条件！");
        }
        */
        /*if(Constants.equalsInteger(Constants.ZERO,model.getStatus())){
            //如果是未优化状态，计算原始距离
            long totalDistance = 0;
            MPJLambdaWrapper<JkSketchLine> queryWrapper1 = new MPJLambdaWrapper<>();
            queryWrapper1.selectAll(JkSketchLine.class )
                    .eq(JkSketchLine::getSketchId, model.getId())
                    .eq(JkSketchLine::getIsdeleted,Constants.ZERO);
            List<JkSketchLine> lineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper1);//
            if(lineList!=null ||lineList.size()>0){
                double cLatitude =0;
                double cLongitude =0;
                String location = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_LOCATION).getCode();
                try {
                    String[] ss = location.split(",");
                    cLongitude = Double.parseDouble(ss[0]);
                    cLatitude = Double.parseDouble(ss[1]);
                }catch (Exception e){

                }
                for(JkSketchLine line : lineList){
                    boolean isFirst =true;
                    JkSketchCustomer last = null;
                    for(JkSketchCustomer c : customerList){
                        if(Constants.equalsInteger(c.getSketchLineId(),line.getId())){
                            if(isFirst){
                                totalDistance += DistanceCalculator.calculateDistance(cLatitude,cLongitude
                                        ,Constants.formatBigdecimal(c.getLatitude()).doubleValue()
                                        ,Constants.formatBigdecimal(c.getLongitude()).doubleValue());
                            }else{
                                totalDistance += DistanceCalculator.calculateDistance(
                                         Constants.formatBigdecimal(c.getLatitude()).doubleValue()
                                        ,Constants.formatBigdecimal(c.getLongitude()).doubleValue()
                                        ,Constants.formatBigdecimal(last.getLatitude()).doubleValue()
                                        ,Constants.formatBigdecimal(last.getLongitude()).doubleValue());
                            }
                            last = c;
                            isFirst=false;
                        }
                        if(last!=null){
                            totalDistance += DistanceCalculator.calculateDistance(cLatitude,cLongitude
                                    ,Constants.formatBigdecimal(last.getLatitude()).doubleValue()
                                    ,Constants.formatBigdecimal(last.getLongitude()).doubleValue());
                        }
                    }
                }

            }
            model.setOriginDistance(totalDistance);
        }*/

        model.setCustomerList(customerList);
        MPJLambdaWrapper<JkSketchLine> queryWrapper1 = new MPJLambdaWrapper<>();
        queryWrapper1.selectAll(JkSketchLine.class )
                .eq(JkSketchLine::getSketchId, model.getId())
                .eq(JkSketchLine::getIsdeleted,Constants.ZERO)
                .orderByAsc(JkSketchLine::getSortnum);
        List<JkSketchLine> lineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper1);
        initCustomerDistance(lineList,model,updateLineDistance);
        return customerList;
    }

@@ -608,8 +727,6 @@
        QueryWrapper<JkSketch> wrapper = new QueryWrapper<>(jkSketch);
        return jkSketchMapper.selectCount(wrapper);
    }


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public List<JkSketch> importBatch(MultipartFile file, String dateInfoStr, LoginUserInfo loginUser){
@@ -682,7 +799,6 @@
            if(newOrderList.size()>0){
                jkOrdersMapper.insert(newOrderList);
            }

            List<JkSketchLine> sketchLineList = initNewSketchLineList(newList,newOrderList,lineList);
            jkSketchLineMapper.update(null,new UpdateWrapper<JkSketchLine>().lambda()
                    .set(JkSketchLine::getIsdeleted,Constants.ONE)
@@ -691,7 +807,6 @@
            if(sketchLineList.size()>0){
                jkSketchLineMapper.insert(sketchLineList);
            }

            List<JkSketchCustomer> sketchCuustomerList = initNewSketchCustomerList(sketchLineList,newOrderList);//按照主线路分组
            jkSketchCustomerMapper.update(null,new UpdateWrapper<JkSketchCustomer>().lambda()
                    .set(JkSketchCustomer::getIsdeleted,Constants.ONE)
@@ -755,29 +870,7 @@
                list.add(tModel);
            }
        }
        /*for(JkOrders orders : newOrderList){
            JkSketchLine tModel = findModelFromListByLineId(orders.getLineId(),list);
            if(tModel!=null){
                tModel.setTotalNum(  tModel.getTotalNum().add(orders.getNum()));//订单量累计
                tModel.setOrderNum(tModel.getOrderNum()+1);//客户数加1
            }else{
                tModel = new JkSketchLine();
                tModel.setSketchId(getSKetchIdByyCategoryId(orders.getCategoryId(),newList));
                tModel.setCreator(orders.getCreator());
                tModel.setCreateDate(orders.getCreateDate());
                tModel.setLineId(orders.getLineId());
                tModel.setTotalNum(orders.getNum());
                tModel.setOrderNum(1);
                tModel.setDateInfo(orders.getDateInfo());
                tModel.setSortnum(list.size()+1);
                tModel.setEditDate(tModel.getCreateDate());
                tModel.setEditor(tModel.getCreator());
                tModel.setIsdeleted(Constants.ZERO);
                if(tModel.getSketchId()!=null){
                    list.add(tModel);
                }
            }
        }*/

        return list;
    }