营销系统-手动推送

pig-marketing/pig-marketing-biz/src/main/java/com/pig4cloud/pig/marketing/service/impl/MarketingConfigServiceImpl.java

@@ -654,52 +654,84 @@ public class MarketingConfigServiceImpl implements MarketingConfigService {
 					break;
 				case PUSH_IP:
 					if (StringUtils.isNotBlank(item.getPublicValue())) {
-						String[] ip = item.getPublicValue().split("&&");
-						res.setIp(List.of(ip));
+						if (item.getPublicValue().contains("&&")) {
+							String[] ip = item.getPublicValue().split("&&");
+							res.setIp(List.of(ip));
+						}else {
+							res.setIp(List.of(item.getPublicValue()));
+						}
+
 					} else {
 						res.setIp(new ArrayList<>());
 					}
 					break;
 				case PUSH_DOMAIN:
 					if (StringUtils.isNotBlank(item.getPublicValue())) {
-						String[] domain = item.getPublicValue().split("&&");
-						res.setDomain(List.of(domain));
+						if (item.getPublicValue().contains("&&")) {
+							String[] domain = item.getPublicValue().split("&&");
+							res.setDomain(List.of(domain));
+						}else {
+							res.setDomain(List.of(item.getPublicValue()));
+						}
 					} else {
 						res.setDomain(new ArrayList<>());
 					}
 					break;
 				case PUSH_ADDR:
 					if (StringUtils.isNotBlank(item.getPublicValue())) {
-						String[] addr = item.getPublicValue().split("&&");
-						res.setPushAddr(List.of(addr));
+						if (item.getPublicValue().contains("&&")) {
+							String[] addr = item.getPublicValue().split("&&");
+							res.setPushAddr(List.of(addr));
+						}else {
+							res.setPushAddr(List.of(item.getPublicValue()));
+						}
 					} else {
 						res.setPushAddr(new ArrayList<>());
 					}
 					break;
 				case PUSH_APP:
 					if (StringUtils.isNotBlank(item.getPublicValue())) {
-						String[] appArray = item.getPublicValue().split("&&");
-						List<PushAPPDTO> pushAppList = new ArrayList<>();
-						for (String appStr : appArray) {
-							if (appStr.contains("@")) {
+						if (item.getPublicValue().contains("&&")) {
+							String[] appArray = item.getPublicValue().split("&&");
+							List<PushAPPDTO> pushAppList = new ArrayList<>();
+							for (String appStr : appArray) {
+								if (appStr.contains("@")) {
+									String[] parts = appStr.split("@", 2);
+									if (parts.length == 2) {
+										PushAPPDTO pushApp = new PushAPPDTO();
+										pushApp.setId(parts[0]);
+										pushApp.setAppId(parts[1]);
+										pushAppList.add(pushApp);
+									}
+								}
+							}
+							res.setPushApp(pushAppList);
+						}else {
+						 	PushAPPDTO pushApp = new PushAPPDTO();
+							List<PushAPPDTO> pushAppList = new ArrayList<>();
+							String appStr = item.getPublicValue();
+							if (appStr.contains("@")){
 								String[] parts = appStr.split("@", 2);
 								if (parts.length == 2) {
-									PushAPPDTO pushApp = new PushAPPDTO();
 									pushApp.setId(parts[0]);
 									pushApp.setAppId(parts[1]);
 									pushAppList.add(pushApp);
+									res.setPushApp(pushAppList);
 								}
 							}
 						}
-						res.setPushApp(pushAppList);
 					} else {
 						res.setPushApp(new ArrayList<>());
 					}
 					break;
 				case PUSH_BUNDLE:
 					if (StringUtils.isNotBlank(item.getPublicValue())) {
-						String[] bundle = item.getPublicValue().split("&&");
-						res.setPushBundle(List.of(bundle));
+						if (item.getPublicValue().contains("&&")) {
+							String[] bundle = item.getPublicValue().split("&&");
+							res.setPushBundle(List.of(bundle));
+						}else {
+							res.setPushBundle(List.of(item.getPublicValue()));
+						}
 					} else {
 						res.setPushBundle(new ArrayList<>());
 					}