Merge remote-tracking branch 'origin/develop' into develop-16542

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

@@ -18,10 +18,7 @@ import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 /**
  * PEA 对外接口
@@ -43,6 +40,14 @@ public class PeaApiController {
     private static final String date_capacity = "{\"groupId\": \"G100038\", \"params\": {\"beginDate\": \"2023-07-21\", \"endDate\": \"2023-07-27\", \"services\": [{\"brand\": \"博世\", \"productType\": \"多门冰箱\", \"serviceType\": \"商场样机安装\"}], \"location\": {\"addressId\": \"21231231\", \"latitude\": 120.608463, \"longitude\": 31.318442, \"name\": \"江苏省苏州市姑苏区蒋庙前\", \"address\": \"江苏省苏州市姑苏区解放大街123号\"}}, \"takeTime\": 720, \"datas\": [{\"date\": \"2023-07-23\", \"segments\": [{\"maxDuration\": 90, \"name\": \"全天\", \"beginTime\": \"2023-07-23 08:00:00\", \"endTime\": \"2023-07-23 17:59:59\", \"status\": 1, \"remain\": 480}, {\"maxDuration\": 60, \"name\": \"时间段\", \"beginTime\": \"2023-07-23 13:00:00\", \"endTime\": \"2023-07-23 15:00:00\", \"status\": 1, \"remain\": 480}]}]}";
     private static final String stage = "{\"orderId\": \"X10001\", \"engineerCode\": \"E12005\", \"engineerName\": \"祝枝山\", \"engineerCodeAssist\": \"E12446\", \"engineerNameAssist\": \"李晓阳\", \"planVisitTime\": \"2023-07-27 12:00:00\", \"realtimeInfo\": {\"engineerLocation\": {\"latitude\": 31.349701, \"longitude\": 120.675945, \"address\": \"江苏省苏州市苏州工业园区和顺路\", \"name\": \"和顺大酒店\"}, \"estimate\": {\"distance\": 2300, \"arriveTime\": \"2023-07-27 12:12:00\"}}}";
 
+    private static Map<String, String> makeMap = new HashMap<>() {
+        {
+            put("120.056196,28.910257", day_capacity);
+            put("120.675945,31.349701", half_capacity);
+            put("120.721813,31.303003", half_capacity2);
+            put("120.763953,31.318573", date_capacity);
+        }
+    };
 
     /**
      * 2.1MQ 组织架构同步事件通知
@@ -115,17 +120,7 @@ public class PeaApiController {
     @PostMapping("/capacity/query")
     public Result<CapacityQueryDTO.Result> capacityQuery(@Validated @RequestBody CapacityQueryDTO.Request reqDTO) throws IOException {
         //查询日期起止参数限制为一月
-
-        ArrayList<String> strings = new ArrayList<>();
-        strings.add(half_capacity);
-        strings.add(day_capacity);
-        strings.add(half_capacity2);
-        strings.add(date_capacity);
-
-        Random random = new Random();
-        int i = random.nextInt(4);
-
-        CapacityQueryDTO.Result result = JsonUtil.parse(strings.get(i), CapacityQueryDTO.Result.class).get();
+        CapacityQueryDTO.Result result = JsonUtil.parse(makeMap.get(reqDTO.getLocation().getLongitude() + "," + reqDTO.getLocation().getLatitude()), CapacityQueryDTO.Result.class).get();
         result.setParams(reqDTO);
         return Result.success(result);
     }

project-order/src/main/resources/application.yaml

@@ -86,4 +86,7 @@ scheduler:
     # 8-20点，每小时1次
     cron-expr: 0 0 1-23 * * ?
     day-offset-begin: 0
-    day-offset-end: 14
\ No newline at end of file
+    day-offset-end: 14
+logging:
+  level:
+    org.hibernate.type.descriptor.sql.BasicBinder: trace
\ No newline at end of file