第二版,安装小程序

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

@@ -0,0 +1,70 @@
+package com.care.common.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 房间范围信息(RoomVO)实体类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:48:26
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_room")
+@ApiModel(value = "房间范围信息", description = "")
+public class CareRoom implements Serializable {
+    private static final long serialVersionUID = -37048058410902896L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("房间id，填充devCode")
+    @TableField("ROOM_ID")
+    private String roomId;
+
+
+    @ApiModelProperty("x(m)")
+    @TableField("X")
+    private Double x;
+
+
+    @ApiModelProperty("y(m)")
+    @TableField("Y")
+    private Double y;
+
+
+    @ApiModelProperty("z(m)")
+    @TableField("Z")
+    private Double z;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+}

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

@@ -0,0 +1,80 @@
+package com.care.common.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 门信息(RoomGateVO)实体类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:48:27
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_room_gate")
+@ApiModel(value = "门信息", description = "")
+public class CareRoomGate implements Serializable {
+    private static final long serialVersionUID = -61193632066929881L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("门ID")
+    @TableField("GID")
+    private Integer gid;
+
+
+    @ApiModelProperty("房间ID")
+    @TableField("ROOM_ID")
+    private String roomId;
+
+
+    @ApiModelProperty("初始位置(0,1,2,3)")
+    @TableField("DIRECTION")
+    private Integer direction;
+
+
+    @ApiModelProperty("长(m)")
+    @TableField("LENGTH")
+    private Double length;
+
+
+    @ApiModelProperty("宽(m)")
+    @TableField("WIDTH")
+    private Double width;
+
+
+    @ApiModelProperty("高(m)")
+    @TableField("HIGHT")
+    private Double hight;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+}

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

@@ -0,0 +1,95 @@
+package com.care.common.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 区域信息(RoomRegionVO)实体类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:48:28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_room_region")
+@ApiModel(value = "区域信息", description = "")
+public class CareRoomRegion implements Serializable {
+    private static final long serialVersionUID = -53374646938718314L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("区域ID")
+    @TableField("RID")
+    private String rid;
+
+
+    @ApiModelProperty("房间ID")
+    @TableField("ROOM_ID")
+    private String roomId;
+
+
+    @ApiModelProperty("区域类型(0,1,2,3)")
+    @TableField("CLS")
+    private Integer cls;
+
+
+    @ApiModelProperty("x轴位置(m)")
+    @TableField("POSITIONX")
+    private Double positionx;
+
+
+    @ApiModelProperty("y轴位置(m)")
+    @TableField("POSITIONY")
+    private Double positiony;
+
+
+    @ApiModelProperty("x轴方向长度(m)")
+    @TableField("SCALEX")
+    private Double scalex;
+
+
+    @ApiModelProperty("y轴方向长度(m)")
+    @TableField("SCALEY")
+    private Double scaley;
+
+
+    @ApiModelProperty("z轴方向长度(m)")
+    @TableField("SCALEZ")
+    private Double scalez;
+
+
+    @ApiModelProperty("旋转角度")
+    @TableField("ROTATION")
+    private Double rotation;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+}

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

@@ -0,0 +1,70 @@
+package com.care.common.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 传感器信息(RoomSensorVO)实体类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:48:28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_room_sensor")
+@ApiModel(value = "传感器信息", description = "")
+public class CareRoomSensor implements Serializable {
+    private static final long serialVersionUID = 254667154285796129L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("房间ID")
+    @TableField("ROOM_ID")
+    private String roomId;
+
+
+    @ApiModelProperty("x(m)")
+    @TableField("X")
+    private Double x;
+
+
+    @ApiModelProperty("y(m)")
+    @TableField("Y")
+    private Double y;
+
+
+    @ApiModelProperty("z(m)")
+    @TableField("Z")
+    private Double z;
+
+
+    @ApiModelProperty("createTime")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+
+}

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

@@ -32,9 +32,8 @@ public class AuthorizationInterceptorConf extends WebMvcConfigurerAdapter implem
             //不拦截登录接口
             "/bms/login",
             "/bms/event/testData",
-            "/bms/switch/autoSms"
-
-
+            "/bms/switch/autoSms",
+            "/installation/api/**"
     };
 
 

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

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.care.common.entity.CareRoomGate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 门信息(RoomGateVO)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:27
+ */
+public interface CareRoomGateMapper extends BaseMapper<CareRoomGate> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.care.common.entity.CareRoom;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 房间范围信息(RoomVO)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:25
+ */
+public interface CareRoomMapper extends BaseMapper<CareRoom> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.care.common.entity.CareRoomRegion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 区域信息(RoomRegionVO)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:29
+ */
+public interface CareRoomRegionMapper extends BaseMapper<CareRoomRegion> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.care.common.mapper;
+
+import com.care.common.entity.CareRoomSensor;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 传感器信息(RoomSensorVO)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:33
+ */
+public interface CareRoomSensorMapper extends BaseMapper<CareRoomSensor> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareRoomGate;
+
+/**
+ * 门信息(RoomGateVO)表服务接口
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:27
+ */
+public interface CareRoomGateService extends IService<CareRoomGate> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareRoomRegion;
+
+/**
+ * 区域信息(RoomRegionVO)表服务接口
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:29
+ */
+public interface CareRoomRegionService extends IService<CareRoomRegion> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareRoomSensor;
+
+/**
+ * 传感器信息(RoomSensorVO)表服务接口
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:33
+ */
+public interface CareRoomSensorService extends IService<CareRoomSensor> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.care.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.care.common.entity.CareRoom;
+
+/**
+ * 房间范围信息(RoomVO)表服务接口
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:25
+ */
+public interface CareRoomService extends IService<CareRoom> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.mapper.CareRoomGateMapper;
+import com.care.common.entity.CareRoomGate;
+import com.care.common.service.CareRoomGateService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 门信息(RoomGateVO)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:28
+ */
+@Service
+public class CareRoomGateServiceImpl extends ServiceImpl<CareRoomGateMapper, CareRoomGate> implements CareRoomGateService {
+
+}

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

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.mapper.CareRoomRegionMapper;
+import com.care.common.entity.CareRoomRegion;
+import com.care.common.service.CareRoomRegionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 区域信息(RoomRegionVO)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:30
+ */
+@Service
+public class CareRoomRegionServiceImpl extends ServiceImpl<CareRoomRegionMapper, CareRoomRegion> implements CareRoomRegionService {
+
+}

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

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.mapper.CareRoomSensorMapper;
+import com.care.common.entity.CareRoomSensor;
+import com.care.common.service.CareRoomSensorService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 传感器信息(RoomSensorVO)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:33
+ */
+@Service
+public class CareRoomSensorServiceImpl extends ServiceImpl<CareRoomSensorMapper, CareRoomSensor> implements CareRoomSensorService {
+
+}

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

@@ -0,0 +1,18 @@
+package com.care.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.care.common.mapper.CareRoomMapper;
+import com.care.common.entity.CareRoom;
+import com.care.common.service.CareRoomService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 房间范围信息(RoomVO)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:35:26
+ */
+@Service
+public class CareRoomServiceImpl extends ServiceImpl<CareRoomMapper, CareRoom> implements CareRoomService {
+
+}

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

@@ -0,0 +1,72 @@
+package com.care.installation.controller;
+
+
+import com.care.common.util.Result;
+import com.care.installation.service.DevInstallService;
+
+import com.care.installation.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 描述：
+ *
+ * @autho：wenskys
+ * @create 2020/5/12 14:13
+ **/
+@Api(tags = "设备安装相关接口")
+@RestController
+@RequestMapping("/installation/api")
+public class DevInstallationController {
+
+    @Resource
+    private DevInstallService devInstallService;
+
+
+
+    /**
+     * 验证设备（是否存在）
+     * @param devCode
+     * @return
+     */
+    @PostMapping("checkDevCode")
+    @ApiOperation(tags = {"设备安装"},value = "验证设备")
+    public Result<Object> checkDevCode(@RequestParam("devCode") String devCode){
+        if (this.devInstallService.checkDevCode(devCode)){
+            return  Result.success("验证成功");
+        } else{
+            return  Result.error("验证失败");
+        }
+    }
+
+    /**
+     * 获取设备安装信息（地址（经纬度）、设备标签、场景）
+     * @param devCode
+     * @return
+     */
+    @GetMapping("getDevInstallationInfo")
+    @ApiOperation(tags = {"设备安装"},value = "获取设备安装信息（地址（经纬度）、设备标签、场景）")
+    public Result<DeviceInstallationVO> getDevInstallationInfo(@RequestParam("devCode") String devCode) {
+       return Result.success(this.devInstallService.getDevInstallationInfo(devCode));
+    }
+
+
+    /**
+     * 保存设备安装信息
+     * @return
+     */
+    @PostMapping("saveDevInstallation")
+    @ApiOperation(tags = {"设备安装"},value = "保存设备安装信息（地址（经纬度）、设备标签、设备场景，注意：devCode必须传")
+    public Result<Object> saveDevInstallation(@RequestBody DeviceInstallationVO vo){
+        if (this.devInstallService.saveDevInstallation(vo)){
+            return  Result.success("保存成功");
+        } else{
+            return  Result.error("保存失败");
+        }
+    }
+
+
+}

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

@@ -0,0 +1,194 @@
+package com.care.installation.controller;
+
+
+import com.care.common.util.Result;
+import com.care.installation.service.DevInstallService;
+import com.care.installation.service.RoomService;
+import com.care.installation.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 描述：
+ *
+ * @autho：wenskys
+ * @create 2020/5/12 14:13
+ **/
+@Api(tags = "设备安装相关接口")
+@Slf4j
+@RestController
+@RequestMapping("/installation/api")
+public class RoomController {
+
+    @Resource
+    private RoomService roomService;
+
+
+
+    /**
+     * 获取房间信息详情
+     * @param devCode
+     * @return
+     */
+    @GetMapping("getRoomInfo")
+    @ApiOperation(tags = {"设备安装"},value = "获取房间信息详情")
+    public Result<RoomVO> getRoomInfo(@RequestParam("devCode") String devCode) {
+        return Result.success(this.roomService.getRoomInfo(devCode));
+    }
+
+    /**
+     * 保存房间信息
+     * @return
+     */
+    @PostMapping("saveRoom")
+    @ApiOperation(tags = {"设备安装"},value = "保存房间信息，注意：roomId（取值devCode）必须传；id空是新增，id有是修改")
+    public Result<Object> saveRoom(@RequestBody RoomVO vo){
+        if (this.roomService.saveRoom(vo)){
+            return  Result.success("保存成功");
+        } else{
+            return  Result.error("保存失败");
+        }
+    }
+
+    /**
+     * 获取传感器信息详情
+     * @param devCode
+     * @return
+     */
+    @GetMapping("getRoomSensorInfo")
+    @ApiOperation(tags = {"设备安装"},value = "获取传感器信息详情")
+    public Result<RoomSensorVO> getRoomSensorInfo(@RequestParam("devCode") String devCode) {
+        return Result.success(this.roomService.getRoomSensorInfo(devCode));
+    }
+
+    /**
+     * 保存传感器信息
+     * @return
+     */
+    @PostMapping("saveRoomSensor")
+    @ApiOperation(tags = {"设备安装"},value = "保存传感器信息，注意：roomId（取值devCode）必须传；id空是新增，id有是修改")
+    public Result<Object> saveRoomSensor(@RequestBody RoomSensorVO vo){
+        if (this.roomService.saveRoomSensor(vo)){
+            return  Result.success("保存成功");
+        } else{
+            return  Result.error("保存失败");
+        }
+    }
+
+    /**
+     * 获取门信息列表
+     * @param devCode
+     * @return
+     */
+    @GetMapping("listRoomGateInfo")
+    @ApiOperation(tags = {"设备安装"},value = "获取门信息列表")
+    public Result<List<RoomGateVO>> listRoomGateInfo(@RequestParam("devCode") String devCode) {
+        return Result.success(this.roomService.listRoomGateInfo(devCode));
+    }
+
+    /**
+     * 获取门信息详情
+     * @param devCode
+     * @return
+     */
+    @GetMapping("getRoomGateInfo")
+    @ApiOperation(tags = {"设备安装"},value = "获取门信息详情")
+    public Result<RoomGateVO> getRoomGateInfo(@RequestParam("devCode") String devCode, @RequestParam("gid") Integer gid) {
+        return Result.success(this.roomService.getRoomGateInfo(devCode,gid));
+    }
+
+    /**
+     * 保存门信息
+     * @return
+     */
+    @PostMapping("saveRoomGate")
+    @ApiOperation(tags = {"设备安装"},value = "保存门信息，注意：roomId（取值devCode）必须传；id空是新增，id有是修改")
+    public Result<Object> saveRoomGate(@RequestBody RoomGateVO vo){
+        if (this.roomService.saveRoomGate(vo)){
+            return  Result.success("保存成功");
+        } else{
+            return  Result.error("保存失败");
+        }
+    }
+
+    @DeleteMapping("delRoomGate")
+    @ApiOperation(tags = {"设备安装"},value = "删除门信息")
+    public Result<Object> delRoomGate(@RequestParam("devCode") String devCode, @RequestParam("gid") Integer gid){
+        try {
+            this.roomService.delRoomGate(devCode, gid);
+            return  Result.success("删除成功！");
+        } catch (Exception e) {
+            log.error("设备安装: 删除门出现异常",e);
+            return Result.error("删除失败！");
+        }
+    }
+
+    /**
+     * 获取区域信息列表
+     * @param devCode
+     * @return
+     */
+    @GetMapping("listRoomRegionInfo")
+    @ApiOperation(tags = {"设备安装"},value = "获取区域信息列表")
+    public Result<List<RoomRegionVO>> listRoomRegionInfo(@RequestParam("devCode") String devCode) {
+        return Result.success(this.roomService.listRoomRegionInfo(devCode));
+    }
+
+    /**
+     * 获取区域信息详情
+     * @param devCode
+     * @return
+     */
+    @GetMapping("getRoomRegionInfo")
+    @ApiOperation(tags = {"设备安装"},value = "获取门信息详情")
+    public Result<RoomRegionVO> getRoomRegionInfo(@RequestParam("devCode") String devCode, @RequestParam("rid") Integer rid) {
+        return Result.success(this.roomService.getRoomRegionInfo(devCode,rid));
+    }
+
+    /**
+     * 保存区域信息
+     * @return
+     */
+    @PostMapping("saveRoomRegion")
+    @ApiOperation(tags = {"设备安装"},value = "保存区域信息，注意：roomId（取值devCode）必须传；id空是新增，id有是修改")
+    public Result<Object> saveRoomRegion(@RequestBody RoomRegionVO vo){
+        if (this.roomService.saveRoomRegion(vo)){
+            return  Result.success("保存成功");
+        } else{
+            return  Result.error("保存失败");
+        }
+    }
+
+    @DeleteMapping("delRoomRegion")
+    @ApiOperation(tags = {"设备安装"},value = "删除区域信息")
+    public Result<Object> delRoomRegion(@RequestParam("devCode") String devCode, @RequestParam("rid") Integer rid){
+        try {
+            this.roomService.delRoomRegion(devCode, rid);
+            return  Result.success("删除成功！");
+        } catch (Exception e) {
+            log.error("设备安装: 删除区域出现异常",e);
+            return Result.error("删除失败！");
+        }
+    }
+
+
+    /**
+     * 提交房间信息
+     * @return
+     */
+    @PostMapping("commitRoomInfo")
+    @ApiOperation(tags = {"设备安装"},value = "提交提交房间信息")
+    public Result<Object> commitRoomInfo(@RequestBody DeviceRoomAllVO vo) {
+        if (this.roomService.commitRoomInfo(vo)){
+            return  Result.success("提交成功");
+        } else{
+            return  Result.error("提交失败");
+        }
+    }
+
+}

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

@@ -0,0 +1,118 @@
+package com.care.installation.service;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.care.common.entity.*;
+
+import com.care.common.service.*;
+
+import com.care.installation.vo.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Slf4j
+@Service
+public class DevInstallService {
+
+
+    @Resource
+    private CareDeviceService careDeviceService;
+    @Resource
+    private CareHouseService careHouseService;
+    @Resource
+    private CareMemberInfoService careMemberInfoService;
+
+
+    public Boolean checkDevCode(String devCode) {
+        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
+       queryWrapper.lambda().eq(CareDevice::getDevCode,devCode);
+        Integer cnt = careDeviceService.count(queryWrapper);
+        if ( cnt != null && cnt > 0) {
+            return true;
+        } else{
+            return false;
+        }
+
+    }
+
+    public DeviceInstallationVO getDevInstallationInfo(String devCode) {
+        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareDevice::getDevCode,devCode);
+        CareDevice careDevice = careDeviceService.getOne(queryWrapper);
+        if(careDevice != null) {
+            DeviceInstallationVO vo = new DeviceInstallationVO();
+            BeanUtil.copyProperties(careDevice,vo);
+
+            //房屋地址
+            if (careDevice.getHouseId() != null) {
+                CareHouse careHouse = careHouseService.getById(careDevice.getHouseId());
+                if (careHouse != null) {
+                    vo.setHouseId(careDevice.getHouseId());
+                    vo.setHouseAddr(careHouse.getAddr());
+                    vo.setLatitude(careHouse.getLatitude());
+                    vo.setLongitude(careHouse.getLongitude());
+                }
+             }
+
+            return vo;
+        }
+        return null;
+    }
+
+    public Boolean saveDevInstallation(DeviceInstallationVO vo) {
+        if(StringUtils.isEmpty(vo.getDevCode())){
+            return false;
+        }
+
+       CareDevice careDevice = new CareDevice();
+        BeanUtil.copyProperties(vo,careDevice);
+        Date date = new Date();
+        careDevice.setModifyTime(date);
+        if(careDevice.getId() == null){
+            QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(CareDevice::getDevCode,vo.getDevCode());
+            careDevice.setId(careDeviceService.getOne(queryWrapper).getId());
+        }
+
+        //关联用户
+        if(StringUtils.isNotEmpty(vo.getMemberPhone())) {
+            QueryWrapper<CareMemberInfo> queryWrapper0 = new QueryWrapper<>();
+            queryWrapper0.lambda().eq(CareMemberInfo::getPhone,vo.getMemberPhone());
+            CareMemberInfo careMemberInfo = this.careMemberInfoService.getOne(queryWrapper0);
+            if (careMemberInfo != null) { //关联,
+                careDevice.setMemberId(careMemberInfo.getId());
+            }
+        }
+
+        //房屋地址
+        if(StringUtils.isNotEmpty(vo.getHouseAddr())) {
+            CareHouse careHouse = new CareHouse();
+            careHouse.setId(vo.getHouseId());
+            careHouse.setName(vo.getHouseAddr());
+            careHouse.setAddr(vo.getHouseAddr());
+            careHouse.setLongitude(vo.getLongitude());
+            careHouse.setLatitude(vo.getLatitude());
+            if(careDevice.getMemberId() != null && careDevice.getMemberId() != 0L){
+                careHouse.setMemberId(careDevice.getMemberId());
+            }
+            if(careHouse.getId() != null) { //修改
+                careHouse.setModifyTime(date);
+                this.careHouseService.updateById(careHouse);
+            } else { //新增
+                careHouse.setOrgId(careDevice.getOrgId());
+                careHouse.setStationId(careDevice.getStationId());
+                careHouse.setCreateTime(date);
+                this.careHouseService.save(careHouse);
+                careDevice.setHouseId(careHouse.getId());
+            }
+        }
+
+        return careDeviceService.updateById(careDevice);
+    }
+
+}

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

@@ -0,0 +1,185 @@
+package com.care.installation.service;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.care.common.entity.*;
+import com.care.common.service.*;
+import com.care.installation.vo.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Service
+public class RoomService {
+
+
+    @Resource
+    private CareRoomService careRoomService;
+    @Resource
+    private CareRoomSensorService careRoomSensorService;
+    @Resource
+    private CareRoomGateService careRoomGateService;
+    @Resource
+    private CareRoomRegionService careRoomRegionService;
+
+
+
+    public RoomVO getRoomInfo(String devCode) {
+        QueryWrapper<CareRoom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareRoom::getRoomId,devCode);
+        CareRoom careRoom = this.careRoomService.getOne(queryWrapper);
+        if (careRoom != null){
+            RoomVO roomVO = new RoomVO();
+            BeanUtil.copyProperties(careRoom,roomVO);
+            return roomVO;
+        }
+        return null;
+    }
+
+    public Boolean saveRoom(RoomVO vo) {
+        CareRoom careRoom = new CareRoom();
+        BeanUtil.copyProperties(vo,careRoom);
+        if (careRoom.getId() != null) {  //修改
+            careRoom.setModifyTime(new Date());
+            return this.careRoomService.updateById(careRoom);
+        } else { //新增
+            careRoom.setCreateTime(new Date());
+            return this.careRoomService.save(careRoom);
+        }
+    }
+
+    public RoomSensorVO getRoomSensorInfo(String devCode) {
+        QueryWrapper<CareRoomSensor> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareRoomSensor::getRoomId,devCode);
+        CareRoomSensor careRoomSensor = this.careRoomSensorService.getOne(queryWrapper);
+        if (careRoomSensor != null){
+            RoomSensorVO roomSensorVO = new RoomSensorVO();
+            BeanUtil.copyProperties(careRoomSensor,roomSensorVO);
+            return roomSensorVO;
+        }
+        return null;
+    }
+
+    public Boolean saveRoomSensor(RoomSensorVO vo) {
+        CareRoomSensor careRoomSensor = new CareRoomSensor();
+        BeanUtil.copyProperties(vo,careRoomSensor);
+        if (careRoomSensor.getId() != null) {  //修改
+            careRoomSensor.setModifyTime(new Date());
+            return this.careRoomSensorService.updateById(careRoomSensor);
+        } else { //新增
+            careRoomSensor.setCreateTime(new Date());
+            return this.careRoomSensorService.save(careRoomSensor);
+        }
+    }
+
+    public List<RoomGateVO> listRoomGateInfo(String devCode) {
+        QueryWrapper<CareRoomGate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareRoomGate::getRoomId,devCode).orderByAsc(CareRoomGate::getGid);
+        List<CareRoomGate> careRoomGateList = this.careRoomGateService.list(queryWrapper);
+        if (CollUtil.isNotEmpty(careRoomGateList)){
+            List<RoomGateVO> roomGateVOList = new ArrayList<>();
+            careRoomGateList.forEach(item ->{
+                RoomGateVO roomGateVO = new RoomGateVO();
+                BeanUtil.copyProperties(item,roomGateVO);
+                roomGateVOList.add(roomGateVO);
+            });
+            return roomGateVOList;
+        }
+        return null;
+    }
+
+    public RoomGateVO getRoomGateInfo(String devCode,Integer gid) {
+        QueryWrapper<CareRoomGate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareRoomGate::getRoomId,devCode).eq(CareRoomGate::getGid,gid);
+        CareRoomGate careRoomGate = this.careRoomGateService.getOne(queryWrapper);
+        if (careRoomGate != null) {
+            RoomGateVO roomGateVO = new RoomGateVO();
+            BeanUtil.copyProperties(careRoomGate,roomGateVO);
+            return roomGateVO;
+        }
+        return null;
+    }
+
+    public Boolean saveRoomGate(RoomGateVO vo) {
+        CareRoomGate careRoomGate = new CareRoomGate();
+        BeanUtil.copyProperties(vo,careRoomGate);
+        if (careRoomGate.getId() != null) {  //修改
+            careRoomGate.setModifyTime(new Date());
+            return this.careRoomGateService.updateById(careRoomGate);
+        } else { //新增
+            careRoomGate.setCreateTime(new Date());
+            return this.careRoomGateService.save(careRoomGate);
+        }
+    }
+
+    public Boolean delRoomGate(String devCode,Integer gid) {
+        QueryWrapper<CareRoomGate> removeWrapper = new QueryWrapper<>();
+        removeWrapper.lambda().eq(CareRoomGate::getRoomId,devCode).eq(CareRoomGate::getGid,gid);
+        return this.careRoomGateService.remove(removeWrapper);
+    }
+
+
+    public List<RoomRegionVO> listRoomRegionInfo(String devCode) {
+        QueryWrapper<CareRoomRegion> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareRoomRegion::getRoomId,devCode).orderByAsc(CareRoomRegion::getRid);
+        List<CareRoomRegion> careRoomRegionList = this.careRoomRegionService.list(queryWrapper);
+        if (CollUtil.isNotEmpty(careRoomRegionList)){
+            List<RoomRegionVO> roomRegionVOList = new ArrayList<>();
+            careRoomRegionList.forEach(item ->{
+                RoomRegionVO roomRegionVO = new RoomRegionVO();
+                BeanUtil.copyProperties(item,roomRegionVO);
+                roomRegionVOList.add(roomRegionVO);
+            });
+            return roomRegionVOList;
+        }
+        return null;
+    }
+
+    public RoomRegionVO getRoomRegionInfo(String devCode,Integer rid) {
+        QueryWrapper<CareRoomRegion> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareRoomRegion::getRoomId,devCode).eq(CareRoomRegion::getRid,rid);
+        CareRoomRegion careRoomRegion = this.careRoomRegionService.getOne(queryWrapper);
+        if (careRoomRegion != null) {
+            RoomRegionVO roomRegionVO = new RoomRegionVO();
+            BeanUtil.copyProperties(careRoomRegion,roomRegionVO);
+            return roomRegionVO;
+        }
+        return null;
+    }
+
+    public Boolean saveRoomRegion(RoomRegionVO vo) {
+        CareRoomRegion careRoomRegion = new CareRoomRegion();
+        BeanUtil.copyProperties(vo,careRoomRegion);
+        if (careRoomRegion.getId() != null) {  //修改
+            careRoomRegion.setModifyTime(new Date());
+            return this.careRoomRegionService.updateById(careRoomRegion);
+        } else { //新增
+            careRoomRegion.setCreateTime(new Date());
+            return this.careRoomRegionService.save(careRoomRegion);
+        }
+    }
+
+    public Boolean delRoomRegion(String devCode,Integer rid) {
+        QueryWrapper<CareRoomRegion> removeWrapper = new QueryWrapper<>();
+        removeWrapper.lambda().eq(CareRoomRegion::getRoomId,devCode).eq(CareRoomRegion::getRid,rid);
+        return this.careRoomRegionService.remove(removeWrapper);
+    }
+    /**
+     * 发送Mqtt消息给dmp
+     * @param vo
+     * @return
+     */
+    public Boolean commitRoomInfo(DeviceRoomAllVO vo) {
+
+        return true;
+
+    }
+
+}

src/main/java/com/care/installation/vo/DeviceInstallationVO.java

@@ -0,0 +1,48 @@
+package com.care.installation.vo;
+
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+ * @Author: lilt
+ * @Date: 2021/6/7
+ * @Desc:
+ */
+@Data
+public class DeviceInstallationVO {
+
+    private Long id;
+
+    @ApiModelProperty("设备编码")
+    private String devCode;
+
+    @ApiModelProperty("设备名称(标签)")
+    private String devName;
+
+    @ApiModelProperty("房屋ID")
+    private Long houseId;
+
+    @ApiModelProperty("房屋地址")
+    private String houseAddr;
+
+    @ApiModelProperty("经度")
+    private Double longitude;
+
+    @ApiModelProperty("纬度")
+    private Double latitude;
+
+    @ApiModelProperty("设备场景：1客厅，2卫生间，3卧室，4其他")
+    private String devScene;
+
+    @ApiModelProperty("关联用户ID")
+    private Long memberId;
+
+    @ApiModelProperty("关联用户号码")
+    private String memberPhone;
+
+
+}

src/main/java/com/care/installation/vo/DeviceRoomAllVO.java

@@ -0,0 +1,32 @@
+package com.care.installation.vo;
+
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * @Author: lilt
+ * @Date: 2021/6/7
+ * @Desc:
+ */
+@Data
+public class DeviceRoomAllVO {
+
+
+    @ApiModelProperty("房间信息")
+    private RoomVO roomVO;
+
+    @ApiModelProperty("传感器信息")
+    private RoomSensorVO roomSensorVO;
+
+    @ApiModelProperty("门信息")
+    private List<RoomGateVO> roomGateVOList;
+
+    @ApiModelProperty("区域信息")
+    private List<RoomRegionVO> roomRegionVOList;
+
+}

src/main/java/com/care/installation/vo/RoomGateVO.java

@@ -0,0 +1,58 @@
+package com.care.installation.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 门信息(RoomGateVO)实体类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:48:27
+ */
+
+@Data
+@ApiModel(value = "门信息", description = "")
+public class RoomGateVO implements Serializable {
+    private static final long serialVersionUID = -61193632066929881L;
+
+    private Long id;
+
+
+    @ApiModelProperty("门ID")
+    private Integer gid;
+
+
+    @ApiModelProperty("房间ID")
+    private String roomId;
+
+
+    @ApiModelProperty("初始位置(0,1,2,3)")
+    private Integer direction;
+
+
+    @ApiModelProperty("长(m)")
+    private Double length;
+
+
+    @ApiModelProperty("宽(m)")
+    private Double width;
+
+
+    @ApiModelProperty("高(m)")
+    private Double hight;
+
+
+    @ApiModelProperty("createTime")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    private Date modifyTime;
+
+
+}

src/main/java/com/care/installation/vo/RoomRegionVO.java

@@ -0,0 +1,72 @@
+package com.care.installation.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 区域信息(RoomRegionVO)实体类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:48:28
+ */
+
+@Data
+@ApiModel(value = "区域信息", description = "")
+public class RoomRegionVO implements Serializable {
+    private static final long serialVersionUID = -53374646938718314L;
+
+
+    private Long id;
+
+
+    @ApiModelProperty("区域ID")
+    private String rid;
+
+
+    @ApiModelProperty("房间ID")
+    private String roomId;
+
+
+    @ApiModelProperty("区域类型(0,1,2,3)")
+    private Integer cls;
+
+
+    @ApiModelProperty("x轴位置(m)")
+    private Double positionx;
+
+
+    @ApiModelProperty("y轴位置(m)")
+    private Double positiony;
+
+
+    @ApiModelProperty("x轴方向长度(m)")
+    private Double scalex;
+
+
+    @ApiModelProperty("y轴方向长度(m)")
+    private Double scaley;
+
+
+    @ApiModelProperty("z轴方向长度(m)")
+    private Double scalez;
+
+
+    @ApiModelProperty("旋转角度")
+    private Double rotation;
+
+
+    @ApiModelProperty("createTime")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    private Date modifyTime;
+
+
+}

src/main/java/com/care/installation/vo/RoomSensorVO.java

@@ -0,0 +1,56 @@
+package com.care.installation.vo;
+
+
+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;
+
+/**
+ * 传感器信息(RoomSensorVO)实体类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:48:28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("care_room_sensor")
+@ApiModel(value = "传感器信息", description = "")
+public class RoomSensorVO implements Serializable {
+    private static final long serialVersionUID = 254667154285796129L;
+
+    private Long id;
+
+
+    @ApiModelProperty("房间ID")
+    private String roomId;
+
+
+    @ApiModelProperty("x(m)")
+    private Double x;
+
+
+    @ApiModelProperty("y(m)")
+    private Double y;
+
+
+    @ApiModelProperty("z(m)")
+    private Double z;
+
+
+    @ApiModelProperty("createTime")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    private Date modifyTime;
+
+
+}

src/main/java/com/care/installation/vo/RoomVO.java

@@ -0,0 +1,50 @@
+package com.care.installation.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 房间范围信息(RoomVO)实体类
+ *
+ * @author makejava
+ * @since 2021-08-28 15:48:26
+ */
+
+@Data
+@ApiModel(value = "房间范围信息", description = "")
+public class RoomVO implements Serializable {
+    private static final long serialVersionUID = -37048058410902896L;
+
+    private Long id;
+
+
+    @ApiModelProperty("房间id，填充devCode")
+    private String roomId;
+
+
+    @ApiModelProperty("x(m)")
+    private Double x;
+
+
+    @ApiModelProperty("y(m)")
+    private Double y;
+
+
+    @ApiModelProperty("z(m)")
+    private Double z;
+
+
+    @ApiModelProperty("createTime")
+    private Date createTime;
+
+
+    @ApiModelProperty("modifyTime")
+    private Date modifyTime;
+
+
+}

src/main/resources/mybatis/CareRoomGateMapper.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.CareRoomGateMapper">
+
+
+</mapper>

src/main/resources/mybatis/CareRoomMapper.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.CareRoomMapper">
+
+
+</mapper>

src/main/resources/mybatis/CareRoomRegionMapper.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.CareRoomRegionMapper">
+
+
+</mapper>

src/main/resources/mybatis/CareRoomSensorMapper.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.CareRoomSensorMapper">
+
+
+</mapper>