Просмотр исходного кода

APP发布需求关键字去除

anderx лет назад: 8
Родитель
Сommit
cf78783077

+ 15 - 13
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -383,14 +383,13 @@ public class AppUserController extends BaseApiController {
             String keyword1,String keyword2,String keyword3) {
         Result res = new Result();
         String[] keywords ;
-        if (null==keyword3) {
+        if (StringUtils.isNotEmpty(keyword3)) {
         	keywords=new String[]{keyword1,keyword2}; 
-        }else if (null==keyword2) {
+        }else if (StringUtils.isNotEmpty(keyword2)) {
         	keywords=new String[]{keyword1};
         }else {
         	keywords=new String[]{keyword1,keyword2,keyword3};
 		}
-        System.out.println( StringUtils.join(keywords,","));
         ia.setKeyword(StringUtils.join(keywords,","));
         if (bindingResult.hasErrors()) {
             res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -447,21 +446,23 @@ public class AppUserController extends BaseApiController {
 			String keyword1,String keyword2,String keyword3,
 			String validityPeriodFormattedDate) {
 		Result res = new Result();
-		 String[] keywords ;
-	        if (null==keyword3) {
+		 /*String[] keywords ;
+	       if (StringUtils.isNotEmpty(keyword3)) {
 	        	keywords=new String[]{keyword1,keyword2}; 
-	        }else if (null==keyword2) {
+	        }else if (StringUtils.isNotEmpty(keyword2)) {
 	        	keywords=new String[]{keyword1};
 	        }else {
 	        	keywords=new String[]{keyword1,keyword2,keyword3};
 			}
-	        demand.setKeyword(StringUtils.join(keywords,","));
+	        if (null!=keywords) {
+	        	demand.setKeyword(StringUtils.join(keywords,","));
+			}*/
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					DemandFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		res = disposeDemand(res, demand, keywords);
+		res = disposeDemand(res, demand, null);
 		if (!res.getError().isEmpty()) {
 			return res;
 		}
@@ -473,7 +474,7 @@ public class AppUserController extends BaseApiController {
 		if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
 			d.setUrgentMoney(demand.getUrgentMoney());
 		}
-		res.setData(demandService.saveAppUserDemand(d, validityPeriodFormattedDate, keywords));
+		res.setData(demandService.saveAppUserDemand(d, validityPeriodFormattedDate, null));
 		return res;
 	}
 	
@@ -483,7 +484,7 @@ public class AppUserController extends BaseApiController {
 			return res;
 		}
 
-		if (StringUtils.isBlank(demand.getKeyword())) {
+		/*if (StringUtils.isBlank(demand.getKeyword())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
 			return res;
 		}
@@ -491,7 +492,7 @@ public class AppUserController extends BaseApiController {
 		if (null == keywords || keywords.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
 			return res;
-		}
+		}*/
 
 		if (null == demand.getIndustryCategoryA()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到行业类别", "行业类别"));
@@ -507,13 +508,14 @@ public class AppUserController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到问题说明", "问题说明"));
 			return res;
 		}
+		
 
-		for (int i = 0; i < keywords.length; i++) {
+		/*for (int i = 0; i < keywords.length; i++) {
 			if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "关键词长度"));
 				return res;
 			}
-		}
+		}*/
 
 		return res;
 	}

+ 5 - 3
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -727,7 +727,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 				dk = new DemandKeyword();
 				dk.setId(UUID.randomUUID().toString());
 				dk.setDemandId(d.getId());
-				dk.setKeyword(keywords[i].trim());
+				//dk.setKeyword(keywords[i].trim());
 				list.add(dk);
 			}
 			demandKeywordMapper.insertBatch(list);
@@ -993,9 +993,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		} else {
 			d.setAuditStatus(DemandAuditStatus.CREATE.getCode());
 		}
-
+		if (null==d.getKeyword()) {
+			d.setKeyword("");
+		}
 		d.setCreateTime(now.getTime());
-		disposeDemandKeyword(keywords, d, false);
+		//disposeDemandKeyword(keywords, d, false);
 		return demandMapper.insert(d);
 	}