From 460d84d5ebd4d9d5ecab59da1026a70e777d7d2f Mon Sep 17 00:00:00 2001
From: ZHD <123456>
Date: Wed, 15 Apr 2020 10:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9E=83=E5=9C=BE=E5=88=86=E7=B1=BB=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E9=80=BB=E8=BE=91=E7=A7=BB=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pocket/api/android/GarbageController.java |  3 +-
 .../vo/android/GarbageSortingResponse.java    |  7 +++--
 .../pocket/repository/android/GarbageDao.java | 28 ++-----------------
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/community/pocket/api/android/GarbageController.java b/src/main/java/com/community/pocket/api/android/GarbageController.java
index 45fb4a1..6b430e8 100644
--- a/src/main/java/com/community/pocket/api/android/GarbageController.java
+++ b/src/main/java/com/community/pocket/api/android/GarbageController.java
@@ -1,5 +1,6 @@
 package com.community.pocket.api.android;
 
+import com.community.pocket.entity.po.android.Garbage;
 import com.community.pocket.entity.po.android.GarbageWasteManage;
 import com.community.pocket.entity.po.android.GarbageWastePrice;
 import com.community.pocket.entity.vo.Result;
@@ -27,7 +28,7 @@ public class GarbageController {
     //检索垃圾
     @GetMapping("/garbage/sorting")
     public GarbageSortingResponse search(QueryGarbageForm garbageForm) {
-        List<GarbageVo> garbageVoList = garbageDao.query(garbageForm);
+        List<Garbage> garbageVoList = garbageDao.query(garbageForm);
         GarbageSortingResponse response = new GarbageSortingResponse(Result.OK, GarbageSortingResponse.Msg.ok);
         response.setGarbageSortings(garbageVoList);
         return response;
diff --git a/src/main/java/com/community/pocket/entity/vo/android/GarbageSortingResponse.java b/src/main/java/com/community/pocket/entity/vo/android/GarbageSortingResponse.java
index 85ef7dd..a654ad1 100644
--- a/src/main/java/com/community/pocket/entity/vo/android/GarbageSortingResponse.java
+++ b/src/main/java/com/community/pocket/entity/vo/android/GarbageSortingResponse.java
@@ -1,5 +1,6 @@
 package com.community.pocket.entity.vo.android;
 
+import com.community.pocket.entity.po.android.Garbage;
 import com.community.pocket.entity.vo.Response;
 import com.community.pocket.entity.vo.Result;
 
@@ -9,17 +10,17 @@ import java.util.List;
  * 垃圾分类信息
  */
 public class GarbageSortingResponse extends Response<GarbageSortingResponse.Msg> {
-    private List<GarbageVo> garbageSortings;
+    private List<Garbage> garbageSortings;
 
     public GarbageSortingResponse(Result result, Msg message, Object... args) {
         super(result, message, args);
     }
 
-    public List<GarbageVo> getGarbageSortings() {
+    public List<Garbage> getGarbageSortings() {
         return garbageSortings;
     }
 
-    public void setGarbageSortings(List<GarbageVo> garbageSortings) {
+    public void setGarbageSortings(List<Garbage> garbageSortings) {
         this.garbageSortings = garbageSortings;
     }
 
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 6d4b5d6..522bc6f 100644
--- a/src/main/java/com/community/pocket/repository/android/GarbageDao.java
+++ b/src/main/java/com/community/pocket/repository/android/GarbageDao.java
@@ -26,32 +26,8 @@ public class GarbageDao extends BaseDao<Garbage> {
     private MessageService messageService;
 
     //查询垃圾分类信息
-    public List<GarbageVo> query(QueryGarbageForm garbageForm) {
-        List<GarbageVo> garbageVos = new ArrayList<>();
-        List<Garbage> garbageList = mongoTemplate.find(new Query(Criteria.where("name").regex(Pattern.compile(".*" + garbageForm.getName() + ".*"))), entityClass());
-        for (Garbage garbage : garbageList) {
-            GarbageVo garbageVo = new GarbageVo();
-            garbageVo.setName(garbage.getName());
-            switch (garbage.getCategory()) {
-                case 1:
-                    garbageVo.setSorting(messageService.getMessage(GarbageCateGory.type1));
-                    break;
-                case 2:
-                    garbageVo.setSorting(messageService.getMessage(GarbageCateGory.type2));
-                    break;
-                case 4:
-                    garbageVo.setSorting(messageService.getMessage(GarbageCateGory.type4));
-                    break;
-                case 8:
-                    garbageVo.setSorting(messageService.getMessage(GarbageCateGory.type8));
-                    break;
-                case 16:
-                    garbageVo.setSorting(messageService.getMessage(GarbageCateGory.type16));
-                    break;
-            }
-            garbageVos.add(garbageVo);
-        }
-        return garbageVos;
+    public List<Garbage> query(QueryGarbageForm garbageForm) {
+        return mongoTemplate.find(new Query(Criteria.where("name").regex(Pattern.compile(".*" + garbageForm.getName() + ".*"))), entityClass());
     }
 
     @Override