java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.增加本地开发给对应各个模块名称修改的问题 

2.增加默认的租户账号编码
dev-warehouse
pref_mail@163.com 2 years ago
parent
4aad0850ed
commit
cfd88fc7a2
11 changed files with 41 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      blade-biz-common/src/main/java/org/springblade/common/constant/TenantNum.java
  2. 3
      blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java
  3. 3
      blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java
  4. 3
      blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java
  5. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
  6. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java
  7. 3
      blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java
  8. 6
      blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
  9. 3
      blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/OldProjectApplication.java
  10. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java
  11. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java

17
blade-biz-common/src/main/java/org/springblade/common/constant/TenantNum.java
Unescape View File

@ -0,0 +1,17 @@
package org.springblade.common.constant;
/**
* 数据传输--租户默认对象
*/
public class TenantNum {;
public static final String HUITONGCODE ="627683";
/**
* 如果不需要 ""
*/
public static final String DEVAUTH ="-pref";
}

3
blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java
Unescape View File

@ -16,6 +16,7 @@
*/
package org.springblade.gateway;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -33,7 +34,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
public class GateWayApplication {
public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args);
BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME.concat(TenantNum.DEVAUTH), GateWayApplication.class, args);
}
}

3
blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java
Unescape View File

@ -1,6 +1,7 @@
package com.xxl.job.admin;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.launch.BladeApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -11,7 +12,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
public class JobAdminApplication {
public static void main(String[] args) {
BladeApplication.run(LauncherConstant.APPLICATION_XXLJOB_ADMIN_NAME, JobAdminApplication.class, args);
BladeApplication.run(LauncherConstant.APPLICATION_XXLJOB_ADMIN_NAME.concat(TenantNum.DEVAUTH), JobAdminApplication.class, args);
}
}

3
blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java
Unescape View File

@ -3,6 +3,7 @@ package com.logpm.basic;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
@ -15,7 +16,7 @@ import org.springblade.core.launch.BladeApplication;
public class BasicApplication {
public static void main(String[] args) {
BladeApplication.run(ModuleNameConstant.APPLICATION_BASIC_NAME, BasicApplication.class, args);
BladeApplication.run(ModuleNameConstant.APPLICATION_BASIC_NAME.concat(TenantNum.DEVAUTH), BasicApplication.class, args);
}
}

3
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
Unescape View File

@ -2,6 +2,7 @@
package com.logpm.basicdata;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
@ -14,7 +15,7 @@ import org.springblade.core.launch.BladeApplication;
public class BasicDataApplication {
public static void main(String[] args) {
BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME, BasicDataApplication.class, args);
BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME.concat(TenantNum.DEVAUTH), BasicDataApplication.class, args);
}

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java
Unescape View File

@ -17,6 +17,7 @@
package com.logpm.distribution;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
@ -29,7 +30,7 @@ import org.springblade.core.launch.BladeApplication;
public class DistributionApplication {
public static void main(String[] args) {
BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME, DistributionApplication.class, args);
BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME.concat(TenantNum.DEVAUTH), DistributionApplication.class, args);
}
}

3
blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java
Unescape View File

@ -17,6 +17,7 @@
package com.logpm.factory;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
@ -29,7 +30,7 @@ import org.springblade.core.launch.BladeApplication;
public class FactoryApplication {
public static void main(String[] args) {
BladeApplication.run(ModuleNameConstant.APPLICATION_FACTORY_NAME, FactoryApplication.class, args);
BladeApplication.run(ModuleNameConstant.APPLICATION_FACTORY_NAME.concat(TenantNum.DEVAUTH), FactoryApplication.class, args);
}
}

6
blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
Unescape View File

@ -41,6 +41,7 @@ import com.logpm.oldproject.vo.DistributionParcelListEntityVO;
import lombok.AllArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.common.constant.TenantNum;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.CommonUtil;
import org.springblade.core.tool.api.R;
@ -366,6 +367,11 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
distributionStockArticleEntity.setWarehouseEntryTime(date);
distributionStockArticleEntity.setTotalNumber(total);
distributionStockArticleEntity.setHandQuantity(0);
distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID
// distributionStockArticleEntity.setWaybillNumber();// 运单号
// 需要插入部门 ID
// 创建ID
//判断是否齐套 查询该订单自编号下面的包件是都全部都交由汇通了
Integer allNum = advanceDetailClient.getAllNumByOrderNo(orderSelfNum);
if(total.equals(allNum)){

3
blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/OldProjectApplication.java
Unescape View File

@ -18,6 +18,7 @@ package com.logpm.oldproject;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
@ -30,7 +31,7 @@ import org.springblade.core.launch.BladeApplication;
public class OldProjectApplication {
public static void main(String[] args) {
BladeApplication.run(ModuleNameConstant.APPLICATION_OLDPROJECT_NAME, OldProjectApplication.class, args);
BladeApplication.run(ModuleNameConstant.APPLICATION_OLDPROJECT_NAME.concat(TenantNum.DEVAUTH), OldProjectApplication.class, args);
}
}

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java
Unescape View File

@ -18,6 +18,7 @@ package com.logpm.trunkline;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
@ -30,7 +31,7 @@ import org.springblade.core.launch.BladeApplication;
public class TrunkLineApplication {
public static void main(String[] args) {
BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME, TrunkLineApplication.class, args);
BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME.concat(TenantNum.DEVAUTH), TrunkLineApplication.class, args);
}
}

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java
Unescape View File

@ -17,6 +17,7 @@
package com.logpm.warehouse;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
@ -29,7 +30,7 @@ import org.springblade.core.launch.BladeApplication;
public class WarehouseApplication {
public static void main(String[] args) {
BladeApplication.run(ModuleNameConstant.APPLICATION_WAREHOUSE_NAME.concat("-pref"), WarehouseApplication.class, args);
BladeApplication.run(ModuleNameConstant.APPLICATION_WAREHOUSE_NAME.concat(TenantNum.DEVAUTH), WarehouseApplication.class, args);
}
}

Write Preview
Loading…
Cancel
Save