Browse Source

还原分布式事物

pull/31/head
pref_mail@163.com 10 months ago
parent
commit
775fec69c6
  1. 2
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
  2. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  3. 1
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java
  4. 2
      blade-service/logpm-trunkline/src/main/resources/application-dev.yml
  5. 2
      blade-service/logpm-trunkline/src/main/resources/application-test.yml

2
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java

@ -11,7 +11,7 @@ import org.springblade.core.launch.BladeApplication;
* *
* @author lmy * @author lmy
*/ */
//@SeataCloudApplication
@BladeCloudApplication @BladeCloudApplication
public class BasicDataApplication { public class BasicDataApplication {

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@ -5294,7 +5294,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
); );
if (!list.isEmpty()) { if (!list.isEmpty()) {
//删除 //删除
log.info(">>> 预约单 {}删除之前的图片 start",distributionSignfor.getReservationId());
iDistributionSignPrintService.deleteLogic(list.stream().map(DistributionSignPrintEntity::getId).collect(Collectors.toList())); iDistributionSignPrintService.deleteLogic(list.stream().map(DistributionSignPrintEntity::getId).collect(Collectors.toList()));
log.info(">>> 预约单 {}删除之前的图片 start",distributionSignfor.getReservationId());
} }
v.forEach(i -> { v.forEach(i -> {
DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity(); DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity();
@ -5302,11 +5305,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionSignPrint.setReservationId(distributionSignfor.getReservationId()); distributionSignPrint.setReservationId(distributionSignfor.getReservationId());
distributionSignPrint.setId(null); distributionSignPrint.setId(null);
distributionSignPrintList.add(distributionSignPrint); distributionSignPrintList.add(distributionSignPrint);
log.info(">>> 需要重新保存的数据 {}",distributionSignPrint);
}); });
}); });
if (!distributionSignPrintList.isEmpty()) { if (!distributionSignPrintList.isEmpty()) {
//添加 //添加
log.info("执行批量保存 {}",distributionSignPrintList);
return iDistributionSignPrintService.saveBatch(distributionSignPrintList); return iDistributionSignPrintService.saveBatch(distributionSignPrintList);
} }

1
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java

@ -26,7 +26,6 @@ import org.springblade.core.launch.BladeApplication;
* @author Chill * @author Chill
*/ */
@BladeCloudApplication @BladeCloudApplication
//@SeataCloudApplication
public class TrunkLineApplication { public class TrunkLineApplication {
public static void main(String[] args) { public static void main(String[] args) {

2
blade-service/logpm-trunkline/src/main/resources/application-dev.yml

@ -39,7 +39,7 @@ spring:
#排除DruidDataSourceAutoConfigure #排除DruidDataSourceAutoConfigure
autoconfigure: autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource: datasource:
dynamic: dynamic:
druid: druid:

2
blade-service/logpm-trunkline/src/main/resources/application-test.yml

@ -12,7 +12,7 @@ server:
spring: spring:
#排除DruidDataSourceAutoConfigure #排除DruidDataSourceAutoConfigure
autoconfigure: autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource: datasource:
dynamic: dynamic:
druid: druid:

Loading…
Cancel
Save