Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvis...

rk

2 天以前 4a8ff39b0fab0627ef8f7459587d514cc01c3676

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

@@ -111,6 +111,12 @@
                .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())
        );
@@ -237,10 +243,10 @@
        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); });
                        .or().isNull(JkCustomer::getLongitude)
                        .or().eq(JkCustomer::getDistanceStatus,Constants.TWO);});
            //查询全部有地址，但是没有经纬度的客户信息
            List<JkCustomer>  list = jkCustomerMapper.selectList(queryWrapper);
            if(list ==null || list.size()==0){
@@ -269,13 +275,18 @@
                            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=========="+json);
                        log.error("更新交控中心客户经纬度信息=====获取失败=========="+urlStr+c.getName()+"-"+c.getLocation());
                        log.error("更新交控中心客户经纬度信息=====获取json=========="+urlStr+"\n"+c.getName()+"\n"+json);
                    }
                }catch (Exception e){
                    log.error("更新交控中心客户经纬度信息=====失败=========="+c.getName()+"-"+c.getLocation());
@@ -394,10 +405,17 @@
            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);
        }