第二版,去除house多余字段

src/main/java/com/care/bms/mqtt/MqttMessageListener.java

@@ -135,6 +135,7 @@ public class MqttMessageListener implements IMqttMessageListener {
 
             Map map = JSON.parseObject(mqttMessageStr);
             String type = (String) map.get("type");
+            Map msgMap = (Map)map.get("msg");
             if ("BreathHeartRate".equals(type)) {
                 Map msg = (Map) map.get("msg");
                 Integer breath = (Integer) msg.get("breath");
@@ -143,26 +144,8 @@ public class MqttMessageListener implements IMqttMessageListener {
                 careDevice.setHeartRate(heart);
                 careDeviceService.updateById(careDevice);
             } else if ("FallDown".equals(type)) { //跌到
-                Integer fallResponseTime = careDevice.getFallResponseTime();
-                MyThread myThread = new MyThread();
-                myThread.setCareDevice(careDevice);
-                myThread.setOrderType(OrderTypeEnum.DI_EDAO.getValue());
-                myThread.setSleepTime(fallResponseTime);
-                myThread.setDate(DateUtil.date());
-                threadMap.put("FallDown-" + System.currentTimeMillis(),myThread);
-                myThread.start();
-
-            } else if ("StayTooLong".equals(type)) { //久滞
-                Integer longlagResponseTime = careDevice.getLonglagResponseTime();
-                MyThread myThread = new MyThread();
-                myThread.setCareDevice(careDevice);
-                myThread.setOrderType(OrderTypeEnum.JIU_ZHI.getValue());
-                myThread.setSleepTime(longlagResponseTime);
-                myThread.setDate(DateUtil.date());
-                threadMap.put("StayTooLong-" + System.currentTimeMillis(),myThread);
-                myThread.start();
-            } else if ("quxiao".equals(type)) { //取消
-                if ("FallDown".equals("FallDown")) { //跌到类型 todo
+                Integer conf = (Integer)msgMap.get("conf");
+                if(conf == 255){ //取消
                     threadMap.forEach((key,value) -> {
                         if(key.startsWith("FallDown")) {
                             if(!value.isInterrupted()){
@@ -172,7 +155,21 @@ public class MqttMessageListener implements IMqttMessageListener {
                             }
                         }
                     });
-                } else if("StayTooLong".equals("StayTooLong")) {//久滞 todo
+                } else {
+                    Integer fallResponseTime = careDevice.getFallResponseTime();
+                    MyThread myThread = new MyThread();
+                    myThread.setCareDevice(careDevice);
+                    myThread.setOrderType(OrderTypeEnum.DI_EDAO.getValue());
+                    myThread.setSleepTime(fallResponseTime);
+                    myThread.setDate(DateUtil.date());
+                    threadMap.put("FallDown-" + System.currentTimeMillis(),myThread);
+                    myThread.start();
+                }
+
+
+            } else if ("StayTooLong".equals(type)) { //久滞
+                Integer conf = (Integer)msgMap.get("conf");
+                if(conf == 255){ //取消
                     threadMap.forEach((key,value) -> {
                         if(key.startsWith("StayTooLong")) {
                             if(!value.isInterrupted()){
@@ -182,7 +179,17 @@ public class MqttMessageListener implements IMqttMessageListener {
                             }
                         }
                     });
+                } else {
+                    Integer longlagResponseTime = careDevice.getLonglagResponseTime();
+                    MyThread myThread = new MyThread();
+                    myThread.setCareDevice(careDevice);
+                    myThread.setOrderType(OrderTypeEnum.JIU_ZHI.getValue());
+                    myThread.setSleepTime(longlagResponseTime);
+                    myThread.setDate(DateUtil.date());
+                    threadMap.put("StayTooLong-" + System.currentTimeMillis(),myThread);
+                    myThread.start();
                 }
+
             }
         } catch (Exception e){
             e.printStackTrace();

src/main/java/com/care/bms/service/HouseService.java

@@ -58,11 +58,11 @@ public class HouseService {
             HouseVO vo = new HouseVO();
             BeanUtil.copyProperties(house,vo);
             vo.setKeyEscrowTypeName(KeyEscrowTypeEnum.getCodeToName(vo.getKeyEscrowType()));
-            if ("0".equals(vo.getStatus())){
-                vo.setStatusName("未激活");
-            }else if ("1".equals(vo.getStatus())){
-                vo.setStatusName("已激活");
-            }
+//            if ("0".equals(vo.getStatus())){
+//                vo.setStatusName("未激活");
+//            }else if ("1".equals(vo.getStatus())){
+//                vo.setStatusName("已激活");
+//            }
             CareStation station = this.careStationService.getById(vo.getStationId());
             if (station!=null){
                 vo.setStationName(station.getShortName());
@@ -92,7 +92,7 @@ public class HouseService {
         BeanUtil.copyProperties(vo,house);
         house.setCreateTime(new Date());
         house.setName(house.getAddr());
-        house.setStatus("1");
+//        house.setStatus("1");
         house.setOrgId(loginUser.getOrgId());
         this.careHouseService.save(house);
 //        CareMemberInfo memberInfo = new CareMemberInfo();
@@ -127,7 +127,7 @@ public class HouseService {
     public IPage<HouseVO> listHouse(String addr, Long  stationId, String status,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
         IPage<CareHouse> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
         QueryWrapper<CareHouse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(StrUtil.isNotEmpty(status),CareHouse::getStatus, status)
+        queryWrapper.lambda()//.eq(StrUtil.isNotEmpty(status),CareHouse::getStatus, status)
                 .like(StrUtil.isNotEmpty(addr),CareHouse::getAddr,addr)
                 .eq(CareHouse::getOrgId,loginUser.getOrgId())
                 .eq(loginUser.getStationId()!=null,CareHouse::getStationId,loginUser.getStationId())
@@ -141,11 +141,11 @@ public class HouseService {
             pageRes.getRecords().forEach(item -> {
                 HouseVO  resVO = new HouseVO();
                 BeanUtils.copyProperties(item,resVO);
-                if ("0".equals(resVO.getStatus())){
-                    resVO.setStatusName("未激活");
-                }else if ("1".equals(resVO.getStatus())){
-                    resVO.setStatusName("已激活");
-                }
+//                if ("0".equals(resVO.getStatus())){
+//                    resVO.setStatusName("未激活");
+//                }else if ("1".equals(resVO.getStatus())){
+//                    resVO.setStatusName("已激活");
+//                }
                 resVO.setKeyEscrowType(KeyEscrowTypeEnum.getCodeToName(resVO.getKeyEscrowType()));
                 CareStation station = this.careStationService.getById(resVO.getStationId());
                 if (station!=null){

src/main/java/com/care/common/entity/CareHouse.java

@@ -52,9 +52,9 @@ public class CareHouse implements Serializable {
     private String keyEscrowType;
 
 
-    @ApiModelProperty("状态： 1激活，0未激活")
-    @TableField("STATUS")
-    private String status;
+//    @ApiModelProperty("状态： 1激活，0未激活")
+//    @TableField("STATUS")
+//    private String status;
 
 
     @ApiModelProperty("地址")

src/main/java/com/care/common/vo/device/HouseVO.java

@@ -38,9 +38,9 @@ public class HouseVO implements Serializable {
     private String keyEscrowType;
     private String keyEscrowTypeName;
 
-    @ApiModelProperty("状态： 0未激活，1已激活")
-    private String status;
-    private String statusName;
+//    @ApiModelProperty("状态： 0未激活，1已激活")
+ //   private String status;
+  //  private String statusName;
 
 
     @ApiModelProperty("地址")

src/main/java/com/care/common/vo/order/CareHouseVO.java

@@ -40,8 +40,8 @@ public class CareHouseVO implements Serializable {
     private String keyEscrowType;
 
 
-    @ApiModelProperty("状态： 1正常，2离开房间，3久滞，4摔倒，5坠床 6主动呼叫")
-    private Integer status;
+ //   @ApiModelProperty("状态： 1正常，2离开房间，3久滞，4摔倒，5坠床 6主动呼叫")
+ //   private Integer status;
 
 
     @ApiModelProperty("地址")