From 064d703f2907b931085c5f565269289e9fa81012 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:53:55 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java | 392 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 359 insertions(+), 33 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
index 82e889a..5cb15bf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
@@ -1,20 +1,44 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.utils.Constants;
+import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.admin.request.JkCustomerImport;
+import com.doumee.dao.admin.request.JkLineImport;
+import com.doumee.dao.business.JkLineMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
+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.JkCustomerMapper;
-import com.doumee.dao.business.model.JkCustomer;
import com.doumee.service.business.JkCustomerService;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* 浜ゆ帶-瀹㈡埛淇℃伅琛⊿ervice瀹炵幇
@@ -22,11 +46,18 @@
* @date 2025/09/28 09:01
*/
@Service
+@Slf4j
public class JkCustomerServiceImpl implements JkCustomerService {
@Autowired
private JkCustomerMapper jkCustomerMapper;
+ @Autowired
+ private JkLineMapper jkLineMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
@Override
public Integer create(JkCustomer jkCustomer) {
jkCustomerMapper.insert(jkCustomer);
@@ -34,8 +65,13 @@
}
@Override
- public void deleteById(Integer id) {
- jkCustomerMapper.deleteById(id);
+ public void deleteById(Integer id,LoginUserInfo user) {
+ jkCustomerMapper.update(null,new UpdateWrapper<JkCustomer>().lambda()
+ .set(JkCustomer::getIsdeleted,Constants.ONE)
+ .set(JkCustomer::getEditor,user.getId())
+ .set(JkCustomer::getEditDate,new Date())
+ .eq(JkCustomer::getId,id)
+ );
}
@Override
@@ -45,16 +81,45 @@
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
+ public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- jkCustomerMapper.deleteBatchIds(ids);
+ jkCustomerMapper.update(null,new UpdateWrapper<JkCustomer>().lambda()
+ .set(JkCustomer::getIsdeleted,Constants.ONE)
+ .set(JkCustomer::getEditor,user.getId())
+ .set(JkCustomer::getEditDate,new Date())
+ .in(JkCustomer::getId,ids)
+ );
}
@Override
public void updateById(JkCustomer jkCustomer) {
- jkCustomerMapper.updateById(jkCustomer);
+ if(jkCustomer.getId() == null
+ ||jkCustomer.getLocationInfo() ==null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ String[] strs = jkCustomer.getLocationInfo().split(",");
+ jkCustomer.setLongitude(getDecimalByVal(strs[0]));//缁忓害
+ jkCustomer.setLatitude(strs.length>1?getDecimalByVal(strs[1]):null);//绾害
+ if(jkCustomer.getLatitude() == null || jkCustomer.getLongitude() ==null){
+ //闈炴垚瀵瑰嚭鐜帮紝鏃犳晥缁忕含搴︿笉缁存姢
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+
+ jkCustomerMapper.update(null,new UpdateWrapper<JkCustomer>().lambda()
+ .set(JkCustomer::getLatitude,jkCustomer.getLatitude())
+ .set(JkCustomer::getLongitude,jkCustomer.getLongitude())
+ .set(JkCustomer::getEditor,jkCustomer.getLoginUserInfo().getId())
+ .set(JkCustomer::getStartDistance,null)
+ .set(JkCustomer::getEndDistance,null)
+ .set(JkCustomer::getStartSteps,null)
+ .set(JkCustomer::getEndSteps,null)
+ .set(JkCustomer::getDistanceStatus,Constants.ZERO)
+ .set(JkCustomer::getDistance,null)
+ .set(JkCustomer::getEditDate,new Date())
+ .eq(JkCustomer::getId,jkCustomer.getId())
+ );
}
@Override
@@ -87,71 +152,332 @@
@Override
public PageData<JkCustomer> findPage(PageWrap<JkCustomer> pageWrap) {
IPage<JkCustomer> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<JkCustomer> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<JkCustomer> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(JkCustomer.class )
+ .selectAs(JkLine::getName,JkCustomer::getLineName)
+ .selectAs(JkLine::getWeeks,JkCustomer::getLineWeeks)
+ .selectAs(Category::getId,JkCustomer::getCategoryId)
+ .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());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getLineName()),JkLine::getName, pageWrap.getModel().getLineName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCategoryName()),Category::getName, pageWrap.getModel().getCategoryName());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(JkCustomer::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(JkCustomer::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(JkCustomer::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(JkCustomer::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(JkCustomer::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(JkCustomer::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(JkCustomer::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(JkCustomer::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(JkCustomer::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(JkCustomer::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(JkCustomer::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(JkCustomer::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(JkCustomer::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(JkCustomer::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(JkCustomer::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(JkCustomer::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(JkCustomer::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.eq(JkCustomer::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(JkCustomer::getName, pageWrap.getModel().getName());
+ queryWrapper.like(JkCustomer::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(JkCustomer::getCode, pageWrap.getModel().getCode());
+ queryWrapper.like(JkCustomer::getCode, pageWrap.getModel().getCode());
}
- if (pageWrap.getModel().getLacation() != null) {
- queryWrapper.lambda().eq(JkCustomer::getLacation, pageWrap.getModel().getLacation());
+ if (pageWrap.getModel().getLocation() != null) {
+ queryWrapper.like(JkCustomer::getLocation, pageWrap.getModel().getLocation());
}
if (pageWrap.getModel().getLongitude() != null) {
- queryWrapper.lambda().eq(JkCustomer::getLongitude, pageWrap.getModel().getLongitude());
+ queryWrapper.eq(JkCustomer::getLongitude, pageWrap.getModel().getLongitude());
}
if (pageWrap.getModel().getLatitude() != null) {
- queryWrapper.lambda().eq(JkCustomer::getLatitude, pageWrap.getModel().getLatitude());
+ queryWrapper.eq(JkCustomer::getLatitude, pageWrap.getModel().getLatitude());
}
- if (pageWrap.getModel().getWeeks() != null) {
- queryWrapper.lambda().eq(JkCustomer::getWeeks, pageWrap.getModel().getWeeks());
+ if (pageWrap.getModel().getSortno() != null) {
+ queryWrapper.eq(JkCustomer::getSortno, pageWrap.getModel().getSortno());
}
if (pageWrap.getModel().getLineId() != null) {
- queryWrapper.lambda().eq(JkCustomer::getLineId, pageWrap.getModel().getLineId());
+ queryWrapper.eq(JkCustomer::getLineId, pageWrap.getModel().getLineId());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(JkCustomer::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(JkCustomer::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(JkCustomer::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(JkCustomer::getSortnum, pageWrap.getModel().getSortnum());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+
+ queryWrapper.orderByAsc(JkCustomer::getCode);
+ IPage<JkCustomer> result = jkCustomerMapper.selectJoinPage(page, JkCustomer.class,queryWrapper);
+ if(result.getRecords()!=null && result.getRecords().size()>0){
+ for(JkCustomer model :result.getRecords()){
+ if(model.getLongitude()!=null && model.getLatitude()!=null){
+ model.setLocationInfo(model.getLongitude().setScale(6, RoundingMode.HALF_UP).doubleValue()
+ +","+model.getLatitude().setScale(6, RoundingMode.HALF_UP).doubleValue());
+ }
}
}
- return PageData.from(jkCustomerMapper.selectPage(page, queryWrapper));
+ return PageData.from(result);
}
+ @Override
+ public void checkNullLocation() {
+ log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�===============寮�濮�");
+ Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.CHECKING_JKCUSTOMER_LOCATION);
+ if(importing!=null && importing){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝涓婃浠诲姟姝ｅ湪鎵ц涓紝璇风◢鍚庡啀璇曪紒");
+ }
+ redisTemplate.opsForValue().set(Constants.RedisKeys.CHECKING_JKCUSTOMER_LOCATION,true);
+ try {
+ LambdaQueryWrapper<JkCustomer> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.isNotNull(JkCustomer::getLocation);
+ queryWrapper.and(wrapper ->{
+ wrapper.isNull(JkCustomer::getLatitude)
+ .or().isNull(JkCustomer::getLongitude)
+ .or().eq(JkCustomer::getDistanceStatus,Constants.TWO);});
+ //鏌ヨ鍏ㄩ儴鏈夊湴鍧�锛屼絾鏄病鏈夌粡绾害鐨勫鎴蜂俊鎭�
+ List<JkCustomer> list = jkCustomerMapper.selectList(queryWrapper);
+ if(list ==null || list.size()==0){
+ return;
+ }
+ String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GAODE_LOCATION_GEOAPI_URL).getCode();
+ for(JkCustomer c : list){
+ try {
+ 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
+ && json.getInteger("status") ==1
+ && json.getJSONArray("geocodes")!=null
+ && json.getJSONArray("geocodes").size()>0
+ && json.getJSONArray("geocodes").getJSONObject(0)!=null
+ && json.getJSONArray("geocodes").getJSONObject(0).getString("location")!=null){
+ //璇锋眰鎴愬姛
+ String[] strs =json.getJSONArray("geocodes").getJSONObject(0).getString("location").split(",");
+ c.setLongitude(getDecimalByVal(strs[0]));//缁忓害
+ c.setLatitude(strs.length>1?getDecimalByVal(strs[1]):null);//绾害
+ if(c.getLatitude() != null && c.getLongitude() !=null){
+ //闈炴垚瀵瑰嚭鐜帮紝鏃犳晥缁忕含搴︿笉缁存姢
+ jkCustomerMapper.update(null,new UpdateWrapper<JkCustomer>().lambda()
+ .set(JkCustomer::getLatitude,c.getLatitude())
+ .set(JkCustomer::getLongitude,c.getLongitude())
+ .set(JkCustomer::getStartDistance,null)
+ .set(JkCustomer::getEndDistance,null)
+ .set(JkCustomer::getStartSteps,null)
+ .set(JkCustomer::getEndSteps,null)
+ .set(JkCustomer::getDistanceStatus,Constants.ZERO)
+ .set(JkCustomer::getDistance,null)
+ .set(JkCustomer::getEditDate,new Date())
+ .eq(JkCustomer::getId,c.getId())
+ );
+ }
+ }else{
+ log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇json=========="+urlStr+"\n"+c.getName()+"\n"+json);
+ }
+ }catch (Exception e){
+ log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====澶辫触=========="+c.getName()+"-"+c.getLocation());
+ }
+ }
+ }catch (Exception e){
+ log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�===============",e.getMessage());
+ }finally {
+ redisTemplate.delete(Constants.RedisKeys.CHECKING_JKCUSTOMER_LOCATION);
+ }
+ log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�===============缁撴潫");
+
+ }
@Override
public long count(JkCustomer jkCustomer) {
QueryWrapper<JkCustomer> wrapper = new QueryWrapper<>(jkCustomer);
return jkCustomerMapper.selectCount(wrapper);
}
+
+
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public List<JkCustomer> importBatch(MultipartFile file, LoginUserInfo loginUserInfo){
+ Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_JKCUSTOMER);
+ if(importing!=null && importing){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
+ }
+ redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_JKCUSTOMER,true,30, TimeUnit.MINUTES);
+ try {
+ ExcelImporter ie = null;
+ List<JkCustomerImport> dataList =null;
+ try {
+ ie = new ExcelImporter(file,1,0);
+ dataList = ie.getDataList(JkCustomerImport.class,null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(dataList == null || dataList.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
+ }
+ //褰撳墠鎵�鏈夌嚎璺�
+ List<JkLine> lineList = jkLineMapper.selectJoinList(JkLine.class,new MPJLambdaWrapper<JkLine>()
+ .selectAll(JkLine.class)
+ .eq(JkLine::getIsdeleted,Constants.ZERO)
+ );
+ List<JkCustomer> allList = jkCustomerMapper.selectJoinList(JkCustomer.class,new MPJLambdaWrapper<JkCustomer>()
+ .selectAll(JkCustomer.class)
+ .eq(JkCustomer::getIsdeleted,Constants.ZERO)
+ );
+
+ List<JkCustomer> newList = new ArrayList<>();
+ List<JkCustomer> updateList = new ArrayList<>();
+ for(int i=0;i<dataList.size();i++){
+ JkCustomerImport model = dataList.get(i);
+ if(StringUtils.isBlank(model.getName())
+ &&StringUtils.isBlank(model.getCode())
+ &&StringUtils.isBlank(model.getLocation())
+ &&StringUtils.isBlank(model.getSortno())
+ &&StringUtils.isBlank(model.getLocationInfo())
+ &&StringUtils.isBlank(model.getLineName()) ){
+ continue;
+ }
+ checkModelParam(model,newList,updateList,i,loginUserInfo,allList,lineList );
+ }
+ if((newList == null || newList.size() ==0) && updateList.size() == 0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏈夋晥鏁版嵁涓虹┖锛�");
+ }
+ if(newList.size()>0){
+ jkCustomerMapper.insert(newList);
+ }
+ if(updateList.size()>0){
+ for (JkCustomer c : updateList){
+ jkCustomerMapper.updateById(c);
+ }
+ }
+ newList.addAll(updateList);
+ 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_JKCUSTOMER);
+ }
+
+ }
+
+
+ private JkCustomer checkModelParam(JkCustomerImport model, List<JkCustomer> newList
+ , List<JkCustomer> updateList
+ ,int index
+ ,LoginUserInfo loginUserInfo
+ ,List<JkCustomer> allList
+ ,List<JkLine> lineList ) {
+ if(StringUtils.isBlank(model.getName())
+ ||StringUtils.isBlank(model.getCode())
+ ||StringUtils.isBlank(model.getLocation()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屽鎴蜂俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ for(JkCustomer param: newList){
+ 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() + "銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+ }
+ }
+ JkLine line = findLineFromListByName(model.getLineName(),lineList);
+ if(line == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�" + (index + 3) + "琛岀嚎璺��" + model.getLineName() + "銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
+ }
+
+ JkCustomer tModel = findModelFromList(model.getCode(),allList);
+ if(tModel == null){
+ tModel = new JkCustomer();
+ tModel.setCreator(loginUserInfo.getId());
+ tModel.setCreateDate(new Date());
+ tModel.setIsnew(Constants.ONE);
+ tModel.setDistanceStatus(Constants.TWO);//闇�瑕侀噸鏂板畾浣�
+ tModel.setStatus(Constants.ZERO);
+ tModel.setDistanceStatus(Constants.ZERO);
+ newList.add(tModel);
+ }else{
+ if(StringUtils.isBlank(model.getLocation()) ||
+ StringUtils.equals(tModel.getLocation().replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]","")
+ ,model.getLocation().replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]",""))){
+ //濡傛灉浣嶇疆淇℃伅鍙戠敓鍙樺寲
+ tModel.setDistanceStatus(Constants.TWO);//闇�瑕侀噸鏂板畾浣�
+ }
+ tModel.setIsnew(Constants.ZERO);
+ updateList.add(tModel);
+ }
+ tModel.setName(model.getName());
+ tModel.setCode(model.getCode());
+ tModel.setLocation(model.getLocation());
+ tModel.setSortno(model.getSortno());
+ tModel.setLineId(line.getId());
+ if(StringUtils.isNotBlank(model.getLocationInfo())){
+ String[] strs = model.getLocationInfo().split(",");
+ tModel.setLongitude(getDecimalByVal(strs[0]));//缁忓害
+ tModel.setLatitude(strs.length>1?getDecimalByVal(strs[1]):null);//绾害
+ }
+ if(tModel.getLatitude() == null || tModel.getLongitude() ==null){
+ //闈炴垚瀵瑰嚭鐜帮紝鏃犳晥缁忕含搴︿笉缁存姢
+ tModel.setLongitude(null);
+ tModel.setLatitude(null);
+ }
+ tModel.setEditDate(new Date());
+ tModel.setEditor(loginUserInfo.getId());
+ tModel.setIsdeleted(Constants.ZERO);
+ return tModel;
+ }
+
+ private BigDecimal getDecimalByVal(String val) {
+ try {
+ return new BigDecimal(val);
+ }catch (Exception e){
+
+ }
+ return null;
+ }
+
+ private Company findCompanyFromList(String companyName, List<Company> companyList) {
+ if(companyList !=null){
+ for(Company company : companyList){
+ if(StringUtils.equals(companyName,company.getCompanyNamePath())){
+ return company;
+ }
+ }
+ }
+ 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 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