增加了配置初始化接口的实现；同时进行了pub_params的表修改和查询返回处理

project-order/src/main/java/com/dituhui/pea/order/dao/PubParamsDao.java

@@ -8,4 +8,6 @@ import java.util.List;
 public interface PubParamsDao extends JpaRepository<PubParamsEntity, Integer> {
 public interface PubParamsDao extends JpaRepository<PubParamsEntity, Integer> {
 
 
     List<PubParamsEntity> findByBiztype(String biztype);
     List<PubParamsEntity> findByBiztype(String biztype);
+
+    List<PubParamsEntity> findByCatalogAndBiztype(String cagtalog, String biztype);
 }
 }

project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamConfigInitDTO.java

@@ -6,6 +6,7 @@ public class BusinessTeamConfigInitDTO {
 
 
     @lombok.Data
     @lombok.Data
     public static class Request {
     public static class Request {
+        private String teamId;
     }
     }
 
 
     @lombok.Data
     @lombok.Data

project-order/src/main/java/com/dituhui/pea/order/entity/PubParamsEntity.java

@@ -33,6 +33,11 @@ public class PubParamsEntity {
     private String pkey;
     private String pkey;
 
 
     /**
     /**
+     * 标题
+     */
+    private String plabel;
+
+    /**
      * 参数值
      * 参数值
      */
      */
     private String pvalue;
     private String pvalue;

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

 package com.dituhui.pea.order.service;
 package com.dituhui.pea.order.service;
 
 
+import com.dituhui.pea.order.dto.LabelValueDTO;
+
+import java.util.List;
+
 public interface CommonService {
 public interface CommonService {
 
 
 
 
@@ -7,4 +11,5 @@ public interface CommonService {
 
 
     void addOrderEvent(String orderId, String subOrderId, String source, String operator, String event, String content, String memo);
     void addOrderEvent(String orderId, String subOrderId, String source, String operator, String event, String content, String memo);
 
 
+    List<LabelValueDTO> getSpecialParams(String catalog, String biztype);
 }
 }

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

@@ -9,6 +9,7 @@ import com.dituhui.pea.order.entity.OrgTeamEngineerEntity;
 import com.dituhui.pea.order.entity.OrgTeamEntity;
 import com.dituhui.pea.order.entity.OrgTeamEntity;
 import com.dituhui.pea.order.entity.OrgWarehouseInfoEntity;
 import com.dituhui.pea.order.entity.OrgWarehouseInfoEntity;
 import com.dituhui.pea.order.service.BusinessTeamService;
 import com.dituhui.pea.order.service.BusinessTeamService;
+import com.dituhui.pea.order.service.CommonService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
@@ -41,6 +42,9 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
     @Autowired
     @Autowired
     private CapacityTeamStatDao capacityTeamStatDao;
     private CapacityTeamStatDao capacityTeamStatDao;
 
 
+    @Autowired
+    private CommonService commonService;
+
     @Override
     @Override
     public Result<?> getTeams(BusinessTeamsDTO.Request req) {
     public Result<?> getTeams(BusinessTeamsDTO.Request req) {
         assert "branch".equals(req.getLevelType()) || "group".equals(req.getLevelType());
         assert "branch".equals(req.getLevelType()) || "group".equals(req.getLevelType());
@@ -110,10 +114,10 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
     }
     }
 
 
     @Override
     @Override
-    public Result<?> getTeamDetail(BusinessTeamDetailDTO.Request req) throws BusinessException {
+    public Result<?> getTeamDetail(BusinessTeamDetailDTO.Request req) {
         OrgTeamEntity teamEntity = orgTeamDao.getByTeamId(req.getTeamId());
         OrgTeamEntity teamEntity = orgTeamDao.getByTeamId(req.getTeamId());
         if (teamEntity == null) {
         if (teamEntity == null) {
-            throw new BusinessException(String.format("工作队[%s]不存在", req.getTeamId()));
+            Result.failed(String.format("工作队[%s]不存在", req.getTeamId()));
         }
         }
         BusinessTeamDetailDTO.Result rs = new BusinessTeamDetailDTO.Result();
         BusinessTeamDetailDTO.Result rs = new BusinessTeamDetailDTO.Result();
         rs.setTeamId(teamEntity.getTeamId())
         rs.setTeamId(teamEntity.getTeamId())
@@ -146,7 +150,14 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
 
 
     @Override
     @Override
     public Result<?> getSchedulingInit(BusinessTeamConfigInitDTO.Request req) {
     public Result<?> getSchedulingInit(BusinessTeamConfigInitDTO.Request req) {
-        return null;
+        BusinessTeamConfigInitDTO.Result rs = new BusinessTeamConfigInitDTO.Result();
+        OrgTeamEntity teamEntity = orgTeamDao.getByTeamId(req.getTeamId());
+        rs.setNextScheduleInterval(teamEntity.getIntervalScheduleNext().toString());
+        rs.setTodayScheduleInterval(teamEntity.getIntervalSchedule().toString());
+        rs.setTransportMode(commonService.getSpecialParams("ScheduleConfig", "TransportMode"));
+        rs.setSchedulingStrategy(commonService.getSpecialParams("ScheduleConfig", "ScheduleStrategy"));
+        rs.setAssignStrategy(commonService.getSpecialParams("ScheduleConfig", "StrategyAppointment"));
+        return Result.success(rs);
     }
     }
 
 
     @Override
     @Override

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

@@ -3,7 +3,10 @@ package com.dituhui.pea.order.service.impl;
 import com.dituhui.pea.order.dao.CapacityTeamStatDao;
 import com.dituhui.pea.order.dao.CapacityTeamStatDao;
 import com.dituhui.pea.order.dao.MapBlockInfoDao;
 import com.dituhui.pea.order.dao.MapBlockInfoDao;
 import com.dituhui.pea.order.dao.OrderEventDao;
 import com.dituhui.pea.order.dao.OrderEventDao;
+import com.dituhui.pea.order.dao.PubParamsDao;
+import com.dituhui.pea.order.dto.LabelValueDTO;
 import com.dituhui.pea.order.entity.OrderEventEntity;
 import com.dituhui.pea.order.entity.OrderEventEntity;
+import com.dituhui.pea.order.entity.PubParamsEntity;
 import com.dituhui.pea.order.service.CommonService;
 import com.dituhui.pea.order.service.CommonService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -21,6 +24,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Random;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 @Slf4j
 @Slf4j
@@ -35,6 +39,9 @@ public class CommonServiceImpl implements CommonService {
     @Autowired
     @Autowired
     private OrderEventDao orderEventDao;
     private OrderEventDao orderEventDao;
 
 
+    @Autowired
+    private PubParamsDao pubParamsDao;
+
     public String getTeamIdByInput(String location, String address, String layer) {
     public String getTeamIdByInput(String location, String address, String layer) {
         // todo 目前会随机兜底，后面将合理化
         // todo 目前会随机兜底，后面将合理化
         log.info("====== getTeamIdByInput ===");
         log.info("====== getTeamIdByInput ===");
@@ -145,4 +152,14 @@ public class CommonServiceImpl implements CommonService {
         entity.setCreateTime(LocalDateTime.now()).setUpdateTime(LocalDateTime.now());
         entity.setCreateTime(LocalDateTime.now()).setUpdateTime(LocalDateTime.now());
         orderEventDao.save(entity);
         orderEventDao.save(entity);
     }
     }
+
+    @Override
+    public List<LabelValueDTO> getSpecialParams(String catalog, String biztype) {
+        List<PubParamsEntity> params = pubParamsDao.findByCatalogAndBiztype(catalog, biztype);
+        return params.stream().map(entity ->{
+            return new LabelValueDTO()
+                    .setLabel(entity.getPlabel())
+                    .setValue(entity.getPvalue());
+        }).collect(Collectors.toList());
+    }
 }
 }