营销系统-手动推送

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

@@ -755,21 +755,30 @@ public class MarketingConfigServiceImpl implements MarketingConfigService {
 		StringBuilder ipBuilder = new StringBuilder();
 		if (reqDto.getIp() != null && !reqDto.getIp().isEmpty()){
 			IPUtils.validateIpList(reqDto.getIp());
-			for (String ip : reqDto.getIp()){
-				ipBuilder.append( ip);
-				ipBuilder.append("&&");
+			if (reqDto.getIp().size()>1){
+				for (String ip : reqDto.getIp()){
+					ipBuilder.append( ip);
+					ipBuilder.append("&&");
+				}
+				ipBuilder.delete(ipBuilder.length()-2, ipBuilder.length());
+			} else if (reqDto.getIp().size() == 1) {
+				ipBuilder.append(reqDto.getIp().get(0));
 			}
-			ipBuilder.delete(ipBuilder.length()-2, ipBuilder.length());
+
 		}
 		// 处理域名列表
 		StringBuilder domainBuilder = new StringBuilder();
 		if (reqDto.getDomain() != null && !reqDto.getDomain().isEmpty()){
 			DomainValidationUtil.validateDomainList(reqDto.getDomain());
-			for (String domain : reqDto.getDomain()){
-				domainBuilder.append( domain);
-				domainBuilder.append("&&");
+			if (reqDto.getDomain().size()>1){
+				for (String domain : reqDto.getDomain()){
+					domainBuilder.append( domain);
+					domainBuilder.append("&&");
+				}
+				domainBuilder.delete(domainBuilder.length()-2, domainBuilder.length());
+			} else if (reqDto.getDomain().size() == 1) {
+				domainBuilder.append(reqDto.getDomain().get(0));
 			}
-			domainBuilder.delete(domainBuilder.length()-2, domainBuilder.length());
 		}
 		// 添加IP
 		sysParam = new SysPublicParamDTO();
@@ -842,15 +851,21 @@ public class MarketingConfigServiceImpl implements MarketingConfigService {
 		if (reqDto.getPushApp() != null && !reqDto.getPushApp().isEmpty()){
 			StringBuilder appBuilder = new StringBuilder();
 
-			for (PushAPPDTO app : reqDto.getPushApp()){
-				if (app != null && app.getId() != null && app.getAppId() != null) {
-					appBuilder.append(app.getId()).append("@").append(app.getAppId());
-					appBuilder.append("&&");
-				}
+			if (reqDto.getPushApp().size() == 1){
+				appBuilder.append(reqDto.getPushApp().get(0).getId()).append("@").append(reqDto.getPushApp().get(0).getAppId());
 			}
-			if (appBuilder.length() > 2) {
-				appBuilder.delete(appBuilder.length()-2, appBuilder.length());
+			if (reqDto.getPushApp().size() > 1){
+				for (PushAPPDTO app : reqDto.getPushApp()){
+					if (app != null && app.getId() != null && app.getAppId() != null) {
+						appBuilder.append(app.getId()).append("@").append(app.getAppId());
+						appBuilder.append("&&");
+					}
+				}
+				if (appBuilder.length() > 2) {
+					appBuilder.delete(appBuilder.length()-2, appBuilder.length());
+				}
 			}
+
 			sysParam = new SysPublicParamDTO();
 			sysParam.setPublicKey(PUSH_APP);
 			sysParam.setPublicValue(appBuilder.toString());
@@ -861,15 +876,21 @@ public class MarketingConfigServiceImpl implements MarketingConfigService {
 		//处理推送地址
 		if (reqDto.getPushAddr() != null && !reqDto.getPushAddr().isEmpty()){
 			StringBuilder addrBuilder = new StringBuilder();
-			for (String addr : reqDto.getPushAddr()){
-				if ("All".equals(addr)){
+			if (reqDto.getPushAddr().size()>1){
+				for (String addr : reqDto.getPushAddr()){
+					addrBuilder.append(addr);
+					addrBuilder.append("&&");
+				}
+				addrBuilder.delete(addrBuilder.length()-2, addrBuilder.length());
+
+			} else {
+				if ("All".equals(reqDto.getPushAddr().get(0))){
 					addrBuilder.append("All");
-					break;
+				} else {
+					addrBuilder.append(reqDto.getPushAddr().get(0));
 				}
-				addrBuilder.append(addr);
-				addrBuilder.append("&&");
 			}
-			addrBuilder.delete(addrBuilder.length()-2, addrBuilder.length());
+
 			sysParam = new SysPublicParamDTO();
 			sysParam.setPublicKey(PUSH_ADDR);
 			sysParam.setPublicValue(addrBuilder.toString());
@@ -880,15 +901,21 @@ public class MarketingConfigServiceImpl implements MarketingConfigService {
 		//处理推送包名
 		StringBuilder bundleBuilder = new StringBuilder();
 		if (reqDto.getPushAddr() != null && !reqDto.getPushAddr().isEmpty()){
-			for (String bundle : reqDto.getPushBundle()){
-				if ("All".equals(bundle)){
+			if (reqDto.getPushBundle().size()>1){
+				for (String bundle : reqDto.getPushBundle()){
+
+					bundleBuilder.append(bundle);
+					bundleBuilder.append("&&");
+				}
+				bundleBuilder.delete(bundleBuilder.length()-2, bundleBuilder.length());
+			} else if ( reqDto.getPushBundle().size() == 1) {
+				if ("All".equals(reqDto.getPushBundle().get(0))){
 					bundleBuilder.append("All");
-					break;
+				}else {
+					bundleBuilder.append(reqDto.getPushBundle().get(0));
 				}
-				bundleBuilder.append(bundle);
-				bundleBuilder.append("&&");
 			}
-			bundleBuilder.delete(bundleBuilder.length()-2, bundleBuilder.length());
+
 			sysParam = new SysPublicParamDTO();
 			sysParam.setPublicKey(PUSH_BUNDLE);
 			sysParam.setPublicValue(bundleBuilder.toString());