remove */old interface for goods and component search

src/main/java/com/uas/search/controller/SearchController.java

@@ -1,14 +1,11 @@
 package com.uas.search.controller;
 
 import com.alibaba.druid.util.StringUtils;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.constant.model.CollectField;
 import com.uas.search.constant.model.PageParams;
 import com.uas.search.constant.model.PageParams.FilterField;
 import com.uas.search.constant.model.SPage;
-import com.uas.search.constant.model.Sort;
-import com.uas.search.constant.model.Sort.Field;
 import com.uas.search.dao.ComponentDao;
 import com.uas.search.exception.SearchException;
 import com.uas.search.model.Brand;
@@ -79,30 +76,6 @@ public class SearchController {
 		return searchService.getBrands(keyword, page, size);
 	}
 
-	@RequestMapping("/componentIds/old")
-	@ResponseBody
-	public Map<String, Object> searchComponentIds(String keyword, Integer page, Integer size, String filters,
-												  HttpServletRequest request) {
-		PageParams pageParams = new PageParams();
-		if (page != null) {
-			pageParams.setPage(page);
-		}
-		if (size != null) {
-			pageParams.setSize(size);
-		}
-		Map<FilterField, Object> filtersMap = new HashMap<>();
-		if (!StringUtils.isEmpty(filters)) {
-			JSONObject json = JSONObject.parseObject(filters);
-			Set<Entry<String, Object>> entrySet = json.entrySet();
-			for (Entry<String, Object> entry : entrySet) {
-				FilterField field = FilterField.valueOf(entry.getKey().toUpperCase());
-				filtersMap.put(field, entry.getValue());
-			}
-		}
-		pageParams.setFilters(filtersMap);
-		return searchService.getComponentIds(keyword, pageParams);
-	}
-
     @RequestMapping("/componentIds")
     @ResponseBody
     public Map<String, Object> searchComponentIds(String keyword, String params, HttpServletRequest request) {
@@ -113,15 +86,6 @@ public class SearchController {
 	@Autowired
 	private ComponentDao componentDao;
 
-	@RequestMapping("/components/old")
-	@ResponseBody
-	public List<Component> searchComponents(String keyword, Integer page, Integer size, String filters,
-											HttpServletRequest request) {
-		@SuppressWarnings("unchecked")
-		List<Long> ids = (List<Long>) searchComponentIds(keyword, page, size, filters, request).get("componentIds");
-        return findComponents(ids);
-	}
-
     @RequestMapping("/components")
     @ResponseBody
     public List<Component> searchComponents(String keyword, String params, HttpServletRequest request) {
@@ -213,45 +177,6 @@ public class SearchController {
 		return searchService.getSimilarPropertyValues(kindId, propertyId, keyword, topNum);
 	}
 
-	@RequestMapping("/goodsIds/old")
-	@ResponseBody
-	public Map<String, Object> getGoodsIds(String keyword, Integer page, Integer size, String filters, String sort,
-										   HttpServletRequest request) {
-		PageParams pageParams = new PageParams();
-		if (page != null) {
-			pageParams.setPage(page);
-		}
-		if (size != null) {
-			pageParams.setSize(size);
-		}
-        Map<FilterField, Object> filtersMap = new HashMap<>();
-        if (!StringUtils.isEmpty(filters)) {
-            filtersMap=parseFilters(JSONObject.parseObject(filters));
-        }
-		pageParams.setFilters(filtersMap);
-		if (!StringUtils.isEmpty(sort)) {
-			JSONArray jsonArray = JSONObject.parseArray(sort);
-			List<Sort> sorts = new ArrayList<>();
-			for (Object object : jsonArray) {
-				if (object instanceof JSONObject) {
-					JSONObject jsonObject = (JSONObject) object;
-					Field field = Field.valueOf(jsonObject.getString("field"));
-					boolean reverse = jsonObject.getBooleanValue("reverse");
-					sorts.add(new Sort(field, reverse));
-				} else {
-					throw new IllegalArgumentException("排序参数并非json格式");
-				}
-			}
-			pageParams.setSort(sorts);
-		}
-		System.out.println(JSONObject.toJSONString(pageParams));
-		System.out.println(pageParams);
-		String json="{\"filters\":{\"GOODS_MINPRICEUSD\":\"0\",\"GOODS_KINDID\":[\"401\",\"23\"],\"GOODS_MAXPRICERMB\":\"10\",\"GOODS_BRANDID\":[\"45\"],\"GOODS_MAXPRICEUSD\":\"10\",\"GOODS_STORE_TYPE\":[\"DISTRIBUTION\"],\"GOODS_MINPRICERMB\":\"0\",\"GOODS_CRNAME\":[\"RMB-USD\"]},\"page\":1,\"size\":8,\"sort\":[{\"field\":\"GO_RESERVE\",\"reverse\":true},{\"field\":\"GO_MINPRICERMB\",\"reverse\":true},{\"field\":\"GO_MINPRICEUSD\",\"reverse\":true},{\"field\":\"GO_SEARCH\",\"reverse\":false}]}";
-		PageParams params = JSONObject.parseObject(json, PageParams.class);
-		System.out.println(params);
-		return searchService.getGoodsIds(keyword, pageParams);
-	}
-
     public Map<FilterField, Object> parseFilters(JSONObject json){
         Map<FilterField, Object> filters = new HashMap<>();
         if(json!=null){
@@ -286,18 +211,6 @@ public class SearchController {
 		return searchService.getGoodsIds(keyword, pageParams);
 	}
 
-	@RequestMapping("/collectBySearchGoods/old")
-	@ResponseBody
-	public List<Map<String, Object>> collectBySearchGoodsOld(String keyword, String collectedField, String filters,
-														  HttpServletRequest request) {
-        Map<FilterField, Object> filtersMap = new HashMap<>();
-        if (!StringUtils.isEmpty(filters)) {
-            filtersMap=parseFilters(JSONObject.parseObject(filters));
-        }
-		return searchService.collectBySearchGoods(keyword, CollectField.valueOf(collectedField.toUpperCase()),
-				filtersMap);
-	}
-
 	@RequestMapping("/collectBySearchGoods")
 	@ResponseBody
 	public List<Map<String, Object>> collectBySearchGoods(String keyword, @RequestParam String collectedField, String filters, HttpServletRequest request) {

src/main/webapp/WEB-INF/views/console.html

@@ -16,11 +16,9 @@
 					<li><a target="_blank">search/kinds/电阻?page=1&size=10</a></li>
 					<li><a target="_blank">search/brandIds/Panasonic?page=1&size=10</a></li>
 					<li><a target="_blank">search/brands/Panasonic?page=1&size=10</a></li>
-					<li>search/componentIds/old?keyword=a&page=1&size=5&filters={"COMPONENT_KINDID":401,"COMPONENT_BRANDID":45,"COMPONENT_HAS_RESERVE":true,"COMPONENT_HAS_SAMPLE":true,"COMPONENT_HAS_ORIGINAL":true,"COMPONENT_HAS_INACTION_STOCK":true,"COMPONENT_PROPERTIES":{"275":"92%20dB","781":"Tube"}}</li>
 					<li>search/componentIds?keyword=a&amp;params={"filters":{"COMPONENT_KINDID":401,"COMPONENT_BRANDID":45,"COMPONENT_HAS_RESERVE":true,"COMPONENT_HAS_SAMPLE":true,"COMPONENT_HAS_ORIGINAL":true,"COMPONENT_HAS_INACTION_STOCK":true,"COMPONENT_PROPERTIES":{"275":"92%20dB","781":"Tube"}},"page":1,"size":8}</li>
 					<li><a target="_blank">search/componentIds?keyword=aaa</a></li>
 					<li><a target="_blank">search/components?keyword=aaa</a></li>
-					<li>search/goodsIds/old?keyword=aaa&page=1&size=8&filters={"GOODS_KINDID":"401,23","GOODS_BRANDID":45,"GOODS_STORE_TYPE":"DISTRIBUTION","GOODS_CRNAME":"RMB-USD","GOODS_MINPRICERMB":0,"GOODS_MAXPRICERMB":10,"GOODS_MINPRICEUSD":0,"GOODS_MAXPRICEUSD":10}&sort=[{"field":"GO_RESERVE","reverse":true},{"field":"GO_MINPRICERMB","reverse":true},{"field":"GO_MINPRICEUSD","reverse":true},{"field":"GO_SEARCH"}]</li>
 					<li>search/goodsIds?keyword=aaa&amp;params={"filters":{"GOODS_MINPRICEUSD":"0","GOODS_KINDID":["401","23"],"GOODS_MAXPRICERMB":"10","GOODS_BRANDID":["45"],"GOODS_MAXPRICEUSD":"10","GOODS_STORE_TYPE":["DISTRIBUTION"],"GOODS_MINPRICERMB":"0","GOODS_CRNAME":["RMB-USD"]},"page":1,"size":8,"sort":[{"field":"GO_RESERVE","reverse":true},{"field":"GO_MINPRICERMB","reverse":true},{"field":"GO_MINPRICEUSD","reverse":true},{"field":"GO_SEARCH","reverse":false}]}</li>
 					<li><a target="_blank">search/goodsIds?keyword=aaa</a></li>
 				</ol>
@@ -32,7 +30,6 @@
 					<li><a target="_blank">search/brandsByComponent?keyword=aaa&kindId=304</a></li>
 					<li><a target="_blank">search/kindIdsByComponent?keyword=aaa&brandId=56</a></li>
 					<li><a target="_blank">search/brandIdsByComponent?keyword=aaa&kindId=304</a></li>
-					<li><a target="_blank">search/collectBySearchGoods/old?keyword=23&collectedField=GOODS_KIND&filters={"GOODS_KINDID":"401,23","GOODS_BRANDID":45,"GOODS_STORE_TYPE":"DISTRIBUTION","GOODS_CRNAME":"RMB-USD"}</a></li>
 					<li><a target="_blank">search/collectBySearchGoods?keyword=23&collectedField=GOODS_KIND&filters={"GOODS_KINDID":[401,23],"GOODS_BRANDID":45,"GOODS_STORE_TYPE":"DISTRIBUTION","GOODS_CRNAME":"RMB-USD"}</a></li>
 				</ol>