commit

PddServer/pom.xml

@@ -74,6 +74,12 @@
             <version>0.4.19</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>2.1.0</version> <!-- 使用最新版本 -->
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

PddServer/src/main/java/org/ta/pddserver/config/SwaggerConfig.java

+package org.ta.pddserver.config;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SwaggerConfig {
+    @Bean
+    public OpenAPI customOpenAPI() {
+        return new OpenAPI()
+                .info(new Info().title("海际集运系统-多多国际接口文档").version("1.0").description("接口说明"));
+    }
+}
+

PddServer/src/main/java/org/ta/pddserver/controller/DataGetController.java

@@ -11,11 +11,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.ta.pddserver.config.PddAPIConfig;
 import org.ta.pddserver.entity.TraceObjectEntity;
+import org.ta.pddserver.model.api.request.CollectOrderListRequest;
 import org.ta.pddserver.model.api.request.CollectOrderRequest;
 import org.ta.pddserver.model.api.request.TraceObjectRequest;
 import org.ta.pddserver.model.api.response.CollectOrderDetailResponse;
 import org.ta.pddserver.model.api.response.CollectOrderInfoResponse;
 import org.ta.pddserver.model.api.response.CollectReceiverDetailResponse;
+import org.ta.pddserver.model.enums.StatusEnum;
 import org.ta.pddserver.model.pddlg.common.TraceObject;
 import org.ta.pddserver.model.pddlg.request.PddLogisticsCoTrackNotifyRequest;
 import org.ta.pddserver.model.pddlg.response.PddLogisticsCoTrackNotifyResponse;
@@ -100,7 +102,7 @@ public class DataGetController {
     }
 
     /*出库详情*/
-    @PostMapping("/collectOrderInfo")
+    @PostMapping("/orderInfo")
     public JSONObject collectOrderInfo(HttpServletRequest request, @RequestBody CollectOrderRequest collectOrderRequest) {
         Map<String, Object> map = new HashMap<>();
         CollectOrderInfoResponse collectOrderInfoResponse = collectOrderImpl.getInfoByOrderCode(collectOrderRequest.getOrderCode());
@@ -113,6 +115,16 @@ public class DataGetController {
         return JsonResponse.generateLocalCommonSuccessResponse(map);
     }
 
+    /*待拣货列表*/
+    @PostMapping("/outboundList")
+    public JSONObject outboundList(HttpServletRequest request, @RequestBody CollectOrderListRequest collectOrderListRequest) {
+        collectOrderListRequest.setStatus(StatusEnum.FINISHOUTBOUND.getCode());
+        if (collectOrderListRequest.getSize() > 100) {
+            collectOrderListRequest.setSize(100);
+        }
+        return JsonResponse.generateLocalCommonSuccessResponse(collectOrderImpl.getList(collectOrderListRequest));
+    }
+
     private PddLogisticsCoTrackNotifyRequest.DataObject getDataObject(String code) {
         PddLogisticsCoTrackNotifyRequest.DataObject dataObjects = new PddLogisticsCoTrackNotifyRequest.DataObject();
         dataObjects.setTraces(new ArrayList<>());

PddServer/src/main/java/org/ta/pddserver/model/api/request/LogOrderListRequest.java

 package org.ta.pddserver.model.api.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.ta.pddserver.model.common.PageTool;
 
 @Data
 public class LogOrderListRequest extends PageTool {
+    @Schema(
+            description = "搜索集运单号，模糊搜索",
+            example = "PC123456",
+            minLength = 0,
+            maxLength = 20,
+            defaultValue = "",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
+//    @NotBlank(message = "用户名不能为空")
     private String logisticsOrderCode;
 }

PddServer/src/main/java/org/ta/pddserver/model/api/request/OutBoundRequest.java

@@ -13,6 +13,8 @@ public class OutBoundRequest {
 
     private List<OutPackage> outPackageList;
 
+    private Result result;
+
 
     /**
      * 包裹详情
@@ -41,4 +43,11 @@ public class OutBoundRequest {
         private String expressCode;
     }
 
+    @Data
+    public static class Result {
+        private String desc;
+        private String remark;
+        private int code;
+    }
+
 }

PddServer/src/main/java/org/ta/pddserver/model/common/PageTool.java

 package org.ta.pddserver.model.common;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public class PageTool {
 
+    @Schema(
+            description = "当前页码，最小1",
+            example = "1",
+            minLength = 0,
+            maxLength = 20,
+            defaultValue = "1",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
     private Integer page;
+    @Schema(
+            description = "不需要传",
+            example = "0",
+            minLength = 0,
+            maxLength = 20,
+            defaultValue = "0",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED // 必填
+    )
     private Integer offset;
+    @Schema(
+            description = "分页数量",
+            example = "20",
+            minLength = 1,
+            maxLength = 2,
+            defaultValue = "20",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
     private Integer size;
 
     public Integer getSize() {

PddServer/src/main/resources/application.yaml

@@ -4,13 +4,13 @@ spring:
 #    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
 #    username: root
 #    password: root
-#    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-#    username: pdd
-#    password: pdd123
-
-    url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
     username: pdd
     password: pdd123
+
+#    url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+#    username: pdd
+#    password: pdd123
     hikari:
       minimum-idle: 5  # 最小空闲连接数
       maximum-pool-size: 10  # 最大活跃连接数