1:托运订单-接口定义

2:销售订单-物流托运接口完善

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/ExceptionFilterConfig.java

@@ -2,7 +2,6 @@ package com.sckw.core.filter;
 
 import com.sckw.core.exception.SystemException;
 import jakarta.servlet.*;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilterConfig.java

@@ -1,24 +1,27 @@
-package com.sckw.core.filter;
-
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-/**
- * @author czh
- * @desc TODO
- * @date 2023/6/14
- */
-@Component
-public class LoginFilterConfig {
-
-
-    @Bean
-    public FilterRegistrationBean registerBusExceptionFilter() {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(new ExceptionFilterConfig());
-        registration.setName("ExceptionFilter");
-        registration.setOrder(-1);
-        return registration;
-    }
-}
+//package com.sckw.core.filter;
+//
+//import jakarta.annotation.Resource;
+//import org.springframework.boot.web.servlet.FilterRegistrationBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.core.annotation.Order;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * @author czh
+// * @desc TODO
+// * @date 2023/6/14
+// */
+//@Component
+//public class LoginFilterConfig {
+//
+//
+//    @Bean
+//    public FilterRegistrationBean registerBusExceptionFilter() {
+//        FilterRegistrationBean registration = new FilterRegistrationBean();
+//        registration.setFilter(new ExceptionFilterConfig());
+//        registration.setName("ExceptionFilter");
+//        registration.setOrder(-1);
+//        return registration;
+//    }
+//}

sckw-common/sckw-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,7 +1,7 @@
 com.sckw.core.aspect.DaoAspect
 com.sckw.core.exception.GlobalSystemExceptionHandler
 com.sckw.core.web.config.CustomConfig
-com.sckw.core.filter.LoginFilter
+#com.sckw.core.filter.LoginFilter
 com.sckw.core.web.config.WebMvcConfig
-com.sckw.core.filter.ExceptionFilterConfig
+#com.sckw.core.filter.ExceptionFilterConfig
 com.sckw.core.config.MybatisPlusConfig

sckw-modules/sckw-product/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,179 @@
+spring:
+  application:
+    name: sckw-transport
+  rabbitmq:
+    username: admin
+    password: admin
+    host: 10.10.10.138
+    port: 5672
+    virtual-host: /
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+#        server-addr: 47.108.162.14:8848
+        server-addr: 127.0.0.1:8848
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # nacos用户名
+        username: nacos
+        # nacos密码
+        password: nacos
+        # 共享配置
+        group: sckw-service-platform
+        # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
+      #        weight: 100
+      config:
+        # 配置中心地址
+#        server-addr: 47.108.162.14:8848
+        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yaml
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # 共享配置
+        group: sckw-service-platform
+        enabled: true
+    stream:
+      bindings:
+        sckwSms-out-0:
+          destination: sckw-sms
+          content-type: application/json
+          default-binder: defaultRabbit
+          group: sckw
+        sckwMessage-out-0:
+          destination: sckw-message
+          content-type: application/json
+          default-binder: defaultRabbit
+          group: sckw
+      binders:
+        defaultRabbit:
+          type: rabbit
+          environment:
+            spring:
+              rabbitmq:
+                virtual-host: /
+                host: 39.104.134.114
+                port: 5672
+                username: wph
+                password: Yy123...
+    # sentinel降级配置
+    sentinel:
+      transport:
+        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
+        port: 8719  #默认8719端口,如果被占用会向上扫描。
+        #控制台地址
+        #dashboard: 47.108.162.14:19527
+        dashboard: 127.0.0.1:19527
+      log:
+        #日志路径
+        dir: logs/sentinel
+        # 默认将调用链路收敛，导致链路流控效果无效
+        web-context-unify: false
+        #持久化nacos配置中
+      datasource:
+        #sentinel-rule: # 唯一名称可自定义
+        #限流
+        flow:
+          nacos:
+            # 设置Nacos的连接地址、命名空间和Group ID
+            namespace:  sckw-service-platform-dev
+            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            # username: ${spring.cloud.nacos.discovery.username}
+            # password: ${spring.cloud.nacos.discovery.password}
+            # 设置Nacos中配置文件的命名规则
+            #            data-id:  ${spring.application.name}-sentinel-flow-rules
+            data-id:  sckw-file-sentinel-flow-rules
+            group-id: SENTINEL_GROUP
+            data-type: json
+            # 必填的重要字段，指定当前规则类型是"限流"
+            rule-type: flow
+        #熔断
+        degrade:
+          nacos:
+            namespace:  sckw-service-platform-dev
+            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            #data-id: ${spring.application.name}-sentinel-degrade-rules
+            data-id: sckw-file-sentinel-degrade-rules
+            group-id: SENTINEL_GROUP
+            #熔断
+            rule-type: degrade
+      #取消慢加载
+      eager: true
+  datasource:
+    dynamic:
+      seata: true
+#sfs:
+#  nacos:
+#    server-addr: 127.0.0.1:8848
+#    namespace: 967df0d8-156b-441a-a5ab-615b4a865168
+#    group: MY_GROUP
+#
+#    nacos:
+#      server-addr: ${sfs.nacos.server-addr}
+#      namespace: ${sfs.nacos.namespace}
+#      group: ${sfs.nacos.group}
+
+#seata:
+#  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+#  # 事务分组名称，要和服务端对应
+#  tx-service-group: sckw-transport-seata-service-group
+#  service:
+#    vgroup-mapping:
+#      # key是事务分组名称 value要和服务端的机房名称保持一致
+#      sckw-transport-seata-service-group: default
+#  registry:
+#    # 指定nacos作为注册中心
+#    type: nacos
+#    nacos:
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      #server-addr: 47.108.162.14:8848
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      #      group: SEATA_GROUP
+#      group: ${spring.cloud.nacos.discovery.group}
+#  config:
+#    # 指定nacos作为配置中心
+#    type: nacos
+#    nacos:
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      #server-addr: 47.108.162.14:8848
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      group: ${spring.cloud.nacos.discovery.group}
+#  application-id: ${spring.application.name}
+#  #  当前不生效，使用驼峰
+#  enabled: true
+#  #  enable-auto-data-source-proxy: false
+#  enableAutoDataSourceProxy: false
+#  application-id: sckw-seata-file
+# 支持feign对sentinel支持
+#feign:
+#  sentinel:
+#    enabled: true
+
+dubbo:
+  application:
+    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
+    name: transport-dubbo-server
+  protocol:
+    name: dubbo
+    port: -1
+    prefer-serialization: java
+  registry:
+    # 配置dubbo的注册中心为nacos
+    address: nacos://${spring.cloud.nacos.discovery.server-addr}
+    group: ${spring.cloud.nacos.config.group}
+    protocol: nacos
+    #use-as-config-center: false
+    #use-as-metadata-center: false
+aliyun:
+  oss:
+    endpoint: oss-cn-chengdu.aliyuncs.com
+    accessKeyId: LTAI5tPEbubCGq5Rdwygbz4Q
+    secret: 7mQLWMaBJeZPRV1SRGogctYGXwppjQ
+    bucket: kaiwu-saas
+links:
+isBindManyRole:
+mybatis-plus:
+  configuration:
+    # 是否将sql打印到控制面板(该配置会将sql语句和查询的结果都打印到控制台)
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

sckw-modules/sckw-transport/pom.xml

@@ -73,6 +73,20 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -1,9 +1,14 @@
 package com.sckw.transport.controller;
 
+import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.excel.easyexcel.RequestHolder;
+import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.transport.model.vo.ConsignOrderVo;
 import com.sckw.transport.service.AcceptCarriageOrderService;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author lfdc
  * @description 承运订单controller
@@ -30,7 +37,7 @@ public class AcceptCarriageOrderController {
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/kwtList", method = RequestMethod.GET)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
     public HttpResult acceptCarriageOrderList(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.list(query);
@@ -44,7 +51,7 @@ public class AcceptCarriageOrderController {
      * 承运订单首页统计查询
      * @return
      */
-    @RequestMapping(value = "/kwtCount", method = RequestMethod.GET)
+    @RequestMapping(value = "/statistics", method = RequestMethod.GET)
     public HttpResult acceptCarriageOrderCount(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.count(query);
@@ -55,11 +62,27 @@ public class AcceptCarriageOrderController {
     }
 
     /**
-     * 承运订单-分包托运
+     * 承运订单导出
+     * @param query
+     * @return
+     */
+    @RequestMapping(value = "/export", method = RequestMethod.GET)
+    public HttpResult export(AcceptCarriageOrderQuery query) {
+        HttpServletResponse response = RequestHolder.getResponse();
+        List list = acceptCarriageOrderService.export(query);
+        if (CollectionUtils.isNotEmpty(list)){
+            ExcelUtil.download(response, ConsignOrderVo.class, list);
+            return HttpResult.ok();
+        }
+        return HttpResult.error("没有可导出的数据");
+    }
+
+    /**
+     * 承运订单-分包托运s
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/kwtSubcontractConsignment", method = RequestMethod.POST)
+    @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
     public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageOrderService.subcontractConsignment(query);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -56,4 +56,8 @@ public class AcceptCarriageOrderService {
     public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
         return null;
     }
+
+    public List export(AcceptCarriageOrderQuery query) {
+        return null;
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ConsignOrderService.java

@@ -1,14 +1,9 @@
 package com.sckw.transport.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sckw.core.common.enums.NumberConstant;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.dao.KwtLogisticsOrderAddressMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderUnitMapper;
-import com.sckw.transport.model.KwtLogisticsOrder;
-import com.sckw.transport.model.KwtLogisticsOrderUnit;
 import com.sckw.transport.model.param.ConsignOrderQuery;
 import com.sckw.transport.model.vo.ConsignOrderVo;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +12,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author lfdc
@@ -39,14 +33,14 @@ public class ConsignOrderService {
     public KwtLogisticsOrderUnitMapper kwtLogisticsOrderUnitMapper;
 
     public HttpResult list(ConsignOrderQuery query) {
-        ConsignOrderVo consignOrderVo = new ConsignOrderVo();
-        LambdaQueryWrapper<KwtLogisticsOrder> wrapper = new LambdaQueryWrapper<>();
-//        kwtLogisticsOrderRepository.page(new Page<>(query.getPage(), query.getPageSize()),
-//                wrapper.like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getLOrderNo,query.getKeywords())
-//                        .like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getc))
-        List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().like(StringUtils.isNotBlank(query.getKeywords()), KwtLogisticsOrder::getLOrderNo, query.getKeywords()));
-        List<Long> ids = kwtLogisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());
-        List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectCompanyBylOrderId(ids, NumberConstant.ONE);
+//        ConsignOrderVo consignOrderVo = new ConsignOrderVo();
+//        LambdaQueryWrapper<KwtLogisticsOrder> wrapper = new LambdaQueryWrapper<>();
+////        kwtLogisticsOrderMapper.selectPage(new Page<>(query.getPage(), query.getPageSize()),
+////                wrapper.like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getLOrderNo,query.getKeywords())
+////                        .like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getc))
+//        List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().like(StringUtils.isNotBlank(query.getKeywords()), KwtLogisticsOrder::getLOrderNo, query.getKeywords()));
+//        List<Long> ids = kwtLogisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());
+//        List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectCompanyBylOrderId(ids, NumberConstant.ONE);
         return null;
     }
 

sckw-modules/sckw-transport/src/main/resources/bootstrap-local.yml

@@ -1,4 +1,6 @@
 spring:
+  application:
+    name: sckw-transport
   rabbitmq:
     username: admin
     password: admin
@@ -112,36 +114,36 @@ spring:
 #      namespace: ${sfs.nacos.namespace}
 #      group: ${sfs.nacos.group}
 
-seata:
-  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称，要和服务端对应
-  tx-service-group: file-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      file-seata-service-group: default
-  registry:
-    # 指定nacos作为注册中心
-    type: nacos
-    nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      #server-addr: 47.108.162.14:8848
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      #      group: SEATA_GROUP
-      group: ${spring.cloud.nacos.discovery.group}
-  config:
-    # 指定nacos作为配置中心
-    type: nacos
-    nacos:
-      server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      #server-addr: 47.108.162.14:8848
-      namespace: ${spring.cloud.nacos.discovery.namespace}
-      group: ${spring.cloud.nacos.discovery.group}
-  application-id: ${spring.application.name}
-  #  当前不生效，使用驼峰
-  enabled: true
-  #  enable-auto-data-source-proxy: false
-  enableAutoDataSourceProxy: false
+#seata:
+#  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+#  # 事务分组名称，要和服务端对应
+#  tx-service-group: sckw-transport-seata-service-group
+#  service:
+#    vgroup-mapping:
+#      # key是事务分组名称 value要和服务端的机房名称保持一致
+#      sckw-transport-seata-service-group: default
+#  registry:
+#    # 指定nacos作为注册中心
+#    type: nacos
+#    nacos:
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      #server-addr: 47.108.162.14:8848
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      #      group: SEATA_GROUP
+#      group: ${spring.cloud.nacos.discovery.group}
+#  config:
+#    # 指定nacos作为配置中心
+#    type: nacos
+#    nacos:
+#      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+#      #server-addr: 47.108.162.14:8848
+#      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      group: ${spring.cloud.nacos.discovery.group}
+#  application-id: ${spring.application.name}
+#  #  当前不生效，使用驼峰
+#  enabled: true
+#  #  enable-auto-data-source-proxy: false
+#  enableAutoDataSourceProxy: false
 #  application-id: sckw-seata-file
 # 支持feign对sentinel支持
 #feign:
@@ -151,7 +153,7 @@ seata:
 dubbo:
   application:
     # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
-    name: file-dubbo-server
+    name: transport-dubbo-server
   protocol:
     name: dubbo
     port: -1
@@ -170,4 +172,8 @@ aliyun:
     secret: 7mQLWMaBJeZPRV1SRGogctYGXwppjQ
     bucket: kaiwu-saas
 links:
-isBindManyRole:
+isBindManyRole:
+mybatis-plus:
+  configuration:
+    # 是否将sql打印到控制面板(该配置会将sql语句和查询的结果都打印到控制台)
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

sckw-modules/sckw-transport/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-transport
   profiles:
-    active: ${DEPLOY_MODE:dev}
+    active: ${DEPLOY_MODE:local}
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-transport/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.transport.dao.KwoTradeOrderDao">
+<mapper namespace="com.sckw.transport.dao.KwoTradeOrderMapper">
     <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwoTradeOrder">
         <id column="id" jdbcType="BIGINT" property="id" />
         <result column="t_order_no" jdbcType="BIGINT" property="tOrderNo" />