Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseBuildFacilityController.java

@@ -0,0 +1,21 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 建筑设施 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+@Controller
+@RequestMapping("/baseBuildFacility")
+public class BaseBuildFacilityController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseBuildFacilityTypeController.java

@@ -0,0 +1,21 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 建筑设施类型 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+@Controller
+@RequestMapping("/baseBuildFacilityType")
+public class BaseBuildFacilityTypeController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuild.java

@@ -134,9 +134,19 @@ public class BaseBuild implements Serializable {
     private Integer facilityId;
 
     /**
-     * 所属联网单位ID
+     * BIM地址
      */
-    private String companyId;
+    private String bimUrl;
+
+    /**
+     * 联系人电话
+     */
+    private String contactPhone;
+
+    /**
+     * 建筑备注
+     */
+    private String buildDesc;
 
     /**
      * 创建时间
@@ -174,19 +184,14 @@ public class BaseBuild implements Serializable {
     private Integer fireproofCoat;
 
     /**
-     * 消防设施系统;0、无 1、有
-     */
-    private String fireFacilitySystem;
-
-    /**
-     * 其他系统;0、无 1、有
+     * 组织机构ID
      */
-    private String otherSystem;
+    private Integer deptId;
 
     /**
-     * 其他设施
+     * 租户ID
      */
-    private String otherFacilities;
+    private Integer tenantId;
 
 
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacility.java

@@ -0,0 +1,126 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 建筑设施
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseBuildFacility implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设施编号
+     */
+    private String facilityNum;
+
+    /**
+     * 设施名称
+     */
+    private String facilityName;
+
+    /**
+     * 设施类型
+     */
+    private String facilityType;
+
+    /**
+     * 所属楼层
+     */
+    private Integer floor;
+
+    /**
+     * 安装位置
+     */
+    private String address;
+
+    /**
+     * 图⽚地址URL
+     */
+    private String imagesUrl;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 联系人
+     */
+    private String contact;
+
+    /**
+     * 联系方式
+     */
+    private String contactPhone;
+
+    /**
+     * X轴坐标
+     */
+    private String xCoordinate;
+
+    /**
+     * Y轴坐标
+     */
+    private String yCoordinate;
+
+    /**
+     * Z轴坐标
+     */
+    private String zCoordinate;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 组织结构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacilityType.java

@@ -0,0 +1,91 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 建筑设施类型
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseBuildFacilityType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 类型编码
+     */
+    private String typeCode;
+
+    /**
+     * 类型简称
+     */
+    private String typeAbbrevia;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 图标
+     */
+    private String typeImg;
+
+    /**
+     * 类型描述
+     */
+    private String typeDesc;
+
+    /**
+     * 数据字段
+     */
+    private String dataField;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseGgpFacility.java

@@ -40,7 +40,7 @@ public class BaseGgpFacility implements Serializable {
     /**
      * 设施状态
      */
-    private Integer status;
+    private Integer facilityStatus;
 
     /**
      * 设施地址

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseBuildFacilityMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.BaseBuildFacility;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 建筑设施 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+public interface BaseBuildFacilityMapper extends CrudMapper<BaseBuildFacility> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseBuildFacilityTypeMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.BaseBuildFacilityType;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 建筑设施类型 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+public interface BaseBuildFacilityTypeMapper extends CrudMapper<BaseBuildFacilityType> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/BaseBuildFacilityService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.BaseBuildFacility;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 建筑设施 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+public interface BaseBuildFacilityService extends CrudService<BaseBuildFacility> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/BaseBuildFacilityTypeService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.BaseBuildFacilityType;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 建筑设施类型 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+public interface BaseBuildFacilityTypeService extends CrudService<BaseBuildFacilityType> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildFacilityServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.BaseBuildFacility;
+import com.usky.iot.mapper.BaseBuildFacilityMapper;
+import com.usky.iot.service.BaseBuildFacilityService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 建筑设施 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+@Service
+public class BaseBuildFacilityServiceImpl extends AbstractCrudService<BaseBuildFacilityMapper, BaseBuildFacility> implements BaseBuildFacilityService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildFacilityTypeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.BaseBuildFacilityType;
+import com.usky.iot.mapper.BaseBuildFacilityTypeMapper;
+import com.usky.iot.service.BaseBuildFacilityTypeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 建筑设施类型 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-26
+ */
+@Service
+public class BaseBuildFacilityTypeServiceImpl extends AbstractCrudService<BaseBuildFacilityTypeMapper, BaseBuildFacilityType> implements BaseBuildFacilityTypeService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseGgpFacilityServiceImpl.java

@@ -154,7 +154,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                 baseGgpFacilityExportVo.setImagesUrl(baseGgpFacilityList.get(i).getImagesUrl());
                 baseGgpFacilityExportVo.setContact(baseGgpFacilityList.get(i).getContact());
                 baseGgpFacilityExportVo.setContactPhone(baseGgpFacilityList.get(i).getContactPhone());
-                baseGgpFacilityExportVo.setStatus(baseGgpFacilityList.get(i).getStatus());
+                baseGgpFacilityExportVo.setStatus(baseGgpFacilityList.get(i).getFacilityStatus());
                 baseGgpFacilityExportVo.setCreateTime(baseGgpFacilityList.get(i).getCreateTime().format(df));
                 list.add(baseGgpFacilityExportVo);
             }

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildFacilityMapper.xml

@@ -0,0 +1,29 @@
+<?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.usky.iot.mapper.BaseBuildFacilityMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.BaseBuildFacility">
+        <id column="id" property="id" />
+        <result column="facility_num" property="facilityNum" />
+        <result column="facility_name" property="facilityName" />
+        <result column="facility_type" property="facilityType" />
+        <result column="floor" property="floor" />
+        <result column="address" property="address" />
+        <result column="images_url" property="imagesUrl" />
+        <result column="device_id" property="deviceId" />
+        <result column="contact" property="contact" />
+        <result column="contact_phone" property="contactPhone" />
+        <result column="x_coordinate" property="xCoordinate" />
+        <result column="y_coordinate" property="yCoordinate" />
+        <result column="z_coordinate" property="zCoordinate" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="create_by" property="createBy" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildFacilityTypeMapper.xml

@@ -0,0 +1,22 @@
+<?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.usky.iot.mapper.BaseBuildFacilityTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.BaseBuildFacilityType">
+        <id column="id" property="id" />
+        <result column="type_code" property="typeCode" />
+        <result column="type_abbrevia" property="typeAbbrevia" />
+        <result column="type_name" property="typeName" />
+        <result column="type_img" property="typeImg" />
+        <result column="type_desc" property="typeDesc" />
+        <result column="data_field" property="dataField" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildMapper.xml

@@ -26,7 +26,9 @@
         <result column="build_inside" property="buildInside" />
         <result column="build_plan" property="buildPlan" />
         <result column="facility_id" property="facilityId" />
-        <result column="company_id" property="companyId" />
+        <result column="bim_url" property="bimUrl" />
+        <result column="contact_phone" property="contactPhone" />
+        <result column="build_desc" property="buildDesc" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
         <result column="update_by" property="updateBy" />
@@ -34,9 +36,8 @@
         <result column="delete_flag" property="deleteFlag" />
         <result column="under_space" property="underSpace" />
         <result column="fireproof_coat" property="fireproofCoat" />
-        <result column="fire_facility_system" property="fireFacilitySystem" />
-        <result column="other_system" property="otherSystem" />
-        <result column="other_facilities" property="otherFacilities" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseGgpFacilityMapper.xml

@@ -7,7 +7,7 @@
         <id column="id" property="id" />
         <result column="facility_num" property="facilityNum" />
         <result column="facility_name" property="facilityName" />
-        <result column="status" property="status" />
+        <result column="facility_status" property="facilityStatus" />
         <result column="address" property="address" />
         <result column="facility_type" property="facilityType" />
         <result column="longitude" property="longitude" />