第二版,频安宝

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

@@ -58,9 +58,9 @@ public class ContactApiController {
     @GetMapping("/my/getMyContactInfo")
     @ApiOperation(tags = {"我的紧急联系人"},value = "紧急联系人详情 -- 二期新增")
     public Result<HouseContactVO> getMyContactInfo(@RequestHeader(value = "token") String token,
-                                          @RequestParam("id") Long id){
+                                          @RequestParam("contactId") Long contactId){
         try {
-            return Result.success(this.pinanbaoContactService.getContactInfo(id));
+            return Result.success(this.pinanbaoContactService.getContactInfo(contactId));
         }catch (BDException e) {
             return  Result.error(e.getMessage());
         } catch (Exception e) {
@@ -111,12 +111,12 @@ public class ContactApiController {
         }
     }
 
-    @DeleteMapping("/my/delete/{id}")
+    @DeleteMapping("/my/delete/{contactId}")
     @ApiOperation(tags = {"我的紧急联系人"},value = "删除紧急联系人 -- 二期新增")
     public Result<Object> deleteMyContact(HttpServletRequest request,@RequestHeader("token") String token,
-                                        @PathVariable("id") Long id) {
+                                        @PathVariable("contactId") Long contactId) {
         try {
-            this.pinanbaoContactService.deleteById(id);
+            this.pinanbaoContactService.deleteById(contactId);
             return Result.success("删除成功！");
         } catch (Exception e) {
             log.error("紧急联系人: 删除紧急联系人出现异常", e);

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

@@ -35,15 +35,15 @@ public class DevApiController {
     private PassportService passportService;
 
     /**
-     * 查询空闲设备列表
+     * 我的设备列表
      * @return
      */
-    @GetMapping("/my/queryFreeDeviceList")
-    @ApiOperation(tags = {"我的设备"},value = "选择要添加设备列表（查询空闲设备列表）--二期新增")
-    public Result<List<DeviceVO>> queryFreeDeviceList(@RequestHeader(value = "token") String token){
+    @GetMapping("/my/myDeviceList")
+    @ApiOperation(tags = {"我的设备"},value = "我的设备列表 -- 二期新增")
+    public Result<List<DeviceVO>> myDeviceList(@RequestHeader(value = "token") String token){
         try {
             MemberInfoVO current = passportService.checkToken(token);
-            List<DeviceVO> datas = pinanbaoDeviceService.queryFreeDeviceList(current.getId());
+            List<DeviceVO> datas = pinanbaoDeviceService.queryDeviceByMemberId(current.getId());
             return Result.success(datas);
         }catch (BDException e) {
             return  Result.error(e.getMessage());
@@ -53,29 +53,15 @@ public class DevApiController {
         }
     }
 
-    /**
-     * 选择空闲设备保存绑定
-     * @return
-     */
-    @PostMapping("/my/bindDevice")
-    @ApiOperation(tags = {"我的设备"},value = "选择空闲设备保存绑定 --二期新增")
-    public Result<Object> bindDevice(HttpServletRequest request, @RequestHeader("token") String token,
-                                   @RequestParam("id") Long id) {
-        MemberInfoVO current = passportService.checkToken(token);
-        if (this.pinanbaoDeviceService.bindDevice(current.getId(),id)) {
-            return  Result.success("绑定成功");
-        } else{
-            return  Result.error("绑定失败");
-        }
-    }
+
 
     @PostMapping("/my/unBindMyDevice")
-    @ApiOperation(tags = {"我的设备"},value = "移除设备（解除绑定） -- 二期新增")
+    @ApiOperation(tags = {"我的设备"},value = "在设备列表中移除设备（解除绑定） -- 二期新增")
     public Result<Object> unBindMyDevice(HttpServletRequest request,@RequestHeader("token") String token,
-                                         @RequestParam("id") Long id) {
+                                         @RequestParam("devId") Long devId) {
         try {
             MemberInfoVO current = passportService.checkToken(token);
-            this.pinanbaoDeviceService.unBindMyDevice(current.getId(),id);
+            this.pinanbaoDeviceService.unBindMyDevice(current.getId(),devId);
             return Result.success("移除成功！");
         } catch (Exception e) {
             log.error("设备: 移除设备出现异常", e);
@@ -83,24 +69,7 @@ public class DevApiController {
         }
     }
 
-    /**
-     * 我的设备列表
-     * @return
-     */
-    @GetMapping("/my/myDeviceList")
-    @ApiOperation(tags = {"我的设备"},value = "我的设备列表 -- 二期新增")
-    public Result<List<DeviceVO>> myDeviceList(@RequestHeader(value = "token") String token){
-        try {
-            MemberInfoVO current = passportService.checkToken(token);
-            List<DeviceVO> datas = pinanbaoDeviceService.queryDeviceByMemberId(current.getId());
-            return Result.success(datas);
-        }catch (BDException e) {
-            return  Result.error(e.getMessage());
-        } catch (Exception e) {
-            log.error("设备: 列表查询出现异常",e);
-            return Result.error( "获取失败");
-        }
-    }
+
 
     /**
      * 我的设备详情
@@ -109,9 +78,9 @@ public class DevApiController {
     @GetMapping("/my/getMyDeviceInfo")
     @ApiOperation(tags = {"我的设备"},value = "设备详情 （包括设备名、场景、响应时间、服务信息等） -- 二期新增")
     public Result<DeviceVO> getMyDeviceInfo(@RequestHeader(value = "token") String token,
-                                                @RequestParam("id") Long id){
+                                                @RequestParam("devId") Long devId){
         try {
-            return Result.success(this.pinanbaoDeviceService.getDeviceInfo(id));
+            return Result.success(this.pinanbaoDeviceService.getDeviceInfo(devId));
         }catch (BDException e) {
             return  Result.error(e.getMessage());
         } catch (Exception e) {
@@ -166,9 +135,9 @@ public class DevApiController {
     @GetMapping("/my/queryMyOlderListByDeviceId")
     @ApiOperation(tags = {"我的设备"},value = "查询我的设备拥有的被监护人列表 -- 二期新增")
     public Result<List<OlderVO>> queryMyOlderListByDeviceId(@RequestHeader(value = "token") String token,
-                                                   @RequestParam("id") Long id){
+                                                   @RequestParam("devId") Long devId){
         try {
-            List<OlderVO> datas = pinanbaoDeviceService.queryMyOlderListByDeviceId(id);
+            List<OlderVO> datas = pinanbaoDeviceService.queryMyOlderListByDeviceId(devId);
             return Result.success(datas);
         }catch (BDException e) {
             return  Result.error(e.getMessage());
@@ -186,9 +155,9 @@ public class DevApiController {
     @GetMapping("/my/queryMyContactListByDeviceId")
     @ApiOperation(tags = {"我的设备"},value = "查询我的设备拥有的紧急联系人列表 -- 二期新增")
     public Result<List<HouseContactVO>> queryMyContactListByDeviceId(@RequestHeader(value = "token") String token,
-                                                            @RequestParam("id") Long id){
+                                                            @RequestParam("devId") Long devId){
         try {
-            List<HouseContactVO> datas = pinanbaoDeviceService.queryMyContactListByDeviceId(id);
+            List<HouseContactVO> datas = pinanbaoDeviceService.queryMyContactListByDeviceId(devId);
             return Result.success(datas);
         }catch (BDException e) {
             return  Result.error(e.getMessage());
@@ -205,9 +174,9 @@ public class DevApiController {
     @PostMapping("/my/bindOlder")
     @ApiOperation(tags = {"我的设备"},value = "选择我的被监护人列表中某个老人保存绑定 --二期新增")
     public Result<Object> bindOlder(HttpServletRequest request, @RequestHeader("token") String token,
-                                    @RequestParam("id") Long id,
+                                    @RequestParam("devId") Long devId,
                                      @RequestParam("olderId") Long olderId) {
-        if (this.pinanbaoDeviceService.bindOlder(id,olderId)) {
+        if (this.pinanbaoDeviceService.bindOlder(devId,olderId)) {
             return  Result.success("绑定成功");
         } else{
             return  Result.error("绑定失败");
@@ -217,10 +186,10 @@ public class DevApiController {
     @PostMapping("/my/unBindOlder")
     @ApiOperation(tags = {"我的设备"},value = "移除被监护人（解除绑定） -- 二期新增")
     public Result<Object> unBindOlder(HttpServletRequest request,@RequestHeader("token") String token,
-                                      @RequestParam("id") Long id,
+                                      @RequestParam("devId") Long devId,
                                       @RequestParam("olderId") Long olderId) {
         try {
-            this.pinanbaoDeviceService.unBindOlder(id,olderId);
+            this.pinanbaoDeviceService.unBindOlder(devId,olderId);
             return Result.success("移除成功！");
         } catch (Exception e) {
             log.error("设备: 移除设备出现异常", e);
@@ -234,9 +203,9 @@ public class DevApiController {
     @PostMapping("/my/bindHouseContact")
     @ApiOperation(tags = {"我的设备"},value = "选择我的紧急人列表中某个保存绑定 --二期新增")
     public Result<Object> bindHouseContact(HttpServletRequest request, @RequestHeader("token") String token,
-                                    @RequestParam("id") Long id,
+                                    @RequestParam("devId") Long devId,
                                     @RequestParam("contactId") Long contactId) {
-        if (this.pinanbaoDeviceService.bindHouseContact(id,contactId)) {
+        if (this.pinanbaoDeviceService.bindHouseContact(devId,contactId)) {
             return  Result.success("绑定成功");
         } else{
             return  Result.error("绑定失败");
@@ -250,9 +219,9 @@ public class DevApiController {
     @PostMapping("/my/unHouseContact")
     @ApiOperation(tags = {"我的设备"},value = "移除被紧急联系人（解除绑定） --二期新增")
     public Result<Object> unHouseContact(HttpServletRequest request, @RequestHeader("token") String token,
-                                           @RequestParam("id") Long id,
+                                           @RequestParam("devId") Long devId,
                                            @RequestParam("contactId") Long contactId) {
-        if (this.pinanbaoDeviceService.unHouseContact(id,contactId)) {
+        if (this.pinanbaoDeviceService.unHouseContact(devId,contactId)) {
             return  Result.success("绑定成功");
         } else{
             return  Result.error("绑定失败");

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

@@ -1,78 +0,0 @@
-package com.care.client.controller;
-
-
-import com.care.client.service.DevInstallApiService;
-import com.care.client.service.PassportService;
-import com.care.client.vo.MemberInfoVO;
-import com.care.common.util.Result;
-
-import com.care.common.vo.device.DeviceVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 描述：
- *
- * @autho：wenskys
- * @create 2020/5/12 14:13
- **/
-@Api(tags = "设备安装接口")
-@RestController
-@RequestMapping("/pinanbao/install")
-public class DevInstallApiController {
-
-    @Resource
-    private DevInstallApiService devInstallApiService;
-    @Resource
-    private PassportService passportService;
-
-
-    /**
-     * 验证设备（是否存在,是否被别人绑定了）
-     * @param devCode
-     * @return
-     */
-    @PostMapping("checkDevCode")
-    @ApiOperation(tags = {"首页"},value = "添加设备-验证设备 --二期新增")
-    public Result<Object> checkDevCode(HttpServletRequest request, @RequestHeader("token") String token, @RequestParam("devCode") String devCode){
-        MemberInfoVO current = passportService.checkToken(token);
-        if (this.devInstallApiService.checkDevCode(current.getId(),devCode)){
-            return  Result.success("验证成功");
-        } else{
-            return  Result.error("验证失败");
-        }
-    }
-
-    /**
-     * 绑定用户
-     * @param devCode
-     * @return
-     */
-    @PostMapping("bindUser")
-    @ApiOperation(tags = {"首页"},value = "添加设备-绑定用户 --二期新增")
-    public Result<Object> bindUser(HttpServletRequest request, @RequestHeader("token") String token,
-                                   @RequestParam("phone") String phone,
-                                   @RequestParam("devCode") String devCode) {
-        if (this.devInstallApiService.bindUser(phone,devCode)) {
-            return  Result.success("绑定成功");
-        } else{
-            return  Result.error("绑定失败");
-        }
-    }
-
-    /**
-     * 获取设备激活状态
-     * @param devCode
-     * @return
-     */
-    @PostMapping("getDevActiveStatus")
-    @ApiOperation(tags = {"首页"},value = "添加设备-获取设备激活状态 --二期新增")
-    public Result<DeviceVO> getDevActiveStatus(HttpServletRequest request, @RequestHeader("token") String token,
-                                               @RequestParam("devCode") String devCode) {
-        return  Result.success(this.devInstallApiService.getDevActiveStatus(devCode));
-    }
-}

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

@@ -1,7 +1,10 @@
 package com.care.client.controller;
 
+import com.care.client.service.PassportService;
 import com.care.client.service.PinanbaoService;
+import com.care.client.vo.MemberInfoVO;
 import com.care.common.util.Result;
+import com.care.common.vo.device.DeviceVO;
 import com.care.common.vo.order.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,12 +28,14 @@ public class EventApiController {
 
     @Resource
     private PinanbaoService pinanbaoService;
-
+    @Resource
+    private PassportService passportService;
 
     @GetMapping("/hasDoing")
-    @ApiOperation(tags = {"首页"},value = "当前进行中的事件")
-    public Result<EventOrderVO> getDoingEvent(HttpServletRequest request,@RequestHeader("token") String token,@RequestParam("houseId") Long houseId){
-        EventOrderVO orderInfo = this.pinanbaoService.getDoingEvent(houseId);
+    @ApiOperation(tags = {"首页"},value = "当前进行中的事件  --二期修改")
+    public Result<EventOrderVO> getDoingEvent(HttpServletRequest request,@RequestHeader("token") String token){
+        MemberInfoVO current = passportService.checkToken(token);
+        EventOrderVO orderInfo = this.pinanbaoService.getDoingEvent(current.getId());
         return  Result.success("查询成功！",orderInfo);
     }
 

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

@@ -5,7 +5,6 @@ import com.care.client.service.PassportService;
 import com.care.client.service.PinanbaoService;
 import com.care.client.vo.DeviceMonitorVO;
 import com.care.client.vo.MemberInfoVO;
-import com.care.common.annotation.Permission;
 import com.care.common.exception.BDException;
 import com.care.common.util.PageResult;
 import com.care.common.util.Result;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -44,11 +42,11 @@ public class HouseApiController {
      * @return
      */
     @GetMapping("/device/list")
-    @ApiOperation(tags = {"首页"},value = "设备列表")
-    public Result<List<DeviceVO>> deviceList(@RequestHeader(value = "token") String token, @RequestParam("houseId") Long houseId){
+    @ApiOperation(tags = {"首页"},value = "设备列表  --二期修改")
+    public Result<List<DeviceVO>> deviceList(@RequestHeader(value = "token") String token){
         try {
-            passportService.checkToken(token);
-            List<DeviceVO> datas = pinanbaoService.devList(houseId);
+            MemberInfoVO current = passportService.checkToken(token);
+            List<DeviceVO> datas = pinanbaoService.devList(current.getId());
             return Result.success(datas);
         }catch (BDException e) {
             log.error("未处理事件查询-分页列表出现异常",e);

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

@@ -4,19 +4,15 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.care.client.service.AbstractPassportService;
 import com.care.client.service.PassportService;
+import com.care.client.service.PinanbaoMemberInfoService;
 import com.care.client.vo.MemberInfoVO;
 import com.care.common.entity.CareMemberInfo;
-import com.care.common.entity.CareOlder;
 import com.care.common.service.CareMemberInfoService;
-import com.care.common.service.CareOlderService;
 import com.care.common.util.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-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;
 
@@ -33,6 +29,8 @@ public class MemberApiController {
 
     @Resource
     private CareMemberInfoService careMemberInfoService;
+    @Resource
+    private PinanbaoMemberInfoService pinanbaoMemberInfoService;
 
 
     @Resource
@@ -43,8 +41,8 @@ public class MemberApiController {
     @ApiOperation(value = "获取基本信息", notes = "获取用户基本信息")
     @PostMapping("detail/info")
     public Result<Object> detailInfo(@RequestHeader String token) {
-        MemberInfoVO current = current(token);
-        CareMemberInfo member = careMemberInfoService.detailByOpenid(current.getOpenId());
+        MemberInfoVO current = passportService.checkToken(token);
+        CareMemberInfo member = careMemberInfoService.detailByPhone(current.getPhone());
         BeanUtil.copyProperties(member,current);
         if (member.getBirthday()!=null){
             current.setAge(DateUtil.ageOfNow(member.getBirthday()));
@@ -52,6 +50,25 @@ public class MemberApiController {
         return Result.success(current);
     }
 
+    @PostMapping("/update/updateMyInfo")
+    @ApiOperation(value = "修改个人信息（姓名、地址） -- 二期新增", notes = "修改个人信息（姓名、地址）")
+    public Result<Object> updateMyMemberInfo(@RequestHeader("token") String token,
+                                         @RequestBody MemberInfoVO vo){
+        try {
+            MemberInfoVO current = passportService.checkToken(token);
+            CareMemberInfo member = careMemberInfoService.detailByPhone(current.getPhone());
+            vo.setId(member.getId());
+            if(this.pinanbaoMemberInfoService.updateMyMemberInfo(vo)){
+                return  Result.success("修改成功！");
+            } else {
+                return Result.error("修改失败！");
+            }
+
+        } catch (Exception e) {
+            return Result.error("修改失败！");
+        }
+    }
+
     /*@ApiOperation(value = "刷新基本信息", notes = "刷新用户基本信息")
     @PostMapping("refresh")
     public Result<Object> refreshMember(@RequestHeader String token) {
@@ -65,9 +82,6 @@ public class MemberApiController {
         return Result.success(passportService.notMatchMemberField(token));
     }
 */
-    public MemberInfoVO current(String token) {
-        return passportService.checkToken(token);
-    }
 
 
 

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

@@ -57,9 +57,9 @@ public class OlderApiController {
     @GetMapping("/my/getMyOlderInfo")
     @ApiOperation(tags = {"我的被监护人"},value = "被监护人详情  -- 二期新增")
     public Result<OlderVO> getMyOlderInfo(@RequestHeader(value = "token") String token,
-                                                @RequestParam("id") Long id){
+                                                @RequestParam("olderId") Long olderId){
         try {
-            return Result.success(this.pinanbaoOlderService.getOlderInfo(id));
+            return Result.success(this.pinanbaoOlderService.getOlderInfo(olderId));
         }catch (BDException e) {
             return  Result.error(e.getMessage());
         } catch (Exception e) {
@@ -110,12 +110,12 @@ public class OlderApiController {
         }
     }
 
-    @DeleteMapping("/my/delete/{id}")
+    @DeleteMapping("/my/delete/{olderId}")
     @ApiOperation(tags = {"我的被监护人"},value = "删除被监护人 -- 二期新增")
     public Result<Object> deleteMyOlder(HttpServletRequest request,@RequestHeader("token") String token,
-                                 @PathVariable("id") Long id) {
+                                 @PathVariable("olderId") Long olderId) {
         try {
-            this.pinanbaoOlderService.deleteById(id);
+            this.pinanbaoOlderService.deleteById(olderId);
             return Result.success("删除成功！");
         } catch (Exception e) {
             log.error("被监护人: 删除被监护人出现异常", e);

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

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 
 @Slf4j
 @Service
-public class PassportService {
+public class PassportService extends AbstractPassportService {
 
     @Resource
     private RedisUtil redisUtil;
@@ -43,6 +43,7 @@ public class PassportService {
             if (!DigestUtils.md5Hex(params.getPassword()).equals(careMemberInfo.getPassword())) {
                 return  Result.error("密码错误");
             }
+            cache(params);
             return Result.success();
         }
         return Result.error();

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

@@ -13,10 +13,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 @Slf4j
 @Service
-public class DevInstallApiService {
+public class PinanbaoDevAddService {
 
     @Resource
     private CareMemberInfoService careMemberInfoService;
@@ -24,17 +26,46 @@ public class DevInstallApiService {
     @Resource
     private CareDeviceService careDeviceService;
 
-    public Boolean checkDevCode(Long memberId ,String devCode) {
+    public Map<String,Boolean> checkDevCode(Long memberId , String devCode) {
+        Map<String,Boolean> map = new HashMap<>();
+
         QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CareDevice::getDevCode,devCode);
         CareDevice careDevice = this.careDeviceService.getOne(queryWrapper);
-        if ( careDevice == null) { //不存在
-            return false;
+        if (careDevice == null) { //不存在
+            map.put("isExist",false);
+            return map;
         } else if(careDevice.getMemberId() !=null && careDevice.getMemberId() != 0L && !careDevice.getMemberId().equals(memberId)) { //已经被别人绑定
-            return false;
+            map.put("isExist",true);
+            map.put("isOtherBind",true);
+            return map;
+        } else if(careDevice.getMemberId() !=null  && careDevice.getMemberId().equals(memberId) && "1".equals(careDevice.getActiveStatus())) { //已经自己绑定，并且已经激活
+            map.put("isExist",true);
+            map.put("isOtherBind",false);
+            map.put("isSelfBind",true);
+            map.put("isActive",true);
+            return map;
+        }  else if(careDevice.getMemberId() !=null  && careDevice.getMemberId().equals(memberId) && "0".equals(careDevice.getActiveStatus())) { //已经自己绑定，并且未激活
+            map.put("isExist",true);
+            map.put("isOtherBind",false);
+            map.put("isSelfBind",true);
+            map.put("isActive",false);
+            return map;
+        }  else if(careDevice.getMemberId() !=null  && careDevice.getMemberId().equals(memberId) && "0".equals(careDevice.getActiveStatus())) { //没绑定，并且未激活
+            map.put("isExist",true);
+            map.put("isOtherBind",false);
+            map.put("isSelfBind",false);
+            map.put("isActive",false);
+            return map;
+        }  else if(careDevice.getMemberId() !=null  && careDevice.getMemberId().equals(memberId) && "0".equals(careDevice.getActiveStatus())) { //没绑定，并且已经激活
+            map.put("isExist",true);
+            map.put("isOtherBind",false);
+            map.put("isSelfBind",false);
+            map.put("isActive",true);
+            return map;
         }
 
-        return true;
+        return map;
     }
 
     public Boolean bindUser(String phone ,String devCode) {

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

@@ -3,10 +3,13 @@ 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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.care.client.vo.DeviceVO;
 import com.care.client.vo.HouseContactVO;
 import com.care.client.vo.OlderVO;
 import com.care.common.entity.*;
+import com.care.common.enums.DeviceActiveStatusEnum;
+import com.care.common.enums.DeviceSceneEnum;
 import com.care.common.enums.OlderLiveTypeEnum;
 import com.care.common.enums.RelationTypeEnum;
 import com.care.common.service.*;
@@ -46,53 +49,16 @@ public class PinanbaoDeviceService {
     @Resource
     private CareHouseContactService careHouseContactService;
 
-    /**
-     * 查询空闲设备列表 //TODO 必须有房屋的
-     * @param memberId
-     * @return
-     */
-    public List<DeviceVO> queryFreeDeviceList(Long memberId){
-        List<DeviceVO> vos = Lists.newArrayList();
-        CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
-        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
-        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);
-        if (CollUtil.isNotEmpty(devices)){
-            devices.forEach(item -> {
-                DeviceVO vo = new DeviceVO();
-                BeanUtil.copyProperties(item,vo);
-                vos.add(vo);
-            });
-        }
-        return vos;
-    }
-
-
-    /**
-     * 绑定设备
-     * @return
-     */
-    public boolean bindDevice(Long memberId,Long devId){
-        CareDevice careDevice = this.careDeviceService.getById(devId);
-        careDevice.setMemberId(memberId);
-        careDevice.setMemberPhone(this.careMemberInfoService.getById(memberId).getPhone());
-        return this.careDeviceService.updateById(careDevice);
-    }
 
     /**
      * 移除设备
      * @return
      */
     public Boolean unBindMyDevice(Long memberId,Long devId) {
-        CareDevice careDevice = new CareDevice();
-        careDevice.setMemberId(null);
-        careDevice.setMemberPhone(null);
-
-        QueryWrapper<CareDevice> updateWrapper = new QueryWrapper<>();
-        updateWrapper.lambda().eq(CareDevice::getMemberId,memberId).eq(CareDevice::getId,devId);
-        return careDeviceService.update(careDevice,updateWrapper);
+        UpdateWrapper<CareDevice> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().eq(CareDevice::getMemberId,memberId).eq(CareDevice::getId,devId)
+        .set(CareDevice::getMemberId,null).set(CareDevice::getMemberPhone,null);
+        return careDeviceService.update(updateWrapper);
     }
 
     /**
@@ -110,6 +76,8 @@ public class PinanbaoDeviceService {
             devices.forEach(item -> {
                 DeviceVO vo = new DeviceVO();
                 BeanUtil.copyProperties(item,vo);
+                vo.setDevSceneName(DeviceSceneEnum.getCodeToName(vo.getDevScene()));
+                vo.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(vo.getActiveStatus()));
                 vos.add(vo);
             });
         }

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

@@ -0,0 +1,48 @@
+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.MemberInfoVO;
+import com.care.client.vo.OlderVO;
+import com.care.common.entity.CareMemberInfo;
+import com.care.common.entity.CareOlder;
+import com.care.common.enums.OlderLiveTypeEnum;
+import com.care.common.service.CareMemberInfoService;
+import com.care.common.service.CareOlderService;
+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 PinanbaoMemberInfoService {
+
+    @Resource
+    private CareMemberInfoService careMemberInfoService;
+
+
+    /**
+     * 修改个人信息
+     * @param vo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateMyMemberInfo(MemberInfoVO vo){
+        CareMemberInfo careMemberInfo = this.careMemberInfoService.getById(vo.getId());
+        BeanUtil.copyProperties(vo,careMemberInfo);
+        careMemberInfo.setModifyTime(new Date());
+        return this.careMemberInfoService.updateById(careMemberInfo);
+    }
+
+
+}

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

@@ -56,12 +56,12 @@ public class PinanbaoService {
     @Resource
     private CareOlderService careOlderService;
     /**
-     * 查询房屋的设备列表
-     * @param houseId
+     * 查询我的的设备列表
+     * @param memberId
      * @return
      */
-    public List<DeviceVO> devList(Long houseId){
-        return this.careDeviceService.queryListByHouseId(houseId);
+    public List<DeviceVO> devList(Long memberId){
+        return this.careDeviceService.queryListByMemberId(memberId);
     }
 
     /**
@@ -87,13 +87,13 @@ public class PinanbaoService {
 
     /**
      * 查询正在进行中的事件
-     * @param houseId
+     * @param memberId
      * @return
      */
-    public EventOrderVO getDoingEvent(Long houseId){
+    public EventOrderVO getDoingEvent(Long memberId){
         EventOrderVO vo = null;
         QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareEventOrder::getHouseId,houseId).and(item->
+        queryWrapper.lambda().eq(CareEventOrder::getMemberId,memberId).and(item->
             item.eq(CareEventOrder::getStatus, OrderStatusEnum.TODO.getValue()).or(i->
                 i.eq(CareEventOrder::getStatus,OrderStatusEnum.DOING.getValue())
             )

src/main/java/com/care/common/mapper/CareDeviceMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @since 2021-05-21 00:08:36
  */
 public interface CareDeviceMapper extends BaseMapper<CareDevice> {
-    List<DeviceVO> queryListByHouseId(@Param("houseId") Long houseId );
+    List<DeviceVO> queryListByMemberId(@Param("memberId") Long memberId );
 
 
     IPage<DeviceVO> queryList(IPage<DeviceVO> page, @Param("stationId") Long stationId,

src/main/java/com/care/common/service/CareDeviceService.java

@@ -19,11 +19,11 @@ import java.util.Map;
 public interface CareDeviceService extends IService<CareDevice> {
 
     /**
-     * 查询房屋的设备列表
-     * @param houseId
+     * 查询我的设备列表
+     * @param memberId
      * @return
      */
-    List<DeviceVO> queryListByHouseId(Long houseId);
+    List<DeviceVO> queryListByMemberId(Long memberId);
 
     IPage<DeviceVO> queryList(PageReqVO pageReqVo, Long stationId, String devCode, String activeStatus,String chambName, String status,String houseAddr, Long chambId,Long memberId,UserLogindConvertVO loginUser);
     Map<String,String> get3dUrl(Long deviceId);

src/main/java/com/care/common/service/impl/CareDeviceServiceImpl.java

@@ -54,14 +54,14 @@ public class CareDeviceServiceImpl extends ServiceImpl<CareDeviceMapper, CareDev
         return map;
     }
     /**
-     * 查询房屋的设备列表
+     * 查询我的设备列表
      *
-     * @param houseId
+     * @param memberId
      * @return
      */
     @Override
-    public List<DeviceVO> queryListByHouseId(Long houseId) {
-        return this.baseMapper.queryListByHouseId(houseId);
+    public List<DeviceVO> queryListByMemberId(Long memberId) {
+        return this.baseMapper.queryListByMemberId(memberId);
     }
 
     @Override

src/main/resources/common.properties

@@ -16,4 +16,4 @@ mqtt.password=public
 #是否开启mqtt消息接受服务，开启：1，不开启：0
 mqtt.on=1
 #设备激活返回消息超时(秒)
-mqtt.dev.jihuo.timeout=5
+mqtt.dev.jihuo.timeout=15

src/main/resources/mybatis/CareDeviceMapper.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.care.common.mapper.CareDeviceMapper">
 
-    <select id="queryListByHouseId" resultType="com.care.common.vo.device.DeviceVO">
+    <select id="queryListByMemberId" resultType="com.care.common.vo.device.DeviceVO">
         select
             d.id ,
             d.dev_name as devName
         from care_device d
-        where d.house_id = #{houseId}
+        where d.member_id = #{memberId}
     </select>
     <select id="queryList" resultType="com.care.common.vo.device.DeviceVO">
         select