第二版,频安宝，紧急联系人

src/main/java/com/care/client/controller/ContactApiController.java

@@ -1,19 +1,15 @@
 package com.care.client.controller;
 
 import com.care.client.service.PassportService;
-import com.care.client.service.PinanbaoService;
+import com.care.client.service.PinanbaoContactService;
 import com.care.client.vo.HouseContactVO;
 import com.care.client.vo.MemberInfoVO;
-import com.care.common.annotation.Permission;
 import com.care.common.exception.BDException;
 import com.care.common.util.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-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 javax.servlet.http.HttpServletRequest;
@@ -31,7 +27,7 @@ import java.util.List;
 public class ContactApiController {
 
     @Resource
-    private PinanbaoService pinanbaoService;
+    private PinanbaoContactService pinanbaoContactService;
     @Resource
     private PassportService passportService;
 
@@ -45,7 +41,7 @@ public class ContactApiController {
     public Result<List<HouseContactVO>> myHouseContactList(HttpServletRequest request, @RequestHeader(value = "token") String token){
         MemberInfoVO current = passportService.checkToken(token);
         try {
-            List<HouseContactVO> datas = pinanbaoService.queryContactByMemberId(current.getId());
+            List<HouseContactVO> datas = pinanbaoContactService.queryContactByMemberId(current.getId());
             return Result.success(datas);
         }catch (BDException e) {
             return  Result.error(e.getMessage());
@@ -55,5 +51,76 @@ public class ContactApiController {
         }
     }
 
+    /**
+     * 我的紧急联系人详情
+     * @return
+     */
+    @GetMapping("/my/getMyContactInfo")
+    @ApiOperation(tags = {"我的紧急联系人"},value = "紧急联系人详情 -- 二期新增")
+    public Result<HouseContactVO> getMyContactInfo(@RequestHeader(value = "token") String token,
+                                          @RequestParam("id") Long id){
+        try {
+            return Result.success(this.pinanbaoContactService.getContactInfo(id));
+        }catch (BDException e) {
+            return  Result.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("紧急联系人: 查询详情出现异常",e);
+            return Result.error( "获取失败");
+        }
+    }
 
+
+    @PostMapping("/my/add")
+    @ApiOperation(tags = {"我的紧急联系人"},value = "紧急联系人新增 -- 二期新增")
+    public Result<Object> addMyContact(@RequestHeader("token") String token,
+                                     @RequestBody HouseContactVO vo){
+        try {
+            MemberInfoVO current = passportService.checkToken(token);
+            if(this.pinanbaoContactService.createMyContact(current.getId(),vo)){
+                return  Result.success("新增成功！");
+            } else {
+                return Result.error("新增失败！");
+            }
+
+        }catch (BDException e) {
+            log.error("新增紧急联系人-出现异常",e);
+            return Result.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("紧急联系人: 新增紧急联系人出现异常",e);
+            return Result.error("新增失败！");
+        }
+    }
+
+    @PostMapping("/my/update")
+    @ApiOperation(tags = {"我的紧急联系人"},value = "紧急联系人修改 -- 二期新增")
+    public Result<Object> updateMyContact(@RequestHeader("token") String token,
+                                        @RequestBody HouseContactVO vo){
+        try {
+            if(this.pinanbaoContactService.updateMyContact(vo)){
+                return  Result.success("修改成功！");
+            } else {
+                return Result.error("修改失败！");
+            }
+
+        }catch (BDException e) {
+            log.error("修改紧急联系人-出现异常",e);
+            return Result.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("紧急联系人: 修改紧急联系人出现异常",e);
+            return Result.error("修改失败！");
+        }
+    }
+
+    @DeleteMapping("/my/delete/{id}")
+    @ApiOperation(tags = {"我的紧急联系人"},value = "删除紧急联系人 -- 二期新增")
+    public Result<Object> deleteMyContact(HttpServletRequest request,@RequestHeader("token") String token,
+                                        @PathVariable("id") Long id) {
+        try {
+            this.pinanbaoContactService.deleteById(id);
+            return Result.success("删除成功！");
+        } catch (Exception e) {
+            log.error("紧急联系人: 删除紧急联系人出现异常", e);
+            return Result.error("删除失败！");
+        }
+    }
 }

src/main/java/com/care/client/controller/OlderApiController.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @Desc:
  */
 @RestController
-@Api(value = "ContactApiController", tags = { "被监护人" })
+@Api(value = "ContactApiController", tags = { "我的被监护人" })
 @Slf4j
 @RequestMapping("/pinanbao/older")
 public class OlderApiController {
@@ -32,11 +32,11 @@ public class OlderApiController {
     private PassportService passportService;
 
     /**
-     * 被监护人列表
+     * 我的被监护人列表
      * @return
      */
     @GetMapping("/my/list")
-    @ApiOperation(tags = {"被监护人"},value = "被监护人列表")
+    @ApiOperation(tags = {"我的被监护人"},value = "被监护人列表")
     public Result<List<OlderVO>> myOlderList(@RequestHeader(value = "token") String token){
         try {
             MemberInfoVO current = passportService.checkToken(token);
@@ -51,11 +51,11 @@ public class OlderApiController {
     }
 
     /**
-     * 被监护人详情
+     * 我的被监护人详情
      * @return
      */
     @GetMapping("/my/getMyOlderInfo")
-    @ApiOperation(tags = {"被监护人"},value = "被监护人详情")
+    @ApiOperation(tags = {"我的被监护人"},value = "被监护人详情  -- 二期新增")
     public Result<OlderVO> getMyOlderInfo(@RequestHeader(value = "token") String token,
                                                 @RequestParam("id") Long id){
         try {
@@ -70,7 +70,7 @@ public class OlderApiController {
 
 
     @PostMapping("/my/add")
-    @ApiOperation(tags = {"被监护人"},value = "被监护人新增")
+    @ApiOperation(tags = {"我的被监护人"},value = "被监护人新增 -- 二期新增")
     public Result<Object> addMyOlder(@RequestHeader("token") String token,
                                    @RequestBody OlderVO vo){
         try {
@@ -91,7 +91,7 @@ public class OlderApiController {
     }
 
     @PostMapping("/my/update")
-    @ApiOperation(tags = {"被监护人"},value = "被监护人修改")
+    @ApiOperation(tags = {"我的被监护人"},value = "被监护人修改 -- 二期新增")
     public Result<Object> updateMyOlder(@RequestHeader("token") String token,
                                  @RequestBody OlderVO vo){
         try {
@@ -110,8 +110,8 @@ public class OlderApiController {
         }
     }
 
-    @PostMapping("/my/{id}")
-    @ApiOperation(value = "删除被监护人")
+    @DeleteMapping("/my/delete/{id}")
+    @ApiOperation(tags = {"我的被监护人"},value = "删除被监护人 -- 二期新增")
     public Result<Object> deleteMyOlder(HttpServletRequest request,@RequestHeader("token") String token,
                                  @PathVariable("id") Long id) {
         try {

src/main/java/com/care/client/service/PinanbaoContactService.java

@@ -0,0 +1,109 @@
+package com.care.client.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.care.client.vo.HouseContactVO;
+import com.care.common.entity.*;
+import com.care.common.enums.RelationTypeEnum;
+import com.care.common.service.*;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Author: lilt
+ * @Date: 2021/6/7
+ * @Desc:
+ */
+@Slf4j
+@Service
+public class PinanbaoContactService {
+    @Resource
+    private CareMemberInfoService careMemberInfoService;
+    @Resource
+    private CareHouseContactService careHouseContactService;
+
+
+    /**
+     * 查询紧急联系人
+     * @param memberId
+     * @return
+     */
+    public List<HouseContactVO> queryContactByMemberId(Long memberId){
+        List<HouseContactVO> vos = Lists.newArrayList();
+        CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
+        QueryWrapper<CareHouseContact> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareHouseContact::getMemberId, memberInfo.getId())
+        .orderByAsc(CareHouseContact::getContactLevel);
+        List<CareHouseContact> contacts = this.careHouseContactService.list(queryWrapper);
+        if (CollUtil.isNotEmpty(contacts)){
+            contacts.forEach(item -> {
+                HouseContactVO vo = new HouseContactVO();
+                BeanUtil.copyProperties(item,vo);
+                vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
+                vos.add(vo);
+            });
+        }
+        return vos;
+    }
+
+    /**
+     * 新增紧急联系人
+     * @param memberId
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean createMyContact(Long memberId,HouseContactVO vo){
+        //保存被监护人
+        CareHouseContact careContact = new CareHouseContact();
+        BeanUtil.copyProperties(vo,careContact);
+        careContact.setMemberId(memberId);
+        careContact.setCreateTime(new Date());
+        return this.careHouseContactService.save(careContact);
+    }
+
+    /**
+     * 查询紧急联系人详情
+     * @param id
+     * @return
+     */
+    public HouseContactVO getContactInfo(Long id){
+        CareHouseContact careContact = this.careHouseContactService.getById(id);
+        HouseContactVO vo = new HouseContactVO();
+        BeanUtil.copyProperties(careContact,vo);
+        vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
+        return vo;
+    }
+
+    /**
+     * 修改紧急联系人
+     * @param vo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateMyContact(HouseContactVO vo){
+        //修改紧急联系人
+        CareHouseContact careContact = this.careHouseContactService.getById(vo.getId());
+        BeanUtil.copyProperties(vo,careContact);
+        careContact.setModifyTime(new Date());
+        return this.careHouseContactService.updateById(careContact);
+    }
+
+    /**
+     * 删除紧急联系人
+     * @param id
+     * @return
+     */
+    public boolean deleteById(Long id){
+        return this.careHouseContactService.removeById(id);
+    }
+
+}

src/main/java/com/care/client/service/PinanbaoService.java

@@ -85,29 +85,6 @@ public class PinanbaoService {
         return vo;
     }
 
-    /**
-     * 查询房屋紧急联系人
-     * @param memberId
-     * @return
-     */
-    public List<HouseContactVO> queryContactByMemberId(Long memberId){
-        List<HouseContactVO> vos = Lists.newArrayList();
-        CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
-        QueryWrapper<CareHouseContact> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareHouseContact::getMemberId, memberInfo.getId())
-        .orderByAsc(CareHouseContact::getContactLevel);
-        List<CareHouseContact> contacts = this.careHouseContactService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(contacts)){
-            contacts.forEach(item -> {
-                HouseContactVO vo = new HouseContactVO();
-                BeanUtil.copyProperties(item,vo);
-                vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
-                vos.add(vo);
-            });
-        }
-        return vos;
-    }
-
     /**
      * 查询正在进行中的事件
      * @param houseId