二期 与安宝bug

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

@@ -76,7 +76,7 @@ public class DevApiController {
      * @return
      */
     @GetMapping("/my/getMyDeviceInfo")
-    @ApiOperation(tags = {"我的设备"},value = "设备详情 （包括设备名、场景、响应时间、服务信息等） -- 二期新增")
+    @ApiOperation(tags = {"我的设备"},value = "设备详情 （包括设备名、场景、响应时间、服务信息，是否设置xxx的标志等） -- 二期新增")
     public Result<DeviceVO> getMyDeviceInfo(@RequestHeader(value = "token") String token,
                                                 @RequestParam("devId") Long devId){
         try {

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

@@ -8,10 +8,7 @@ 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.enums.*;
 import com.care.common.service.*;
 import com.care.common.vo.device.StationVO;
 import lombok.extern.slf4j.Slf4j;
@@ -113,6 +110,9 @@ public class PinanbaoDeviceService {
         vo.setChambName(chamb.getName());
         vo.setChambPhone(chamb.getPhone());
         vo.setStationName(this.careStationService.getById(vo.getStationId()).getShortName());
+        vo.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(vo.getActiveStatus()));
+        vo.setStatusName(DeviceStatusEnum.getCodeToName(vo.getStatus()));
+
         if(StringUtils.isNotEmpty(vo.getDevScene())){
             vo.setIsHasScene(true);
         } else {

src/main/java/com/care/mqtt/service/MqttMsgInstallService.java

@@ -91,7 +91,7 @@ public class MqttMsgInstallService {
             UpdateWrapper<CareRoomSensor> updateWrapper = new UpdateWrapper<>();
             updateWrapper.lambda().eq(CareRoomSensor::getRoomId,devCode).set(CareRoomSensor::getAck,ack);
             careRoomSensorService.update(updateWrapper);
-        } else if("CfgGatesAck".equals(type)) { //门
+        } else if("CfgEntrancesAck".equals(type)) { //门
             UpdateWrapper<CareRoomGate> updateWrapper = new UpdateWrapper<>();
             updateWrapper.lambda().eq(CareRoomGate::getRoomId,devCode).set(CareRoomGate::getAck,ack);
             careRoomGateService.update(updateWrapper);