diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/controller/LogpmDataSearchController.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/controller/LogpmDataSearchController.java new file mode 100644 index 000000000..ff0598cb8 --- /dev/null +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/controller/LogpmDataSearchController.java @@ -0,0 +1,49 @@ +package com.logpm.datasharing.controller; + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 物流订单/运单信息查询接口 + + *
  • 1.包含运单的运输作业节点信息
  • + *
  • 2.包含订单的运输作业节点信息
  • + *
  • 3.该接口需要对外开发查询
  • + *
  • 4.需要考虑该接口对同一IP的流量管控
  • + * + */ +@RestController +@AllArgsConstructor +@RequestMapping("/search") +@Api(value = "运单/订单查询", tags = "运单/订单查询") +public class LogpmDataSearchController extends BladeController { + + + /** + * 订单/运单搜索 + * @return + */ + @GetMapping("/data/${type}/${order}") + public R data(@PathVariable("order") String order){ + + + + + + + + + return null; + + + } + + + +} diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/ILogpmDataSearchService.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/ILogpmDataSearchService.java new file mode 100644 index 000000000..844564b6b --- /dev/null +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/ILogpmDataSearchService.java @@ -0,0 +1,12 @@ +package com.logpm.datasharing.service; + +import org.springblade.core.tool.api.R; + +/** + * 数据擦或许 + */ +public interface ILogpmDataSearchService { + + R data(String type, String order); + +} diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java new file mode 100644 index 000000000..b1094c908 --- /dev/null +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java @@ -0,0 +1,42 @@ +package com.logpm.datasharing.service.impl; + +import com.logpm.datasharing.service.ILogpmDataSearchService; +import org.springblade.core.tool.api.R; +import org.springframework.stereotype.Service; + +@Service +public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService { + @Override + public R data(String type, String order) { + + + // 判断type类型 + switch (type) { + case "order": + // 订单查询 + return dataOrder(order); + + case "waybill": + // 运单查询 + break; + default: + // 需要没有参数的查询全部的情况 + return R.fail("参数错误"); + } + + return null; + } + + private R dataOrder(String order) { + + // 通过订单查询站存单导入时间 + + + // 导入 + + // + + + return null; + } +} diff --git a/blade-service/logpm-data-sharing/src/main/resources/application.yml b/blade-service/logpm-data-sharing/src/main/resources/application.yml index e06f3357f..bf5d903dc 100644 --- a/blade-service/logpm-data-sharing/src/main/resources/application.yml +++ b/blade-service/logpm-data-sharing/src/main/resources/application.yml @@ -10,16 +10,6 @@ swagger: - org.springblade - com.logpm -#oss配置 -oss: - enabled: true - name: minio - tenant-mode: false - endpoint: http://8.137.14.82:9000 - access-key: minio - secret-key: 123123123 - bucket-name: bladex - logging: config: classpath:logback.xml diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java index a0e1e063d..f5e5580bf 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java @@ -24,8 +24,6 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { private final ZbFactoryProperties zbFactoryProperties; - private final Environment environment; - private final RedisLockClient redisLockClient; private final MockLoginService mockLoginService;