第二版,频安宝

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

@@ -6,6 +6,7 @@ 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.*;
@@ -62,4 +63,16 @@ public class DevInstallApiController {
             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/MemberApiController.java

@@ -40,7 +40,7 @@ public class MemberApiController {
     @Autowired
     private AbstractPassportService abstractPassportService;
 
-    @ApiOperation(value = "获取基本信息", notes = "获取用户基本录信息")
+    @ApiOperation(value = "获取基本信息", notes = "获取用户基本信息")
     @PostMapping("detail/info")
     public Result<Object> detailInfo(@RequestHeader String token) {
         MemberInfoVO current = current(token);

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

@@ -5,8 +5,10 @@ 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.enums.DeviceActiveStatusEnum;
 import com.care.common.service.CareDeviceService;
 import com.care.common.service.CareMemberInfoService;
+import com.care.common.vo.device.DeviceVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -50,4 +52,15 @@ public class DevInstallApiService {
         return this.careDeviceService.updateById(careDevice);
     }
 
+
+    public DeviceVO getDevActiveStatus(String devCode) {
+        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareDevice::getDevCode,devCode);
+        CareDevice careDevice = this.careDeviceService.getOne(queryWrapper);
+        DeviceVO vo = new DeviceVO();
+        vo.setActiveStatus(careDevice.getActiveStatus());
+        vo.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(vo.getActiveStatus()));
+        return vo;
+    }
+
 }