第二版,安装bug

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

@@ -100,6 +100,36 @@ public class PassportController {
 
     }
 
+//    @ApiOperation(value = "修改密码", notes = "修改密码")
+//    @ApiParam(name = "params", value = "登录参数")
+//    @PostMapping("changePwd")
+//    public Result<Object> changePwd(@RequestBody MemberInitParams params) {
+//
+//        if (StringUtils.isBlank(params.getPhone())) {
+//            return Result.error("请输入手机号码");
+//        }
+//        if (StringUtils.isBlank(params.getPassword())) {
+//            return Result.error("请输入密码");
+//        }
+//        if (StringUtils.isBlank(params.getVcode())) {
+//            return Result.error("请输入验证码");
+//        }
+//        if (!StringUtils.equalsIgnoreCase(params.getVcode(), smsTimeoutCache.getIfPresent(params.getPhone()))) {
+//            return Result.error("请输入正确的验证码");
+//        }
+//        MemberOpenDO memberOpenDO = memberOpenService.detailByPhone(params.getPhone());
+//        if (memberOpenDO == null) {
+//            return Result.error("该手机号未注册");
+//        }
+//
+//        boolean flag = memberInfoService.changePwd(params.getPassword(), memberOpenDO.getMember().getId());
+//        if (flag) {
+//            return Result.success();
+//        }
+//
+//        return Result.error("绑定手机号码失败");
+//    }
+
 
     @ApiOperation(value = "小程序登出", notes = "小程序登出")
     @PostMapping("logout")

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 描述：
@@ -29,6 +30,16 @@ public class RoomController {
     private RoomService roomService;
 
 
+    /**
+     * 获取是否配置的状态接口
+     * @param devCode
+     * @return
+     */
+    @GetMapping("getConfStatusInfo")
+    @ApiOperation(tags = {"设备安装"},value = "获取是否配置的状态接口")
+    public Result<Map<String,Boolean>> getConfStatusInfo(@RequestParam("devCode") String devCode) {
+        return Result.success(this.roomService.getConfStatusInfo(devCode));
+    }
 
     /**
      * 获取房间信息详情

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

@@ -13,6 +13,7 @@ import com.care.installation.vo.*;
 import com.care.mqtt.service.MqttConnectorPoolService;
 import com.care.mqtt.service.MqttPublishService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,6 +39,37 @@ public class RoomService {
     @Resource
     private MqttConnectorPoolService mqttConnectorPoolService;
 
+    public  Map<String,Boolean> getConfStatusInfo(String devCode) {
+        Map<String,Boolean> map = new HashMap<>();
+        RoomVO roomVO = getRoomInfo(devCode);
+        if (roomVO != null){
+            map.put("roomVO",true);
+        } else {
+            map.put("roomVO",false);
+        }
+        RoomSensorVO roomSensorVO = getRoomSensorInfo(devCode);
+        if (roomSensorVO != null){
+            map.put("roomSensorVO",true);
+        } else {
+            map.put("roomSensorVO",false);
+        }
+        List<RoomGateVO> listRoomGateVO = listRoomGateInfo(devCode);
+        if(CollUtil.isNotEmpty(listRoomGateVO)){
+            map.put("listRoomGateVO",true);
+        } else {
+            map.put("listRoomGateVO",false);
+        }
+
+        List<RoomRegionVO> listRoomRegionVO = listRoomRegionInfo(devCode);
+        if(CollUtil.isNotEmpty(listRoomRegionVO)){
+            map.put("listRoomRegionVO",true);
+        } else {
+            map.put("listRoomRegionVO",false);
+        }
+
+        return map;
+    }
+
     public RoomVO getRoomInfo(String devCode) {
         QueryWrapper<CareRoom> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CareRoom::getRoomId,devCode);
@@ -51,8 +83,21 @@ public class RoomService {
     }
 
     public Boolean saveRoom(RoomVO vo) {
+        if (StringUtils.isEmpty(vo.getRoomId())){
+            return false;
+        }
+
         CareRoom careRoom = new CareRoom();
         BeanUtil.copyProperties(vo,careRoom);
+
+        QueryWrapper<CareRoom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareRoom::getRoomId,careRoom.getRoomId());
+        CareRoom careRoomDb = this.careRoomService.getOne(queryWrapper);
+        if(careRoomDb != null ){
+            careRoom.setId(careRoomDb.getId());
+        }
+
+
         if (careRoom.getId() != null) {  //修改
             careRoom.setModifyTime(new Date());
             return this.careRoomService.updateById(careRoom);
@@ -224,12 +269,13 @@ public class RoomService {
         QueryWrapper<CareRoom> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.lambda().eq(CareRoom::getRoomId,devCode);
         CareRoom careRoom = careRoomService.getOne(queryWrapper2);
-        boolean careRoomBool = "true".equals(careRoom.getAck());
+
+        boolean careRoomBool = careRoom != null && "true".equals(careRoom.getAck());
 
         QueryWrapper<CareRoomSensor> queryWrapper3 = new QueryWrapper<>();
         queryWrapper3.lambda().eq(CareRoomSensor::getRoomId,devCode);
         CareRoomSensor careRoomSensor = careRoomSensorService.getOne(queryWrapper3);
-        boolean careRoomSensorBool = "true".equals(careRoomSensor.getAck());
+        boolean careRoomSensorBool = careRoomSensor != null && "true".equals(careRoomSensor.getAck());
 
         QueryWrapper<CareRoomGate> queryWrapper4 = new QueryWrapper<>();
         queryWrapper4.lambda().eq(CareRoomGate::getRoomId,devCode);