Merge branch 'dev' into pre-production

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

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

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

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

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

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,32 +33,3 @@ spring:
           url: ${blade.datasource.basic.master.url}
           username: ${blade.datasource.basic.master.username}
           password: ${blade.datasource.basic.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.basic.627683.url}
-          username: ${blade.datasource.basic.627683.username}
-          password: ${blade.datasource.basic.627683.password}
-
-        695224:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.basic.695224.url}
-          username: ${blade.datasource.basic.695224.username}
-          password: ${blade.datasource.basic.695224.password}
-
-        645789:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.basic.645789.url}
-          username: ${blade.datasource.basic.645789.username}
-          password: ${blade.datasource.basic.645789.password}

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

@@ -12,7 +12,7 @@ server:
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
     dynamic:
       druid:
@@ -33,20 +33,4 @@ spring:
           url: ${blade.datasource.basicdata.master.url}
           username: ${blade.datasource.basicdata.master.username}
           password: ${blade.datasource.basicdata.master.password}
-        627683:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.basicdata.627683.url}
-          username: ${blade.datasource.basicdata.627683.username}
-          password: ${blade.datasource.basicdata.627683.password}
-        695224:
-          url: ${blade.datasource.basicdata.695224.url}
-          username: ${blade.datasource.basicdata.695224.username}
-          password: ${blade.datasource.basicdata.695224.password}
-        645789:
-          url: ${blade.datasource.basicdata.645789.url}
-          username: ${blade.datasource.basicdata.645789.username}
-          password: ${blade.datasource.basicdata.645789.password}
+

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

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

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

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

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

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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -2682,24 +2682,26 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		IPage<TrunklineCarsLoadScanVO> pageList = trunklineCarsLoadScanService.loadingDetail(page, loadCarsDTO);
 		List<TrunklineCarsLoadScanVO> records = pageList.getRecords();
 		//把records中type等于2的id放入一个集合
-		List<Long> scanLoadIds = records.stream().filter(item -> item.getType() == 2).map(TrunklineCarsLoadScanVO::getId).collect(Collectors.toList());
+		List<Long> scanLoadIds = records.stream().filter(item -> item.getType() == 2).map(TrunklineCarsLoadScanVO::getCarsLoadScanId).collect(Collectors.toList());
 		if(CollUtil.isNotEmpty(scanLoadIds)){
 			List<TrunklineScanZeroDetailVO> scanZeroDetailVOS = scanZeroDetailService.findListByCarsLoadScanIds(scanLoadIds);
 			//把scanZeroDetailVOS通过scanId进行分组
 			Map<Long, List<TrunklineScanZeroDetailVO>> scanZeroDetailVOMap = scanZeroDetailVOS.stream().collect(Collectors.groupingBy(TrunklineScanZeroDetailVO::getScanId));
 			records.forEach(item -> {
-				Long scanId = item.getId();
+				Long scanId = item.getCarsLoadScanId();
 				List<TrunklineScanZeroDetailVO> list = scanZeroDetailVOMap.get(scanId);
-				//把list中所有元素的goodsName用逗号拼起来
-				String loadingGoods = list.stream()
-					.map(t-> t.getGoodsName()+"("+t.getLoadingNum()+")")
-					.collect(Collectors.joining(","));
-
-				String unloadGoods = list.stream()
-					.map(t-> t.getGoodsName()+"("+t.getUnloadNum()+")")
-					.collect(Collectors.joining(","));
-				item.setLoadingGoods(loadingGoods);
-				item.setUnloadGoods(unloadGoods);
+				if(CollUtil.isNotEmpty(list)){
+					//把list中所有元素的goodsName用逗号拼起来
+					String loadingGoods = list.stream()
+						.map(t-> t.getGoodsName()+"("+t.getLoadingNum()+")")
+						.collect(Collectors.joining(","));
+
+					String unloadGoods = list.stream()
+						.map(t-> t.getGoodsName()+"("+t.getUnloadNum()+")")
+						.collect(Collectors.joining(","));
+					item.setLoadingGoods(loadingGoods);
+					item.setUnloadGoods(unloadGoods);
+				}
 			});
 		}
 		pageList.setRecords(records);