企业app首页数据统计

承运订单/托运订单-统计接口

sckw-modules/sckw-contract/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

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

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-contract
   profiles:
-    active: @profiles.active@
+    active: dev
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

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

@@ -101,41 +101,41 @@ spring:
   datasource:
     dynamic:
       seata: true
-seata:
-  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称，要和服务端对应
-  tx-service-group: example-seata-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      example-seata-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
+#seata:
+#  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+#  # 事务分组名称，要和服务端对应
+#  tx-service-group: example-seata-group
+#  service:
+#    vgroup-mapping:
+#      # key是事务分组名称 value要和服务端的机房名称保持一致
+#      example-seata-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:

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

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

sckw-modules/sckw-fleet/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw_zk
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw_zk
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
@@ -22,3 +22,180 @@ spring:
           - dataId: sckw-common.yml
             group: sckw-service-platform
             refresh: true
+#spring:
+#  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-fleet/src/main/resources/bootstrap.yml

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

sckw-modules/sckw-manage/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw_zk
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw_zk
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

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

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-system
   profiles:
-    active: @profiles.active@
+    active: dev
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

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

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

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

@@ -3,26 +3,18 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-#        server-addr: 47.108.162.14:8848
-        server-addr: 10.10.10.178:8848
+        server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw-service-platform-dev
-        # nacos用户名
-        username: nacos
-        # nacos密码
-        password: nacos
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
-        # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
-      #        weight: 100
       config:
         # 配置中心地址
-#        server-addr: 47.108.162.14:8848
-        server-addr: 10.10.10.178:8848
+        server-addr: 10.10.10.230:8848
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
@@ -30,3 +22,180 @@ spring:
           - dataId: sckw-common.yml
             group: sckw-service-platform
             refresh: true
+#spring:
+#  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-product/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-product
   profiles:
-    active: @profiles.active@
+    active: local
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

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

@@ -6,6 +6,8 @@ spring:
     name: sckw-report
   profiles:
     active: @profiles.active@
+#    active: test
+#    active: ${DEPLOY_MODE:test}
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-system/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

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

@@ -1,145 +1,201 @@
 spring:
-  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
+        server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
-        # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
-      #        weight: 100
       config:
         # 配置中心地址
-        #        server-addr: 47.108.162.14:8848
-        server-addr: 127.0.0.1:8848
+        server-addr: 10.10.10.230:8848
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         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: 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-system-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-system-sentinel-degrade-rules
-            group-id: SENTINEL_GROUP
-            #熔断
-            rule-type: degrade
-      #取消慢加载
-      eager: true
-  datasource:
-    dynamic:
-      seata: true
-seata:
-  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
-  # 事务分组名称，要和服务端对应
-  tx-service-group: system-seata-service-group
-  service:
-    vgroup-mapping:
-      # key是事务分组名称 value要和服务端的机房名称保持一致
-      system-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}
-#  application-id: sckw-seata-file
-# 支持feign对sentinel支持
-#feign:
-#  sentinel:
-#    enabled: true
-
-dubbo:
-  application:
-    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
-    name: system-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
+        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-service-platform
+            refresh: true
+#spring:
+#  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-system/src/main/resources/bootstrap.yml

@@ -5,7 +5,9 @@ spring:
   application:
     name: sckw-system
   profiles:
-    active: @profiles.active@
+     active: ${DEPLOY_MODE:local}
+#    active: @profiles.active@
+#    active: test
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppAcceptCarriageController.java

@@ -0,0 +1,38 @@
+package com.sckw.transport.controller.enterpriseApp;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.transport.service.AcceptCarriageOrderService;
+import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lfdc
+ * @description 企业app承运controller
+ * @date 2023-08-21 16:08:41
+ */
+@Slf4j
+@RestController("/appKwtAcceptCarriageOrder")
+public class AppAcceptCarriageController {
+
+    @Autowired
+    private AcceptCarriageOrderService carriageOrderService;
+
+    @RequestMapping(name = "企业app订单管理数据承运订单统计", path = "/statisticsCarriage", method = RequestMethod.POST)
+    public HttpResult statisticsCarriage(@Valid @RequestBody AcceptCarriageOrderQuery query) {
+        log.info("企业app订单管理数据承运订单统计 query :{}", JSONObject.toJSONString(query));
+        try {
+            return HttpResult.ok(carriageOrderService.statisticsCarriage(query));
+        } catch (Exception e) {
+            log.error("企业app订单管理数据承运订单统计失败  query:{}, error:{}", JSONObject.toJSONString(query), e.getMessage(), e);
+            return HttpResult.error(e.getMessage());
+        }
+    }
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppConsignController.java

@@ -0,0 +1,38 @@
+package com.sckw.transport.controller.enterpriseApp;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.transport.service.ConsignOrderService;
+import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lfdc
+ * @description 企业端app托运controller
+ * @date 2023-08-21 16:08:41
+ */
+@Slf4j
+@RestController("appKwtConsignOrder")
+public class AppConsignController {
+
+    @Autowired
+    private ConsignOrderService consignOrderService;
+
+    @RequestMapping(name = "企业app订单管理数据托运订单统计", path = "/statisticsConsign", method = RequestMethod.POST)
+    public HttpResult statisticsConsign(@Valid  @RequestBody AcceptCarriageOrderQuery query) {
+        log.info("企业app订单管理数据托运订单统计 query :{}", JSONObject.toJSONString(query));
+        try {
+            return HttpResult.ok(consignOrderService.statisticsConsignByApp(query));
+        } catch (Exception e) {
+            log.error("企业app订单管理数据托运订单统计失败  query:{}, error:{}", JSONObject.toJSONString(query), e.getMessage(), e);
+            return HttpResult.error(e.getMessage());
+        }
+    }
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -184,6 +184,14 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
      */
     List<DriverListVo> selectLoopOrderAndDriverListByOrderIds(@Param("idsList") List<Long> idsList);
 
+    /**
+     *
+     * @param query
+     * @param orderList
+     * @param type
+     * @param entId
+     * @return
+     */
     List<AcceptCarriageOrderVO> selectLogisticsOrderList(@Param("query") AcceptCarriageOrderQuery query,
                                                          @Param("orderList") List<Integer> orderList,
                                                          @Param("type") String type,
@@ -191,9 +199,20 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
     );
 
 
-    List<TableTops> selectLogisticsOrderListByStatus(@Param("query") AcceptCarriageOrderQuery query,
+    /**
+     *
+     * @param query
+     * @param orderList
+     * @param type
+     * @param entId
+     * @return
+     */
+    List<TableTops> countLogisticsOrderListByStatus(@Param("query") AcceptCarriageOrderQuery query,
                                                      @Param("orderList") List<Integer> orderList,
                                                      @Param("type") String type,
                                                      @Param("entId") Long entId
     );
+
+//    List<TableTops> countAppLogisticsOrderListByStatus(@Param("type") String type,@Param("entId") Long entId
+//    );
 }

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

@@ -2034,7 +2034,7 @@ public class AcceptCarriageOrderService {
                 case 3 -> query.setUnloadAddressCode(loadCode);
             }
         }
-        List<TableTops> list = logisticsOrderMapper.selectLogisticsOrderListByStatus(query, orderList, type, entId);
+        List<TableTops> list = logisticsOrderMapper.countLogisticsOrderListByStatus(query, orderList, type, entId);
         List<TableTops> arrayList = new ArrayList<>();
         arrayList.addAll(list);
         /**补全数据状态不齐的情况*/
@@ -2045,4 +2045,23 @@ public class AcceptCarriageOrderService {
         // 查询结果
         return HttpResult.ok(map);
     }
+
+    /**
+     * 企业app-订单主页面-承运订单统计
+     *
+     * @return
+     */
+    public HttpResult statisticsCarriage(AcceptCarriageOrderQuery query) {
+//        Long entId = LoginUserHolder.getEntId();
+//        Long queryEntId = 0L;
+//        Map<Long, EntCacheResDto> entMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(entId));
+//        if (entMap == null) {
+//            queryEntId = entId;
+//        } else {
+//            queryEntId = entMap.get(entId).getId();
+//        }
+        String type = "2";
+        HttpResult httpResult = statisticsAcceptCarriage(query, type);
+        return httpResult;
+    }
 }

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

@@ -75,7 +75,7 @@ public class ConsignOrderService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false,timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteContractService remoteContractService;
@@ -437,6 +437,7 @@ public class ConsignOrderService {
             }
             List<KwtWaybillOrder> kwtWaybillOrders = kwtWaybillOrderMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrder>()
                             .eq(StringUtils.isNotBlank(order.getId()), KwtWaybillOrder::getLOrderId, order.getId())
+                            /**.eq(KwtWaybillOrder::getType,NumberConstant.ONE)*/
                             .orderByDesc(KwtWaybillOrder::getCreateTime)
                     /**.last("limit " + (orderDto.getPage() - 1) + " , " + orderDto.getPageSize()*/);
             /**.eq(KwtWaybillOrder::getEntId, LoginUserHolder.getEntId()));*/
@@ -1353,7 +1354,7 @@ public class ConsignOrderService {
         List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
                 .eq(KwtLogisticsOrderUnit::getTopEntId, entId)
         );
-        if (CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isEmpty(list)) {
             return HttpResult.ok(res);
         }
 //        List<KwtLogisticsOrderUnit> unitInfo = kwtLogisticsOrderUnitMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
@@ -1496,7 +1497,7 @@ public class ConsignOrderService {
                 case 3 -> query.setUnloadAddressCode(loadCode);
             }
         }
-        List<TableTops> list = kwtLogisticsOrderMapper.selectLogisticsOrderListByStatus(query, orderList, type, entId);
+        List<TableTops> list = kwtLogisticsOrderMapper.countLogisticsOrderListByStatus(query, orderList, type, entId);
         List<TableTops> arrayList = new ArrayList<>();
         arrayList.addAll(list);
         /**补全数据状态不齐的情况*/
@@ -1509,4 +1510,14 @@ public class ConsignOrderService {
     }
 
 
+    /**
+     * 企业app-订单主页面-托运订单统计
+     *
+     * @return
+     */
+    public HttpResult statisticsConsignByApp(AcceptCarriageOrderQuery query) {
+        String type = "1";
+        HttpResult httpResult = statisticsConsign(query, type);
+        return httpResult;
+    }
 }

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

@@ -796,7 +796,7 @@
         ORDER BY a.id DESC
         <!--               ,a.create_time-->
     </select>
-    <select id="selectLogisticsOrderListByStatus" resultType="com.sckw.mongo.model.TableTops">
+    <select id="countLogisticsOrderListByStatus" resultType="com.sckw.mongo.model.TableTops">
         SELECT
         a.`status` AS value ,
         COUNT(a.`status`) AS total