Merge branch 'feature/backlist-contact-20220120' into 'release'

Feature/backlist contact 20220120

See merge request !45

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/contact/ContactController.java

@@ -4,19 +4,17 @@ import cn.quantgroup.user.enums.BizType;
 import cn.quantgroup.xyqb.controller.middleoffice.contact.dto.ContactSaveDto;
 import cn.quantgroup.xyqb.controller.middleoffice.contact.dto.ContactUpdateDto;
 import cn.quantgroup.xyqb.entity.Contact;
+import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.Tuple;
 import cn.quantgroup.xyqb.service.user.IContactService;
+import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.ValidationUtil;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -30,6 +28,9 @@ public class ContactController {
     @Resource
     private IContactService contactService;
 
+    @Resource
+    private IUserService userService;
+
     /**
      * 获取联系人
      *
@@ -87,4 +88,21 @@ public class ContactController {
         return JsonResult.buildSuccessResult();
     }
 
+    /**
+     * @需求 http://confluence.quantgroup.cn/pages/viewpage.action?pageId=61683308
+     * 根据用户uuid 获取联系人列表
+     * @param uuid
+     * @return
+     * @Yapi http://yapi.quantgroups.com/project/17/interface/api/33578
+     */
+    @RequestMapping("/getContactForUuid")
+    public JsonResult getContactForUuid(@RequestParam String uuid) {
+        User user = userService.findByUuidInDb(uuid);
+        List<Contact> contactList = new ArrayList<>();
+        if (user != null) {
+            contactList = contactService.findContactForUserId(user.getId());
+        }
+        return JsonResult.buildSuccessResult("", contactList);
+    }
+
 }

src/main/java/cn/quantgroup/xyqb/repository/IContactRepository.java

@@ -22,4 +22,8 @@ public interface IContactRepository extends JpaRepository<Contact, Long> {
     @Transactional(rollbackFor = Exception.class)
     @Query(value = "update contact set name=?1,phone_no=?2,relation=?3 where id = ?4", nativeQuery = true)
     void update(String name, String phoneNo, Integer relation, Long id);
+
+//    @Query(value = "select  *, max(`id`) as mid from contact where user_id=?1 GROUP BY phone_no ORDER BY id desc limit 2", nativeQuery = true)
+    @Query(value = "select * from contact, (select   max(`id`) as mid from contact where user_id=?1 GROUP BY phone_no ORDER BY id desc limit 2) as ids where contact.id=ids.mid", nativeQuery = true)
+    List<Contact> findContactForUserId(Long userId);
 }

src/main/java/cn/quantgroup/xyqb/service/user/IContactService.java

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.service.user;
 import cn.quantgroup.user.enums.BizType;
 import cn.quantgroup.user.enums.Relation;
 import cn.quantgroup.xyqb.entity.Contact;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
@@ -41,4 +42,6 @@ public interface IContactService {
     void update(String name, String phoneNo, Relation relation, Long id);
 
     void save(List<Contact> contactList);
+
+    List<Contact> findContactForUserId(Long userId);
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/ContactServiceImpl.java

@@ -98,6 +98,11 @@ public class ContactServiceImpl implements IContactService {
         contactRepository.save(contactList);
     }
 
+    @Override
+    public List<Contact> findContactForUserId(Long userId) {
+        return contactRepository.findContactForUserId(userId);
+    }
+
     /**
      * 合并当前用户列表到更新列表
      *