|
@@ -10,6 +10,7 @@ import org.springblade.business.utils.MileageUtill;
|
|
import org.springblade.common.utils.BaseUtils;
|
|
import org.springblade.common.utils.BaseUtils;
|
|
import org.springblade.core.tool.utils.CollectionUtil;
|
|
import org.springblade.core.tool.utils.CollectionUtil;
|
|
import org.springblade.core.tool.utils.Func;
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
|
+import org.springblade.core.tool.utils.StringPool;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -30,15 +31,15 @@ public class MileageClientImpl implements MileageClient {
|
|
@Override
|
|
@Override
|
|
public Map<String,String[]> mileage2Coordinate(List<String> mileages,Long contractId) {
|
|
public Map<String,String[]> mileage2Coordinate(List<String> mileages,Long contractId) {
|
|
Map<String,String[]> result = new HashMap<>(mileages.size());
|
|
Map<String,String[]> result = new HashMap<>(mileages.size());
|
|
- Map<String,List<String>> group=mileages.stream().collect(Collectors.groupingBy(e->e.replaceAll("K.+","")));
|
|
|
|
|
|
+ Map<String,List<String>> group=mileages.stream().collect(Collectors.groupingBy(e->e.replaceAll("K.+",StringPool.EMPTY)));
|
|
for(Map.Entry<String,List<String>> entry:group.entrySet()){
|
|
for(Map.Entry<String,List<String>> entry:group.entrySet()){
|
|
String part= entry.getKey();
|
|
String part= entry.getKey();
|
|
List<Mileagexy> target=this.service.list(Wrappers.<Mileagexy>lambdaQuery().eq(Mileagexy::getContractId,contractId.toString()).eq(Mileagexy::getPartNo,part).orderByAsc(Mileagexy::getValue));
|
|
List<Mileagexy> target=this.service.list(Wrappers.<Mileagexy>lambdaQuery().eq(Mileagexy::getContractId,contractId.toString()).eq(Mileagexy::getPartNo,part).orderByAsc(Mileagexy::getValue));
|
|
if(CollectionUtil.isNotEmpty(target)){
|
|
if(CollectionUtil.isNotEmpty(target)){
|
|
entry.getValue().forEach(e->{
|
|
entry.getValue().forEach(e->{
|
|
- String[] r = new String[]{"",""};
|
|
|
|
|
|
+ String[] r = new String[]{StringPool.EMPTY,StringPool.EMPTY};
|
|
if(Func.isNotBlank(e)){
|
|
if(Func.isNotBlank(e)){
|
|
- String[] arr=e.split("@");
|
|
|
|
|
|
+ String[] arr=e.split(StringPool.AT);
|
|
double[] db= MileageUtill.azimuthZbXy(BaseUtils.k2d(arr[0]),Double.parseDouble(arr[1]),90,target);
|
|
double[] db= MileageUtill.azimuthZbXy(BaseUtils.k2d(arr[0]),Double.parseDouble(arr[1]),90,target);
|
|
if(db!=null&&db.length==3){
|
|
if(db!=null&&db.length==3){
|
|
r[0]=String.valueOf(db[0]);
|
|
r[0]=String.valueOf(db[0]);
|