From 093f5a3b20ca6e170560f8b851723735b8f0becb Mon Sep 17 00:00:00 2001 From: panqihua <1029559041@qq.com> Date: Thu, 16 Apr 2020 15:48:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8B=B1=E6=96=87=E5=9E=83?= =?UTF-8?q?=E5=9C=BE=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pocket/entity/po/android/Garbage.java | 12 ++++++++- .../pocket/entity/vo/android/GarbageVo.java | 9 +++++++ .../pocket/repository/android/GarbageDao.java | 7 +++--- .../pocket/DemoApplicationTests.java | 25 ++++++++++++------- 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/community/pocket/entity/po/android/Garbage.java b/src/main/java/com/community/pocket/entity/po/android/Garbage.java index b1b73f8..807da89 100644 --- a/src/main/java/com/community/pocket/entity/po/android/Garbage.java +++ b/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; + } } diff --git a/src/main/java/com/community/pocket/entity/vo/android/GarbageVo.java b/src/main/java/com/community/pocket/entity/vo/android/GarbageVo.java index e284c8d..dcb536f 100644 --- a/src/main/java/com/community/pocket/entity/vo/android/GarbageVo.java +++ b/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; + } } diff --git a/src/main/java/com/community/pocket/repository/android/GarbageDao.java b/src/main/java/com/community/pocket/repository/android/GarbageDao.java index 522bc6f..0d1ab77 100644 --- a/src/main/java/com/community/pocket/repository/android/GarbageDao.java +++ b/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 { //查询垃圾分类信息 public List 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 diff --git a/src/test/java/com/community/pocket/DemoApplicationTests.java b/src/test/java/com/community/pocket/DemoApplicationTests.java index 459add8..368bc46 100644 --- a/src/test/java/com/community/pocket/DemoApplicationTests.java +++ b/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 { - Gson gson = new Gson(); - MyGarbage g = gson.fromJson(new InputStreamReader(new FileInputStream("src/main/resources/garbage.json"), StandardCharsets.UTF_8), MyGarbage.class); - for (Garbage garbage : g.getList()) { - garbageDao.save(garbage); - } +// 初始化垃圾数据 +@Test +void loadData() throws FileNotFoundException { + Gson gson = new Gson(); + MyGarbage g = gson.fromJson(new InputStreamReader(new FileInputStream("src/main/resources/garbage.json"), StandardCharsets.UTF_8), MyGarbage.class); + 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(); + } }