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

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

@@ -10,6 +10,7 @@ import com.dituhui.pea.order.common.EngineerUtils;
 import com.dituhui.pea.order.common.SaasUtils;
 import com.dituhui.pea.order.common.SaasUtils;
 import com.dituhui.pea.order.common.jackson.DateTimeUtil;
 import com.dituhui.pea.order.common.jackson.DateTimeUtil;
 import com.dituhui.pea.order.common.jackson.DateUtil;
 import com.dituhui.pea.order.common.jackson.DateUtil;
+import com.dituhui.pea.order.common.jackson.JsonUtil;
 import com.dituhui.pea.order.dao.CapacityEngineerStatDao;
 import com.dituhui.pea.order.dao.CapacityEngineerStatDao;
 import com.dituhui.pea.order.dao.EngineerInfoDao;
 import com.dituhui.pea.order.dao.EngineerInfoDao;
 import com.dituhui.pea.order.dao.EngineerSkillDao;
 import com.dituhui.pea.order.dao.EngineerSkillDao;
@@ -127,10 +128,13 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
         //分站、网点ID
         //分站、网点ID
         List<String> teamIdList = mapBlockInBlockIdsList.stream().map(MapBlockInfoEntity::getTeamId).distinct()
         List<String> teamIdList = mapBlockInBlockIdsList.stream().map(MapBlockInfoEntity::getTeamId).distinct()
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
+        log.info("[matchCapacityData], 坐标：{},匹配到的工作队列表：{}", addressLongLat, JsonUtil.toJson(teamIdList));
         List<String> groupList = mapBlockInBlockIdsList.stream().map(MapBlockInfoEntity::getGroupId).distinct()
         List<String> groupList = mapBlockInBlockIdsList.stream().map(MapBlockInfoEntity::getGroupId).distinct()
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
+        log.info("[matchCapacityData], 坐标：{},匹配到的分部列表：{}", addressLongLat, JsonUtil.toJson(groupList));
         List<String> branchList = mapBlockInBlockIdsList.stream().map(MapBlockInfoEntity::getBranchId).distinct()
         List<String> branchList = mapBlockInBlockIdsList.stream().map(MapBlockInfoEntity::getBranchId).distinct()
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
+        log.info("[matchCapacityData], 坐标：{},匹配到的大区：{}", addressLongLat, JsonUtil.toJson(branchList));
         final String branchId = branchList.get(0);
         final String branchId = branchList.get(0);
         final String groupId = groupList.get(0);
         final String groupId = groupList.get(0);
 
 
@@ -149,7 +153,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
             querySkillGroup.add(skillInfo);
             querySkillGroup.add(skillInfo);
 
 
         }
         }
-
+        log.info("[matchCapacityData], 匹配到的技能组信息：{}", JsonUtil.toJson(skillGroupCodes));
 
 
         Set<EngineerInfoEntity> allFulfillEngineer = new HashSet<>();
         Set<EngineerInfoEntity> allFulfillEngineer = new HashSet<>();
         for (String teamId : teamIdList) {
         for (String teamId : teamIdList) {
@@ -181,7 +185,13 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
 
 
         //定义返回值
         //定义返回值
         CapacityQueryDTO.Result result = new CapacityQueryDTO.Result();
         CapacityQueryDTO.Result result = new CapacityQueryDTO.Result();
-        result.setGroupId(groupId);
+        //FIXME   CC测试需要GROUP ID与BEAN保持一致, 后期需移除本分支
+        if ("gsuzhou".equals(groupId)){
+            result.setGroupId("da30be3a890f68e9682fba2e8611ee98");
+        } else {
+
+            result.setGroupId(groupId);
+        }
         result.setTakeTime(totalTakeTime);
         result.setTakeTime(totalTakeTime);
 
 
         final int corePoolSize = Runtime.getRuntime().availableProcessors();
         final int corePoolSize = Runtime.getRuntime().availableProcessors();