业务逻辑发生变更，代码重构

src/main/java/com/care/bms/controller/EventHandleController.java

@@ -113,11 +113,17 @@ public class EventHandleController {
         this.bmsEventOrderService.receiveOrder(orderId,loginUser);
         return  Result.success("领取工单成功！");
     }
+    @GetMapping("/getEventInfo/{orderId}")
+    @ApiOperation(tags = {"事件处理"},value = "事件详情")
+    public Result<EventOrderVO> getEventInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
+        EventOrderVO orderInfo = this.bmsEventOrderService.getOrderInfo(orderId);
+        return  Result.success("查询成功！",orderInfo);
+    }
 
-    @GetMapping("/getOlderInfo/{orderId}")
-    @ApiOperation(tags = {"事件处理"},value = "被监护人信息")
-    public Result<OrderOlderVO> getOlderInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
-        OrderOlderVO older = this.bmsEventOrderService.getOrderOlderInfo(orderId);
+    @GetMapping("/getOlderList/{orderId}")
+    @ApiOperation(tags = {"事件处理"},value = "被监护人信息列表")
+    public Result<List<OrderOlderVO>> getOlderInfo(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
+        List<OrderOlderVO> older = this.bmsEventOrderService.queryOrderOlderList(orderId);
         return  Result.success("查询成功！",older);
     }
 
@@ -148,7 +154,8 @@ public class EventHandleController {
     @PostMapping("/key/auth/{applyId}")
     @ApiOperation(tags = {"事件处理"},value = "钥匙授权")
     public Result<Object> keyAuth(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("applyId") Long applyId){
-        if (this.bmsEventOrderService.keyAuth(applyId)) {
+        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+        if (this.bmsEventOrderService.keyAuth(applyId,loginUser)) {
             return  Result.success("钥匙授权成功！");
         }else{
             return  Result.error("钥匙授权失败！");
@@ -159,7 +166,8 @@ public class EventHandleController {
     public Result<Object> updateOrderContactStatus(HttpServletRequest request,@RequestHeader("token") String token,
                                                    @PathVariable("orderContactId") Long orderContactId,
                                                    @PathVariable("status") Integer status){
-        if (this.bmsEventOrderService.updateOrderContactStatus(orderContactId,status)) {
+        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+        if (this.bmsEventOrderService.updateOrderContactStatus(orderContactId,status,loginUser)) {
             return  Result.success("更新成功！");
         }else{
             return  Result.error("更新失败！");

src/main/java/com/care/bms/controller/TestController.java

@@ -0,0 +1,33 @@
+package com.care.bms.controller;
+
+import com.care.bms.service.BmsEventOrderService;
+import com.care.common.util.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/5/26
+ * @Desc:
+ */
+@RestController
+@Api(value = "TestController", tags = { "测试" })
+@Slf4j
+@RequestMapping("/bms/event")
+public class TestController {
+
+    @Autowired
+    private BmsEventOrderService bmsEventOrderService;
+
+    @GetMapping("/testData")
+    @ApiOperation(tags = {"未处理事件"},value = "模拟生成定单数据")
+    public Result<Object> listMyHandle(){
+            this.bmsEventOrderService.insertTestData();
+            return Result.success("生成成功");
+    }
+}

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

@@ -3,11 +3,13 @@ package com.care.bms.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.care.bigscreen.service.BigScreenService;
 import com.care.common.cache.RedisKeyConstant;
 import com.care.common.cache.RedisUtil;
 import com.care.common.entity.*;
@@ -20,7 +22,6 @@ import com.care.common.vo.event.*;
 import com.care.common.vo.outcall.CcCallResultVO;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,10 +38,10 @@ import java.util.List;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class BmsEventOrderService {
-    @Autowired
+    @Resource
     RedisUtil redisUtil;
     @Resource
-    private CareOlderContactService careOlderContactService;
+    private CareHouseContactService careHouseContactService;
     @Resource
     private CareOlderService careOlderService;
     @Resource
@@ -48,8 +49,6 @@ public class BmsEventOrderService {
     @Resource
     private CareSysUserService careSysUserService;
     @Resource
-    private CareChamberlainOlderRelService careChamberlainOlderRelService;
-    @Resource
     private CareEventOrderContactStatusService careEventOrderContactStatusService;
     @Resource
     private CareEventOrderHandleHisService careEventOrderHandleHisService;
@@ -57,6 +56,17 @@ public class BmsEventOrderService {
     private CareEventOrderKeyApplyService careEventOrderKeyApplyService;
     @Resource
     private CcCallResultService ccCallResultService;
+    @Resource
+    private CareHouseService careHouseService;
+    @Resource
+    private CareEventOrderOlderService careEventOrderOlderService;
+    @Resource
+    private CareEventOrderChambService careEventOrderChambService;
+
+
+    @Resource
+    private BigScreenService bigScreenService;
+
     /**
      * 工单查询
      * @param orderStatus
@@ -130,7 +140,6 @@ public class BmsEventOrderService {
      * @param orderId
      * @param loginUser
      */
-
     public void receiveOrder(Long orderId, UserLogindConvertVO loginUser) {
         String key = RedisKeyConstant.DO_ORDER+":"+orderId;
         boolean result = redisUtil.tryLock(key,3000);
@@ -141,19 +150,11 @@ public class BmsEventOrderService {
                 if (OrderStatusEnum.TODO.getValue().equals(order.getStatus())){
                     UpdateWrapper<CareEventOrder> updateWrapper = new UpdateWrapper<>();
                     updateWrapper.lambda().eq(CareEventOrder::getId,orderId)
-                            .set(CareEventOrder::getStatus,OrderStatusEnum.DOING)
+                            .set(CareEventOrder::getStatus,OrderStatusEnum.DOING.getValue())
                             .set(CareEventOrder::getSeatId,loginUser.getId())
+                            .set(CareEventOrder::getSeatName,loginUser.getName())
                             .set(CareEventOrder::getModifyTime,DateUtil.date());
                     this.careEventOrderService.update(updateWrapper);
-                    //2. 将老人的联系人、管家 插入到 事件工单 联系人中
-                    List<CareEventOrderContactStatus> orderContactList = Lists.newArrayList();
-                    //查询老人
-                    addOlderToOrderContact(order,orderContactList);
-                    //查询管家
-                    addChamberlainToOrderContact(order,orderContactList);
-                    //查询紧急联系人
-                    addContactToOrderContact(order,orderContactList);
-                    this.careEventOrderContactStatusService.saveBatch(orderContactList);
                 }else{
                     throw  new BDException("该工单状态已变化，请刷新");
                 }
@@ -167,39 +168,55 @@ public class BmsEventOrderService {
     }
 
     /**
-     * 查询老人信息
+     *
      * @param orderId
      * @return
      */
-    public OrderOlderVO  getOrderOlderInfo(Long orderId){
-        OrderOlderVO orderOlderVo = new OrderOlderVO();
+    public EventOrderVO getOrderInfo(Long orderId){
+        EventOrderVO eventOrderVO = null;
         CareEventOrder order = this.careEventOrderService.getById(orderId);
         if (order!=null){
-            CareOlder older =  this.careOlderService.getById(order.getOlderId());
-            BeanUtil.copyProperties(older,orderOlderVo);
-            orderOlderVo.setEventType(order.getOrderType());
-            orderOlderVo.setEventTypeDesc(OrderTypeEnum.getCodeToName(order.getOrderType()));
-            //查看老人联系状态
-            QueryWrapper<CareEventOrderContactStatus> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(CareEventOrderContactStatus::getOrderId,orderId)
-                    .eq(CareEventOrderContactStatus::getContactRole,UserRoleEnum.OLDER.getValue())
-                    .eq(CareEventOrderContactStatus::getContactId,older.getId());
-            List<CareEventOrderContactStatus> ceocs = this.careEventOrderContactStatusService.list(queryWrapper);
-            if (CollUtil.isNotEmpty(ceocs)){
-                CareEventOrderContactStatus contactStatus = ceocs.get(0);
-                orderOlderVo.setContactStatus(contactStatus.getStatus());
-                orderOlderVo.setContactStatusDesc(ContactorStatusEnum.getCodeToName(contactStatus.getStatus()));
-            }
+            eventOrderVO  = new EventOrderVO();
+            BeanUtil.copyProperties(order,eventOrderVO);
+            eventOrderVO.setStatusName(OrderStatusEnum.getCodeToName(eventOrderVO.getStatus()));
+            eventOrderVO.setOrderType(OrderTypeEnum.getCodeToName(eventOrderVO.getOrderType()));
+            CareHouse house = this.careHouseService.getById(order.getHouseId());
+            eventOrderVO.setHouse(house);
+        }
+        return  eventOrderVO;
+    }
 
-            //查询管家
+    /**
+     * 查询老人列表
+     * @param orderId
+     * @return
+     */
+    public List<OrderOlderVO>  queryOrderOlderList(Long orderId){
+        List<OrderOlderVO> orderOlderVOList = Lists.newArrayList();
+        CareEventOrder order = this.careEventOrderService.getById(orderId);
+        OrderOlderVO orderOlderVo = new OrderOlderVO();
+        QueryWrapper<CareEventOrderOlder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareEventOrderOlder::getOrderId,orderId);
+        List<CareEventOrderOlder> ceoos  = this.careEventOrderOlderService.list(queryWrapper);
+        if (CollUtil.isNotEmpty(ceoos)){
             ChamberlainVO chamberlainVO = new ChamberlainVO();
-            CareSysUser user = this.careChamberlainOlderRelService.getMainChamberlainByOlderId(older.getId());
-            if (user!= null){
-                BeanUtil.copyProperties(user,chamberlainVO);
-                orderOlderVo.setChamberlain(chamberlainVO);
+            CareHouse house = this.careHouseService.getById(order.getHouseId());
+            if (house!=null){
+                CareSysUser user = this.careSysUserService.getById(house.getChambId());
+                if (user!= null){
+                    BeanUtil.copyProperties(user,chamberlainVO);
+                }
             }
+            ceoos.forEach(item->{
+                OrderOlderVO orderOlderVO = new OrderOlderVO();
+                BeanUtil.copyProperties(item,orderOlderVO);
+                orderOlderVO.setStatusDesc(OrderOlderStatusEnum.getCodeToName(orderOlderVO.getStatus()));
+                orderOlderVO.setChamberlain(chamberlainVO);
+                orderOlderVOList.add(orderOlderVO);
+            });
+
         }
-        return orderOlderVo;
+        return orderOlderVOList;
     }
 
     /**
@@ -238,6 +255,7 @@ public class BmsEventOrderService {
                 OrderContactorVO contactorVO = new OrderContactorVO();
                 BeanUtil.copyProperties(item,contactorVO);
                 contactorVO.setStatusDesc(ContactorStatusEnum.getCodeToName(item.getStatus()));
+                result.add(contactorVO);
             });
         }
         return  result;
@@ -249,11 +267,20 @@ public class BmsEventOrderService {
      * @param orderStatusEnum
      */
     public void updateOrderStatus(Long orderId,OrderStatusEnum orderStatusEnum){
+        CareEventOrder order = this.careEventOrderService.getById(orderId);
         UpdateWrapper<CareEventOrder> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().eq(CareEventOrder::getId,orderId)
                 .set(CareEventOrder::getStatus,orderStatusEnum.getValue())
                 .set(CareEventOrder::getModifyTime,DateUtil.date());
+        this.careEventOrderService.update(updateWrapper);
+        this.bigScreenService.pushRtEventFlag(order.getStationId().toString());
     }
+
+    /**
+     * 获取钥匙请求历史
+     * @param orderId
+     * @return
+     */
     public  List<OrderKeyApplyVO> queryKeyAuthList(Long orderId){
         List<OrderKeyApplyVO> result = Lists.newArrayList();
         QueryWrapper<CareEventOrderKeyApply> queryWrapper = new QueryWrapper<>();
@@ -273,10 +300,26 @@ public class BmsEventOrderService {
      * @param applyId
      * @return
      */
-    public boolean keyAuth(Long applyId){
+    public boolean keyAuth(Long applyId ,UserLogindConvertVO loginUser){
+        CareEventOrderKeyApply apply = this.careEventOrderKeyApplyService.getById(applyId);
         UpdateWrapper<CareEventOrderKeyApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().eq(CareEventOrderKeyApply::getId,applyId)
                 .set(CareEventOrderKeyApply::getStatus,KeyAuthEnum.AUTHED.getValue());
+        //TODO 增加日志
+        CareEventOrderHandleHis his = new CareEventOrderHandleHis();
+        his.setOrgId(apply.getOrgId());
+        his.setStationId(apply.getStationId());
+        his.setOrderId(apply.getOrderId());
+       // his.setLogType();
+        his.setLogObjectId(apply.getApplyUserId());
+        his.setLogObjectName(apply.getApplyUserName());
+      //  his.setLogResult();
+        his.setOpUserRole(UserRoleEnum.SEAT.getValue());
+        his.setOpUserId(loginUser.getId());
+        his.setOpUserName(loginUser.getName());
+        his.setCreateTime(DateUtil.date());
+        his.setRelationTypeDesc(apply.getRelationTypeDesc());
+        this.careEventOrderHandleHisService.save(his);
         return  this.careEventOrderKeyApplyService.update(updateWrapper);
     }
 
@@ -286,10 +329,25 @@ public class BmsEventOrderService {
      * @param status
      * @return
      */
-    public boolean updateOrderContactStatus(Long orderContactId,Integer status){
+    public boolean updateOrderContactStatus(Long orderContactId,Integer status,UserLogindConvertVO loginUser){
+        CareEventOrderContactStatus contact = this.careEventOrderContactStatusService.getById(orderContactId);
         UpdateWrapper<CareEventOrderContactStatus> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().eq(CareEventOrderContactStatus::getId,orderContactId)
                 .set(CareEventOrderContactStatus::getStatus,status);
+
+        CareEventOrderHandleHis his = new CareEventOrderHandleHis();
+        his.setOrgId(contact.getOrgId());
+        his.setStationId(contact.getStationId());
+        his.setOrderId(contact.getOrderId());
+       // his.setLogType();
+        his.setLogObjectId(contact.getContactId());
+        his.setLogObjectName(contact.getContactName());
+        his.setLogResult(ContactorStatusEnum.getCodeToName(status));
+        his.setOpUserRole(UserRoleEnum.SEAT.getValue());
+        his.setOpUserId(loginUser.getId());
+        his.setOpUserName(loginUser.getName());
+        his.setCreateTime(DateUtil.date());
+        his.setRelationTypeDesc(contact.getRelationTypeDesc());
         return  this.careEventOrderContactStatusService.update(updateWrapper);
     }
 
@@ -306,64 +364,86 @@ public class BmsEventOrderService {
         }
 
     }
+    public void insertTestData(){
+        List<CareHouse> houses = Lists.newArrayList();
+        CareHouse house = new CareHouse();
+        house.setId(1L);
+        house.setName("201室");
+        house.setAddr("北太平庄21号院1单元201室");
+        houses.add(house);
+        CareEventOrder order = new CareEventOrder();
+        order.setOrgId(1L);
+        order.setOrgName("测试机构");
+        order.setStationId(1L);
+        order.setStationName("站点1");
+        order.setHouseId(1L);
+        order.setHouseName(house.getName());
+        order.setTitle(house.getAddr());
+        order.setOrderType(OrderTypeEnum.values()[RandomUtil.randomInt(0,4)].getValue());
+        order.setStatus("0");
+        order.setCreateTime(DateUtil.date());
+        order.setModifyTime(DateUtil.date());
+        this.careEventOrderService.save(order);
+        addOlderToOrderOlder(order);
+        addChamberlainToOrder(order);
+        addContactToOrderContact(order);
+    }
     /**
-     * 将老人加入到 工单联系人
+     * 将老人加入到 工单中
      * @param order
-     * @param orderContactList
      */
-    private void addOlderToOrderContact(CareEventOrder order,List<CareEventOrderContactStatus> orderContactList){
-        CareOlder older = this.careOlderService.getById(order.getOlderId());
-        CareEventOrderContactStatus orderContactStatus = new CareEventOrderContactStatus();
-        orderContactStatus.setOrgId(order.getOrgId());
-        orderContactStatus.setStationId(order.getStationId());
-        orderContactStatus.setOrderId(order.getId());
-        orderContactStatus.setContactRole(UserRoleEnum.OLDER.getValue());
-        orderContactStatus.setContactId(older.getId());
-        orderContactStatus.setStatus(ContactorStatusEnum.WEI_LIAN_XI.getValue());
-        orderContactStatus.setContactName(older.getName());
-        orderContactStatus.setContactPhone(older.getPhone());
-        orderContactStatus.setLongitude(older.getLongitude());
-        orderContactStatus.setLatitude(older.getLatitude());
-        orderContactStatus.setCreateTime(DateUtil.date());
-        orderContactStatus.setModifyTime(DateUtil.date());
-        orderContactStatus.setRelationTypeDesc(RelationTypeEnum.OLDER.getValue());
-        orderContactList.add(orderContactStatus);
+    public void addOlderToOrderOlder(CareEventOrder order){
+       QueryWrapper<CareOlder> queryWrapper = new QueryWrapper<>();
+       queryWrapper.lambda().eq(CareOlder::getHouseId,order.getHouseId());
+       List<CareOlder> olders = this.careOlderService.list(queryWrapper);
+       if (CollUtil.isNotEmpty(olders)){
+           List<CareEventOrderOlder>  ceoos = Lists.newArrayList();
+           olders.forEach(item -> {
+               CareEventOrderOlder ceoo = new CareEventOrderOlder();
+               BeanUtil.copyProperties(item,ceoo);
+               ceoo.setOrderId(order.getId());
+               if (order.getOlderId() == item.getId()){
+                   //主动呼叫
+                    ceoo.setIsZhudong(1);
+               }else{
+                   ceoo.setIsZhudong(0);
+               }
+               ceoo.setStatus(OrderOlderStatusEnum.WEI_LIAN_XI.getValue());
+               ceoo.setCreateTime(DateUtil.date());
+               ceoos.add(ceoo);
+           });
+           this.careEventOrderOlderService.saveBatch(ceoos);
+       }
     }
 
     /**
      * 将管家加入到联系人当中
      * @param order
-     * @param orderContactList
      */
-    private void addChamberlainToOrderContact(CareEventOrder order,List<CareEventOrderContactStatus> orderContactList){
-        CareSysUser user = careChamberlainOlderRelService.getMainChamberlainByOlderId(order.getOlderId());
-        if (user != null){
-            CareEventOrderContactStatus orderContactStatus = new CareEventOrderContactStatus();
-            orderContactStatus.setOrgId(order.getOrgId());
-            orderContactStatus.setStationId(order.getStationId());
-            orderContactStatus.setOrderId(order.getId());
-            orderContactStatus.setContactRole(UserRoleEnum.CHANMB.getValue());
-            orderContactStatus.setContactId(user.getId());
-            orderContactStatus.setStatus(ContactorStatusEnum.WEI_LIAN_XI.getValue());
-            orderContactStatus.setContactName(user.getName());
-            orderContactStatus.setContactPhone(user.getPhone());
-            orderContactStatus.setLongitude(user.getLongitude());
-            orderContactStatus.setLatitude(user.getLatitude());
-            orderContactStatus.setCreateTime(DateUtil.date());
-            orderContactStatus.setModifyTime(DateUtil.date());
-            orderContactStatus.setRelationTypeDesc(RelationTypeEnum.CHANMB.getValue());
-            orderContactList.add(orderContactStatus);
+    public void addChamberlainToOrder(CareEventOrder order){
+        CareHouse house = this.careHouseService.getById(order.getHouseId());
+        if (house != null){
+            CareSysUser user = this.careSysUserService.getById(house.getChambId());
+            if (user != null){
+                CareEventOrderChamb chamb = new CareEventOrderChamb();
+                BeanUtil.copyProperties(user,chamb);
+                chamb.setHouseId(house.getId());
+                chamb.setStatus(0);
+                chamb.setCreateTime(DateUtil.date());
+                chamb.setModifyTime(DateUtil.date());
+                this.careEventOrderChambService.save(chamb);
+            }
         }
     }
 
     /**
      * 将紧急联系人加入到联系人当中
      * @param order
-     * @param orderContactList
      */
-    private void addContactToOrderContact(CareEventOrder order,List<CareEventOrderContactStatus> orderContactList){
-        List<CareOlderContact> cons = this.careOlderContactService.queryContactByOlderId(order.getOlderId());
+    public void addContactToOrderContact(CareEventOrder order){
+        List<CareHouseContact> cons = this.careHouseContactService.queryContactByHouseId(order.getHouseId());
         if (CollUtil.isNotEmpty(cons)){
+            List<CareEventOrderContactStatus> orderContactList = Lists.newArrayList();
             cons.forEach(item ->{
                 CareEventOrderContactStatus orderContactStatus = new CareEventOrderContactStatus();
                 orderContactStatus.setOrgId(order.getOrgId());
@@ -382,6 +462,7 @@ public class BmsEventOrderService {
                 orderContactStatus.setModifyTime(DateUtil.date());
                 orderContactList.add(orderContactStatus);
             });
+            this.careEventOrderContactStatusService.saveBatch(orderContactList);
         }
 
     }

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

@@ -1,44 +0,0 @@
-package com.care.common.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 安全管家-被监护人关系表(CareChamberlainOlderRel)实体类
- *
- * @author makejava
- * @since 2021-05-29 14:38:06
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("care_chamberlain_older_rel")
-@ApiModel(value = "安全管家-被监护人关系表", description = "")
-public class CareChamberlainOlderRel implements Serializable {
-    private static final long serialVersionUID = -59191434539586970L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
-    @ApiModelProperty("安全管家ID")
-    @TableField("CHAMBERLAIN_ID")
-    private Long chamberlainId;
-
-
-    @ApiModelProperty("被监护人ID")
-    @TableField("OLDER_ID")
-    private Long olderId;
-
-
-}

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

@@ -17,7 +17,7 @@ import java.util.Date;
  * 被监护人-设备(CareDevice)实体类
  *
  * @author makejava
- * @since 2021-05-21 00:08:36
+ * @since 2021-06-02 21:42:00
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_device")
 @ApiModel(value = "被监护人-设备", description = "")
 public class CareDevice implements Serializable {
-    private static final long serialVersionUID = 905583520337157262L;
+    private static final long serialVersionUID = -55934448200777465L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -82,4 +82,14 @@ public class CareDevice implements Serializable {
     private Date modifyTime;
 
 
+    @ApiModelProperty("呼吸频率")
+    @TableField("BREATH_RATE")
+    private Integer breathRate;
+
+
+    @ApiModelProperty("心跳频率")
+    @TableField("HEART_RATE")
+    private Integer heartRate;
+
+
 }

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

@@ -17,7 +17,7 @@ import java.util.Date;
  * 事件定单表(CareEventOrder)实体类
  *
  * @author makejava
- * @since 2021-05-29 14:38:09
+ * @since 2021-06-02 22:01:03
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_event_order")
 @ApiModel(value = "事件定单表", description = "")
 public class CareEventOrder implements Serializable {
-    private static final long serialVersionUID = 237959753917020691L;
+    private static final long serialVersionUID = -33521636703717060L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -52,6 +52,16 @@ public class CareEventOrder implements Serializable {
     private String stationName;
 
 
+    @ApiModelProperty("房屋ID")
+    @TableField("HOUSE_ID")
+    private Long houseId;
+
+
+    @ApiModelProperty("房屋名称")
+    @TableField("HOUSE_NAME")
+    private String houseName;
+
+
     @ApiModelProperty("被监护人ID")
     @TableField("OLDER_ID")
     private Long olderId;
@@ -67,7 +77,7 @@ public class CareEventOrder implements Serializable {
     private String title;
 
 
-    @ApiModelProperty("工单分类： 1：跌倒 2：久滞 3坠床 4主动呼叫 5户外呼叫")
+    @ApiModelProperty("工单分类：  21：跌倒 22：久滞 23坠床 31主动呼叫")
     @TableField("ORDER_TYPE")
     private String orderType;
 

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

@@ -0,0 +1,95 @@
+package com.care.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 管家工单(CareEventOrderChamb)实体类
+ *
+ * @author makejava
+ * @since 2021-06-02 23:31:34
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_event_order_chamb")
+@ApiModel(value = "管家工单", description = "")
+public class CareEventOrderChamb implements Serializable {
+    private static final long serialVersionUID = -77047215922999145L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("机构ID")
+    @TableField("ORG_ID")
+    private Long orgId;
+
+
+    @ApiModelProperty("服务站ID")
+    @TableField("STATION_ID")
+    private Long stationId;
+
+
+    @ApiModelProperty("房屋ID")
+    @TableField("HOUSE_ID")
+    private Long houseId;
+
+
+    @ApiModelProperty("工单ID")
+    @TableField("ORDER_ID")
+    private Long orderId;
+
+
+    @ApiModelProperty("管家ID")
+    @TableField("CHAMB_ID")
+    private Long chambId;
+
+
+    @ApiModelProperty("管家姓名")
+    @TableField("CHAMB_NAME")
+    private String chambName;
+
+
+    @ApiModelProperty("联系电话")
+    @TableField("PHONE")
+    private String phone;
+
+
+    @ApiModelProperty("状态： 0：未联系  1已联系  2 到达  3离开")
+    @TableField("STATUS")
+    private Integer status;
+
+
+    @ApiModelProperty("到达时间")
+    @TableField("DAODA_TIME")
+    private Date daodaTime;
+
+
+    @ApiModelProperty("离开时间")
+    @TableField("LIKAI_TIME")
+    private Date likaiTime;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+}

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

@@ -17,7 +17,7 @@ import java.util.Date;
  * 事件-紧急联系人/管家状态(CareEventOrderContactStatus)实体类
  *
  * @author makejava
- * @since 2021-05-29 16:02:23
+ * @since 2021-06-02 21:42:11
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_event_order_contact_status")
 @ApiModel(value = "事件-紧急联系人/管家状态", description = "")
 public class CareEventOrderContactStatus implements Serializable {
-    private static final long serialVersionUID = 834255079963159982L;
+    private static final long serialVersionUID = 974899034224026188L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -42,6 +42,11 @@ public class CareEventOrderContactStatus implements Serializable {
     private Long stationId;
 
 
+    @ApiModelProperty("房屋ID")
+    @TableField("HOUSE_ID")
+    private Long houseId;
+
+
     @ApiModelProperty("工单ID")
     @TableField("ORDER_ID")
     private Long orderId;
@@ -72,11 +77,6 @@ public class CareEventOrderContactStatus implements Serializable {
     private String contactPhone;
 
 
-    @ApiModelProperty("处理结果")
-    @TableField("HANDLE_RESULT")
-    private String handleResult;
-
-
     @ApiModelProperty("坐席ID")
     @TableField("SEAT_ID")
     private Long seatId;

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

@@ -17,7 +17,7 @@ import java.util.Date;
  * 事件-处理历史(CareEventOrderHandleHis)实体类
  *
  * @author makejava
- * @since 2021-05-30 13:15:41
+ * @since 2021-06-02 21:42:17
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_event_order_handle_his")
 @ApiModel(value = "事件-处理历史", description = "")
 public class CareEventOrderHandleHis implements Serializable {
-    private static final long serialVersionUID = 457100022870050091L;
+    private static final long serialVersionUID = 808847334145669603L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -42,6 +42,11 @@ public class CareEventOrderHandleHis implements Serializable {
     private Long stationId;
 
 
+    @ApiModelProperty(" 房屋ID")
+    @TableField("HOUSE_ID")
+    private Long houseId;
+
+
     @ApiModelProperty("工单ID")
     @TableField("ORDER_ID")
     private Long orderId;

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

@@ -17,7 +17,7 @@ import java.util.Date;
  * 事件工单-钥匙申请记录(CareEventOrderKeyApply)实体类
  *
  * @author makejava
- * @since 2021-05-30 12:37:50
+ * @since 2021-06-02 21:42:23
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_event_order_key_apply")
 @ApiModel(value = "事件工单-钥匙申请记录", description = "")
 public class CareEventOrderKeyApply implements Serializable {
-    private static final long serialVersionUID = -10293834624867160L;
+    private static final long serialVersionUID = 149387485962236465L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -42,6 +42,11 @@ public class CareEventOrderKeyApply implements Serializable {
     private Long stationId;
 
 
+    @ApiModelProperty("房屋ID")
+    @TableField("HOUSE_ID")
+    private Long houseId;
+
+
     @ApiModelProperty("工单ID")
     @TableField("ORDER_ID")
     private Long orderId;

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

@@ -0,0 +1,110 @@
+package com.care.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 被监护人表(CareEventOrderOlder)实体类
+ *
+ * @author makejava
+ * @since 2021-06-02 23:22:53
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_event_order_older")
+@ApiModel(value = "被监护人表", description = "")
+public class CareEventOrderOlder implements Serializable {
+    private static final long serialVersionUID = 142962079101236959L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("机构ID")
+    @TableField("ORG_ID")
+    private Long orgId;
+
+
+    @ApiModelProperty("服务站ID")
+    @TableField("STATION_ID")
+    private Long stationId;
+
+
+    @ApiModelProperty("房屋ID")
+    @TableField("HOUSE_ID")
+    private Long houseId;
+
+
+    @ApiModelProperty("工单ID")
+    @TableField("ORDER_ID")
+    private Long orderId;
+
+
+    @ApiModelProperty("姓名")
+    @TableField("NAME")
+    private String name;
+
+
+    @ApiModelProperty("电话")
+    @TableField("PHONE")
+    private String phone;
+
+
+    @ApiModelProperty("姓名：M：男 W：女")
+    @TableField("GENDER")
+    private String gender;
+
+
+    @ApiModelProperty("生日")
+    @TableField("BIRTHDAY")
+    private Date birthday;
+
+
+    @ApiModelProperty("居住类别：1：独居 2：非独居 3：集中居住 4：其他")
+    @TableField("LIVE_TYPE")
+    private String liveType;
+
+
+    @ApiModelProperty("床号或者门牌号")
+    @TableField("BED_NUMBER")
+    private String bedNumber;
+
+
+    @ApiModelProperty("安全级别： 1 ：一级 2：二级 3: 三级")
+    @TableField("SAFE_LEVEL")
+    private String safeLevel;
+
+
+    @ApiModelProperty("状态： 0：未联系  1已联系")
+    @TableField("STATUS")
+    private Integer status;
+
+
+    @ApiModelProperty("是否主动呼叫  1是 0否")
+    @TableField("IS_ZHUDONG")
+    private Integer isZhudong;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+}

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

@@ -0,0 +1,105 @@
+package com.care.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 被监护房屋信息(CareHouse)实体类
+ *
+ * @author makejava
+ * @since 2021-06-02 22:00:37
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_house")
+@ApiModel(value = "被监护房屋信息", description = "")
+public class CareHouse implements Serializable {
+    private static final long serialVersionUID = -60036036914347085L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("机构ID")
+    @TableField("ORG_ID")
+    private Long orgId;
+
+
+    @ApiModelProperty("服务站ID")
+    @TableField("STATION_ID")
+    private Long stationId;
+
+
+    @ApiModelProperty("房屋简称")
+    @TableField("NAME")
+    private String name;
+
+
+    @ApiModelProperty("钥匙托管类型： 1 ：电子 2：机械 0：未托管")
+    @TableField("KEY_ESCROW_TYPE")
+    private String keyEscrowType;
+
+
+    @ApiModelProperty("状态： 1正常，2离开房间，3久滞，4摔倒，5坠床 6主动呼叫")
+    @TableField("STATUS")
+    private Integer status;
+
+
+    @ApiModelProperty("地址")
+    @TableField("ADDR")
+    private String addr;
+
+
+    @ApiModelProperty("经度")
+    @TableField("LONGITUDE")
+    private Double longitude;
+
+
+    @ApiModelProperty("纬度")
+    @TableField("LATITUDE")
+    private Double latitude;
+
+
+    @ApiModelProperty("管理者电话")
+    @TableField("MANAGE_PHONE")
+    private String managePhone;
+
+
+    @ApiModelProperty("管理者姓名")
+    @TableField("MANAGE_NAME")
+    private String manageName;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+    @ApiModelProperty("管家ID")
+    @TableField("CHAMB_ID")
+    private Long chambId;
+
+
+    @ApiModelProperty("管家姓名")
+    @TableField("CHAMB_NAME")
+    private String chambName;
+
+
+}

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

@@ -14,19 +14,19 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 被监护人紧急联系人(CareOlderContact)实体类
+ * 被监护人紧急联系人(CareHouseContact)实体类
  *
  * @author makejava
- * @since 2021-05-29 14:43:25
+ * @since 2021-06-02 21:54:55
  */
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("care_older_contact")
+@TableName("care_house_contact")
 @ApiModel(value = "被监护人紧急联系人", description = "")
-public class CareOlderContact implements Serializable {
-    private static final long serialVersionUID = -95022212755613351L;
+public class CareHouseContact implements Serializable {
+    private static final long serialVersionUID = -90072609726445263L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -42,9 +42,9 @@ public class CareOlderContact implements Serializable {
     private Long stationId;
 
 
-    @ApiModelProperty("被监护人ID")
-    @TableField("OLDER_ID")
-    private Long olderId;
+    @ApiModelProperty("房屋ID")
+    @TableField("HOUSE_ID")
+    private Long houseId;
 
 
     @ApiModelProperty("姓名")
@@ -57,16 +57,6 @@ public class CareOlderContact implements Serializable {
     private String phone;
 
 
-    @ApiModelProperty("password")
-    @TableField("PASSWORD")
-    private String password;
-
-
-    @ApiModelProperty("姓名：M：男 W：女")
-    @TableField("GENDER")
-    private String gender;
-
-
     @ApiModelProperty("关系类别：kinsman亲属  neighbor：邻居")
     @TableField("RELATION_TYPE")
     private String relationType;
@@ -77,11 +67,6 @@ public class CareOlderContact implements Serializable {
     private Integer contactLevel;
 
 
-    @ApiModelProperty("状态：1正常；2：禁用")
-    @TableField("STATUS")
-    private Integer status;
-
-
     @ApiModelProperty("经度")
     @TableField("LONGITUDE")
     private Double longitude;

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

@@ -13,19 +13,19 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 
 /**
- * 设备-被监护人关系表(CareOlderDeviceRel)实体类
+ * 设备-房屋关系表(CareHouseDeviceRel)实体类
  *
  * @author makejava
- * @since 2021-05-21 00:08:31
+ * @since 2021-06-02 21:43:18
  */
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("care_older_device_rel")
-@ApiModel(value = "设备-被监护人关系表", description = "")
-public class CareOlderDeviceRel implements Serializable {
-    private static final long serialVersionUID = 951190077580179880L;
+@TableName("care_house_device_rel")
+@ApiModel(value = "设备-房屋关系表", description = "")
+public class CareHouseDeviceRel implements Serializable {
+    private static final long serialVersionUID = -41169507202345645L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;

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

@@ -0,0 +1,90 @@
+package com.care.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户登录信息(CareMemberInfo)实体类
+ *
+ * @author makejava
+ * @since 2021-06-02 21:43:38
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_member_info")
+@ApiModel(value = "用户登录信息", description = "")
+public class CareMemberInfo implements Serializable {
+    private static final long serialVersionUID = 353859844290691859L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("姓名")
+    @TableField("NAME")
+    private String name;
+
+
+    @ApiModelProperty("昵称")
+    @TableField("NICKNAME")
+    private String nickname;
+
+
+    @ApiModelProperty("电话")
+    @TableField("PHONE")
+    private String phone;
+
+
+    @ApiModelProperty("密码")
+    @TableField("PASSWORD")
+    private String password;
+
+
+    @ApiModelProperty("头像")
+    @TableField("PROFILE")
+    private String profile;
+
+
+    @ApiModelProperty("邮箱")
+    @TableField("EMAIL")
+    private String email;
+
+
+    @ApiModelProperty("性别")
+    @TableField("GENDER")
+    private String gender;
+
+
+    @ApiModelProperty("分享码")
+    @TableField("SHARE_CODE")
+    private String shareCode;
+
+
+    @ApiModelProperty("状态")
+    @TableField("STATUS")
+    private String status;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+}

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

@@ -17,7 +17,7 @@ import java.util.Date;
  * 被监护人表(CareOlder)实体类
  *
  * @author makejava
- * @since 2021-05-21 00:08:32
+ * @since 2021-06-02 21:54:49
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_older")
 @ApiModel(value = "被监护人表", description = "")
 public class CareOlder implements Serializable {
-    private static final long serialVersionUID = 519345504309499891L;
+    private static final long serialVersionUID = -94602489879653618L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
@@ -42,6 +42,11 @@ public class CareOlder implements Serializable {
     private Long stationId;
 
 
+    @ApiModelProperty("房屋ID")
+    @TableField("HOUSE_ID")
+    private Long houseId;
+
+
     @ApiModelProperty("姓名")
     @TableField("NAME")
     private String name;
@@ -77,39 +82,9 @@ public class CareOlder implements Serializable {
     private String safeLevel;
 
 
-    @ApiModelProperty("钥匙托管类型： 1 ：电子 2：机械 0：未托管")
-    @TableField("KEY_ESCROW_TYPE")
-    private String keyEscrowType;
-
-
-    @ApiModelProperty("状态： 1正常，2离开房间，3久滞，4摔倒，5主动求助")
+    @ApiModelProperty("状态：  10正常，11离开房间， 21：跌倒 22：久滞 23坠床 31主动呼叫")
     @TableField("STATUS")
-    private Integer status;
-
-
-    @ApiModelProperty("呼吸频率")
-    @TableField("BREATH_RATE")
-    private Integer breathRate;
-
-
-    @ApiModelProperty("心跳频率")
-    @TableField("HEART_RATE")
-    private Integer heartRate;
-
-
-    @ApiModelProperty("地址")
-    @TableField("ADDR")
-    private String addr;
-
-
-    @ApiModelProperty("经度")
-    @TableField("LONGITUDE")
-    private Double longitude;
-
-
-    @ApiModelProperty("纬度")
-    @TableField("LATITUDE")
-    private Double latitude;
+    private String status;
 
 
     @ApiModelProperty("createTime")

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

@@ -17,7 +17,7 @@ import java.util.Date;
  * 机构(CareOrganization)实体类
  *
  * @author makejava
- * @since 2021-05-21 00:08:35
+ * @since 2021-06-02 21:44:00
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_organization")
 @ApiModel(value = "机构", description = "")
 public class CareOrganization implements Serializable {
-    private static final long serialVersionUID = -34585950888103479L;
+    private static final long serialVersionUID = 783765292295776882L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;

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

@@ -17,7 +17,7 @@ import java.util.Date;
  * 服务站(CareStation)实体类
  *
  * @author makejava
- * @since 2021-05-21 00:08:27
+ * @since 2021-06-02 21:44:11
  */
 
 @Data
@@ -26,7 +26,7 @@ import java.util.Date;
 @TableName("care_station")
 @ApiModel(value = "服务站", description = "")
 public class CareStation implements Serializable {
-    private static final long serialVersionUID = 363768825150983385L;
+    private static final long serialVersionUID = 278407010051454823L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;

src/main/java/com/care/common/enums/OrderOlderStatusEnum.java

@@ -0,0 +1,35 @@
+package com.care.common.enums;
+
+
+/**
+ * @Author:java
+ * @Date: 2021/05/27
+ */
+public enum OrderOlderStatusEnum {
+    /**
+     *
+     */
+    WEI_LIAN_XI(0,"未联系"),
+    YI_LIAN_XI(1,"已联系");
+    private Integer value;
+    private String name;
+    OrderOlderStatusEnum(Integer value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+    public Integer getValue() {
+        return value;
+    }
+
+    public static String getCodeToName(Integer code){
+        if (code == null){
+            return null;
+        }
+        if (WEI_LIAN_XI.getValue().intValue() == code.intValue()){
+            return  WEI_LIAN_XI.name;
+        }else if (YI_LIAN_XI.getValue().intValue() == code.intValue()){
+            return  YI_LIAN_XI.name;
+        }
+        return null;
+    }
+}

src/main/java/com/care/common/enums/OrderTypeEnum.java

@@ -10,7 +10,7 @@ import cn.hutool.core.util.StrUtil;
 public enum OrderTypeEnum {
 
     /**
-     * 1：跌倒 2：久滞 3坠床 4主动呼叫 5户外呼叫
+     *
      */
     DI_EDAO("21","跌倒"),
     JIU_ZHI("22","久滞"),

src/main/java/com/care/common/enums/RelationTypeEnum.java

@@ -25,6 +25,9 @@ public enum RelationTypeEnum {
     public String getValue() {
         return value;
     }
+    public String getName() {
+        return name;
+    }
 
     public static String getCodeToName(String code){
         if (StrUtil.isEmpty(code)){

src/main/java/com/care/common/interceptor/AuthorizationInterceptorConf.java

@@ -31,6 +31,7 @@ public class AuthorizationInterceptorConf extends WebMvcConfigurerAdapter implem
             "/bms/bigscreen/ws",
             //不拦截登录接口
             "/bms/login",
+            "/bms/event/testData"
 
 
     };

src/main/java/com/care/common/mapper/CareChamberlainOlderRelMapper.java

@@ -1,15 +0,0 @@
-package com.care.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.care.common.entity.CareChamberlainOlderRel;
-
-
-/**
- * 安全管家-被监护人关系表(CareChamberlainOlderRel)表数据库访问层
- *
- * @author makejava
- * @since 2021-05-21 00:08:33
- */
-public interface CareChamberlainOlderRelMapper extends BaseMapper<CareChamberlainOlderRel> {
-
-}

src/main/java/com/care/common/mapper/CareEventOrderChambMapper.java

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.care.common.entity.CareEventOrderChamb;
+
+
+/**
+ * 管家工单(CareEventOrderChamb)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-06-02 23:31:34
+ */
+public interface CareEventOrderChambMapper extends BaseMapper<CareEventOrderChamb> {
+
+}

src/main/java/com/care/common/mapper/CareEventOrderOlderMapper.java

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.care.common.entity.CareEventOrderOlder;
+
+
+/**
+ * 被监护人表(CareEventOrderOlder)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-06-02 22:19:13
+ */
+public interface CareEventOrderOlderMapper extends BaseMapper<CareEventOrderOlder> {
+
+}

src/main/java/com/care/common/mapper/CareHouseContactMapper.java

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.care.common.entity.CareHouseContact;
+
+
+/**
+ * 被监护人紧急联系人(CareHouseContact)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-06-02 21:42:59
+ */
+public interface CareHouseContactMapper extends BaseMapper<CareHouseContact> {
+
+}

src/main/java/com/care/common/mapper/CareHouseDeviceRelMapper.java

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.care.common.entity.CareHouseDeviceRel;
+
+
+/**
+ * 设备-房屋关系表(CareHouseDeviceRel)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-06-02 21:43:19
+ */
+public interface CareHouseDeviceRelMapper extends BaseMapper<CareHouseDeviceRel> {
+
+}

src/main/java/com/care/common/mapper/CareHouseMapper.java

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.care.common.entity.CareHouse;
+
+
+/**
+ * 被监护房屋信息(CareHouse)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-06-02 21:42:44
+ */
+public interface CareHouseMapper extends BaseMapper<CareHouse> {
+
+}

src/main/java/com/care/common/mapper/CareMemberInfoMapper.java

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.care.common.entity.CareMemberInfo;
+
+
+/**
+ * 用户登录信息(CareMemberInfo)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-06-02 21:43:38
+ */
+public interface CareMemberInfoMapper extends BaseMapper<CareMemberInfo> {
+
+}

src/main/java/com/care/common/mapper/CareOlderContactMapper.java

@@ -1,15 +0,0 @@
-package com.care.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.care.common.entity.CareOlderContact;
-
-
-/**
- * 被监护人紧急联系人(BigSreenOlderContactVO)表数据库访问层
- *
- * @author makejava
- * @since 2021-05-21 00:08:25
- */
-public interface CareOlderContactMapper extends BaseMapper<CareOlderContact> {
-
-}

src/main/java/com/care/common/mapper/CareOlderDeviceRelMapper.java

@@ -1,15 +0,0 @@
-package com.care.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.care.common.entity.CareOlderDeviceRel;
-
-
-/**
- * 设备-被监护人关系表(CareOlderDeviceRel)表数据库访问层
- *
- * @author makejava
- * @since 2021-05-21 00:08:31
- */
-public interface CareOlderDeviceRelMapper extends BaseMapper<CareOlderDeviceRel> {
-
-}

src/main/java/com/care/common/service/CareChamberlainOlderRelService.java

@@ -1,22 +0,0 @@
-package com.care.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.care.common.entity.CareChamberlainOlderRel;
-import com.care.common.entity.CareSysUser;
-
-import java.util.List;
-
-/**
- * 安全管家-被监护人关系表(CareChamberlainOlderRel)表服务接口
- *
- * @author makejava
- * @since 2021-05-21 00:08:34
- */
-public interface CareChamberlainOlderRelService extends IService<CareChamberlainOlderRel> {
-    /**
-     * 获取老人的管家
-     * @param olderId
-     * @return
-     */
-    CareSysUser getMainChamberlainByOlderId(Long olderId);
-}

src/main/java/com/care/common/service/CareEventOrderChambService.java

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareEventOrderChamb;
+
+/**
+ * 管家工单(CareEventOrderChamb)表服务接口
+ *
+ * @author makejava
+ * @since 2021-06-02 23:31:34
+ */
+public interface CareEventOrderChambService extends IService<CareEventOrderChamb> {
+
+}

src/main/java/com/care/common/service/CareEventOrderOlderService.java

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareEventOrderOlder;
+
+/**
+ * 被监护人表(CareEventOrderOlder)表服务接口
+ *
+ * @author makejava
+ * @since 2021-06-02 22:19:13
+ */
+public interface CareEventOrderOlderService extends IService<CareEventOrderOlder> {
+
+}

src/main/java/com/care/common/service/CareHouseContactService.java

@@ -0,0 +1,21 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareHouseContact;
+
+import java.util.List;
+
+/**
+ * 被监护人紧急联系人(CareHouseContact)表服务接口
+ *
+ * @author makejava
+ * @since 2021-06-02 21:42:59
+ */
+public interface CareHouseContactService extends IService<CareHouseContact> {
+    /**
+     * 查询房屋紧急联系人
+     * @param houseId
+     * @return
+     */
+    List<CareHouseContact> queryContactByHouseId(Long houseId);
+}

src/main/java/com/care/common/service/CareHouseDeviceRelService.java

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareHouseDeviceRel;
+
+/**
+ * 设备-房屋关系表(CareHouseDeviceRel)表服务接口
+ *
+ * @author makejava
+ * @since 2021-06-02 21:43:19
+ */
+public interface CareHouseDeviceRelService extends IService<CareHouseDeviceRel> {
+
+}

src/main/java/com/care/common/service/CareHouseService.java

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareHouse;
+
+/**
+ * 被监护房屋信息(CareHouse)表服务接口
+ *
+ * @author makejava
+ * @since 2021-06-02 21:42:44
+ */
+public interface CareHouseService extends IService<CareHouse> {
+
+}

src/main/java/com/care/common/service/CareMemberInfoService.java

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareMemberInfo;
+
+/**
+ * 用户登录信息(CareMemberInfo)表服务接口
+ *
+ * @author makejava
+ * @since 2021-06-02 21:43:38
+ */
+public interface CareMemberInfoService extends IService<CareMemberInfo> {
+
+}

src/main/java/com/care/common/service/CareOlderContactService.java

@@ -1,23 +0,0 @@
-package com.care.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.care.common.entity.CareOlderContact;
-
-import java.util.List;
-
-/**
- * 被监护人紧急联系人(BigSreenOlderContactVO)表服务接口
- *
- * @author makejava
- * @since 2021-05-21 00:08:26
- */
-public interface CareOlderContactService extends IService<CareOlderContact> {
-
-    /**
-     * 查询老人-紧急联系人
-     * @param olderId
-     * @return
-     */
-    List<CareOlderContact> queryContactByOlderId(Long olderId);
-
-}

src/main/java/com/care/common/service/CareOlderDeviceRelService.java

@@ -1,14 +0,0 @@
-package com.care.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.care.common.entity.CareOlderDeviceRel;
-
-/**
- * 设备-被监护人关系表(CareOlderDeviceRel)表服务接口
- *
- * @author makejava
- * @since 2021-05-21 00:08:31
- */
-public interface CareOlderDeviceRelService extends IService<CareOlderDeviceRel> {
-
-}

src/main/java/com/care/common/service/CommonService.java

@@ -21,4 +21,17 @@ public interface CommonService {
 
     List<SysDimCode> getDimCodeListe(String typeCode);
 
+    /**
+     *  坐席在线
+     * @param userId
+     * @return
+     */
+    Boolean onLine4Seat(Long orgId,Long userId);
+
+    /**
+     * 在线坐席统计
+     * @param orgId
+     * @return
+     */
+    Long countOnlineSeat(Long orgId);
 }

src/main/java/com/care/common/service/impl/CareChamberlainOlderRelServiceImpl.java

@@ -1,45 +0,0 @@
-package com.care.common.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.care.common.entity.CareChamberlainOlderRel;
-import com.care.common.entity.CareSysUser;
-import com.care.common.mapper.CareChamberlainOlderRelMapper;
-import com.care.common.service.CareChamberlainOlderRelService;
-import com.care.common.service.CareSysUserService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 安全管家-被监护人关系表(CareChamberlainOlderRel)表服务实现类
- *
- * @author makejava
- * @since 2021-05-21 00:08:34
- */
-@Service
-public class CareChamberlainOlderRelServiceImpl extends ServiceImpl<CareChamberlainOlderRelMapper, CareChamberlainOlderRel> implements CareChamberlainOlderRelService {
-
-    @Resource
-    private CareSysUserService careSysUserService;
-    /**
-     * 获取老人的管家
-     *
-     * @param olderId
-     * @return
-     */
-    @Override
-    public CareSysUser getMainChamberlainByOlderId(Long olderId) {
-        CareSysUser user = null;
-        QueryWrapper<CareChamberlainOlderRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareChamberlainOlderRel::getOlderId,olderId);
-        List<CareChamberlainOlderRel> datas = this.list(queryWrapper);
-        if (CollUtil.isNotEmpty(datas)){
-            CareChamberlainOlderRel rel = datas.get(0);
-            user = this.careSysUserService.getById(rel.getChamberlainId());
-        }
-        return user;
-    }
-}

src/main/java/com/care/common/service/impl/CareEventOrderChambServiceImpl.java

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.entity.CareEventOrderChamb;
+import com.care.common.mapper.CareEventOrderChambMapper;
+import com.care.common.service.CareEventOrderChambService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 管家工单(CareEventOrderChamb)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-06-02 23:31:34
+ */
+@Service
+public class CareEventOrderChambServiceImpl extends ServiceImpl<CareEventOrderChambMapper, CareEventOrderChamb> implements CareEventOrderChambService {
+
+}

src/main/java/com/care/common/service/impl/CareEventOrderOlderServiceImpl.java

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.entity.CareEventOrderOlder;
+import com.care.common.mapper.CareEventOrderOlderMapper;
+import com.care.common.service.CareEventOrderOlderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 被监护人表(CareEventOrderOlder)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-06-02 22:19:13
+ */
+@Service
+public class CareEventOrderOlderServiceImpl extends ServiceImpl<CareEventOrderOlderMapper, CareEventOrderOlder> implements CareEventOrderOlderService {
+
+}

src/main/java/com/care/common/service/impl/CareHouseContactServiceImpl.java

@@ -0,0 +1,32 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.entity.CareHouseContact;
+import com.care.common.mapper.CareHouseContactMapper;
+import com.care.common.service.CareHouseContactService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 被监护人紧急联系人(CareHouseContact)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-06-02 21:43:00
+ */
+@Service
+public class CareHouseContactServiceImpl extends ServiceImpl<CareHouseContactMapper, CareHouseContact> implements CareHouseContactService {
+    /**
+     * 查询老人-紧急联系人
+     *
+     * @param houseId
+     * @return
+     */
+    @Override
+    public List<CareHouseContact> queryContactByHouseId(Long houseId) {
+        QueryWrapper<CareHouseContact> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareHouseContact::getHouseId,houseId);
+        return this.list(queryWrapper);
+    }
+}

src/main/java/com/care/common/service/impl/CareHouseDeviceRelServiceImpl.java

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.entity.CareHouseDeviceRel;
+import com.care.common.mapper.CareHouseDeviceRelMapper;
+import com.care.common.service.CareHouseDeviceRelService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 设备-房屋关系表(CareHouseDeviceRel)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-06-02 21:43:19
+ */
+@Service
+public class CareHouseDeviceRelServiceImpl extends ServiceImpl<CareHouseDeviceRelMapper, CareHouseDeviceRel> implements CareHouseDeviceRelService {
+
+}

src/main/java/com/care/common/service/impl/CareHouseServiceImpl.java

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.entity.CareHouse;
+import com.care.common.mapper.CareHouseMapper;
+import com.care.common.service.CareHouseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 被监护房屋信息(CareHouse)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-06-02 21:42:44
+ */
+@Service
+public class CareHouseServiceImpl extends ServiceImpl<CareHouseMapper, CareHouse> implements CareHouseService {
+
+}

src/main/java/com/care/common/service/impl/CareMemberInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.entity.CareMemberInfo;
+import com.care.common.mapper.CareMemberInfoMapper;
+import com.care.common.service.CareMemberInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户登录信息(CareMemberInfo)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-06-02 21:43:38
+ */
+@Service
+public class CareMemberInfoServiceImpl extends ServiceImpl<CareMemberInfoMapper, CareMemberInfo> implements CareMemberInfoService {
+
+}

src/main/java/com/care/common/service/impl/CareOlderContactServiceImpl.java

@@ -1,34 +0,0 @@
-package com.care.common.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.care.common.entity.CareOlderContact;
-import com.care.common.mapper.CareOlderContactMapper;
-import com.care.common.service.CareOlderContactService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 被监护人紧急联系人(BigSreenOlderContactVO)表服务实现类
- *
- * @author makejava
- * @since 2021-05-21 00:08:27
- */
-@Service
-public class CareOlderContactServiceImpl extends ServiceImpl<CareOlderContactMapper, CareOlderContact> implements CareOlderContactService {
-
-    /**
-     * 查询老人-紧急联系人
-     *
-     * @param olderId
-     * @return
-     */
-    @Override
-    public List<CareOlderContact> queryContactByOlderId(Long olderId) {
-        QueryWrapper<CareOlderContact> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareOlderContact::getOlderId,olderId)
-                .eq(CareOlderContact::getStatus,"1");
-        return this.list(queryWrapper);
-    }
-}

src/main/java/com/care/common/service/impl/CareOlderDeviceRelServiceImpl.java

@@ -1,18 +0,0 @@
-package com.care.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.care.common.entity.CareOlderDeviceRel;
-import com.care.common.mapper.CareOlderDeviceRelMapper;
-import com.care.common.service.CareOlderDeviceRelService;
-import org.springframework.stereotype.Service;
-
-/**
- * 设备-被监护人关系表(CareOlderDeviceRel)表服务实现类
- *
- * @author makejava
- * @since 2021-05-21 00:08:32
- */
-@Service
-public class CareOlderDeviceRelServiceImpl extends ServiceImpl<CareOlderDeviceRelMapper, CareOlderDeviceRel> implements CareOlderDeviceRelService {
-
-}

src/main/java/com/care/common/service/impl/CommonServiceImpl.java

@@ -3,6 +3,7 @@ package com.care.common.service.impl;
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.TimedCache;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.care.common.cache.RedisUtil;
 import com.care.common.entity.SysDimCode;
 import com.care.common.service.CommonService;
 import com.care.common.service.SysDimCodeService;
@@ -27,6 +28,9 @@ public class CommonServiceImpl implements CommonService {
     @Resource
     SysDimCodeService sysDimCodeService;
 
+    @Resource
+    RedisUtil redisUtil;
+
     @Override
     public List<SysDimCode> getDimCodeListe(String typeCode){
         QueryWrapper<SysDimCode> wrapper = new QueryWrapper<>();
@@ -36,6 +40,28 @@ public class CommonServiceImpl implements CommonService {
         return sysDimCodeService.list(wrapper);
     }
 
+    /**
+     * 坐席在线
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    public Boolean onLine4Seat(Long orgId,Long userId) {
+        return null;
+    }
+
+    /**
+     * 在线坐席统计
+     *
+     * @param orgId
+     * @return
+     */
+    @Override
+    public Long countOnlineSeat(Long orgId) {
+        return null;
+    }
+
     @Override
     public String convertedCodeName(String typeCode, String code)  {
         if (StringUtils.isEmpty(typeCode) || StringUtils.isEmpty(code)) {

src/main/java/com/care/common/vo/event/ChamberlainVO.java

@@ -1,5 +1,6 @@
 package com.care.common.vo.event;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,6 +10,7 @@ import lombok.Data;
  * @Desc: 管家
  */
 @Data
+@ApiModel(value = "管家信息", description = "")
 public class ChamberlainVO {
 
     private Long id;

src/main/java/com/care/common/vo/event/EventOrderVO.java

@@ -1,8 +1,11 @@
 package com.care.common.vo.event;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.care.common.entity.CareHouse;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -17,6 +20,7 @@ import java.util.Date;
  */
 
 @Data
+@ApiModel(value = "定单信息", description = "")
 public class EventOrderVO implements Serializable {
     private static final long serialVersionUID = -78566992201198077L;
 
@@ -40,6 +44,12 @@ public class EventOrderVO implements Serializable {
     private String stationName;
 
 
+    @ApiModelProperty("房屋ID")
+    private Long houseId;
+
+    @ApiModelProperty("房屋名称")
+    private String houseName;
+
     @ApiModelProperty("被监护人ID")
     private Long olderId;
 
@@ -85,5 +95,8 @@ public class EventOrderVO implements Serializable {
     @ApiModelProperty("完成时间")
     private Date completeTime;
 
+    @ApiModelProperty("房屋")
+    private CareHouse house;
+
 
 }

src/main/java/com/care/common/vo/event/KeyApplyVO.java

@@ -1,57 +0,0 @@
-package com.care.common.vo.event;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 事件工单-钥匙申请记录(CareEventOrderKeyApply)实体类
- *
- * @author makejava
- * @since 2021-05-29 15:45:38
- */
-
-@Data
-@ApiModel(value = "事件工单-钥匙申请记录", description = "")
-public class KeyApplyVO implements Serializable {
-    private static final long serialVersionUID = 225803583759698088L;
-
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty("申请人角色 chanmb管家 contact紧联系人")
-    private String applyRole;
-
-
-    @ApiModelProperty("申请人ID")
-    private Long applyUserId;
-
-
-    @ApiModelProperty("状态：0:待授权 1 已授权")
-    private String status;
-
-
-    @ApiModelProperty("联系人姓名")
-    private String applyUserName;
-
-
-    @ApiModelProperty("处理结果")
-    private String handleResult;
-
-
-    @ApiModelProperty("createTime")
-    private Date createTime;
-
-
-    @ApiModelProperty("modifyTime")
-    private Date modifyTime;
-
-    @ApiModelProperty("关系类别")
-    private String relationTypeDesc;
-
-}

src/main/java/com/care/common/vo/event/OrderContactorVO.java

@@ -2,6 +2,7 @@ package com.care.common.vo.event;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "联系人", description = "")
 public class OrderContactorVO implements Serializable {
     private static final long serialVersionUID = -77087502578795347L;
 
@@ -59,13 +61,6 @@ public class OrderContactorVO implements Serializable {
     @ApiModelProperty("联系电话")
     private String contactPhone;
 
-    @ApiModelProperty("坐席ID")
-    private Long seatId;
-
-
-    @ApiModelProperty("modifyTime")
-    private Date modifyTime;
-
     @ApiModelProperty("关系类别描述")
     private String relationTypeDesc;
 
@@ -81,5 +76,4 @@ public class OrderContactorVO implements Serializable {
     @ApiModelProperty("纬度")
     private Double latitude;
 
-
 }

src/main/java/com/care/common/vo/event/OrderOlderVO.java

@@ -1,41 +1,81 @@
 package com.care.common.vo.event;
 
 import cn.hutool.core.date.DateUtil;
-import com.care.common.entity.CareOlder;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * @Author: lilt
  * @Date: 2021/5/29
  * @Desc:
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(value = "老人详细信息", description = "老人详细信息响应类")
-public class OrderOlderVO extends CareOlder {
+@ApiModel(value = "事件定单老人详细信息", description = "老人详细信息响应类")
+public class OrderOlderVO  {
+
+    private Long id;
+
+
+    @ApiModelProperty("机构ID")
+    private Long orgId;
+
+
+    @ApiModelProperty("服务站ID")
+    private Long stationId;
+
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+
+    @ApiModelProperty("姓名：M：男 W：女")
+    private String gender;
+
+
+    @ApiModelProperty("生日")
+    private Date birthday;
+
+
+    @ApiModelProperty("居住类别：1：独居 2：非独居 3：集中居住 4：其他")
+    private String liveType;
+
+
+    @ApiModelProperty("床号或者门牌号")
+    private String bedNumber;
+
+
+    @ApiModelProperty("安全级别： 1 ：一级 2：二级 3: 三级")
+    private String safeLevel;
+
+
+
+    @ApiModelProperty("状态：  0：未联系  1已联系 ")
+    private Integer status;
 
     @ApiModelProperty("老人联系状态描述")
-    private String contactStatusDesc;
-    @ApiModelProperty("老人联系状态")
-    private Integer contactStatus;
+    private String statusDesc;
+
+    @ApiModelProperty("是否主动呼叫  1是 0否")
+    private Integer isZhudong;
+
 
     @ApiModelProperty("年龄")
     private Integer age;
 
-    @ApiModelProperty("事件类型")
-    private String eventType;
-    @ApiModelProperty("事件类型描述")
-    private String eventTypeDesc;
-
     @ApiModelProperty("管家")
     private ChamberlainVO chamberlain;
 
     public Integer getAge(){
-        if (super.getBirthday() != null){
-            return DateUtil.ageOfNow(super.getBirthday());
+        if (this.getBirthday() != null){
+            return DateUtil.ageOfNow(this.getBirthday());
         }else{
             return null;
         }

src/main/resources/mybatis/CareChamberlainOlderRelMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.common.mapper.CareChamberlainOlderRelMapper">
+<mapper namespace="com.care.common.mapper.CareEventOrderChambMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareEventOrderOlderMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.care.common.mapper.CareEventOrderOlderMapper">
+   
+
+</mapper>

src/main/resources/mybatis/CareOlderContactMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.common.mapper.CareOlderContactMapper">
+<mapper namespace="com.care.common.mapper.CareHouseContactMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareOlderDeviceRelMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.common.mapper.CareOlderDeviceRelMapper">
+<mapper namespace="com.care.common.mapper.CareHouseDeviceRelMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareHouseMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.care.common.mapper.CareHouseMapper">
+   
+
+</mapper>

src/main/resources/mybatis/CareMemberInfoMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.care.common.mapper.CareMemberInfoMapper">
+   
+
+</mapper>