第二版,频安宝

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

@@ -0,0 +1,65 @@
+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 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("绑定失败");
+        }
+    }
+}

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

@@ -1,8 +1,7 @@
 package com.care.client.controller;
 
 import com.care.client.service.PassportService;
-import com.care.client.service.PinanbaoService;
-import com.care.client.vo.HouseContactVO;
+import com.care.client.service.PinanbaoOlderService;
 import com.care.client.vo.MemberInfoVO;
 import com.care.client.vo.OlderVO;
 import com.care.common.exception.BDException;
@@ -10,10 +9,7 @@ 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;
@@ -25,35 +21,105 @@ import java.util.List;
  * @Desc:
  */
 @RestController
-@Api(value = "ContactApiController", tags = { "被监护人档案" })
+@Api(value = "ContactApiController", tags = { "被监护人" })
 @Slf4j
 @RequestMapping("/pinanbao/older")
 public class OlderApiController {
 
     @Resource
-    private PinanbaoService pinanbaoService;
+    private PinanbaoOlderService pinanbaoOlderService;
     @Resource
     private PassportService passportService;
 
     /**
-     * 紧急联系人列表
-     * @param request
+     * 被监护人列表
      * @return
      */
     @GetMapping("/my/list")
-    @ApiOperation(tags = {"被监护人档案"},value = "被监护人档案列表")
-    public Result<List<OlderVO>> myHouseOlderList(HttpServletRequest request, @RequestHeader(value = "token") String token){
-        MemberInfoVO current = passportService.checkToken(token);
+    @ApiOperation(tags = {"被监护人"},value = "被监护人列表")
+    public Result<List<OlderVO>> myOlderList(@RequestHeader(value = "token") String token){
         try {
-            List<OlderVO> datas = pinanbaoService.queryOlderByMemberId(current.getId());
+            MemberInfoVO current = passportService.checkToken(token);
+            List<OlderVO> datas = pinanbaoOlderService.queryOlderByMemberId(current.getId());
             return Result.success(datas);
         }catch (BDException e) {
             return  Result.error(e.getMessage());
         } catch (Exception e) {
-            log.error("被监护人档案: 列表查询出现异常",e);
+            log.error("被监护人: 列表查询出现异常",e);
             return Result.error( "获取失败");
         }
     }
 
+    /**
+     * 被监护人详情
+     * @return
+     */
+    @GetMapping("/my/getMyOlderInfo")
+    @ApiOperation(tags = {"被监护人"},value = "被监护人详情")
+    public Result<OlderVO> getMyOlderInfo(@RequestHeader(value = "token") String token,
+                                                @RequestParam("id") Long id){
+        try {
+            return Result.success(this.pinanbaoOlderService.getOlderInfo(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> addMyOlder(@RequestHeader("token") String token,
+                                   @RequestBody OlderVO vo){
+        try {
+            MemberInfoVO current = passportService.checkToken(token);
+            if(this.pinanbaoOlderService.createMyOlder(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> updateMyOlder(@RequestHeader("token") String token,
+                                 @RequestBody OlderVO vo){
+        try {
+            if(this.pinanbaoOlderService.updateMyOlder(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/{id}")
+    @ApiOperation(value = "删除被监护人")
+    public Result<Object> deleteMyOlder(HttpServletRequest request,@RequestHeader("token") String token,
+                                 @PathVariable("id") Long id) {
+        try {
+            this.pinanbaoOlderService.deleteById(id);
+            return Result.success("删除成功！");
+        } catch (Exception e) {
+            log.error("被监护人: 删除被监护人出现异常", e);
+            return Result.error("删除失败！");
+        }
+    }
 }

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

@@ -0,0 +1,53 @@
+package com.care.client.service;
+
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.care.common.entity.CareDevice;
+import com.care.common.entity.CareMemberInfo;
+import com.care.common.service.CareDeviceService;
+import com.care.common.service.CareMemberInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Service
+public class DevInstallApiService {
+
+    @Resource
+    private CareMemberInfoService careMemberInfoService;
+
+    @Resource
+    private CareDeviceService careDeviceService;
+
+    public Boolean checkDevCode(Long memberId ,String devCode) {
+        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareDevice::getDevCode,devCode);
+        CareDevice careDevice = this.careDeviceService.getOne(queryWrapper);
+        if ( careDevice == null) { //不存在
+            return false;
+        } else if(careDevice.getMemberId() !=null && careDevice.getMemberId() != 0L && !careDevice.getMemberId().equals(memberId)) { //已经被别人绑定
+            return false;
+        }
+
+        return true;
+    }
+
+    public Boolean bindUser(String phone ,String devCode) {
+        QueryWrapper<CareMemberInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareMemberInfo::getPhone,phone);
+        CareMemberInfo careMemberInfo = this.careMemberInfoService.getOne(queryWrapper);
+
+        QueryWrapper<CareDevice> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.lambda().eq(CareDevice::getDevCode,devCode);
+        CareDevice careDevice = this.careDeviceService.getOne(queryWrapper2);
+
+        careDevice.setMemberId(careMemberInfo.getId());
+        careDevice.setMemberPhone(phone);
+
+        return this.careDeviceService.updateById(careDevice);
+    }
+
+}

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

@@ -0,0 +1,105 @@
+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.OlderVO;
+import com.care.common.entity.*;
+
+import com.care.common.enums.OlderLiveTypeEnum;
+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 PinanbaoOlderService {
+
+    @Resource
+    private CareMemberInfoService careMemberInfoService;
+    @Resource
+    private CareOlderService careOlderService;
+
+    /**
+     * 查询老人
+     * @param memberId
+     * @return
+     */
+    public List<OlderVO> queryOlderByMemberId(Long memberId){
+        List<OlderVO> vos = Lists.newArrayList();
+        CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
+        QueryWrapper<CareOlder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareOlder::getMemberId, memberInfo.getId());
+        List<CareOlder> olders = this.careOlderService.list(queryWrapper);
+        if (CollUtil.isNotEmpty(olders)){
+            olders.forEach(item -> {
+                OlderVO vo = new OlderVO();
+                BeanUtil.copyProperties(item,vo);
+                vo.setLiveTypeDesc(OlderLiveTypeEnum.getCodeToName(vo.getLiveType()));
+                vos.add(vo);
+            });
+        }
+        return vos;
+    }
+
+    /**
+     * 新增老人
+     * @param memberId
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean createMyOlder(Long memberId,OlderVO vo){
+        //保存被监护人
+        CareOlder careOlder = new CareOlder();
+        BeanUtil.copyProperties(vo,careOlder);
+        careOlder.setMemberId(memberId);
+        careOlder.setCreateTime(new Date());
+        return this.careOlderService.save(careOlder);
+    }
+
+    /**
+     * 查询老人详情
+     * @param id
+     * @return
+     */
+    public OlderVO getOlderInfo(Long id){
+        CareOlder careOlder = this.careOlderService.getById(id);
+        OlderVO vo = new OlderVO();
+        BeanUtil.copyProperties(careOlder,vo);
+        vo.setLiveTypeDesc(OlderLiveTypeEnum.getCodeToName(vo.getLiveType()));
+        return vo;
+    }
+
+    /**
+     * 修改老人
+     * @param vo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateMyOlder(OlderVO vo){
+        //修改老人
+        CareOlder careOlder = this.careOlderService.getById(vo.getId());
+        BeanUtil.copyProperties(vo,careOlder);
+        careOlder.setModifyTime(new Date());
+        return this.careOlderService.updateById(careOlder);
+    }
+
+    /**
+     * 删除老人
+     * @param id
+     * @return
+     */
+    public boolean deleteById(Long id){
+        return this.careOlderService.removeById(id);
+    }
+}

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

@@ -230,24 +230,4 @@ public class PinanbaoService {
         return  map.get("toWX");
     }
 
-    /**
-     * 查询房屋老人
-     * @param memberId
-     * @return
-     */
-    public List<OlderVO> queryOlderByMemberId(Long memberId){
-        List<OlderVO> vos = Lists.newArrayList();
-        CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
-        QueryWrapper<CareOlder> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareOlder::getMemberId, memberInfo.getId());
-        List<CareOlder> contacts = this.careOlderService.list(queryWrapper);
-        if (CollUtil.isNotEmpty(contacts)){
-            contacts.forEach(item -> {
-                OlderVO vo = new OlderVO();
-                BeanUtil.copyProperties(item,vo);
-                vos.add(vo);
-            });
-        }
-        return vos;
-    }
 }

src/main/java/com/care/client/vo/OlderVO.java

@@ -51,6 +51,8 @@ public class OlderVO {
     @ApiModelProperty("居住类别：1：独居 2：非独居 3：集中居住 4：其他")
     private String liveType;
 
+    @ApiModelProperty("居住类别描述")
+    private String liveTypeDesc;
 
     @ApiModelProperty("床号或者门牌号")
     private String bedNumber;

src/main/java/com/care/installation/controller/DevInstallationController.java

@@ -17,10 +17,10 @@ import javax.annotation.Resource;
  * @autho：wenskys
  * @create 2020/5/12 14:13
  **/
-@Api(tags = "设备安装相关接口")
+@Api(tags = "设备安装接口")
 @RestController
 @RequestMapping("/installation/api")
-public class DevInstallationController {
+public class DevInstallController {
 
     @Resource
     private DevInstallService devInstallService;

src/main/java/com/care/installation/service/DevInstallService.java

@@ -76,18 +76,20 @@ public class DevInstallService {
         if(careDevice.getId() == null){
             QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(CareDevice::getDevCode,vo.getDevCode());
-            careDevice.setId(careDeviceService.getOne(queryWrapper).getId());
+            CareDevice careDeviceDb = careDeviceService.getOne(queryWrapper);
+            careDevice.setId(careDeviceDb.getId());
+            careDevice.setMemberId(careDeviceDb.getMemberId());
         }
 
-        //关联用户
-        if(StringUtils.isNotEmpty(vo.getMemberPhone())) {
-            QueryWrapper<CareMemberInfo> queryWrapper0 = new QueryWrapper<>();
-            queryWrapper0.lambda().eq(CareMemberInfo::getPhone,vo.getMemberPhone());
-            CareMemberInfo careMemberInfo = this.careMemberInfoService.getOne(queryWrapper0);
-            if (careMemberInfo != null) { //关联,
-                careDevice.setMemberId(careMemberInfo.getId());
-            }
-        }
+//        //关联用户
+//        if(StringUtils.isNotEmpty(vo.getMemberPhone())) {
+//            QueryWrapper<CareMemberInfo> queryWrapper0 = new QueryWrapper<>();
+//            queryWrapper0.lambda().eq(CareMemberInfo::getPhone,vo.getMemberPhone());
+//            CareMemberInfo careMemberInfo = this.careMemberInfoService.getOne(queryWrapper0);
+//            if (careMemberInfo != null) { //关联,
+//                careDevice.setMemberId(careMemberInfo.getId());
+//            }
+//        }
 
         //房屋地址
         if(StringUtils.isNotEmpty(vo.getHouseAddr())) {

src/main/java/com/care/installation/service/RoomService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.care.common.entity.*;
+import com.care.common.enums.DeviceActiveStatusEnum;
 import com.care.common.service.*;
 import com.care.common.util.JsonUtil;
 import com.care.installation.vo.*;
@@ -200,7 +201,10 @@ public class RoomService {
                 mqttPublishService.publish(careDevice, getRoomRegionVOMqttData(roomRegionVOList));
             }
             //TODO 返回值
-            return true;
+
+            //激活
+            careDevice.setActiveStatus(DeviceActiveStatusEnum.ACTIVE.getValue());
+            return careDeviceService.updateById(careDevice);
         } catch (Exception e) {
             e.printStackTrace();
             return false;