记录筛选

src/main/java/com/izouma/dingdong/repo/ChatRepo.java

@@ -11,4 +11,7 @@ public interface ChatRepo extends JpaRepository<Chat, Long>, JpaSpecificationExe
 
     //按聊天框查找
     List<Chat> findAllBySendUserIdAndReceiveUserId(Long sendUserId, Long receiveUserId);
+
+    //按个人查找
+    List<Chat> findAllBySendUserIdOrReceiveUserId(Long userId, Long userId2);
 }

src/main/java/com/izouma/dingdong/repo/MoneyRecordRepo.java

@@ -1,11 +1,17 @@
 package com.izouma.dingdong.repo;
 
 import com.izouma.dingdong.domain.MoneyRecord;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.lang.Nullable;
 
 import java.util.List;
 
 public interface MoneyRecordRepo extends JpaRepository<MoneyRecord, Long>, JpaSpecificationExecutor<MoneyRecord> {
     List<MoneyRecord> findAllByUserId(Long userId);
+
+    Page<MoneyRecord> findAllByUserId(Long userId, @Nullable Specification<MoneyRecord> spec, Pageable pageable);
 }

src/main/java/com/izouma/dingdong/service/ChatService.java

@@ -4,8 +4,6 @@ import com.izouma.dingdong.repo.ChatRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 @AllArgsConstructor
 public class ChatService {

src/main/java/com/izouma/dingdong/web/ChatController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.util.Comparator;
 import java.util.List;
 
 @RestController
@@ -62,12 +63,20 @@ public class ChatController extends BaseController {
         ExcelUtils.export(response, data);
     }
 
+    @ApiOperation("显示个人聊天列表")
+    @GetMapping("/my")
+    public List<Chat> my(){
+
+        return null;
+    }
+
     @ApiOperation("显示两个人的所有聊天")
     @GetMapping("/showChat")
     public List<Chat> showChat(Long userOne, Long userTwo) {
         List<Chat> sendChats = chatRepo.findAllBySendUserIdAndReceiveUserId(userOne, userTwo);
         List<Chat> receiveChats = chatRepo.findAllBySendUserIdAndReceiveUserId(userTwo, userOne);
         sendChats.addAll(receiveChats);
+        //sendChats.sort(Comparator.comparing());
         return sendChats;
     }
 }

src/main/java/com/izouma/dingdong/web/MoneyRecordController.java

@@ -1,21 +1,23 @@
 package com.izouma.dingdong.web;
+
 import com.izouma.dingdong.domain.MoneyRecord;
 import com.izouma.dingdong.service.MoneyRecordService;
 import com.izouma.dingdong.dto.PageQuery;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.MoneyRecordRepo;
 import com.izouma.dingdong.utils.ObjUtils;
-import com.izouma.dingdong.utils.SecurityUtils;
 import com.izouma.dingdong.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.criteria.Predicate;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/moneyRecord")
@@ -39,7 +41,7 @@ public class MoneyRecordController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @GetMapping("/all")
     public Page<MoneyRecord> all(PageQuery pageQuery) {
-        return moneyRecordRepo.findAll(toSpecification(pageQuery,MoneyRecord.class), toPageRequest(pageQuery));
+        return moneyRecordRepo.findAll(toSpecification(pageQuery, MoneyRecord.class), toPageRequest(pageQuery));
     }
 
     @GetMapping("/get/{id}")
@@ -60,8 +62,17 @@ public class MoneyRecordController extends BaseController {
     }
 
     @GetMapping("/my")
-    public Page<MoneyRecord> my(PageQuery pageQuery){
-        return new PageImpl<>(moneyRecordRepo.findAllByUserId(SecurityUtils.getAuthenticatedUser().getId()),toPageRequest(pageQuery),pageQuery.getSize());
+    public Page<MoneyRecord> my(PageQuery pageQuery, Long userId) {
+//        Map<String, Object> query = pageQuery.getQuery();
+//        query.put("time","2020-05-14 00:00:00,2020-05-14 13:59:59");
+        List<MoneyRecord> all = moneyRecordRepo.findAll(toSpecification(pageQuery, MoneyRecord.class));
+        List<MoneyRecord> my = new ArrayList<>();
+        all.forEach(a -> {
+                    if (a.getUserId().equals(userId))
+                        my.add(a);
+                }
+        );
+        return new PageImpl<>(my, toPageRequest(pageQuery), pageQuery.getSize());
     }
 }
 

src/main/vue/src/views/merchant/MerchantList.vue

@@ -95,12 +95,7 @@
             <el-table-column prop="merchantNature.name" label="营业性质"
             >
             </el-table-column>
-            <!--            <el-table-column prop="blacklist" label="黑名单"
-                        >
-                            <template slot-scope="{row}">
-                                <el-tag :type="row.blacklist?'':'info'">{{row.blacklist}}</el-tag>
-                            </template>
-                        </el-table-column>-->
+
             <!--<el-table-column
                     label="操作"
                     align="center"
@@ -188,7 +183,7 @@
                               :src="formData.qualification" fit="fit"
                               :preview-src-list="[formData.qualification]"/>
                 </div>
-                <div class="info-item">营业性质：{{formData.merchantNature.name}}</div>
+                <!--<div class="info-item">营业性质：{{formData.merchantNature.name}}</div>-->
                 <div class="info-item">公告：{{formData.proclamation}}</div>
                 <div class="info-item">经营品类：{{formData.category}}
                 </div>

src/test/java/com/izouma/dingdong/contorller/MoneyRecordTest.java

@@ -0,0 +1,34 @@
+package com.izouma.dingdong.contorller;
+
+import com.izouma.dingdong.domain.MoneyRecord;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.web.MoneyRecordController;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class MoneyRecordTest {
+    @Autowired
+    private MoneyRecordController moneyRecordController;
+
+    @Test
+    public void test(){
+        PageQuery pageQuery = new PageQuery();
+        pageQuery.setPage(0);
+        pageQuery.setSize(50);
+        pageQuery.setSearch(null);
+        pageQuery.setSort("");
+        Map<String,Object> map = new HashMap<>();
+        map.put("time","2020-05-14 13:49:11");
+        pageQuery.setQuery(map);
+
+        System.out.println(moneyRecordController.my(pageQuery,47L));
+    }
+}

src/test/java/com/izouma/dingdong/repo/ChatRepoTest.java

@@ -8,6 +8,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -24,4 +26,16 @@ public class ChatRepoTest {
 
         System.out.println(cs.get(0).getSendUser().getAvatar());
     }
+
+    @Test
+    public void showMy(){
+        List<Chat> chats = chatRepo.findAllBySendUserIdOrReceiveUserId(82L, 82L);
+        Set<Long> sends = chats.stream().map(Chat::getSendUserId).collect(Collectors.toSet());
+        Set<Long> reces = chats.stream().map(Chat::getReceiveUserId).collect(Collectors.toSet());
+        sends.addAll(reces);
+        sends.remove(82L);
+        System.out.println(sends);
+
+        //System.out.println(chatRepo.findAllBySendUserIdOrReceiveUserId(82L,82L));
+    }
 }

src/test/java/com/izouma/dingdong/service/MerchantServiceTest.java

@@ -1,8 +1,10 @@
 package com.izouma.dingdong.service;
 
 import com.izouma.dingdong.dto.MerchantDTO;
+import com.izouma.dingdong.dto.PageQuery;
 import com.izouma.dingdong.repo.merchant.MerchantRepo;
 import com.izouma.dingdong.service.merchant.MerchantService;
+import com.izouma.dingdong.web.merchant.MerchantController;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +12,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.time.LocalTime;
+import java.util.HashMap;
+import java.util.Map;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -18,6 +22,9 @@ public class MerchantServiceTest {
     @Autowired
     private MerchantService merchantService;
 
+    @Autowired
+    private MerchantController merchantController;
+
     @Test
     public void testChange(){
         MerchantDTO merchantDTO = MerchantDTO.builder()
@@ -31,4 +38,17 @@ public class MerchantServiceTest {
                 .build();
         merchantService.change(merchantDTO);
     }
+
+    @Test
+    public void testAll(){
+        PageQuery pageQuery = new PageQuery();
+        pageQuery.setPage(0);
+        pageQuery.setSize(50);
+        pageQuery.setSearch(null);
+        pageQuery.setSort("");
+        Map<String,Object> map = new HashMap<>();
+        map.put("startTime","2020-05-14 13:49:11,2020-5-30 23:59:59");
+        pageQuery.setQuery(map);
+        System.out.println(merchantController.all(pageQuery));
+    }
 }