From c97d60075a43626dcdd4d5d4e59d55c94642a7dc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 10:35:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 1215 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,182 insertions(+), 33 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 3bab1bb..729c962 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,20 +1,43 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelImporter;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.tsp.*;
+import com.doumee.core.utils.*;
+import com.doumee.core.wms.model.response.WmsBaseDataResponse;
+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.model.*;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
-import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.JkSketchMapper;
-import com.doumee.dao.business.model.JkSketch;
import com.doumee.service.business.JkSketchService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
-import java.util.List;
+import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
/**
* 浜ゆ帶-绾胯矾浼樺寲璁板綍淇℃伅琛⊿ervice瀹炵幇
@@ -22,17 +45,37 @@
* @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
+ private JkSketchCustomerMapper jkSketchCustomerMapper;
+ @Autowired
+ private JkCustomerMapper jkCustomerMapper;
+ @Autowired
+ private JkCustomerNavigationMapper jkCustomerNavigationMapper;
+ @Autowired
+ private JkLineMapper jkLineMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private JkOrdersMapper jkOrdersMapper;
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
@Override
public Integer create(JkSketch jkSketch) {
jkSketchMapper.insert(jkSketch);
return jkSketch.getId();
}
-
@Override
public void deleteById(Integer id) {
jkSketchMapper.deleteById(id);
@@ -45,16 +88,806 @@
}
@Override
+ @PostConstruct
+ public void initAyncsJob() {
+ //閲嶇疆浜ら�氳鍒掑拰绾胯矾瑙勫垝鐨勫紓姝ヤ换鍔$姸鎬�
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .set(JkSketch::getStatus,Constants.THREE)
+ .eq(JkSketch::getIsdeleted,Constants.ZERO)
+ .eq(JkSketch::getStatus,Constants.ONE));
+ categoryMapper.update(null,new UpdateWrapper<Category>().lambda()
+ .set(Category::getStatus,Constants.ZERO)
+ .eq(Category::getType,Constants.FOUR)
+ .eq(Category::getIsdeleted,Constants.ZERO)
+ .eq(Category::getStatus,Constants.TWO));
+ }
+
+ @Override
public void deleteByIdInBatch(List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
jkSketchMapper.deleteBatchIds(ids);
}
+ //绾胯矾浼樺寲
+ @Override
+ public JkSketch updateById(JkSketch jkSketch ) {
+ JkSketch model = jkSketchMapper.selectById(jkSketch.getId());
+ if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if( model.getDateInfo() == null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺棩鏈熶俊鎭笉姝g‘锛屼笉鏀寔浼樺寲锛�");
+ }
+ if(Constants.equalsInteger(Constants.ZERO,jkSketch.getForceUpdate()) && Constants.equalsInteger(model.getStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺瓨鍦ㄦ鍦ㄤ紭鍖栦腑锛岃鑰愬績绛夊緟浼樺寲瀹屾垚鎴栬�呴�夋嫨寮哄埗浼樺寲鎿嶄綔锛�");
+ }
+
+ if( jkSketch.getLineIdList() ==null || jkSketch.getLineIdList().size()==0 ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇烽�夋嫨鏈夋晥鍚堢悊鐨勭嚎璺繘琛屼紭鍖栨搷浣滐紒");
+ }
+ //褰撳墠鎵�鏈夌嚎璺�(绗﹀悎鏉′欢鐨勭嚎璺級
+ List<JkLine> lineList = jkLineMapper.selectJoinList(JkLine.class,new MPJLambdaWrapper<JkLine>()
+ .selectAll(JkLine.class)
+ .eq(JkLine::getWeeks,DateUtil.getWeekZhouOfDate(model.getDateInfo()))//鍙兘閫夋嫨褰撳墠鐨勭嚎璺�
+ .eq(JkLine::getIsdeleted,Constants.ZERO)
+ .in(JkLine::getId,jkSketch.getLineIdList())
+ );
+ Integer totalCus = 0,totalNum =0;
+ for(JkLine line :lineList){
+ totalCus += Constants.formatIntegerNum(line.getMaxCustomer());//鎬诲鎴烽噺
+ totalNum += Constants.formatIntegerNum(line.getMaxOrder());//鎬婚�佽揣閲�
+ }
+ if( totalCus < Constants.formatIntegerNum(model.getOrderNum()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ョ嚎璺鍗曞鎴锋暟閲忚秴杩囦簡绾胯矾鎬诲鎴烽噺闄愬埗锛屾棤娉曡繘琛屼紭鍖栵紒");
+ }
+ if( totalNum < Constants.formatBigdecimal(model.getTotalNum()).doubleValue()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ョ嚎璺鍗曢�佽揣閲忚秴杩囦簡绾胯矾鎬婚�佽揣閲忛檺鍒讹紝鏃犳硶杩涜浼樺寲锛�");
+ }
+ model.setLineList(lineList);//绾胯矾闆嗗悎
+ model.setCustomerList(checkJketchCustomerLocation(model,false));//璁㈠崟闆嗗悎
+ model.setStatus(Constants.ONE);
+ model.setPlanLineNum(lineList.size());
+ model.setEditDate(new Date());
+ model.setEditor(jkSketch.getLoginUserInfo().getId());
+ model.setPlanLineDate(model.getEditDate());
+ model.setPlanLineUserId(jkSketch.getLoginUserInfo().getId());
+ model.setJobId(UUID.randomUUID().toString());
+ redisTemplate.opsForValue().set(Constants.RedisKeys.JKLINE_JOB+model.getJobId(),true );//鍋氬紓姝ュ鐞�
+ jkSketchMapper.updateById(model);
+ return model;
+ }
@Override
- public void updateById(JkSketch jkSketch) {
- jkSketchMapper.updateById(jkSketch);
+ public JkSketch updateSketchLine(JkSketch jkSketch) {
+ JkSketch model = jkSketchMapper.selectById(jkSketch.getId());
+ if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if( jkSketch.getSketchLineList() ==null || jkSketch.getSketchLineList().size()==0 ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋寜瑕佹眰璋冩暣浼樺寲鏂规锛�");
+ }
+ if(Constants.equalsInteger(model.getStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠绾胯矾姝e瓨鍦ㄤ紭鍖栦换鍔★紝璇疯�愬績绛夊緟浼樺寲瀹屾垚鍐嶈繘琛岃璋冩暣鎿嶄綔锛�");
+ }
+
+ //褰撳墠鎵�鏈夌嚎璺�(绗﹀悎鏉′欢鐨勭嚎璺級
+ List<JkSketchLine> lineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,new MPJLambdaWrapper<JkSketchLine>()
+ .selectAll(JkSketchLine.class )
+ .selectAs(JkLine::getName,JkSketchLine::getLineName)
+ .selectAs(JkLine::getMaxOrder,JkSketchLine::getMaxOrder)
+ .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(),"褰撳墠绾胯矾涓嶆弧瓒充紭鍖栨柟妗堣皟鏁存潯浠讹紒");
+ }
+ for(JkSketchLine line :lineList){
+ JkSketchLine lineParam =getLineParamById(line.getId(),jkSketch.getSketchLineList());
+ if(lineParam == null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇峰熀浜庣幇鏈夌嚎璺繘琛屾柟妗堣皟鏁达紝绾胯矾銆�"+line.getLineName()+"銆戠嚎璺厤缃笉姝g‘锛�");
+ }
+ if(lineParam.getCustomerList() == null || lineParam.getCustomerList().size() == 0 ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇峰熀浜庣幇鏈夌嚎璺繘琛屾柟妗堣皟鏁达紝绾胯矾銆�"+line.getLineName()+"銆戝鎴蜂俊鎭笉鑳戒负绌猴紒");
+ }
+ Integer totalCus = 0;
+ BigDecimal totalNum =new BigDecimal(0);
+ for(JkSketchCustomer customer :lineParam.getCustomerList()){
+ totalCus += 1;//鎬诲鎴烽噺
+ totalNum = totalNum.add(Constants.formatBigdecimal(customer.getTotalNum()));//鎬婚�佽揣閲�
+ customer.setSketchLineId(line.getId());
+ }
+ if( totalCus > Constants.formatIntegerNum(line.getMaxCustomer()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戠嚎璺鍗曞鎴锋暟閲忚秴杩囦簡绾胯矾鎬诲鎴烽噺闄愬埗锛屾棤娉曡繘琛岃皟鏁达紒");
+ }
+ if( totalNum.doubleValue() > Constants.formatIntegerNum(line.getMaxOrder())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣鍗曢�佽揣閲忚秴杩囦簡绾胯矾鎬婚�佽揣閲忛檺鍒讹紝鏃犳硶杩涜璋冩暣锛�");
+ }
+ lineParam.setTotalNum(totalNum);
+ lineParam.setOrderNum(totalCus);
+ }
+ model.setSketchLineList(jkSketch.getSketchLineList());//绾胯矾淇℃伅
+ model.setStatus(Constants.ONE);
+ model.setEditDate(new Date());
+ model.setEditor(jkSketch.getLoginUserInfo().getId());
+ model.setPlanLineDate(model.getEditDate());
+ model.setPlanLineUserId(jkSketch.getLoginUserInfo().getId());
+ model.setJobId(UUID.randomUUID().toString());
+ redisTemplate.opsForValue().set(Constants.RedisKeys.JKLINE_JOB+model.getJobId(),true );//鍋氬紓姝ュ鐞�
+ jkSketchMapper.updateById(model);
+ return model;
+ }
+
+ private JkSketchLine getLineParamById(Integer id, List<JkSketchLine> sketchLineList) {
+ for(JkSketchLine line: sketchLineList){
+ if(Constants.equalsInteger(line.getId(),id)){
+ return line;
+ }
+ }
+ return null;
+ }
+
+ @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.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 || Constants.equalsInteger(c1.getDistanceStatus(),Constants.TWO)){
+ 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;
+ }
+
+ /**
+ * 寮�濮嬪紓姝ユ墽琛岀嚎璺紭鍖栦换鍔�
+ * @param model
+ */
+ @Override
+ @Async
+ public void startUpdateLineAsync(JkSketch model) {
+ try {
+ List<JkSketchCustomer> customerList = model.getCustomerList();
+ List<JkLine> lineList = model.getLineList();
+ TspSolver.DataModel dataModel = new TspSolver.DataModel();
+ int vehicleNumber1 = lineList.size();//绾胯矾鏁伴噺
+ long[] vehicleCapacities1=new long[lineList.size()];//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
+ long[] demands1 = new long[customerList.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
+ long[][] distanceMatrix1 = new long[customerList.size()+1][customerList.size()+1];
+ distanceMatrix1[0][0] = 0;
+ demands1[0] =0;//鍘熺偣
+ for (int i = 0; i < customerList.size(); i++) {
+ List<DistanceMapParam> disList = customerList.get(i).getDistanceMapParamList();
+ distanceMatrix1[0][i+1] = disList.get(0).getDistance();
+ distanceMatrix1[i+1][0] = disList.get(disList.size() -1).getDistance();
+ demands1[i+1] = Constants.formatBigdecimal( customerList.get(i).getTotalNum()).longValue(); //鍚勪釜鐐圭殑璁㈠崟閲�
+ for (int j = 0; j < customerList.size(); j++) {
+ distanceMatrix1[i+1][j+1] =disList.get(j+1).getDistance() ;
+ }
+ /* for (int j = 0; j< disList.size()-2; j++) {
+ if(j+1 >=10){
+ break;
+ }
+ if(disList.size()>j+1){
+ distanceMatrix1[i+1][j+1] = disList.get(j+1).getDistance()/1000;//鏋勯�犺窛绂荤煩闃�
+ }else{
+ distanceMatrix1[i+1][j+1] = 1l;
+ }
+ }*/
+ }
+ for (int i = 0; i < lineList.size(); i++) {
+ vehicleCapacities1[i] = lineList.get(i).getMaxOrder();//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
+ }
+ //鏋勯�犱紭鍖栨暟鎹ā鍨�
+ dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1);
+ TspSolver.startSearch(dataModel);
+ dealSearchSolution(model,dataModel);
+ }catch (Exception e){
+ e.printStackTrace();
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .eq(JkSketch::getId,model.getId() )
+ .eq(JkSketch::getJobId,model.getJobId() )
+ .set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆$嚎璺紭鍖栧け璐ワ紒")
+ .set(JkSketch::getStatus,Constants.THREE)
+ .set(JkSketch::getPlanLineEndDate,new Date()));
+ }
+ }
+ @Override
+ @Async
+ public void startInitOriginDistanceBatch( JkSketch model) {
+ initOriginDistance(model);
+ }
+ @Override
+ @Async
+ public void startEditSketchLineAsync(JkSketch model) {
+ boolean success = true;
+ int totalDistance = 0;
+ List<JkSketchLine> lineList = model.getSketchLineList();
+ try {
+ MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(JkSketchCustomer.class )
+ .selectAs(JkCustomer::getName,JkSketchCustomer::getName)
+ .selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
+ .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+ .selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
+ .selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
+ .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);
+ List<JkSketchCustomer> customerList = jkSketchCustomerMapper.selectJoinList(JkSketchCustomer.class,queryWrapper);
+ if(customerList == null ||customerList.size() ==0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴蜂俊鎭负绌猴紝涓嶆弧瓒充紭鍖栨潯浠讹紒");
+ }
+
+ int totalNum = 0;
+ for(JkSketchLine line : lineList){
+ //瀹屽杽绾胯矾瀹㈡埛浼樺寲鍙傛暟
+ List<JkSketchCustomer> customerListParam = line.getCustomerList() ;
+ if(customerListParam ==null || customerListParam.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ initSketchCustomerListParam(line.getCustomerList(),customerList) ;
+ totalNum += customerListParam.size();
+ }
+ if(totalNum != Constants.formatIntegerNum(model.getOrderNum())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ for(JkSketchLine line : lineList){
+ //閫愪釜璺嚎浼樺寲
+ List<JkSketchCustomer> customerListParam = line.getCustomerList() ;
+ TspSolver.DataModel dataModel = new TspSolver.DataModel();
+ int vehicleNumber1 = 1;//绾胯矾鏁伴噺
+ long[] vehicleCapacities1=new long[]{line.getMaxOrder()};//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
+ long[] demands1 = new long[customerListParam.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
+ long[][] distanceMatrix1 = new long[customerListParam.size()+1][customerListParam.size()+1];
+ distanceMatrix1[0][0] = 0;
+ demands1[0] =0;//鍘熺偣
+ for (int i = 0; i < customerListParam.size(); i++) {
+ List<DistanceMapParam> disList = customerListParam.get(i).getDistanceMapParamList();
+ distanceMatrix1[0][i+1] = disList.get(0).getDistance();
+ distanceMatrix1[i+1][0] = disList.get(disList.size() -1).getDistance();
+ demands1[i+1] = Constants.formatBigdecimal( customerListParam.get(i).getTotalNum()).longValue(); //鍚勪釜鐐圭殑璁㈠崟閲�
+ for (int j = 0; j < customerListParam.size(); j++) {
+ distanceMatrix1[i+1][j+1] =disList.get(j+1).getDistance() ;
+ }
+ }
+ //鏋勯�犱紭鍖栨暟鎹ā鍨�
+ dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1);
+ TspSolver.startSearch(dataModel);
+ if(dataModel.getSolutions()==null || dataModel.getSolutions().size()==0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛屾湭鑾峰緱鏈�浼樹氦閫氳鍒掓柟妗堬紒");
+ }
+ TspSolverSolutions so = dataModel.getSolutions().get(0);
+ List<Integer> routes = so.getRouteIndex();
+ totalDistance += so.getDistance();
+ if(routes.size() <=2) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛屾湭鑾峰緱鏈�浼樹氦閫氳鍒掓柟妗堬紒");
+ }
+ //鏈夋晥璺緞
+ for (Integer cIndex : routes){
+ if(cIndex ==0){
+ continue; //璧峰鐐逛笉澶勭悊
+ }
+ JkSketchCustomer customer = customerListParam.get(cIndex-1);
+ customer.setSortnum(cIndex-1);
+ }
+ line.setDistance(so.getDistance());
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ success =false;
+ }finally {
+ if(success){
+ List<JkSketchCustomer> allList = new ArrayList<>();
+ for(JkSketchLine line : lineList){
+ allList.addAll(line.getCustomerList());
+ }
+ jkSketchLineMapper.updateById(lineList);
+ jkSketchCustomerMapper.updateById(allList);
+ }
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .eq(JkSketch::getId,model.getId() )
+ .eq(JkSketch::getJobId,model.getJobId() )
+ .set(success,JkSketch::getDistance,totalDistance)
+ .set(JkSketch::getPlanLineInfo,success?"鏈�杩戜竴娆$嚎璺皟鏁存垚鍔�":"鏈�杩戜竴娆$嚎璺皟鏁村け璐ワ紒")
+ .set(JkSketch::getStatus,success?Constants.TWO:Constants.THREE)
+ .set(JkSketch::getPlanLineEndDate,new Date()));
+ }
+ }
+ private List<JkSketchCustomer> initSketchCustomerListParam(List<JkSketchCustomer> customerList, List<JkSketchCustomer> customerList1) {
+ for(JkSketchCustomer param : customerList){
+ for(JkSketchCustomer model : customerList1){
+ if(Constants.equalsInteger(model.getId(),param.getId())){
+ param.setLatitude(model.getLatitude());
+ param.setLongitude(model.getLongitude());
+ param.setStartDistance(model.getStartDistance());
+ param.setEndDistance(model.getEndDistance());
+ param.setDistanceJson(model.getDistanceJson());
+ }
+ }
+ }
+ for(JkSketchCustomer c : customerList){
+ List<DistanceMapParam> tmpList = new ArrayList<>();
+ List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistanceJson());
+ DistanceMapParam t0 = new DistanceMapParam();
+ t0.setId(-2);//琛ㄧず杩斿洖鍥尯
+ t0.setDistance(Constants.formatLongNum(c.getStartDistance()) );
+ tmpList.add(t0);
+ for(JkSketchCustomer cm : customerList){
+ //瀹㈡埛鍜屽鎴蜂箣闂寸殑璺濈淇℃伅
+ DistanceMapParam t = new DistanceMapParam();
+ t.setId(cm.getCustomerId());
+ t.setDistance(0);
+ DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
+ if(param!=null){//濡傛灉涔嬪墠宸茬粡鑾峰彇杩�
+ t = param;
+ }
+ tmpList.add(t);
+ }
+ DistanceMapParam tt = new DistanceMapParam();
+ tt.setId(-2);//琛ㄧず杩斿洖鍥尯
+ tt.setDistance(Constants.formatLongNum(c.getEndDistance()));
+ tmpList.add(tt);
+ c.setDistanceMapParamList(tmpList);
+ }
+ return customerList;
+ }
+
+
+ private void initCustomerDistance( List<JkSketchLine> lineList,JkSketch model,boolean updateLineDistance) {
+ List<JkSketchCustomer> customerList = model.getCustomerList();
+ for(JkSketchCustomer c : customerList){
+ List<DistanceMapParam> tmpList = new ArrayList<>();
+ List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistanceJson());
+ DistanceMapParam t0 = new DistanceMapParam();
+ t0.setId(-2);//琛ㄧず杩斿洖鍥尯
+ t0.setDistance(Constants.formatLongNum(c.getStartDistance()) );
+ if(Constants.formatLongNum(c.getStartDistance()) <= 0){
+ //鍥尯鍓嶅線璇ュ鎴风殑璺濈锛屽鏋滀箣鍓嶆湭鑾峰彇杩�
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:"+c.getName()+"浜ら�氳鍒掑皻鏈畬鎴愶紝涓嶆弧瓒充紭鍖栨潯浠讹紒");
+ }
+ tmpList.add(t0);
+ for(JkSketchCustomer cm : customerList){
+ //瀹㈡埛鍜屽鎴蜂箣闂寸殑璺濈淇℃伅
+ DistanceMapParam t = new DistanceMapParam();
+ t.setId(cm.getCustomerId());
+ DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
+ if(param!=null){//濡傛灉涔嬪墠宸茬粡鑾峰彇杩�
+ t = param;
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:"+c.getName()+"浜ら�氳鍒掑皻鏈畬鎴愶紝涓嶆弧瓒宠矾绋嬭绠楁潯浠讹紒");
+ }
+ tmpList.add(t);
+ }
+ DistanceMapParam tt = new DistanceMapParam();
+ tt.setId(-2);//琛ㄧず杩斿洖鍥尯
+ tt.setDistance(Constants.formatLongNum(c.getEndDistance()));
+ if(Constants.formatLongNum(c.getEndDistance()) <= 0){
+ //璇ュ鎴疯繑鍥炲洯鍖虹殑璺濈 ,濡傛灉涔嬪墠鏈幏鍙栬繃
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:"+c.getName()+"浜ら�氳鍒掑皻鏈畬鎴愶紝涓嶆弧瓒宠矾绋嬭绠楁潯浠讹紒");
+ }
+ tmpList.add(tt);
+ c.setDistanceMapParamList(tmpList);
+ }
+ if(lineList!=null){
+ long totalDistance = 0;
+ for (JkSketchLine line :lineList){
+ long lineDistance = 0;
+ List<JkSketchCustomer> customers = getCustomerListByLineId(line.getId(),customerList);
+ int index =0;
+ for(JkSketchCustomer c : customers){
+ if(index ==0){
+ lineDistance+= Constants.formatLongNum(c.getStartDistance());
+ }
+ if(index == customers.size()-1){
+ lineDistance+= Constants.formatLongNum(c.getEndDistance());
+ break;
+ }
+ DistanceMapParam param = getParamByCustomerIds( customers.get(index+1).getCustomerId(),getListFromJsonStr(c.getDistanceJson()));
+ lineDistance += param.getDistance();
+ index++;
+ /* 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);
+ }
+ }
+ }
+
+ 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) {
+ if(distanceMapParamList!=null){
+ for(DistanceMapParam p :distanceMapParamList){
+ if(Constants.equalsInteger(p.getId(),id1)){
+ return p;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ private List<DistanceMapParam> getListFromJsonStr(String distanceJson) {
+ try {
+ return JSONObject.parseObject(distanceJson, new TypeReference<List<DistanceMapParam>>(){}.getType());
+ }catch (Exception e){
+ }
+ return new ArrayList<>();
+ }
+
+ private void dealSearchSolution(JkSketch model, TspSolver.DataModel dataModel) {
+ Date date = new Date();
+ List<TspSolverSolutions> solutions = dataModel.getSolutions();
+ List<JkSketchLine> sketchLineList = new ArrayList<>();
+ List<JkSketchCustomer> sketchCustomerList = new ArrayList<>();
+ long totalDistance = 0l;
+ if(solutions!=null && solutions.size()>0){
+ for(TspSolverSolutions so : solutions){
+ List<Integer> routes = so.getRouteIndex();
+ totalDistance+= so.getDistance();
+ if(routes.size() <=2) {
+ continue;//鏃犲鎴风殑闈炴湁鏁堣矾绾�
+ }
+// totalDistance+= so.getDistance();
+ JkLine line =model.getLineList().get(so.getLineIndex());
+ JkSketchLine tModel = new JkSketchLine();
+ tModel.setSketchId(model.getId());
+ tModel.setCreator(model.getEditor());
+ tModel.setCreateDate(date);
+ tModel.setLineId(line.getId());
+ 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());
+ tModel.setIsdeleted(Constants.ZERO);
+ tModel.setDistance(so.getDistance());//
+ sketchLineList.add(tModel);
+ tModel.setCustomerList( new ArrayList<>());
+ //鏈夋晥璺緞
+ for (Integer cIndex : routes){
+ if(cIndex ==0){
+ continue; //璧峰鐐逛笉澶勭悊
+ }
+ JkSketchCustomer customer = model.getCustomerList().get(cIndex-1);
+ tModel.setTotalNum(tModel.getTotalNum().add(Constants.formatBigdecimal(customer.getTotalNum())));//閫佽揣閲�
+ JkSketchCustomer cModel = new JkSketchCustomer();
+ 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);
+ cModel.setEditDate(tModel.getCreateDate());
+ cModel.setEditor(tModel.getCreator());
+ cModel.setIsdeleted(Constants.ZERO);
+ cModel.setSketchId(model.getId());
+ cModel.setCustomerId(customer.getCustomerId());
+ tModel.getCustomerList().add(cModel);
+
+ }
+ }
+ }
+ if(sketchLineList!=null && sketchLineList.size()>0){
+ 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);
+ }
+ for(JkSketchLine l : sketchLineList){
+ if(l.getCustomerList()!=null ){
+ for(JkSketchCustomer c :l.getCustomerList()){
+ c.setSketchLineId(l.getId());
+ }
+ sketchCustomerList.addAll(l.getCustomerList());
+ }
+ }
+ if(sketchCustomerList.size()>0){
+ jkSketchCustomerMapper.insert(sketchCustomerList);
+ }
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .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)
+ .set(JkSketch::getPlanLineEndDate,date));
+ }else{
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .eq(JkSketch::getId,model.getId() )
+ .eq(JkSketch::getJobId,model.getJobId() )
+ .set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆$嚎璺紭鍖栧け璐�,鏈壘鍒版渶浼樿矾绾匡紒")
+ .set(JkSketch::getStatus,Constants.THREE)
+ .set(JkSketch::getPlanLineEndDate,date));
+ }
+ }
+
+ 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)
+ .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);
+ List<JkSketchCustomer> customerList = jkSketchCustomerMapper.selectJoinList(JkSketchCustomer.class,queryWrapper);
+ if(customerList == null ||customerList.size() ==0){
+ 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()+" | ";
+ }
+ if(!Constants.equalsInteger(c.getDistanceStatus(),Constants.ONE)){
+ errorMsg1 += c.getName()+"-"+c.getName()+" | ";
+ }
+ }
+ if(StringUtils.isNotBlank(errorMsg)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:銆�"+errorMsg+"銆戝畾浣嶄俊鎭笉瀹屾暣锛屼笉婊¤冻浼樺寲鏉′欢锛�");
+ }
+ if(StringUtils.isNotBlank(errorMsg1)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:銆�"+errorMsg1+"銆戜氦閫氳鍒掑皻鏈畬鎴愶紝涓嶆弧瓒充紭鍖栨潯浠讹紒");
+ }
+ model.setCustomerList(customerList);
+ MPJLambdaWrapper<JkSketchLine> queryWrapper1 = new MPJLambdaWrapper<>();
+ 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);
+ return customerList;
}
@Override
@@ -87,61 +920,62 @@
@Override
public PageData<JkSketch> findPage(PageWrap<JkSketch> pageWrap) {
IPage<JkSketch> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<JkSketch> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<JkSketch> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(JkSketch.class )
+ .selectAs(Category::getId,JkSketch::getCategoryId)
+ .selectAs(Category::getName,JkSketch::getCategoryName)
+ .leftJoin(Category.class,Category::getId,JkSketch::getCategoryId );
+ queryWrapper.eq( pageWrap.getModel().getCategoryId()!=null,JkLine::getCategoryId, pageWrap.getModel().getCategoryId());
+
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(JkSketch::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(JkSketch::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(JkSketch::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(JkSketch::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(JkSketch::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(JkSketch::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(JkSketch::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(JkSketch::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(JkSketch::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(JkSketch::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(JkSketch::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(JkSketch::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(JkSketch::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(JkSketch::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(JkSketch::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(JkSketch::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(JkSketch::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.eq(JkSketch::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getCategoryId() != null) {
- queryWrapper.lambda().eq(JkSketch::getCategoryId, pageWrap.getModel().getCategoryId());
+ queryWrapper.eq(JkSketch::getCategoryId, pageWrap.getModel().getCategoryId());
}
if (pageWrap.getModel().getTotalNum() != null) {
- queryWrapper.lambda().eq(JkSketch::getTotalNum, pageWrap.getModel().getTotalNum());
+ queryWrapper.eq(JkSketch::getTotalNum, pageWrap.getModel().getTotalNum());
}
if (pageWrap.getModel().getOrderNum() != null) {
- queryWrapper.lambda().eq(JkSketch::getOrderNum, pageWrap.getModel().getOrderNum());
+ queryWrapper.eq(JkSketch::getOrderNum, pageWrap.getModel().getOrderNum());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(JkSketch::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(JkSketch::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(JkSketch::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(JkSketch::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getDateInfo() != null) {
- queryWrapper.lambda().ge(JkSketch::getDateInfo, Utils.Date.getStart(pageWrap.getModel().getDateInfo()));
- queryWrapper.lambda().le(JkSketch::getDateInfo, Utils.Date.getEnd(pageWrap.getModel().getDateInfo()));
+ queryWrapper.eq(JkSketch::getDateInfo, pageWrap.getModel().getDateInfo());
}
if (pageWrap.getModel().getJobId() != null) {
- queryWrapper.lambda().eq(JkSketch::getJobId, pageWrap.getModel().getJobId());
+ queryWrapper.eq(JkSketch::getJobId, pageWrap.getModel().getJobId());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(jkSketchMapper.selectPage(page, queryWrapper));
+ queryWrapper.orderByDesc(JkSketch::getDateInfo);
+ IPage<JkSketch> result = jkSketchMapper.selectJoinPage(page, JkSketch.class,queryWrapper);
+ return PageData.from(result);
}
@Override
@@ -149,4 +983,319 @@
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){
+ if(StringUtils.isBlank(dateInfoStr)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨閫佽揣鏃ユ湡锛�");
+ }
+ Date dateInfo = DateUtil.getDateFromShortString(dateInfoStr);
+ if(dateInfo == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝g‘鐨勯�佽揣鏃ユ湡锛�");
+ }
+ Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_JKORDERS);
+ if(importing!=null && importing){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
+ }
+ redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_JKORDERS,true,30, TimeUnit.MINUTES);
+ try {
+ ExcelImporter ie = null;
+ List<JkOrdersImport> dataList =null;
+ try {
+ ie = new ExcelImporter(file,1,0);
+ dataList = ie.getDataList(JkOrdersImport.class,null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(dataList == null || dataList.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
+ }
+ List<JkCustomer> customerList = jkCustomerMapper.selectJoinList(JkCustomer.class,new MPJLambdaWrapper<JkCustomer>()
+ .selectAll(JkCustomer.class)
+ .eq(JkCustomer::getIsdeleted,Constants.ZERO)
+ );
+ String week = DateUtil.getWeekZhouOfDate(dateInfo);
+ //褰撳墠鎵�鏈夌嚎璺�
+ List<JkLine> lineList = jkLineMapper.selectJoinList(JkLine.class,new MPJLambdaWrapper<JkLine>()
+ .selectAll(JkLine.class)
+ .eq(JkLine::getWeeks,week)//鍙兘閫夋嫨褰撳墠鐨勭嚎璺�
+ .eq(JkLine::getIsdeleted,Constants.ZERO)
+ );
+ List<JkOrders> newOrderList = new ArrayList<>();
+ for(int i=0;i<dataList.size();i++){
+ JkOrdersImport model = dataList.get(i);
+ if(StringUtils.isBlank(model.getName())
+ &&StringUtils.isBlank(model.getCode())
+ &&StringUtils.isBlank(model.getNum())
+ &&StringUtils.isBlank(model.getSortnum())
+ &&StringUtils.isBlank(model.getDateInfo())
+ &&StringUtils.isBlank(model.getLineName()) ){
+ continue;
+ }
+ checkModelParam(model, newOrderList, i,dateInfo,loginUser,customerList,lineList );
+ }
+ if( newOrderList.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏈夋晥鏁版嵁涓虹┖锛�");
+ }
+ List<JkSketch> newList = initNewSketchList(newOrderList);//鎸夌収涓荤嚎璺垎缁�
+ if( newList.size() ==0 ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏈夋晥鏁版嵁涓虹┖锛�");
+ }
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .set(JkSketch::getIsdeleted,Constants.ONE)
+ .eq(JkSketch::getIsdeleted,Constants.ZERO)
+ .eq(JkSketch::getDateInfo,dateInfo));
+ jkOrdersMapper.update(null,new UpdateWrapper<JkOrders>().lambda()
+ .set(JkOrders::getIsdeleted,Constants.ONE)
+ .eq(JkOrders::getIsdeleted,Constants.ZERO)
+ .eq(JkOrders::getDateInfo,dateInfo));
+ if(newList.size()>0){
+ jkSketchMapper.insert(newList);
+ }
+ 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)
+ .eq(JkSketchLine::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchLine::getDateInfo,dateInfo));
+ 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)
+ .eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchCustomer::getDateInfo,dateInfo));
+ if(sketchCuustomerList.size()>0){
+ jkSketchCustomerMapper.insert(sketchCuustomerList);
+ }
+ return newList;
+ }catch (BusinessException e){
+ throw e;
+ }catch (Exception e){
+ e.printStackTrace();
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"淇℃伅瀵煎叆澶辫触锛岃绋嶅悗閲嶈瘯");
+ }finally {
+ redisTemplate.delete(Constants.RedisKeys.IMPORTING_JKORDERS);
+ }
+
+ }
+
+
+
+ private List<JkSketchCustomer> initNewSketchCustomerList(List<JkSketchLine> sketchLineList, List<JkOrders> newOrderList) {
+ List<JkSketchCustomer> list =new ArrayList<>();
+ for(JkOrders orders : newOrderList){
+ JkSketchLine line = findModelFromListByLineId(orders.getLineId(),sketchLineList);
+ if( line!=null){
+ JkSketchCustomer tModel = new JkSketchCustomer();
+ tModel.setCreator(orders.getCreator());
+ tModel.setOrderId(orders.getId());
+ tModel.setCreateDate(orders.getCreateDate());
+ 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);
+ tModel.setSketchId(line.getSketchId());
+ tModel.setCustomerId(orders.getCustomerId());
+ tModel.setSketchLineId(line.getId());
+ list.add(tModel);
+ }
+ }
+ return list;
+ }
+ private List<JkSketchLine> initNewSketchLineList(List<JkSketch> newList, List<JkOrders> newOrderList,List<JkLine> lineList) {
+ List<JkSketchLine> list =new ArrayList<>();
+ for (JkLine line : lineList){
+ JkSketchLine tModel = new JkSketchLine();
+ tModel.setSketchId(getSKetchIdByyCategoryId(line.getCategoryId(),newList));
+ tModel.setCreator(newList.get(0).getCreator());
+ tModel.setCreateDate(newList.get(0).getCreateDate());
+ tModel.setLineId(line.getId());
+ 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);
+ if(tModel.getSketchId()!=null && Constants.formatIntegerNum(tModel.getOrderNum()) >0){
+ list.add(tModel);
+ }
+ }
+
+ return list;
+ }
+
+ private void initOrderAndTotalNum(JkSketchLine tModel, Integer id, List<JkOrders> newOrderList) {
+ for(JkOrders orders : newOrderList){
+ if(Constants.equalsInteger(orders.getLineId(),id)){
+ tModel.setOrderNum(Constants.formatIntegerNum(tModel.getOrderNum())+1);
+ tModel.setTotalNum(Constants.formatBigdecimal(tModel.getTotalNum()).add(Constants.formatBigdecimal(orders.getNum())));
+ }
+ }
+ }
+
+ private Integer getSKetchIdByyCategoryId(Integer categoryId, List<JkSketch> newList) {
+ for(JkSketch model:newList){
+ if(Constants.equalsInteger(model.getCategoryId(),categoryId)){
+ return model.getId();
+ }
+ }
+ return null;
+ }
+
+ private JkSketchLine findModelFromListByLineId(Integer lineId, List<JkSketchLine> list) {
+ if(list !=null){
+ for(JkSketchLine model : list){
+ if(Constants.equalsInteger(lineId,model.getLineId())){
+ return model;
+ }
+ }
+ }
+ return null;
+ }
+
+ private List<JkSketch> initNewSketchList(List<JkOrders> newOrderList) {
+ List<JkSketch> list =new ArrayList<>();
+ for(JkOrders orders : newOrderList){
+ JkSketch tModel = findModelFromListByCateId(orders.getCategoryId(),list);
+ if(tModel!=null){
+ tModel.setTotalNum( tModel.getTotalNum().add(orders.getNum()));//璁㈠崟閲忕疮璁�
+ tModel.setOrderNum(tModel.getOrderNum()+1);//瀹㈡埛鏁板姞1
+ }else{
+ tModel = new JkSketch();
+ tModel.setLineNum(getLineNumByOrders(orders.getCategoryId(),newOrderList));
+ tModel.setPlanLineNum(tModel.getLineNum());
+ tModel.setCreator(orders.getCreator());
+ 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);
+ tModel.setEditDate(tModel.getCreateDate());
+ tModel.setEditor(tModel.getCreator());
+ tModel.setStatus(Constants.ZERO);
+ tModel.setIsdeleted(Constants.ZERO);
+ list.add(tModel);
+ }
+ }
+ return list;
+ }
+
+ private Integer getLineNumByOrders(Integer cateId, List<JkOrders> newOrderList) {
+ List<JkSketchLine> list =new ArrayList<>();
+ for(JkOrders orders : newOrderList){
+ if(!Constants.equalsInteger(orders.getCategoryId(),cateId)){
+ continue;
+ }
+ JkSketchLine tModel = findModelFromListByLineId(orders.getLineId(),list);
+ if(tModel ==null){
+ tModel = new JkSketchLine();
+ tModel.setLineId(orders.getLineId());
+ list.add(tModel);
+ }
+ }
+ return list.size();
+ }
+
+
+ private JkOrders checkModelParam(JkOrdersImport model
+ , List<JkOrders> newOrderList
+ ,int index
+ ,Date dateInfo
+ ,LoginUserInfo loginUserInfo
+ ,List<JkCustomer> allList
+ ,List<JkLine> lineList ) {
+ if(StringUtils.isBlank(model.getName())
+ ||StringUtils.isBlank(model.getCode())
+ ||StringUtils.isBlank(model.getName())
+ ||StringUtils.isBlank(model.getLineName()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屽鎴蜂俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ for(JkOrders param: newOrderList){
+ if(StringUtils.isNotBlank(model.getCode())&&StringUtils.isNotBlank(param.getCode())) {
+ if (StringUtils.equals(model.getCode(), param.getCode())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�" + (index + 3) + "琛屽鎴风畝鐮併��" + model.getName() + "銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ }
+ }
+ JkCustomer customer = findModelFromList(model.getCode(),allList);
+ if(customer == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�" + (index + 3) + "琛屽鎴风紪鐮併��" + model.getCode() + "銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ if(!StringUtils.equals(customer.getName(),model.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�" + (index + 3) + "琛屽鎴峰悕绉般��" + model.getName() + "銆戝拰缂栫爜涓嶅尮閰嶏紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ JkLine line = findLineFromListByName(model.getLineName(),lineList);
+ if(line == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�" + (index + 3) + "琛岀嚎璺��" + model.getLineName() + "銆戜笉瀛樺湪鎴栬�呴厤閫佸懆鏈熶笉绗﹀悎锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+
+ JkOrders tModel = new JkOrders();
+ tModel.setCreator(loginUserInfo.getId());
+ tModel.setCreateDate(new Date());
+ tModel.setName(model.getName());
+ tModel.setCode(model.getCode());
+ tModel.setNum(getDecimalByVal(model.getNum()));
+ tModel.setCustomerId(customer.getId());
+ tModel.setDateInfo(dateInfo);
+ tModel.setLatitude(customer.getLatitude());
+ tModel.setLongitude(customer.getLongitude());
+ tModel.setSortnum(model.getSortnum());
+ tModel.setLineId(line.getId());
+ tModel.setCategoryId(line.getCategoryId());
+ tModel.setEditDate(new Date());
+ tModel.setEditor(loginUserInfo.getId());
+ tModel.setIsdeleted(Constants.ZERO);
+ newOrderList.add(tModel);
+ return tModel;
+ }
+
+ private BigDecimal getDecimalByVal(String val) {
+ try {
+ return new BigDecimal(val);
+ }catch (Exception e){
+
+ }
+ return null;
+ }
+
+ private JkCustomer findModelFromList(String code, List<JkCustomer> list) {
+ if(list !=null){
+ for(JkCustomer model : list){
+ if(StringUtils.equals(code,model.getCode())){
+ return model;
+ }
+ }
+ }
+ return null;
+ }
+ private JkSketch findModelFromListByCateId(Integer cateId, List<JkSketch> list) {
+ if(list !=null){
+ for(JkSketch model : list){
+ if(Constants.equalsInteger(cateId,model.getCategoryId())){
+ return model;
+ }
+ }
+ }
+ return null;
+ }
+ private JkLine findLineFromListByName(String name, List<JkLine> list) {
+ if(list !=null){
+ for(JkLine model : list){
+ if(StringUtils.equals(name,model.getName())){
+ return model;
+ }
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3