|
|
@@ -96,20 +96,20 @@ public class BrandServiceImpl implements BrandService {
|
|
|
|
|
|
@Override
|
|
|
public Map<String, List<BrandInfo>> getInitialSimpleInfo(String keyword) {
|
|
|
- Map<String, List<BrandInfo>> brands = getInitialSimpleInfo();
|
|
|
Map<String, List<BrandInfo>> map = new HashMap<String, List<BrandInfo>>();
|
|
|
+ String[] initals = new String[]{"A", "B", "C"};
|
|
|
if ("0~9".equals(keyword)) {
|
|
|
- map.put("0~9", brands.get("0~9"));
|
|
|
+ initals = new String[]{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
|
|
|
+ List<BrandInfo> brandInfos = brandInfoDao.findInInitals(initals);
|
|
|
+ map.put(keyword, brandInfos);
|
|
|
return map;
|
|
|
- }
|
|
|
- String[] arr = new String[3];
|
|
|
- for (int i = 0; i < keyword.length(); i++) {
|
|
|
- arr[i] = keyword.substring(i, i+1);
|
|
|
+ } else {
|
|
|
+ initals = keyword.split("");
|
|
|
}
|
|
|
|
|
|
- for (String initial : arr) {
|
|
|
- if (StringUtils.hasText(initial))
|
|
|
- map.put(initial.toUpperCase(), brands.get(initial.toUpperCase()));
|
|
|
+ for (String inital : initals) {
|
|
|
+ List<BrandInfo> brandInfos = brandInfoDao.findInInitals(new String[]{inital});
|
|
|
+ map.put(inital.toUpperCase(), brandInfos);
|
|
|
}
|
|
|
return map;
|
|
|
}
|
|
|
@@ -290,4 +290,39 @@ public class BrandServiceImpl implements BrandService {
|
|
|
List<Map<String, Object>> map = jdbcTemplate.queryForList(sql);
|
|
|
return map;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public String initBrandNameInital() {
|
|
|
+ List<BrandInfo> brandInfos = brandInfoDao.findAll();
|
|
|
+ // 将品牌按首字母分组
|
|
|
+ for (BrandInfo brand : brandInfos) {
|
|
|
+ String initialName = "";
|
|
|
+ if (isChinese(brand.getNameEn())) {
|
|
|
+ initialName = PinyinUtils.chineseToPinyin(brand.getNameEn());
|
|
|
+ } else {
|
|
|
+ initialName = brand.getNameEn();
|
|
|
+ }
|
|
|
+ String initial = initialName.substring(0,1).toUpperCase();
|
|
|
+ brand.setInital(initial);
|
|
|
+ System.err.println("品牌名:" + brand.getNameEn() + " 首字母:" + initial);
|
|
|
+ }
|
|
|
+ brandInfoDao.save(brandInfos);
|
|
|
+
|
|
|
+// // 将数字未为首字母的品牌挪到0~9分组中
|
|
|
+// String reg="^\\d+$";
|
|
|
+// List<BrandInfo> brandsInitialZero = new ArrayList<BrandInfo>();
|
|
|
+// map.put("0~9",brandsInitialZero);
|
|
|
+// List<String> removeInitial = new ArrayList<String>();
|
|
|
+// Iterator iterator = map.keySet().iterator();
|
|
|
+// while (iterator.hasNext()) {
|
|
|
+// String value = String.valueOf(iterator.next());
|
|
|
+// if (value.matches(reg)) {
|
|
|
+// brandsInitialZero.addAll(map.get(value));
|
|
|
+// iterator.remove();
|
|
|
+// map.remove(value);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// return map;
|
|
|
+ return "success";
|
|
|
+ }
|
|
|
}
|