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 garbageVoList = garbageDao.query(garbageForm); + List 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 { - private List garbageSortings; + private List garbageSortings; public GarbageSortingResponse(Result result, Msg message, Object... args) { super(result, message, args); } - public List getGarbageSortings() { + public List getGarbageSortings() { return garbageSortings; } - public void setGarbageSortings(List garbageSortings) { + public void setGarbageSortings(List 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 { private MessageService messageService; //查询垃圾分类信息 - public List query(QueryGarbageForm garbageForm) { - List garbageVos = new ArrayList<>(); - List 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 query(QueryGarbageForm garbageForm) { + return mongoTemplate.find(new Query(Criteria.where("name").regex(Pattern.compile(".*" + garbageForm.getName() + ".*"))), entityClass()); } @Override