diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/MainlineWaybill.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/MainlineWaybill.java similarity index 99% rename from blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/MainlineWaybill.java rename to blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/MainlineWaybill.java index a7b123636..d06376974 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/MainlineWaybill.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/MainlineWaybill.java @@ -1,4 +1,4 @@ -package com.logpm.trunkline.entity; +package com.logpm.warehouse.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/IMainlineWaybillClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IMainlineWaybillClient.java similarity index 89% rename from blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/IMainlineWaybillClient.java rename to blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IMainlineWaybillClient.java index f205f16da..573d654a2 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/IMainlineWaybillClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IMainlineWaybillClient.java @@ -14,9 +14,9 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package com.logpm.trunkline.feign; +package com.logpm.warehouse.feign; -import com.logpm.trunkline.entity.MainlineWaybill; +import com.logpm.warehouse.entity.MainlineWaybill; import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -37,5 +37,5 @@ public interface IMainlineWaybillClient { String TOP = API_PREFIX + "/top"; @GetMapping(API_PREFIX + "/findByWaybillNo") - MainlineWaybill findByWaybillNo(@RequestParam String waybillNo); + MainlineWaybill findByWaybillNo(@RequestParam String waybillNo); } diff --git a/blade-service/logpm-warehouse/pom.xml b/blade-service/logpm-warehouse/pom.xml index 11c1e7224..535c115e9 100644 --- a/blade-service/logpm-warehouse/pom.xml +++ b/blade-service/logpm-warehouse/pom.xml @@ -28,6 +28,12 @@ blade-core-auto compile + + org.springblade + logpm-warehouse-api + 3.1.0.RELEASE + compile + - + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/MainlineWaybillController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/MainlineWaybillController.java similarity index 84% rename from blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/MainlineWaybillController.java rename to blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/MainlineWaybillController.java index 08e791e47..e9c74d011 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/MainlineWaybillController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/MainlineWaybillController.java @@ -1,6 +1,6 @@ -package com.logpm.trunkline.controller; +package com.logpm.warehouse.controller; -import com.logpm.trunkline.service.IMainlineWaybillService; +import com.logpm.warehouse.service.IMainlineWaybillService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java new file mode 100644 index 000000000..fa4ee131c --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java @@ -0,0 +1,25 @@ +package com.logpm.warehouse.controller; + +import com.logpm.warehouse.service.IMainlineWaybillService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 运单;(logpm_mainline_waybill)表控制层 + * @author : http://www.chiner.pro + * @date : 2023-7-8 + */ +@Api(tags = "老系统推送数据功能接口") +@RestController +@RequestMapping("/oldpush") +public class OldSystemPushController { + @Autowired + private IMainlineWaybillService mainlineWaybillService; + + + + + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/launcher/WarehouseLauncherServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/launcher/WarehouseLauncherServiceImpl.java new file mode 100644 index 000000000..f599c498b --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/launcher/WarehouseLauncherServiceImpl.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.warehouse.launcher; + +import org.springblade.core.auto.service.AutoService; +import org.springblade.core.launch.constant.NacosConstant; +import org.springblade.core.launch.service.LauncherService; +import org.springblade.core.launch.utils.PropsUtil; +import org.springframework.boot.builder.SpringApplicationBuilder; + +import java.util.Properties; + +/** + * 启动参数拓展 + * + * @author Chill + */ +@AutoService(LauncherService.class) +public class WarehouseLauncherServiceImpl implements LauncherService { + + @Override + public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { + Properties props = System.getProperties(); + // 开启多数据源 + PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true"); + // 指定注册配置信息 + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].data-id", NacosConstant.dataId(appName, profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].group", NacosConstant.NACOS_CONFIG_GROUP); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH); + // 指定注册IP + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.ip", "127.0.0.1"); + // 指定注册端口 + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.port", "8200"); + // 自定义命名空间 + // PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE); + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE); + // 自定义分组 + // PropsUtil.setProperty(props, "spring.cloud.nacos.config.group", NacosConstant.NACOS_CONFIG_GROUP); + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.group", NacosConstant.NACOS_CONFIG_GROUP); + } + + @Override + public int getOrder() { + return 20; + } +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/MainlineWaybillMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/MainlineWaybillMapper.java similarity index 78% rename from blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/MainlineWaybillMapper.java rename to blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/MainlineWaybillMapper.java index 97a9ec668..0723d7ddd 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/MainlineWaybillMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/MainlineWaybillMapper.java @@ -1,7 +1,7 @@ -package com.logpm.trunkline.mapper; +package com.logpm.warehouse.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.logpm.trunkline.entity.MainlineWaybill; +import com.logpm.warehouse.entity.MainlineWaybill; import org.apache.ibatis.annotations.Mapper; /** diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/MainlineWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/MainlineWaybillMapper.xml similarity index 100% rename from blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/MainlineWaybillMapper.xml rename to blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/MainlineWaybillMapper.xml diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IMainlineWaybillService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IMainlineWaybillService.java similarity index 81% rename from blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IMainlineWaybillService.java rename to blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IMainlineWaybillService.java index db76e04c5..5ab6eced0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IMainlineWaybillService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IMainlineWaybillService.java @@ -1,4 +1,4 @@ -package com.logpm.trunkline.service; +package com.logpm.warehouse.service; /** * 运单;(logpm_mainline_waybill)表服务接口 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/MainlineWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/MainlineWaybillServiceImpl.java new file mode 100644 index 000000000..3c165b9d9 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/MainlineWaybillServiceImpl.java @@ -0,0 +1,18 @@ +package com.logpm.warehouse.service.impl; + +import com.logpm.warehouse.mapper.MainlineWaybillMapper; +import com.logpm.warehouse.service.IMainlineWaybillService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 运单;(logpm_mainline_waybill)表服务实现类 + * @author : http://www.chiner.pro + * @date : 2023-7-4 + */ +@Service +public class MainlineWaybillServiceImpl implements IMainlineWaybillService { + @Autowired + private MainlineWaybillMapper mainlineWaybillMapper; + +}