第二版,频安宝小程序

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

@@ -37,7 +37,7 @@ public class ContactApiController {
      * @return
      */
     @GetMapping("/my/list")
-    @ApiOperation(tags = {"我的紧急联系人"},value = "紧急联系人列表")
+    @ApiOperation(tags = {"我的紧急联系人,我的设备"},value = "紧急联系人列表")
     public Result<List<HouseContactVO>> myHouseContactList(HttpServletRequest request, @RequestHeader(value = "token") String token){
         MemberInfoVO current = passportService.checkToken(token);
         try {
@@ -71,7 +71,7 @@ public class ContactApiController {
 
 
     @PostMapping("/my/add")
-    @ApiOperation(tags = {"我的紧急联系人"},value = "紧急联系人新增 -- 二期新增")
+    @ApiOperation(tags = {"我的紧急联系人,我的设备"},value = "紧急联系人新增 -- 二期新增")
     public Result<Object> addMyContact(@RequestHeader("token") String token,
                                      @RequestBody HouseContactVO vo){
         try {
@@ -92,7 +92,7 @@ public class ContactApiController {
     }
 
     @PostMapping("/my/update")
-    @ApiOperation(tags = {"我的紧急联系人"},value = "紧急联系人修改 -- 二期新增")
+    @ApiOperation(tags = {"我的紧急联系人,我的设备"},value = "紧急联系人修改 -- 二期新增")
     public Result<Object> updateMyContact(@RequestHeader("token") String token,
                                         @RequestBody HouseContactVO vo){
         try {

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

@@ -69,13 +69,13 @@ public class DevApiController {
         }
     }
 
-    @DeleteMapping("/my/removeMyDevice/{id}")
+    @PostMapping("/my/unBindMyDevice")
     @ApiOperation(tags = {"我的设备"},value = "移除设备（解除绑定） -- 二期新增")
-    public Result<Object> removeMyDevice(HttpServletRequest request,@RequestHeader("token") String token,
-                                         @PathVariable("id") Long id) {
+    public Result<Object> unBindMyDevice(HttpServletRequest request,@RequestHeader("token") String token,
+                                         @RequestParam("id") Long id) {
         try {
             MemberInfoVO current = passportService.checkToken(token);
-            this.pinanbaoDeviceService.removeMyDevice(current.getId(),id);
+            this.pinanbaoDeviceService.unBindMyDevice(current.getId(),id);
             return Result.success("移除成功！");
         } catch (Exception e) {
             log.error("设备: 移除设备出现异常", e);
@@ -88,7 +88,7 @@ public class DevApiController {
      * @return
      */
     @GetMapping("/my/myDeviceList")
-    @ApiOperation(tags = {"我的设备"},value = "我的设备列表")
+    @ApiOperation(tags = {"我的设备"},value = "我的设备列表 -- 二期新增")
     public Result<List<DeviceVO>> myDeviceList(@RequestHeader(value = "token") String token){
         try {
             MemberInfoVO current = passportService.checkToken(token);
@@ -164,7 +164,7 @@ public class DevApiController {
      * @return
      */
     @GetMapping("/my/queryMyOlderListByDeviceId")
-    @ApiOperation(tags = {"我的设备"},value = "查询我的设备拥有的被监护人列表")
+    @ApiOperation(tags = {"我的设备"},value = "查询我的设备拥有的被监护人列表 -- 二期新增")
     public Result<List<OlderVO>> queryMyOlderListByDeviceId(@RequestHeader(value = "token") String token,
                                                    @RequestParam("id") Long id){
         try {
@@ -178,12 +178,13 @@ public class DevApiController {
         }
     }
 
+
     /**
      * 查询我的设备拥有的紧急联系人列表
      * @return
      */
     @GetMapping("/my/queryMyContactListByDeviceId")
-    @ApiOperation(tags = {"我的设备"},value = "查询我的设备拥有的紧急联系人列表")
+    @ApiOperation(tags = {"我的设备"},value = "查询我的设备拥有的紧急联系人列表 -- 二期新增")
     public Result<List<HouseContactVO>> queryMyContactListByDeviceId(@RequestHeader(value = "token") String token,
                                                             @RequestParam("id") Long id){
         try {
@@ -196,4 +197,68 @@ public class DevApiController {
             return Result.error( "获取失败");
         }
     }
+
+    /**
+     * 选择我的被监护人列表中某个老人保存绑定
+     * @return
+     */
+    @PostMapping("/my/bindOlder")
+    @ApiOperation(tags = {"我的设备"},value = "选择我的被监护人列表中某个老人保存绑定 --二期新增")
+    public Result<Object> bindOlder(HttpServletRequest request, @RequestHeader("token") String token,
+                                    @RequestParam("id") Long id,
+                                     @RequestParam("olderId") Long olderId) {
+        if (this.pinanbaoDeviceService.bindOlder(id,olderId)) {
+            return  Result.success("绑定成功");
+        } else{
+            return  Result.error("绑定失败");
+        }
+    }
+
+    @PostMapping("/my/unBindOlder")
+    @ApiOperation(tags = {"我的设备"},value = "移除被监护人（解除绑定） -- 二期新增")
+    public Result<Object> unBindOlder(HttpServletRequest request,@RequestHeader("token") String token,
+                                      @RequestParam("id") Long id,
+                                      @RequestParam("olderId") Long olderId) {
+        try {
+            this.pinanbaoDeviceService.unBindOlder(id,olderId);
+            return Result.success("移除成功！");
+        } catch (Exception e) {
+            log.error("设备: 移除设备出现异常", e);
+            return Result.error("移除失败！");
+        }
+    }
+    /**
+     * 选择我的紧急人列表中某个保存绑定
+     * @return
+     */
+    @PostMapping("/my/bindOlder")
+    @ApiOperation(tags = {"我的设备"},value = "选择我的紧急人列表中某个保存绑定 --二期新增")
+    public Result<Object> bindHouseContact(HttpServletRequest request, @RequestHeader("token") String token,
+                                    @RequestParam("id") Long id,
+                                    @RequestParam("contactId") Long contactId) {
+        if (this.pinanbaoDeviceService.bindHouseContact(id,contactId)) {
+            return  Result.success("绑定成功");
+        } else{
+            return  Result.error("绑定失败");
+        }
+    }
+
+    /**
+     * 移除被紧急联系人（解除绑定）
+     * @return
+     */
+    @PostMapping("/my/unHouseContact")
+    @ApiOperation(tags = {"我的设备"},value = "移除被紧急联系人（解除绑定） --二期新增")
+    public Result<Object> unHouseContact(HttpServletRequest request, @RequestHeader("token") String token,
+                                           @RequestParam("id") Long id,
+                                           @RequestParam("contactId") Long contactId) {
+        if (this.pinanbaoDeviceService.unHouseContact(id,contactId)) {
+            return  Result.success("绑定成功");
+        } else{
+            return  Result.error("绑定失败");
+        }
+    }
+
+
+
 }

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

@@ -36,7 +36,7 @@ public class OlderApiController {
      * @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);
@@ -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 {

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

@@ -47,7 +47,7 @@ public class PinanbaoDeviceService {
     private CareHouseContactService careHouseContactService;
 
     /**
-     * 查询空闲设备列表
+     * 查询空闲设备列表 //TODO 必须有房屋的
      * @param memberId
      * @return
      */
@@ -55,7 +55,7 @@ public class PinanbaoDeviceService {
         List<DeviceVO> vos = Lists.newArrayList();
         CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
         QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().ne(CareDevice::getMemberId, memberInfo.getId())
+        queryWrapper.lambda().ne(CareDevice::getMemberId, memberInfo.getId()).isNotNull(CareDevice::getHouseId)
                 .and(wrapper ->wrapper.isNull(CareDevice::getMemberId).or().eq(CareDevice::getMemberId,'0'))
                 .orderByAsc(CareDevice::getDevCode);
         List<CareDevice> devices = this.careDeviceService.list(queryWrapper);
@@ -85,7 +85,7 @@ public class PinanbaoDeviceService {
      * 移除设备
      * @return
      */
-    public Boolean removeMyDevice(Long memberId,Long devId) {
+    public Boolean unBindMyDevice(Long memberId,Long devId) {
         CareDevice careDevice = new CareDevice();
         careDevice.setMemberId(null);
         careDevice.setMemberPhone(null);
@@ -195,6 +195,7 @@ public class PinanbaoDeviceService {
         return vos;
     }
 
+
     /**
      * 查询我的设备拥有的紧急联系人列表
      * @param devId
@@ -220,4 +221,53 @@ public class PinanbaoDeviceService {
         return vosNew;
     }
 
+    /**
+     * 绑定设备 和 老人
+     * @return
+     */
+    public boolean bindOlder(Long devId,Long olderId){
+        CareDevice careDevice = this.careDeviceService.getById(devId);
+        CareHouseOlderRel careHouseOlderRel = new CareHouseOlderRel();
+        careHouseOlderRel.setHouseId(careDevice.getHouseId());
+        careHouseOlderRel.setOlderId(olderId);
+        return this.careHouseOlderRelService.save(careHouseOlderRel);
+    }
+
+    /**
+     * 移除被监护人，解绑设备 和 老人
+     * @return
+     */
+    public boolean unBindOlder(Long devId,Long olderId){
+        CareDevice careDevice = this.careDeviceService.getById(devId);
+
+        QueryWrapper<CareHouseOlderRel> delWrapper = new QueryWrapper<>();
+        delWrapper.lambda().eq(CareHouseOlderRel::getHouseId, careDevice.getHouseId())
+        .eq(CareHouseOlderRel::getOlderId, olderId);
+        return this.careHouseOlderRelService.remove(delWrapper);
+    }
+
+    /**
+     * 绑定设备 和 紧急联系人
+     * @return
+     */
+    public boolean bindHouseContact(Long devId,Long contactId){
+        CareDevice careDevice = this.careDeviceService.getById(devId);
+        CareHouseContactRel careHouseContactRel = new CareHouseContactRel();
+        careHouseContactRel.setHouseId(careDevice.getHouseId());
+        careHouseContactRel.setContactId(contactId);
+        return this.careHouseContactRelService.save(careHouseContactRel);
+    }
+
+    /**
+     * 移除被监护人，解绑设备 和 老人
+     * @return
+     */
+    public boolean unHouseContact(Long devId,Long contactId){
+        CareDevice careDevice = this.careDeviceService.getById(devId);
+
+        QueryWrapper<CareHouseContactRel> delWrapper = new QueryWrapper<>();
+        delWrapper.lambda().eq(CareHouseContactRel::getHouseId, careDevice.getHouseId())
+                .eq(CareHouseContactRel::getContactId, contactId);
+        return this.careHouseContactRelService.remove(delWrapper);
+    }
 }