From 74d22d2e5a2ee4b9dab139901326a1cb11059340 Mon Sep 17 00:00:00 2001 From: panqihua <1029559041@qq.com> Date: Tue, 21 Apr 2020 08:08:30 +0800 Subject: [PATCH] =?UTF-8?q?web=E8=AE=BF=E5=AE=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=A2=84=E7=BA=A6=E4=BA=BA=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=A3=80=E7=B4=A2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pocket/entity/vo/web/VisitorQuery.java | 10 ++++++++ .../pocket/repository/android/VisitorDao.java | 9 +++++--- .../pocket/DemoApplicationTests.java | 23 +++++++++++++++---- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/community/pocket/entity/vo/web/VisitorQuery.java b/src/main/java/com/community/pocket/entity/vo/web/VisitorQuery.java index ddb1d67..e61deab 100644 --- a/src/main/java/com/community/pocket/entity/vo/web/VisitorQuery.java +++ b/src/main/java/com/community/pocket/entity/vo/web/VisitorQuery.java @@ -6,6 +6,8 @@ package com.community.pocket.entity.vo.web; public class VisitorQuery { private Long currentPage; + private String appointment; + public Long getCurrentPage() { return currentPage; } @@ -13,4 +15,12 @@ public class VisitorQuery { public void setCurrentPage(Long currentPage) { this.currentPage = currentPage; } + + public String getAppointment() { + return appointment; + } + + public void setAppointment(String appointment) { + this.appointment = appointment; + } } diff --git a/src/main/java/com/community/pocket/repository/android/VisitorDao.java b/src/main/java/com/community/pocket/repository/android/VisitorDao.java index fe98160..e099df1 100644 --- a/src/main/java/com/community/pocket/repository/android/VisitorDao.java +++ b/src/main/java/com/community/pocket/repository/android/VisitorDao.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Repository; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.List; +import java.util.regex.Pattern; //访客数据接口 @Repository @@ -51,9 +52,11 @@ public class VisitorDao extends BaseDao { //加载所有访客信息 public Page loadAllVisitor(VisitorQuery visitorQuery) { - long count = mongoTemplate.count(new Query(), entityClass()); + Criteria criteria = Criteria.where("appointment").regex(Pattern.compile(".*") + visitorQuery.getAppointment() + ".*"); + Query query = new Query(criteria); + long count = mongoTemplate.count(query, entityClass()); Page page = new Page<>(count, visitorQuery.getCurrentPage(), pageSize); - List visitorList = mongoTemplate.find(new Query().with(PageRequest.of(visitorQuery.getCurrentPage().intValue() - 1, pageSize)), entityClass()); + List visitorList = mongoTemplate.find(query.with(PageRequest.of(visitorQuery.getCurrentPage().intValue() - 1, pageSize)), entityClass()); page.setList(visitorList); return page; } @@ -63,7 +66,7 @@ public class VisitorDao extends BaseDao { return mongoTemplate.updateFirst(new Query(Criteria.where(LookupOperationUtil.idKey).is(visitorForm.getId())), Update.update("status", visitorForm.getStatus()).set("managerName", visitorForm.getManagerName()), entityClass()).wasAcknowledged(); } - + //用户加载访客信息 private List load(com.community.pocket.entity.vo.android.VisitorQuery visitorQuery, Criteria criteria) { if (visitorQuery.getStartDate() != null && visitorQuery.getEndDate() != null) { criteria = criteria.andOperator(Criteria.where("time").gte(visitorQuery.getStartDate().getTime()), Criteria.where("time").lte(visitorQuery.getEndDate().getTime())); diff --git a/src/test/java/com/community/pocket/DemoApplicationTests.java b/src/test/java/com/community/pocket/DemoApplicationTests.java index 82a473c..0ce8a39 100644 --- a/src/test/java/com/community/pocket/DemoApplicationTests.java +++ b/src/test/java/com/community/pocket/DemoApplicationTests.java @@ -8,10 +8,8 @@ import com.community.pocket.entity.po.android.Token; import com.community.pocket.entity.vo.android.GarbageCateGory; import com.community.pocket.entity.vo.android.Info; import com.community.pocket.entity.vo.android.QueryUserForm; -import com.community.pocket.repository.android.GarbageDao; -import com.community.pocket.repository.android.GarbagePriceDao; -import com.community.pocket.repository.android.UserDao; -import com.community.pocket.repository.android.VisitorPeopleDao; +import com.community.pocket.entity.vo.android.VisitorForm; +import com.community.pocket.repository.android.*; import com.community.pocket.util.MessageService; import com.google.gson.Gson; import org.apache.commons.lang3.RandomStringUtils; @@ -65,6 +63,9 @@ class DemoApplicationTests { @Autowired private TestTokenDao testTokenDao; + @Autowired + private VisitorDao visitorDao; + private MockMvc mockMvc; @BeforeEach @@ -240,4 +241,18 @@ class DemoApplicationTests { void findUser() { Info myInfo = userDao.queryUser("panqihua"); } + + //测试访客保存 + @Test + void saveVisitor() { + for (int i = 0; i < 20; i++) { + VisitorForm visitorForm = new VisitorForm(); + visitorForm.setAppointment("abc" + i); + visitorForm.setChooseDate("2020/04/01"); + visitorForm.setChooseTime("11:00"); + visitorForm.setNotes("备注"); + visitorForm.setUsername("eee" + i); + visitorDao.save(visitorForm); + } + } }