完善物理模型开发

iot-platform-manager/src/main/java/com/platform/controller/IotModGroupController.java

@@ -1,21 +1,24 @@
 package com.platform.controller;
 
 
+import com.platform.exception.BaseResult;
+import com.platform.exception.PageResult;
 import com.platform.manage.IotModGroupManage;
-import com.platform.request.mod.IotModGroupDetailReq;
-import com.platform.request.mod.IotModGroupRequest;
+import com.platform.request.modGroup.IotModGroupDetailReq;
+import com.platform.request.modGroup.IotModGroupRequest;
+import com.platform.request.modGroup.IotModGroupSaveRequest;
 import com.platform.response.device.DeviceDetailResp;
-import com.platform.response.device.DevicePageResp;
+import com.platform.response.modGroup.IotModGroupPageResp;
 import com.platform.result.HttpResult;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 /**
-*@Author: donglang
-*@CreateTime: 2025-10-09
-*@Description: 物联模型分组Controller
-*@Version: 1.0
-*/
+ * Author: donglang
+ * Time: 2025-10-09
+ * Description: 物联模型分组Controller
+ * Version: 1.0
+ */
 
 @RestController
 @RequestMapping("/iot/mod/group")
@@ -29,44 +32,25 @@ public class IotModGroupController {
      * 分页查询物理模型分组
      */
     @PostMapping("/pageModGroupList")
-    public HttpResult<DevicePageResp> pageModGroupList(@RequestBody IotModGroupDetailReq req) {
-        return HttpResult.success(iotModGroupManage.pageModGroupList(req));
+    public PageResult<IotModGroupPageResp> pageModList(@RequestBody IotModGroupRequest request) {
+        return iotModGroupManage.pageModGroupList(request);
     }
 
     /**
      * 添加物理模型分组
      */
     @PostMapping("/addModGroup")
-    public HttpResult<Boolean> addModGroup(@RequestBody IotModGroupRequest request) {
-        return HttpResult.success(iotModGroupManage.addModGroup(request));
-    }
-
-    /**
-     * 修改物理模型分组
-     */
-    @PostMapping("/updateModGroup")
-    public HttpResult<Boolean> updateModGroup(@RequestBody IotModGroupRequest request) {
-        return HttpResult.success(iotModGroupManage.updateModGroup(request));
+    public BaseResult<Boolean> addModGroup(@RequestBody IotModGroupSaveRequest request) {
+        return BaseResult.success(iotModGroupManage.addModGroup(request));
     }
 
     /**
      * 删除物理模型分组
      */
     @GetMapping("/deleteModGroup")
-    public HttpResult<Boolean> deleteModGroup(String guid) {
-        return HttpResult.success(iotModGroupManage.deleteModGroup(guid));
+    public BaseResult<Boolean> deleteModGroup(Long id) {
+        return BaseResult.success(iotModGroupManage.deleteModGroup(id));
     }
 
-    /**
-     * 物理模型分组详情查询
-     */
-    @PostMapping("/getModGroupDetail")
-    public HttpResult<DeviceDetailResp> getModGroupDetail(@RequestBody IotModGroupDetailReq req) {
-        return HttpResult.success(iotModGroupManage.getModGroupDetail(req));
-    }
-
-
-
-
 
 }

iot-platform-manager/src/main/java/com/platform/entity/IotModGroup.java

@@ -1,11 +1,16 @@
 package com.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.platform.request.mod.IotModSaveRequest;
+import com.platform.request.modGroup.IotModGroupSaveRequest;
 import lombok.Data;
+
 import java.time.LocalDateTime;
+import java.util.UUID;
 
 /**
  * 物理模型分组表实体类
+ *
  * @author PC
  */
 @Data
@@ -71,4 +76,18 @@ public class IotModGroup {
      */
     @TableField("update_user")
     private String updateUser;
+
+    private static IotModGroup getInstance() {
+        return new IotModGroup();
+    }
+
+
+    public static IotModGroup requestToIotModGroup(IotModGroupSaveRequest request) {
+        IotModGroup iotModGroup = IotModGroup.getInstance();
+        iotModGroup.setCompanyId(null);
+        iotModGroup.setTenantId(null);
+        iotModGroup.setModeGroupCode(UUID.randomUUID().toString());
+        iotModGroup.setName(request.getName());
+        return iotModGroup;
+    }
 }

iot-platform-manager/src/main/java/com/platform/manage/IotModGroupManage.java

@@ -1,43 +1,95 @@
 package com.platform.manage;
 
-import com.platform.request.mod.IotModDetailReq;
-import com.platform.request.mod.IotModGroupDetailReq;
-import com.platform.request.mod.IotModGroupRequest;
-import com.platform.request.mod.IotModRequest;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.platform.entity.IotMod;
+import com.platform.entity.IotModGroup;
+import com.platform.enums.ErrorCodeEnum;
+import com.platform.exception.IotException;
+import com.platform.exception.PageResult;
+import com.platform.request.modGroup.IotModGroupDetailReq;
+import com.platform.request.modGroup.IotModGroupRequest;
+import com.platform.request.modGroup.IotModGroupSaveRequest;
 import com.platform.response.device.DeviceDetailResp;
 import com.platform.response.device.DevicePageResp;
+import com.platform.response.modGroup.IotModGroupPageResp;
+import com.platform.service.IotModGroupService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 
 /**
- *@Author: donglang
- *@CreateTime: 2025-10-09
- *@Description:
- *@Version: 1.0
+ * @Author: donglang
+ * @CreateTime: 2025-10-09
+ * @Description:
+ * @Version: 1.0
  */
 
 @Service
+@RequiredArgsConstructor
 public class IotModGroupManage {
 
-    public DevicePageResp pageModGroupList(IotModGroupDetailReq req) {
-        return null;
-    }
+    private final IotModGroupService iotModGroupService;
 
-    public Boolean addModGroup(IotModGroupRequest request) {
-        return true;
-    }
 
-    public Boolean updateModGroup(IotModGroupRequest request) {
-        return true;
-    }
+    /**
+     * 分页查询
+     *
+     * @param request
+     * @return
+     */
+    public PageResult<IotModGroupPageResp> pageModGroupList(IotModGroupRequest request) {
+        IPage<IotModGroup> page = new Page<>(request.getPageNum(), request.getPageSize());
+        LambdaQueryWrapper<IotModGroup> queryWrapper = Wrappers.<IotModGroup>lambdaQuery()
+                .eq(StringUtils.isNotBlank(request.getName()), IotModGroup::getName, request.getName());
+        List<IotModGroup> modGroupList = iotModGroupService.list(page, queryWrapper);
 
-    public Boolean deleteModGroup(String guid) {
-        return true;
+        //若为null,返回空分页结果
+        if (CollectionUtils.isEmpty(modGroupList)) {
+            return PageResult.empty(request.getPageNum(), request.getPageSize());
+        }
+
+        List<IotModGroupPageResp> modGroupPageRespList = new ArrayList<>();
+        for (IotModGroup iotModGroup : modGroupList) {
+            IotModGroupPageResp iotPageResp = IotModGroupPageResp.toIotPageResp(iotModGroup);
+            modGroupPageRespList.add(iotPageResp);
+        }
+        return PageResult.of(modGroupPageRespList.size(), request.getPageNum(), request.getPageSize(), modGroupPageRespList);
     }
 
-    public DeviceDetailResp getModGroupDetail(IotModGroupDetailReq req) {
-        return null;
+    /**
+     * 新增
+     *
+     * @param request
+     * @return
+     */
+    public Boolean addModGroup(IotModGroupSaveRequest request) {
+        IotModGroup oneByName = iotModGroupService.getOneByName(request.getName());
+        if (oneByName != null) {
+            throw new IotException(ErrorCodeEnum.DATA_SAVE_FAIL, "物理模型分组名称已存在");
+        }
+        IotModGroup iotModGroup = IotModGroup.requestToIotModGroup(request);
+        return iotModGroupService.save(iotModGroup);
+
     }
 
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     */
+    public Boolean deleteModGroup(Long id) {
+        return iotModGroupService.deleteById(id);
+    }
 
 }

iot-platform-manager/src/main/java/com/platform/manage/IotModManage.java

@@ -31,10 +31,10 @@ import java.util.List;
 
 
 /**
- *@Author: donglang
- *@CreateTime: 2025-10-09
- *@Description:
- *@Version: 1.0
+ * @Author: donglang
+ * @CreateTime: 2025-10-09
+ * @Description:
+ * @Version: 1.0
  */
 
 @Service
@@ -46,19 +46,23 @@ public class IotModManage {
 
     /**
      * 分页查询
+     *
      * @param request
      * @return
      */
     public PageResult<IotModPageResp> pageModList(IotModRequest request) {
         IPage<IotMod> page = new Page<>(request.getPageNum(), request.getPageSize());
-        LambdaQueryWrapper<IotMod> queryWrapper =  Wrappers.<IotMod>lambdaQuery()
+        LambdaQueryWrapper<IotMod> queryWrapper = Wrappers.<IotMod>lambdaQuery()
                 .eq(IotMod::getModeGroupCode, request.getModeGroupCode())
-                .eq(StringUtils.isNotBlank(request.getGuid()), IotMod::getGuid,request.getGuid())
-                .eq(StringUtils.isNotBlank(request.getName()), IotMod::getName,request.getName());
+                .eq(StringUtils.isNotBlank(request.getGuid()), IotMod::getGuid, request.getGuid())
+                .eq(StringUtils.isNotBlank(request.getName()), IotMod::getName, request.getName());
         List<IotMod> modList = iotModService.list(page, queryWrapper);
+
+        //若为null,返回空分页结果
         if (CollectionUtils.isEmpty(modList)) {
-            PageResult.empty(request.getPageNum(),request.getPageSize());
+            return PageResult.empty(request.getPageNum(), request.getPageSize());
         }
+
         List<IotModPageResp> modPageRespList = new ArrayList<>();
         for (IotMod item : modList) {
             IotModPageResp iotPageResp = IotModPageResp.toIotPageResp(item);
@@ -70,6 +74,7 @@ public class IotModManage {
 
     /**
      * 新增
+     *
      * @param request
      * @return
      */
@@ -84,12 +89,13 @@ public class IotModManage {
 
     /**
      * 更新
+     *
      * @param request
      * @return
      */
     public Boolean updateMod(IotModSaveRequest request) {
         IotMod iotMod = IotMod.requestToIotMod(request);
-        if (StringUtils.isBlank(iotMod.getModCode())){
+        if (StringUtils.isBlank(iotMod.getModCode())) {
             throw new IotException(ErrorCodeEnum.DATA_UPDATE_FAIL, "物理模型编号不能为空");
         }
         LambdaUpdateWrapper<IotMod> updateWrapper = Wrappers.<IotMod>lambdaUpdate()
@@ -99,6 +105,7 @@ public class IotModManage {
 
     /**
      * 删除
+     *
      * @param id
      * @return
      */
@@ -109,6 +116,7 @@ public class IotModManage {
 
     /**
      * 详情
+     *
      * @param req
      * @return
      */

iot-platform-manager/src/main/java/com/platform/request/mod/IotModGroupDetailReq.java → iot-platform-manager/src/main/java/com/platform/request/modGroup/IotModGroupDetailReq.java

@@ -1,4 +1,4 @@
-package com.platform.request.mod;
+package com.platform.request.modGroup;
 
 
 import lombok.Data;

iot-platform-manager/src/main/java/com/platform/request/mod/IotModGroupRequest.java → iot-platform-manager/src/main/java/com/platform/request/modGroup/IotModGroupRequest.java

@@ -1,6 +1,7 @@
-package com.platform.request.mod;
+package com.platform.request.modGroup;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.platform.request.PageRequest;
 import lombok.Data;
 
@@ -15,4 +16,11 @@ import lombok.Data;
 public class IotModGroupRequest  extends PageRequest {
 
 
+    /**
+     * 物模型分组名称
+     */
+    private String name;
+
+
+
 }

iot-platform-manager/src/main/java/com/platform/request/modGroup/IotModGroupSaveRequest.java

@@ -0,0 +1,26 @@
+package com.platform.request.modGroup;
+
+
+import lombok.Data;
+
+/**
+ * @Author: donglang
+ * @CreateTime: 2025-10-09
+ * @Description:
+ * @Version: 1.0
+ */
+
+@Data
+public class IotModGroupSaveRequest {
+
+    /**
+     * 物模型名称
+     */
+    private String name;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+}

iot-platform-manager/src/main/java/com/platform/response/modGroup/IotModGroupDetailResp.java

@@ -0,0 +1,118 @@
+package com.platform.response.modGroup;
+
+
+import com.platform.entity.IotMod;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * Author: donglang
+ * Time: 2025-10-09
+ * Des: 物理模型详情模型
+ * Version: 1.0
+ */
+
+@Data
+public class IotModGroupDetailResp {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 物理模型码值
+     */
+    private String modCode;
+
+    /**
+     * 所属客户id
+     */
+    private Long companyId;
+
+    /**
+     * 物模型分组码值
+     */
+    private String modeGroupCode;
+
+    /**
+     * 唯一标识
+     */
+    private String guid;
+
+    /**
+     * 物模型名称
+     */
+    private String name;
+
+    /**
+     * 最后一次更新值[原来字段 desc]
+     */
+    private String description;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 包含JSON
+     */
+    private String tslJson;
+
+    /**
+     * 版本[原来字段 tsl_ver]
+     */
+    private Integer version;
+
+    /**
+     * 设备数
+     */
+    private Integer num;
+
+    /**
+     * 0-未删除,1-删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    private static IotModGroupDetailResp getInstance(){
+        return new IotModGroupDetailResp();
+    }
+
+
+    public static IotModGroupDetailResp toIotDetailResp(IotMod iotMod){
+        IotModGroupDetailResp iotModDetailResp = IotModGroupDetailResp.getInstance();
+        iotModDetailResp.setModCode(iotMod.getModCode());
+        //TODO
+
+        return iotModDetailResp;
+
+    }
+
+}

iot-platform-manager/src/main/java/com/platform/response/modGroup/IotModGroupPageResp.java

@@ -0,0 +1,60 @@
+package com.platform.response.modGroup;
+
+
+import com.platform.entity.IotModGroup;
+import lombok.Data;
+
+
+/**
+ * Author: donglang
+ * Time: 2025-10-09
+ * Des: 物理模型详情模型
+ * Version: 1.0
+ */
+
+@Data
+public class IotModGroupPageResp {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 所属客户id
+     */
+    private Long companyId;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 物理模型分组码值唯一标识
+     */
+    private String modeGroupCode;
+
+    /**
+     * 物模型分组名称
+     */
+    private String name;
+
+
+    private static IotModGroupPageResp getInstance() {
+        return new IotModGroupPageResp();
+    }
+
+
+    public static IotModGroupPageResp toIotPageResp(IotModGroup iotModGroup) {
+        IotModGroupPageResp iotModDetailResp = IotModGroupPageResp.getInstance();
+        iotModDetailResp.setId(iotModGroup.getId());
+        iotModDetailResp.setCompanyId(iotModGroup.getCompanyId());
+        iotModDetailResp.setTenantId(iotModDetailResp.getTenantId());
+        iotModDetailResp.setModeGroupCode(iotModGroup.getModeGroupCode());
+        iotModDetailResp.setName(iotModDetailResp.getName());
+        return iotModDetailResp;
+
+    }
+
+}

iot-platform-manager/src/main/java/com/platform/service/IotModGroupService.java

@@ -1,6 +1,7 @@
 package com.platform.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.IotMod;
 import com.platform.entity.IotModGroup;
 
 /**
@@ -12,4 +13,23 @@ import com.platform.entity.IotModGroup;
 
 
 public interface IotModGroupService extends IService<IotModGroup> {
+    /**
+     * 根据姓名查询
+     * @param modGroupName
+     * @return
+     */
+    IotModGroup getOneByName(String modGroupName);
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+    IotModGroup getOneById(Long id);
+
+    /**
+     * 根据id删除
+     * @return
+     */
+    boolean deleteById(Long id);
 }

iot-platform-manager/src/main/java/com/platform/service/IotModService.java

@@ -16,7 +16,7 @@ import com.platform.mapper.IotModMapper;
 public interface IotModService extends IService<IotMod> {
 
     /**
-     * 跟进姓名查询
+     * 根据姓名查询
      * @param modName
      * @return
      */

iot-platform-manager/src/main/java/com/platform/service/impl/IotModGroupServiceImpl.java

@@ -1,6 +1,9 @@
 package com.platform.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.platform.entity.IotDevice;
+import com.platform.entity.IotDeviceGroup;
 import com.platform.entity.IotModGroup;
 import com.platform.mapper.IotModGroupMapper;
 import com.platform.service.IotModGroupService;
@@ -15,4 +18,23 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class IotModGroupServiceImpl extends ServiceImpl<IotModGroupMapper, IotModGroup> implements IotModGroupService {
+
+
+    @Override
+    public IotModGroup getOneByName(String modGroupName) {
+        return getOne(Wrappers.<IotModGroup>lambdaQuery()
+                .eq(IotModGroup::getName, modGroupName)
+                .last("limit 1"));
+
+    }
+
+    @Override
+    public IotModGroup getOneById(Long id) {
+        return getById(id);
+    }
+
+    @Override
+    public boolean deleteById(Long id) {
+        return removeById(id);
+    }
 }

sql/2025/11/create_cxf.sql

@@ -1,7 +1,6 @@
 create table iot_device
 (
     id          bigint unsigned auto_increment primary key,
-    tenant_id   varchar(128)                 not null default ''  comment '租户id',
     company_id  bigint unsigned              not null default  0  comment '所属客户id',
     guid        varchar(255)                 not null default ''  comment '唯一标识[暂时保留]',
     device_code varchar(255)                 not null default ''  comment '设备编号',
@@ -22,6 +21,7 @@ create table iot_device
     update_user varchar(255)                 not null default '' comment '更新人',
     del_flag    tinyint                      not null default 0 comment '0-未删除,1-删除',
     eg_id       bigint                       not null default -1  comment '设备类别',
+    tenant_id   varchar(128)                 not null default ''  comment '租户id',
     constraint guid unique (guid)
 ) comment '设备表';
 
@@ -32,15 +32,15 @@ create table iot_device_group
 (
     id          bigint unsigned auto_increment  primary key,
     device_group_code  varchar(255)       not null default '' comment '设备分组码值',
-    tenant_id    varchar(255)                 not null default '' comment '租户id',
     company_id   bigint                       not null default 0  comment '所属客户id',
     title       varchar(255)                 not null default '' comment '设备分组名称',
     large_type  tinyint unsigned             not null default 0  comment '[有点晕？]1-12(车辆、装载机、矿卡、人员、水表、电表、边坡监控、视频监控、皮带称重、环境监测、无人地磅、排放监测)',
     del_flag    tinyint                      not null default 0  comment '0-未删除，1-删除',
     create_time datetime                     not null default CURRENT_TIMESTAMP comment '创建时间',
     update_time datetime                     not null default current_timestamp on update CURRENT_TIMESTAMP comment '更新时间',
-        create_user varchar(255)                 not null default '' comment '创建人',
-    update_user varchar(255)                 not null default '' comment '更新人'
+    create_user varchar(255)                 not null default '' comment '创建人',
+    update_user varchar(255)                 not null default '' comment '更新人',
+    tenant_id    varchar(255)                 not null default '' comment '租户id'
 ) comment '设备分组表';
 
 
@@ -48,7 +48,6 @@ create table iot_mod_group
 (
     id          bigint unsigned auto_increment primary key,
     company_id  bigint unsigned             not null default 0 comment '所属客户id',
-    tenant_id    varchar(255)                 not null default '' comment '租户id',
     mode_group_code  varchar(255)           not null default '' comment '物理模型分组码值唯一标识',
     name        varchar(255)                not null default '' comment '物模型分组名称',
     create_time datetime                    not null default CURRENT_TIMESTAMP comment '创建时间',
@@ -56,6 +55,7 @@ create table iot_mod_group
     del_flag    tinyint                     not null default 0 comment '0-未删除，1-删除',
     create_user varchar(255)                not null default '' comment '创建人',
     update_user varchar(255)                not null default '' comment '修改人',
+    tenant_id    varchar(255)                 not null default '' comment '租户id',
     constraint name unique (mode_group_code)
 ) comment '物理模型分组表';
 
@@ -64,7 +64,6 @@ create table iot_mod_group
 create table iot_mod
 (
     id          bigint unsigned auto_increment primary key,
-    tenant_id    varchar(255)                 not null default '' comment '租户id',
     mod_code    varchar(255)                            not null default '' comment '物理模型码值',
     company_id  bigint unsigned                         not null default 0  comment '所属客户id',
     mode_group_code  varchar(255)                       not null default '' comment '物模型分组码值',
@@ -79,7 +78,8 @@ create table iot_mod
     create_user varchar(255)                            not null default '' comment '创建人',
     update_user varchar(255)                            not null default '' comment '更新人',
     create_time datetime                                not null default current_timestamp comment '创建时间',
-    update_time datetime                                not null default current_timestamp on update CURRENT_TIMESTAMP comment '更新时间'
+    update_time datetime                                not null default current_timestamp on update CURRENT_TIMESTAMP comment '更新时间',
+    tenant_id    varchar(255)                 not null default '' comment '租户id'
 )comment '物模型lot表' ;
 
 create table iot_device_error
@@ -90,13 +90,11 @@ create table iot_device_error
     error_reason   text                      null                  comment '设备异常原因',
     create_time datetime                     not null default current_timestamp comment '创建时间',
     update_time datetime                     not null default current_timestamp on update CURRENT_TIMESTAMP comment '更新时间'
-
 )comment '设备异常记录表';
 
 create table iot_mod_error
 (
-    id          bigint unsigned auto_increment
-        primary key,
+    id       bigint unsigned auto_increment  primary key,
     mod_code varchar(255)                    not null default ''  comment '物理模型编号',
     error_reason   text                      null                 comment '设备异常原因',
     create_time datetime                     not null default current_timestamp comment '创建时间',
@@ -105,22 +103,20 @@ create table iot_mod_error
 
 create table time_Series_database_mapping
 (
-    id          bigint unsigned auto_increment
-        primary key,
-    tenant_id                varchar(255)                  not null default '' comment '租户id',
+    id        bigint unsigned auto_increment               primary key,
     time_Series_table_name   varchar(255)                   not null default ''  comment '时序数据库子表名称',
     time_Series_super_name   varchar(255)                   not null default ''  comment '时序数据库超级表名称',
     guid                     varchar(255)                   not null default '' comment 'guid',
     create_time              datetime                       not null default current_timestamp comment '创建时间',
-    update_time              datetime                       not null default current_timestamp on update CURRENT_TIMESTAMP comment '更新时间'
+    update_time              datetime                       not null default current_timestamp on update CURRENT_TIMESTAMP comment '更新时间',
+    tenant_id                varchar(255)                  not null default '' comment '租户id'
 )comment '时序数据库和关系型数据库映射表';
 
 
 
 create table saas_equipment_manage
 (
-    id                       int unsigned auto_increment
-        primary key,
+    id                       int unsigned auto_increment  primary key,
     device_name              varchar(60)              not null default '' comment '设备名称',
     equipment_type           varchar(100)             not null default '' comment '设备类型',
     energy_type              tinyint(1)               not null default 1  comment '能源形式',
@@ -132,8 +128,7 @@ create table saas_equipment_manage
     create_time              datetime                 not null default current_timestamp comment '创建时间',
     update_time              datetime                 not null default current_timestamp on update current_timestamp comment '更新时间'
 
-)
-    comment '设备基础管理表(关联物联网ID)';
+)comment '设备基础管理表(关联物联网ID)';
 
 create index energy_type
     on saas_equipment_manage (energy_type);