Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

project-order/pom.xml

@@ -92,6 +92,11 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.5</version>
+        </dependency>
     </dependencies>
 
     <build>

project-order/src/main/java/com/dituhui/pea/order/controller/ScheduleController.java

@@ -22,7 +22,7 @@ public class ScheduleController {
 	public Result<?> getScheduleOverview(@RequestParam long page, @RequestParam long size, @RequestParam String date,
 										 @RequestParam String levelType, @RequestParam("levelValue") List<String> levelIds) {
 		Result<?> res = null;
-		try{
+		try {
 			res = scheduleService.getScheduleOverview(page, size, date, levelType, levelIds);
 		} catch (BusinessException e) {
 			return Result.failed(e.getMessage());

project-order/src/main/java/com/dituhui/pea/order/service/CommonService.java

@@ -36,20 +36,24 @@ public class CommonService {
 
     public String getTeamIdByInput(String location, String address, String layer) {
         // todo 目前会随机兜底，后面将合理化
+        log.info("====== getTeamIdByInput ===");
         String teamId = null;
         List<LayerAndArea> layerAndAreas = getLayerAndAreas(location, address);
         if (layerAndAreas == null || layerAndAreas.size() == 0) {
             // 分单接口没有查到，本地随机处理一下
             teamId = capacityTeamStatDao.getRandomTeamIdByLayer(layer);
         } else {
+            // 分单接口查到了areaId(blockId)，查询map_block_info，从而限定groupId，然后再随机teamId，这样就相对真实一点
             // 生成随机索引
             int randomIndex = new Random().nextInt(layerAndAreas.size());
             // 获取随机元素
             LayerAndArea layerAndArea = layerAndAreas.get(randomIndex);
             teamId = mapBlockInfoDao.getTeamIdByBlockIdAndLayer(layerAndArea.areaId, layer);
+            log.info("layerAndArea=={}, teamId=={}", layerAndArea, teamId);
         }
         if (StringUtils.isEmpty(teamId)) {
             teamId = capacityTeamStatDao.getRandomTeamId();
+            log.info("查询没有teamId，需要随机生成teamId=={}", teamId);
         }
         log.info("teamId ==> {}", teamId);
         assert (StringUtils.isNotEmpty(teamId));
@@ -80,8 +84,9 @@ public class CommonService {
         MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
         params.add("ak", "284c57cbabad4755a9c657885a8df3e2");
         if (StringUtils.isNotEmpty(location)) {
-            url = "https://pea-test.bshg.com.cn/v2/xyfendan";
-            params.add("coordinate", location);
+            url = "https://pea-test.bshg.com.cn/v1/xyfendan";
+            String[] coordinates = location.split(",");
+            params.add("coordinate", String.format("{\"x\":%s, \"y\":%s}", coordinates[0], coordinates[1]));
         } else {
             url = "https://pea-test.bshg.com.cn/v2/fendan";
             params.add("addresses", String.format("[{\"address\":\"%s\"}]", address));
@@ -125,7 +130,7 @@ public class CommonService {
         private String areaName;
     }
 
-    public void addOrderChange(String orderId, String subOrderId, String source, String operator, String content, String memo){
+    public void addOrderChange(String orderId, String subOrderId, String source, String operator, String content, String memo) {
         OrderChangeEntity entity = new OrderChangeEntity();
         entity.setOrderId(orderId).setSuborderId(subOrderId).setSource(source).setOperator(operator).setContent(content).setMemo(memo);
         entity.setCreateTime(new Date()).setUpdateTime(new Date());

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java

@@ -16,6 +16,7 @@
 
 package com.dituhui.pea.order.service.impl;
 
+import cn.hutool.core.util.IdUtil;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.dao.OrderRequestDao;
 import com.dituhui.pea.order.dao.OrgTeamDao;
@@ -85,7 +86,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
     public Result<?> createOrder(OrderCreateReqDTO req) {
         log.info("[createOrder] current XID: {}", RootContext.getXID());
         OrderRequestEntity entity = new OrderRequestEntity();
-        entity.setId(UUID.randomUUID().toString().replace("-", ""));
+        entity.setId(IdUtil.getSnowflake().nextIdStr());
         String orderId = req.getOrderId();
         if (StringUtils.isEmpty(orderId)) {
             orderId = UUID.randomUUID().toString().replace("-", "");

project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java

@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+
 @Service
 public class ScheduleServiceImpl implements ScheduleService {
 
@@ -162,7 +163,10 @@ public class ScheduleServiceImpl implements ScheduleService {
 		dynamics.add(new LabelValueDTO("交通工具", "电动车"));
 
 		List<String> orderIds = orderAppointments.stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
-		List<OrderRequest> orderRequests = orderRequestMPDao.selectByOrderIds(orderIds);
+		List<OrderRequest> orderRequests = new ArrayList<>();
+		if(orderIds!=null && !orderIds.isEmpty()) {
+			orderRequests = orderRequestMPDao.selectByOrderIds(orderIds);
+		}
 		List<ScheduleEngineerOverviewResp.Order> orders = new ArrayList<>();
 		for (OrderRequest o : orderRequests) {
 			ScheduleEngineerOverviewResp.Order item = new ScheduleEngineerOverviewResp.Order();