Sfoglia il codice sorgente

需求:设计对接BOSS的交付计划的接口

lijie 3 anni fa
parent
commit
781f93f1a7

+ 1 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/controller/AdmDictController.java

@@ -1,7 +1,7 @@
 package com.persagy.proxy.dictionary.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import com.persagy.dmp.define.entity.ObjectInfoCollect;
+import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
 import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
 import com.persagy.proxy.adm.constant.AdmDictConstant;
 import com.persagy.proxy.adm.request.AdmCreateRequest;

+ 1 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AbstractAdmDictBaseServiceImpl.java

@@ -11,7 +11,7 @@ import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.dmp.common.constant.ValidEnum;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.utils.JsonHelper;
-import com.persagy.dmp.define.entity.ObjectInfoCollect;
+import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmDictConstant;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;

+ 4 - 10
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java

@@ -6,11 +6,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.define.entity.ObjectInfoCollect;
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
+import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
 import com.persagy.proxy.adm.constant.AdmDictConstant;
 import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
-import com.persagy.proxy.adm.constant.AdmObjectInfoConstant;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmDictQueryCriteria;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
@@ -19,10 +17,6 @@ import com.persagy.proxy.dictionary.model.*;
 import com.persagy.proxy.dictionary.service.IAdmDictService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.object.model.*;
-import com.persagy.proxy.object.service.IAdmEquipmentService;
-import com.persagy.proxy.object.service.IAdmShaftService;
-import com.persagy.proxy.object.service.IAdmSpaceService;
-import com.persagy.proxy.object.service.IAdmSystemService;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -307,7 +301,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
             infoCollect.setDefineInfoId(funcIdGather.getId());
             infoCollect.setClassCode(funcIdGather.getClassCode());
             infoCollect.setCode(funcIdGather.getCode());
-            infoCollect.setVisiable(funcIdGather.getVisible());
+            //infoCollect.setVisiable(funcIdGather.getVisible());
             infoCollect.setKeyWord(funcIdGather.getKeyWord());
             list.add((T) infoCollect);
         }
@@ -457,7 +451,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
             if(CollUtil.isNotEmpty(objectInfoCollectMap)){
                 ObjectInfoCollect collect = objectInfoCollectMap.get(id);
                 if(collect != null){
-                    visiable = collect.getVisiable();
+                    //visiable = collect.getVisiable();
                     admObjectInfo.setKeyWord(collect.getKeyWord());
                 }
             }
@@ -497,7 +491,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
             if(CollUtil.isNotEmpty(objectInfoCollectMap)){
                 ObjectInfoCollect collect = objectInfoCollectMap.get(id);
                 if(collect!=null){
-                    visiable = collect.getVisiable();
+                    //visiable = collect.getVisiable();
                     admObjectInfo.setKeyWord(collect.getKeyWord());
                 }
             }

+ 45 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/controller/AdmDeliverPlanController.java

@@ -0,0 +1,45 @@
+package com.persagy.adm.server.algorithm.controller;
+
+import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
+import com.persagy.adm.server.algorithm.domain.ModelFileVo;
+import com.persagy.adm.server.algorithm.domain.QueryModelFileVo;
+import com.persagy.adm.server.algorithm.service.AdmModelService;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ResultHelper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 02-交付计划入口
+ * 后端服务名:adm-server
+ * @author : lijie
+ * Update By 2022/1/12 14:01
+ */
+@RestController
+@RequestMapping("/deliver/plan")
+@RequiredArgsConstructor
+public class AdmDeliverPlanController {
+
+    private final AdmModelService admModelService;
+
+    /**
+     * 020101-交付计划-处理BOSS产生的交付计划
+     * @param deliverPlanVo : 交付计划信息
+     * @return : com.persagy.dmp.common.model.response.CommonResult<java.util.List<java.lang.Void>>
+     * @author : lijie
+     * Update By 2022/1/14 17:22
+     */
+    @PostMapping(value = "/relayDeliverPlan")
+    public CommonResult<List<Void>> relayDeliverPlan(@Validated @RequestBody DeliverPlanVo deliverPlanVo) {
+        admModelService.relayDeliverPlan(deliverPlanVo);
+        return ResultHelper.multi(new ArrayList<>());
+    }
+
+}

+ 1 - 1
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/controller/AdmModelController.java

@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 01-楼层管理入口
+ * 01-模型文件管理
  * 后端服务名:adm-server
  * @author : lijie
  * Update By 2022/1/12 14:01

+ 69 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/domain/DeliverPlanVo.java

@@ -0,0 +1,69 @@
+package com.persagy.adm.server.algorithm.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+import java.util.Set;
+
+/**
+ * 交付计划VO类
+ * @author : lijie
+ * Update By 2022/1/14 16:26
+ */
+@Data
+public class DeliverPlanVo {
+    /**
+     * 交付计划总id
+     * @mock @string(8)
+     * */
+    @NotBlank
+    private String deliverPlanMasterId;
+    /**
+     * 交付计划id
+     * @mock @string(8)
+     * */
+    @NotBlank
+    private String deliverPlanId;
+    /**
+     * 交付计划名称
+     * @mock @string(8)
+     * */
+    @NotBlank
+    private String deliverPlanName;
+    /**商品编码集合*/
+    @NotEmpty
+    private Set<String> skuCodes;
+    /**
+     * 数量
+     * @mock @natural(0,10000)
+     * */
+    private Integer number;
+    /**
+     * 开始时间,时间戳格式
+     * @mock @timestamp
+     * */
+    private Long startTime;
+    /**
+     * 结束时间,时间戳格式
+     * @mock @timestamp
+     * */
+    private Long endTime;
+    /**
+     * 项目id
+     * @mock @string(8)
+     * */
+    private String itemId;
+    /**
+     * 项目名称
+     * @mock @string(8)
+     * */
+    private String itemName;
+    /**
+     * 创建人名称:管家名称
+     * @mock @string(5)
+     * */
+    private String creator;
+}

+ 9 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/AdmDeliverPlanService.java

@@ -0,0 +1,9 @@
+package com.persagy.adm.server.algorithm.service;
+
+/**
+ * 对接BOSS的交付计划逻辑处理接口
+ * @author : lijie
+ * Update By 2022/1/14 16:07
+ */
+public interface AdmDeliverPlanService {
+}

+ 10 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/AdmModelService.java

@@ -1,8 +1,18 @@
 package com.persagy.adm.server.algorithm.service;
+
+import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
+
 /**
  * 模型文件的逻辑处理接口
  * @author : lijie
  * Update By 2022/1/12 14:06
  */
 public interface AdmModelService {
+    /**
+     * 处理BOSS产生的交付计划
+     * @param deliverPlanVo : 交付计划信息
+     * @author : lijie
+     * Update By 2022/1/14 17:22
+     */
+    void relayDeliverPlan(DeliverPlanVo deliverPlanVo);
 }

+ 21 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmDeliverPlanServiceImpl.java

@@ -0,0 +1,21 @@
+package com.persagy.adm.server.algorithm.service.impl;
+
+import com.persagy.adm.server.algorithm.service.AdmDeliverPlanService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AdmDeliverPlanServiceImpl implements AdmDeliverPlanService {
+
+
+
+
+
+
+
+
+
+}

+ 12 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelServiceImpl.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.server.algorithm.service.impl;
 
+import com.persagy.adm.server.algorithm.domain.DeliverPlanVo;
 import com.persagy.adm.server.algorithm.service.AdmModelService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,4 +15,15 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @RequiredArgsConstructor
 public class AdmModelServiceImpl implements AdmModelService {
+    /**
+     * 处理BOSS产生的交付计划
+     * @param deliverPlanVo : 交付计划信息
+     * @author : lijie
+     * Update By 2022/1/14 17:22
+     */
+    @Override
+    public void relayDeliverPlan(DeliverPlanVo deliverPlanVo) {
+        // 1.根据商品code与项目任务模板的映射数据与规则生成项目任务数据
+        // 2.调用dmp-rwd服务根据商品code生成交付范围
+    }
 }

+ 1 - 1
adm-business/adm-server/src/main/resources/mapper/AdmModelFileMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.persagy.adm.server.algorithm.mapper.AdmModelFileMapper">
+<mapper namespace="com.persagy.adm.server.algorithm.dao.AdmModelFileMapper">
 
     <resultMap id="BaseResultMap" type="com.persagy.adm.server.algorithm.entity.AdmModelFile">
             <id property="id" column="id" jdbcType="VARCHAR"/>