修复snm 数据重复问题 2

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java

@@ -163,12 +163,12 @@ public class FactoryXxlJob {
 				.filter(staorderPackagesEntity -> {
 
 					List<StaorderPackagesEntity> list = staorderPackagesService.lambdaQuery()
-						.eq(StaorderPackagesEntity::getIsDeleted, 0)
 						.eq(StaorderPackagesEntity::getTcPoa014, staorderPackagesEntity.getTcPoa014()).list();
 					// 验证查询处理的包件中是否包含当前循环的包件
 					boolean exists = list.stream()
 						.anyMatch(t -> t.getPackagenum().equals(staorderPackagesEntity.getPackagenum()));
-
+					log.info("staorderPackagesEntity.getPackagenum() {}", staorderPackagesEntity.getPackagenum());
+					log.info("exists", exists);
 					if (!exists) {
 						// 更新订单ID
 						for (StationOrderEntity v : finalDataList) {
@@ -177,11 +177,13 @@ public class FactoryXxlJob {
 							}
 						}
 					}
+					log.info("existingPackageNumbers {}", existingPackageNumbers);
 
 					return !exists && !existingPackageNumbers.contains(staorderPackagesEntity.getPackagenum());
 				})
 				.collect(Collectors.toList());
 
+			log.info("filteredStaorderPackagesEntityList {}", filteredStaorderPackagesEntityList.size());
 			// 插入数据库
 			if (!filteredStaorderPackagesEntityList.isEmpty()) {
 				staorderPackagesService.saveBatch(filteredStaorderPackagesEntityList);

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java

@@ -141,7 +141,9 @@ public class OrderServiceImpl implements IOrderService {
 
 			responseStationOrderVo.getData().forEach(responseStationOrderInfoVo -> {
 				StationOrderEntity stationOrderEntity = new StationOrderEntity();
+				if(!ObjectUtils.isEmpty(responseStationOrderInfoVo.getPACKAGE_LIST())){
 					PACKAGE_LIST.addAll(responseStationOrderInfoVo.getPACKAGE_LIST());
+				}
 				try {
 					buildStationOrderEntityByRelative(responseStationOrderInfoVo, stationOrderEntity);
 				} catch (NoSuchFieldException e) {