增加英文垃圾支持

src/main/java/com/community/pocket/entity/po/android/Garbage.java

@@ -9,11 +9,13 @@ import org.springframework.data.mongodb.core.mapping.Document;
  */
 @Document(TableName.garbage)
 public class Garbage {
-    //垃圾名
+    //垃圾中文名
     @Id
     private String name;
     //分类信息
     private Integer category;
+    //垃圾英文名
+    private String englishName;
 
     public String getName() {
         return name;
@@ -30,4 +32,12 @@ public class Garbage {
     public void setCategory(Integer category) {
         this.category = category;
     }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName;
+    }
 }

src/main/java/com/community/pocket/entity/vo/android/GarbageVo.java

@@ -3,6 +3,7 @@ package com.community.pocket.entity.vo.android;
 public class GarbageVo {
     private String name;
     private String sorting;
+    private String englishName;
 
     public String getName() {
         return name;
@@ -19,4 +20,12 @@ public class GarbageVo {
     public void setSorting(String sorting) {
         this.sorting = sorting;
     }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName;
+    }
 }

src/main/java/com/community/pocket/repository/android/GarbageDao.java

@@ -1,8 +1,6 @@
 package com.community.pocket.repository.android;
 
 import com.community.pocket.entity.po.android.Garbage;
-import com.community.pocket.entity.vo.android.GarbageCateGory;
-import com.community.pocket.entity.vo.android.GarbageVo;
 import com.community.pocket.entity.vo.android.QueryGarbageForm;
 import com.community.pocket.repository.BaseDao;
 import com.community.pocket.util.MessageService;
@@ -13,7 +11,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Repository;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -27,7 +24,9 @@ public class GarbageDao extends BaseDao<Garbage> {
 
     //查询垃圾分类信息
     public List<Garbage> query(QueryGarbageForm garbageForm) {
-        return mongoTemplate.find(new Query(Criteria.where("name").regex(Pattern.compile(".*" + garbageForm.getName() + ".*"))), entityClass());
+        return mongoTemplate.find(new Query(new Criteria()
+                .orOperator(Criteria.where("englishName").regex(Pattern.compile(".*" + garbageForm.getName())),
+                        Criteria.where("name").regex(Pattern.compile(".*" + garbageForm.getName() + ".*")))), entityClass());
     }
 
     @Override

src/test/java/com/community/pocket/DemoApplicationTests.java

@@ -27,9 +27,7 @@ import org.springframework.web.context.WebApplicationContext;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Random;
@@ -87,14 +85,15 @@ class DemoApplicationTests {
 		LOG.info(String.join(",", s));
 	}
 
-	@Test
+//	初始化垃圾数据
-	void loadData() throws FileNotFoundException {
+@Test
-		Gson gson = new Gson();
+void loadData() throws FileNotFoundException {
-		MyGarbage g = gson.fromJson(new InputStreamReader(new FileInputStream("src/main/resources/garbage.json"), StandardCharsets.UTF_8), MyGarbage.class);
+	Gson gson = new Gson();
-		for (Garbage garbage : g.getList()) {
+	MyGarbage g = gson.fromJson(new InputStreamReader(new FileInputStream("src/main/resources/garbage.json"), StandardCharsets.UTF_8), MyGarbage.class);
-			garbageDao.save(garbage);
+	for (Garbage garbage : g.getList()) {
-		}
+		garbageDao.save(garbage);
 	}
+}
 
 	@Test
 	void loadPriceData() {
@@ -165,4 +164,12 @@ class DemoApplicationTests {
 				.param("password", "123456")
 		).andDo(MockMvcResultHandlers.print()).andReturn();
 	}
+
+	//测试垃圾分类查询
+	@Test
+	void queryGarbage() throws Exception {
+		mockMvc.perform(MockMvcRequestBuilders.get("/garbage/sorting")
+				.param("name", "安")
+		).andDo(MockMvcResultHandlers.print()).andReturn();
+	}
 }