Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblBreakdownController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblDatapointController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentOrganizationalController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentSbookController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblGatewayController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblModbusRtuController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblModbusTcpController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblMqttController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleExecuteController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleFilterController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblSensorSbookController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblVideoController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblVideoDetailController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/controller/TblWarnController.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblBreakdown.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblDatapoint.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipment.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentOrganizational.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentSbook.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblGateway.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblModbusRtu.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblModbusTcp.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblMqtt.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRule.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRuleExecute.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRuleFilter.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblSensorSbook.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblVideo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblVideoDetail.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/TblWarn.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblBreakdownBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblDatapointBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentOrganizationalBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentSbookBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblGatewayBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusRtuBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusTcpBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblMqttBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleExecuteBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleFilterBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSensorSbookBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoDetailBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblWarnBo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblBreakdownVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblDatapointVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentOrganizationalVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentSbookVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblGatewayVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblModbusRtuVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblModbusTcpVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblMqttVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleExecuteVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleFilterVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblSensorSbookVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblVideoDetailVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblVideoVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblWarnVo.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblBreakdownMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblDatapointMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentOrganizationalMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentSbookMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblGatewayMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblModbusRtuMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblModbusTcpMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblMqttMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblRuleExecuteMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblRuleFilterMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblRuleMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblSensorSbookMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblVideoDetailMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblVideoMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblWarnMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblBreakdownService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblDatapointService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblEquipmentOrganizationalService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblEquipmentSbookService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblEquipmentService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblGatewayService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblModbusRtuService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblModbusTcpService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblMqttService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblRuleExecuteService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblRuleFilterService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblRuleService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblSensorSbookService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblVideoDetailService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblVideoService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/ITblWarnService.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblBreakdownServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblDatapointServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblEquipmentOrganizationalServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblEquipmentSbookServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblEquipmentServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblGatewayServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblModbusRtuServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblModbusTcpServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblMqttServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblRuleExecuteServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblRuleFilterServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblRuleServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblSensorSbookServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblVideoDetailServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblVideoServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblWarnServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/data/TblBreakdownMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblDatapointMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblEquipmentMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblEquipmentOrganizationalMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblEquipmentSbookMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblGatewayMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblModbusRtuMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblModbusTcpMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblMqttMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblRuleExecuteMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblRuleFilterMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblRuleMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblSensorSbookMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblVideoDetailMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblVideoMapper.xml
#	ruoyi-system/src/main/resources/mapper/data/TblWarnMapper.xml
#	ruoyi-ui-vue3/src/views/data/mqtt/index.vue

ruoyi-common/pom.xml

@@ -165,6 +165,12 @@
             <artifactId>ip2region</artifactId>
         </dependency>
 
+        <!--            mqtt消息队列-->
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-mqtt</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/src/main/java/com/ruoyi/common/utils/mqtt/Callback.java

@@ -0,0 +1,44 @@
+package com.ruoyi.common.utils.mqtt;
+
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
+import org.eclipse.paho.client.mqttv3.MqttCallback;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+
+/**
+ * 常规MQTT回调函数
+ *
+ * @author Mr.Qu
+ * @since 2020/1/9 16:26
+ */
+@Slf4j
+public class Callback implements MqttCallback {
+
+    /**
+     * MQTT 断开连接会执行此方法
+     */
+    @Override
+    public void connectionLost(Throwable throwable) {
+        log.info("断开了MQTT连接 ：{}", throwable.getMessage());
+        log.error(throwable.getMessage(), throwable);
+    }
+
+    /**
+     * publish发布成功后会执行到这里
+     */
+    @Override
+    public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
+        log.info("发布消息成功");
+    }
+
+    /**
+     * subscribe订阅后得到的消息会执行到这里
+     */
+    @Override
+    public void messageArrived(String topic, MqttMessage message) throws Exception {
+        //  TODO    此处可以将订阅得到的消息进行业务处理、数据存储
+        log.info("收到来自 " + topic + " 的消息：{}", new String(message.getPayload()));
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/mqtt/MQTTConnect.java

@@ -0,0 +1,120 @@
+package com.ruoyi.common.utils.mqtt;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.*;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * MQTT工具类操作
+ *
+ * @author Mr.Qu
+ * @since v1.1.0 2020-01-10
+ */
+@Slf4j
+@Component
+public class MQTTConnect {
+
+    private MqttClient mqttClient;
+
+    /**
+     * 客户端connect连接mqtt服务器
+     *
+     * @param userName     用户名
+     * @param passWord     密码
+     * @param mqttCallback 回调函数
+     **/
+    public void setMqttClient(String Host,String clientId,String userName, String passWord, MqttCallback mqttCallback) throws MqttException {
+        MqttConnectOptions options = mqttConnectOptions(Host,clientId,userName, passWord);
+        if (mqttCallback == null) {
+            mqttClient.setCallback(new Callback());
+        } else {
+            mqttClient.setCallback(mqttCallback);
+        }
+        mqttClient.connect(options);
+    }
+
+    /**
+     * MQTT连接参数设置
+     */
+    private MqttConnectOptions mqttConnectOptions(String host,String clientId,String userName, String passWord) throws MqttException {
+        mqttClient = new MqttClient(host, clientId, new MemoryPersistence());
+        MqttConnectOptions options = new MqttConnectOptions();
+        options.setUserName(userName);
+        options.setPassword(passWord.toCharArray());
+        options.setConnectionTimeout(10);///默认：30
+        options.setAutomaticReconnect(true);//默认：false
+        options.setCleanSession(false);//默认：true
+        //options.setKeepAliveInterval(20);//默认：60
+        return options;
+    }
+
+    /**
+     * 关闭MQTT连接
+     */
+    public void close() throws MqttException {
+        mqttClient.disconnect();
+        mqttClient.close();
+    }
+
+    /**
+     * 向某个主题发布消息 默认qos：1
+     *
+     * @param topic:发布的主题
+     * @param msg：发布的消息
+     */
+    public void pub(String topic, String msg) throws MqttException {
+        MqttMessage mqttMessage = new MqttMessage();
+        //mqttMessage.setQos(2);
+        mqttMessage.setPayload(msg.getBytes());
+        MqttTopic mqttTopic = mqttClient.getTopic(topic);
+        MqttDeliveryToken token = mqttTopic.publish(mqttMessage);
+        token.waitForCompletion();
+    }
+
+    /**
+     * 向某个主题发布消息
+     *
+     * @param topic: 发布的主题
+     * @param msg:   发布的消息
+     * @param qos:   消息质量    Qos：0、1、2
+     */
+    public void pub(String topic, String msg, int qos) throws MqttException {
+        MqttMessage mqttMessage = new MqttMessage();
+        mqttMessage.setQos(qos);
+        mqttMessage.setPayload(msg.getBytes());
+        MqttTopic mqttTopic = mqttClient.getTopic(topic);
+        MqttDeliveryToken token = mqttTopic.publish(mqttMessage);
+        token.waitForCompletion();
+    }
+
+    /**
+     * 订阅某一个主题 ，此方法默认的的Qos等级为：1
+     *
+     * @param topic 主题
+     */
+    public void sub(String topic) throws MqttException {
+        mqttClient.subscribe(topic);
+    }
+
+    /**
+     * 订阅某一个主题，可携带Qos
+     *
+     * @param topic 所要订阅的主题
+     * @param qos   消息质量：0、1、2
+     */
+    public void sub(String topic, int qos) throws MqttException {
+        mqttClient.subscribe(topic, qos);
+    }
+
+    /**
+     * main函数自己测试用
+     */
+//    public static void main(String[] args) throws MqttException {
+//        MQTTConnect mqttConnect = new MQTTConnect();
+//        mqttConnect.setMqttClient("admin", "public", new Callback());
+//        mqttConnect.sub("com/iot/init");
+//        mqttConnect.pub("com/iot/init", "Mr.Qu" + (int) (Math.random() * 100000000));
+//    }
+}

ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java

@@ -34,6 +34,7 @@ public class SecurityConfig {
                     , adminContextPath + "/login"
                     , "/actuator"
                     , "/actuator/**"
+                    ,"/data/**"
                 ).permitAll()
                 .anyRequest().authenticated()
                 .and()

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblBreakdownController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 故障管理
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblBreakdownController extends BaseController {
     @SaCheckPermission("data:breakdown:query")
     @GetMapping("/{id}")
     public R<TblBreakdownVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblBreakdownService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblBreakdownController extends BaseController {
     @Log(title = "故障管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblBreakdownService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblDatapointController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 点位数据
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblDatapointController extends BaseController {
     @SaCheckPermission("data:datapoint:query")
     @GetMapping("/{id}")
     public R<TblDatapointVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblDatapointService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblDatapointController extends BaseController {
     @Log(title = "点位数据", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblDatapointService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentCodeController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.data.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.data.domain.vo.TblEquipmentCodeVo;
+import com.ruoyi.data.domain.bo.TblEquipmentCodeBo;
+import com.ruoyi.data.service.ITblEquipmentCodeService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 设备编码
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/data/equipmentCode")
+public class TblEquipmentCodeController extends BaseController {
+
+    private final ITblEquipmentCodeService iTblEquipmentCodeService;
+
+    /**
+     * 查询设备编码列表
+     */
+    @SaCheckPermission("data:equipmentCode:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblEquipmentCodeVo> list(TblEquipmentCodeBo bo, PageQuery pageQuery) {
+        return iTblEquipmentCodeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备编码列表
+     */
+    @SaCheckPermission("data:equipmentCode:export")
+    @Log(title = "设备编码", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblEquipmentCodeBo bo, HttpServletResponse response) {
+        List<TblEquipmentCodeVo> list = iTblEquipmentCodeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备编码", TblEquipmentCodeVo.class, response);
+    }
+
+    /**
+     * 获取设备编码详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("data:equipmentCode:query")
+    @GetMapping("/{id}")
+    public R<TblEquipmentCodeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iTblEquipmentCodeService.queryById(id));
+    }
+
+    /**
+     * 新增设备编码
+     */
+    @SaCheckPermission("data:equipmentCode:add")
+    @Log(title = "设备编码", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblEquipmentCodeBo bo) {
+        return toAjax(iTblEquipmentCodeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备编码
+     */
+    @SaCheckPermission("data:equipmentCode:edit")
+    @Log(title = "设备编码", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblEquipmentCodeBo bo) {
+        return toAjax(iTblEquipmentCodeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备编码
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("data:equipmentCode:remove")
+    @Log(title = "设备编码", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iTblEquipmentCodeService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 设备
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblEquipmentController extends BaseController {
     @SaCheckPermission("data:equipment:query")
     @GetMapping("/{id}")
     public R<TblEquipmentVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblEquipmentService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblEquipmentController extends BaseController {
     @Log(title = "设备", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblEquipmentService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentOrganizationalController.java

@@ -23,13 +23,12 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.data.domain.vo.TblEquipmentOrganizationalVo;
 import com.ruoyi.data.domain.bo.TblEquipmentOrganizationalBo;
 import com.ruoyi.data.service.ITblEquipmentOrganizationalService;
-import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 设备组织机构
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -44,8 +43,9 @@ public class TblEquipmentOrganizationalController extends BaseController {
      */
     @SaCheckPermission("data:equipmentOrganizational:list")
     @GetMapping("/list")
-    public TableDataInfo<TblEquipmentOrganizationalVo> list(TblEquipmentOrganizationalBo bo, PageQuery pageQuery) {
-        return iTblEquipmentOrganizationalService.queryPageList(bo, pageQuery);
+    public R<List<TblEquipmentOrganizationalVo>> list(TblEquipmentOrganizationalBo bo) {
+        List<TblEquipmentOrganizationalVo> list = iTblEquipmentOrganizationalService.queryList(bo);
+        return R.ok(list);
     }
 
     /**
@@ -67,7 +67,7 @@ public class TblEquipmentOrganizationalController extends BaseController {
     @SaCheckPermission("data:equipmentOrganizational:query")
     @GetMapping("/{id}")
     public R<TblEquipmentOrganizationalVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblEquipmentOrganizationalService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblEquipmentOrganizationalController extends BaseController {
     @Log(title = "设备组织机构", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblEquipmentOrganizationalService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentSbookController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 设备台账
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblEquipmentSbookController extends BaseController {
     @SaCheckPermission("data:equipmentSbook:query")
     @GetMapping("/{id}")
     public R<TblEquipmentSbookVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblEquipmentSbookService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblEquipmentSbookController extends BaseController {
     @Log(title = "设备台账", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblEquipmentSbookService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentSenesorController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.data.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.data.domain.vo.TblEquipmentSenesorVo;
+import com.ruoyi.data.domain.bo.TblEquipmentSenesorBo;
+import com.ruoyi.data.service.ITblEquipmentSenesorService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 设备传感器连接
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/data/equipmentSenesor")
+public class TblEquipmentSenesorController extends BaseController {
+
+    private final ITblEquipmentSenesorService iTblEquipmentSenesorService;
+
+    /**
+     * 查询设备传感器连接列表
+     */
+    @SaCheckPermission("data:equipmentSenesor:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblEquipmentSenesorVo> list(TblEquipmentSenesorBo bo, PageQuery pageQuery) {
+        return iTblEquipmentSenesorService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备传感器连接列表
+     */
+    @SaCheckPermission("data:equipmentSenesor:export")
+    @Log(title = "设备传感器连接", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblEquipmentSenesorBo bo, HttpServletResponse response) {
+        List<TblEquipmentSenesorVo> list = iTblEquipmentSenesorService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备传感器连接", TblEquipmentSenesorVo.class, response);
+    }
+
+    /**
+     * 获取设备传感器连接详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("data:equipmentSenesor:query")
+    @GetMapping("/{id}")
+    public R<TblEquipmentSenesorVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iTblEquipmentSenesorService.queryById(id));
+    }
+
+    /**
+     * 新增设备传感器连接
+     */
+    @SaCheckPermission("data:equipmentSenesor:add")
+    @Log(title = "设备传感器连接", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblEquipmentSenesorBo bo) {
+        return toAjax(iTblEquipmentSenesorService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备传感器连接
+     */
+    @SaCheckPermission("data:equipmentSenesor:edit")
+    @Log(title = "设备传感器连接", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblEquipmentSenesorBo bo) {
+        return toAjax(iTblEquipmentSenesorService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备传感器连接
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("data:equipmentSenesor:remove")
+    @Log(title = "设备传感器连接", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iTblEquipmentSenesorService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentTagController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.data.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.data.domain.vo.TblEquipmentTagVo;
+import com.ruoyi.data.domain.bo.TblEquipmentTagBo;
+import com.ruoyi.data.service.ITblEquipmentTagService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 设备标签
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/data/equipmentTag")
+public class TblEquipmentTagController extends BaseController {
+
+    private final ITblEquipmentTagService iTblEquipmentTagService;
+
+    /**
+     * 查询设备标签列表
+     */
+    @SaCheckPermission("data:equipmentTag:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblEquipmentTagVo> list(TblEquipmentTagBo bo, PageQuery pageQuery) {
+        return iTblEquipmentTagService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备标签列表
+     */
+    @SaCheckPermission("data:equipmentTag:export")
+    @Log(title = "设备标签", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblEquipmentTagBo bo, HttpServletResponse response) {
+        List<TblEquipmentTagVo> list = iTblEquipmentTagService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备标签", TblEquipmentTagVo.class, response);
+    }
+
+    /**
+     * 获取设备标签详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("data:equipmentTag:query")
+    @GetMapping("/{id}")
+    public R<TblEquipmentTagVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iTblEquipmentTagService.queryById(id));
+    }
+
+    /**
+     * 新增设备标签
+     */
+    @SaCheckPermission("data:equipmentTag:add")
+    @Log(title = "设备标签", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblEquipmentTagBo bo) {
+        return toAjax(iTblEquipmentTagService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备标签
+     */
+    @SaCheckPermission("data:equipmentTag:edit")
+    @Log(title = "设备标签", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblEquipmentTagBo bo) {
+        return toAjax(iTblEquipmentTagService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备标签
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("data:equipmentTag:remove")
+    @Log(title = "设备标签", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iTblEquipmentTagService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblGatewayController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 网关管理
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblGatewayController extends BaseController {
     @SaCheckPermission("data:gateway:query")
     @GetMapping("/{id}")
     public R<TblGatewayVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblGatewayService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblGatewayController extends BaseController {
     @Log(title = "网关管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblGatewayService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblModbusRtuController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * modbus_rtu配置
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblModbusRtuController extends BaseController {
     @SaCheckPermission("data:modbusRtu:query")
     @GetMapping("/{id}")
     public R<TblModbusRtuVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblModbusRtuService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblModbusRtuController extends BaseController {
     @Log(title = "modbus_rtu配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblModbusRtuService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblModbusTcpController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * modbus_tcp协议配置
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblModbusTcpController extends BaseController {
     @SaCheckPermission("data:modbusTcp:query")
     @GetMapping("/{id}")
     public R<TblModbusTcpVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblModbusTcpService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblModbusTcpController extends BaseController {
     @Log(title = "modbus_tcp协议配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblModbusTcpService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblMqttController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * mqtt配置
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblMqttController extends BaseController {
     @SaCheckPermission("data:mqtt:query")
     @GetMapping("/{id}")
     public R<TblMqttVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblMqttService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblMqttController extends BaseController {
     @Log(title = "mqtt配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblMqttService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 规则
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblRuleController extends BaseController {
     @SaCheckPermission("data:rule:query")
     @GetMapping("/{id}")
     public R<TblRuleVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblRuleService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblRuleController extends BaseController {
     @Log(title = "规则", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblRuleService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleExecuteController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 规则条件列
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblRuleFilterController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 规则执行列
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblSeneorController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.data.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.data.domain.vo.TblSeneorVo;
+import com.ruoyi.data.domain.bo.TblSeneorBo;
+import com.ruoyi.data.service.ITblSeneorService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 传感器列
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/data/seneor")
+public class TblSeneorController extends BaseController {
+
+    private final ITblSeneorService iTblSeneorService;
+
+    /**
+     * 查询传感器列列表
+     */
+    @SaCheckPermission("data:seneor:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblSeneorVo> list(TblSeneorBo bo, PageQuery pageQuery) {
+        return iTblSeneorService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出传感器列列表
+     */
+    @SaCheckPermission("data:seneor:export")
+    @Log(title = "传感器列", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblSeneorBo bo, HttpServletResponse response) {
+        List<TblSeneorVo> list = iTblSeneorService.queryList(bo);
+        ExcelUtil.exportExcel(list, "传感器列", TblSeneorVo.class, response);
+    }
+
+    /**
+     * 获取传感器列详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("data:seneor:query")
+    @GetMapping("/{id}")
+    public R<TblSeneorVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iTblSeneorService.queryById(id));
+    }
+
+    /**
+     * 新增传感器列
+     */
+    @SaCheckPermission("data:seneor:add")
+    @Log(title = "传感器列", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblSeneorBo bo) {
+        return toAjax(iTblSeneorService.insertByBo(bo));
+    }
+
+    /**
+     * 修改传感器列
+     */
+    @SaCheckPermission("data:seneor:edit")
+    @Log(title = "传感器列", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblSeneorBo bo) {
+        return toAjax(iTblSeneorService.updateByBo(bo));
+    }
+
+    /**
+     * 删除传感器列
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("data:seneor:remove")
+    @Log(title = "传感器列", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iTblSeneorService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblSensorSbookController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 传感器台账
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblSensorSbookController extends BaseController {
     @SaCheckPermission("data:sensorSbook:query")
     @GetMapping("/{id}")
     public R<TblSensorSbookVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblSensorSbookService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblSensorSbookController extends BaseController {
     @Log(title = "传感器台账", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblSensorSbookService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblUnitController.java

@@ -0,0 +1,108 @@
+package com.ruoyi.data.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.data.domain.vo.TblUnitVo;
+import com.ruoyi.data.domain.bo.TblUnitBo;
+import com.ruoyi.data.service.ITblUnitService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 单位
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/data/unit")
+public class TblUnitController extends BaseController {
+
+    private final ITblUnitService iTblUnitService;
+
+    /**
+     * 查询单位列表
+     */
+    @SaCheckPermission("data:unit:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblUnitVo> list(TblUnitBo bo, PageQuery pageQuery) {
+        return iTblUnitService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出单位列表
+     */
+    @SaCheckPermission("data:unit:export")
+    @Log(title = "单位", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblUnitBo bo, HttpServletResponse response) {
+        List<TblUnitVo> list = iTblUnitService.queryList(bo);
+        ExcelUtil.exportExcel(list, "单位", TblUnitVo.class, response);
+    }
+
+    /**
+     * 获取单位详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("data:unit:query")
+    @GetMapping("/{id}")
+    public R<TblUnitVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iTblUnitService.queryById(id));
+    }
+
+    /**
+     * 新增单位
+     */
+    @SaCheckPermission("data:unit:add")
+    @Log(title = "单位", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblUnitBo bo) {
+        return toAjax(iTblUnitService.insertByBo(bo));
+    }
+
+    /**
+     * 修改单位
+     */
+    @SaCheckPermission("data:unit:edit")
+    @Log(title = "单位", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblUnitBo bo) {
+        return toAjax(iTblUnitService.updateByBo(bo));
+    }
+
+    /**
+     * 删除单位
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("data:unit:remove")
+    @Log(title = "单位", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iTblUnitService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblVideoController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 视频
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblVideoController extends BaseController {
     @SaCheckPermission("data:video:query")
     @GetMapping("/{id}")
     public R<TblVideoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblVideoService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblVideoController extends BaseController {
     @Log(title = "视频", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblVideoService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblVideoDetailController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 摄像机详情
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblVideoDetailController extends BaseController {
     @SaCheckPermission("data:videoDetail:query")
     @GetMapping("/{id}")
     public R<TblVideoDetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblVideoDetailService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblVideoDetailController extends BaseController {
     @Log(title = "摄像机详情", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblVideoDetailService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblWarnController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 告警管理
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class TblWarnController extends BaseController {
     @SaCheckPermission("data:warn:query")
     @GetMapping("/{id}")
     public R<TblWarnVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iTblWarnService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class TblWarnController extends BaseController {
     @Log(title = "告警管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iTblWarnService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblBreakdown.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 故障管理对象 tbl_breakdown
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblBreakdown extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 故障名称
      */
@@ -40,7 +40,7 @@ public class TblBreakdown extends BaseEntity {
     /**
      * 设备id
      */
-    private String equipmentId;
+    private Long equipmentId;
     /**
      * 故障设备
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblDatapoint.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 点位数据对象 tbl_datapoint
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblDatapoint extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 名称
      */
@@ -36,7 +36,7 @@ public class TblDatapoint extends BaseEntity {
     /**
      * 设备id
      */
-    private String deviceId;
+    private Long deviceId;
     /**
      * 数据类型
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipment.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 设备对象 tbl_equipment
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblEquipment extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 设备名称
      */
@@ -52,7 +52,7 @@ public class TblEquipment extends BaseEntity {
     /**
      * 设备分类
      */
-    private String equipmentTypeId;
+    private Long equipmentTypeId;
     /**
      * 生产商
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentCode.java

@@ -0,0 +1,51 @@
+package com.ruoyi.data.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备编码对象 tbl_equipment_code
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_equipment_code")
+public class TblEquipmentCode extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 设备信息
+     */
+    private String equipmentInfoId;
+    /**
+     * 前缀
+     */
+    private String prefix;
+    /**
+     * 编码序号规则
+     */
+    private String serialNumRule;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentOrganizational.java

@@ -9,18 +9,18 @@ import java.math.BigDecimal;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.TreeEntity;
 
 /**
  * 设备组织机构对象 tbl_equipment_organizational
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("tbl_equipment_organizational")
-public class TblEquipmentOrganizational extends BaseEntity {
+public class TblEquipmentOrganizational extends TreeEntity<TblEquipmentOrganizational> {
 
     private static final long serialVersionUID=1L;
 
@@ -28,16 +28,12 @@ public class TblEquipmentOrganizational extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 区域编码
      */
     private String sn;
     /**
-     * 上层位置
-     */
-    private String parentId;
-    /**
      * 区域名称
      */
     private String name;

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentSbook.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 设备台账对象 tbl_equipment_sbook
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,11 +28,11 @@ public class TblEquipmentSbook extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 上层位置
      */
-    private String equipmentTreeId;
+    private Long equipmentTreeId;
     /**
      * 设备编码
      */
@@ -60,7 +60,7 @@ public class TblEquipmentSbook extends BaseEntity {
     /**
      * 所属类型
      */
-    private String equipmentTypeId;
+    private Long equipmentTypeId;
     /**
      * 负责人
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentSenesor.java

@@ -0,0 +1,39 @@
+package com.ruoyi.data.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备传感器连接对象 tbl_equipment_senesor
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_equipment_senesor")
+public class TblEquipmentSenesor extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 设备Id
+     */
+    private Long equipmentId;
+    /**
+     * 传感器Id
+     */
+    private Long sensorId;
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentTag.java

@@ -0,0 +1,43 @@
+package com.ruoyi.data.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备标签对象 tbl_equipment_tag
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_equipment_tag")
+public class TblEquipmentTag extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 编码
+     */
+    private String sn;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblGateway.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 网关管理对象 tbl_gateway
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblGateway extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 序列号
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblModbusRtu.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * modbus_rtu配置对象 tbl_modbus_rtu
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblModbusRtu extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblModbusTcp.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * modbus_tcp协议配置对象 tbl_modbus_tcp
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblModbusTcp extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 协议名称
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblMqtt.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * mqtt配置对象 tbl_mqtt
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblMqtt extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 协议名称
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRule.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 规则对象 tbl_rule
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblRule extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 规则编号
      */
@@ -44,11 +44,11 @@ public class TblRule extends BaseEntity {
     /**
      * 设备ID
      */
-    private String equipmentId;
+    private Long equipmentId;
     /**
      * 传感器Id
      */
-    private String sensorId;
+    private Long sensorId;
     /**
      * 时间
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRuleExecute.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 规则条件列对象 tbl_rule_execute
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -40,7 +40,7 @@ public class TblRuleExecute extends BaseEntity {
     /**
      * 设备ID
      */
-    private String equipmentId;
+    private Long equipmentId;
     /**
      * 执行动作
      */
@@ -73,5 +73,13 @@ public class TblRuleExecute extends BaseEntity {
      * 
      */
     private String expr2;
+    /**
+     * 规则id
+     */
+    private Long ruleId;
+    /**
+     * 条件id
+     */
+    private Long executeId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblRuleFilter.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 规则执行列对象 tbl_rule_filter
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblSeneor.java

@@ -0,0 +1,55 @@
+package com.ruoyi.data.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 传感器列对象 tbl_seneor
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_seneor")
+public class TblSeneor extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 传感器名称
+     */
+    private String name;
+    /**
+     * 传感器编号
+     */
+    private String sn;
+    /**
+     * 传感器类型
+     */
+    private String sensorType;
+    /**
+     * 描述
+     */
+    private String sensorDesc;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblSensorSbook.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 传感器台账对象 tbl_sensor_sbook
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblSensorSbook extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 编号
      */
@@ -40,11 +40,11 @@ public class TblSensorSbook extends BaseEntity {
     /**
      * 上层位置
      */
-    private String equipmentTreeId;
+    private Long equipmentTreeId;
     /**
      * 设备ID
      */
-    private String equipmentId;
+    private Long equipmentId;
     /**
      * 设备名称
      */
@@ -60,7 +60,7 @@ public class TblSensorSbook extends BaseEntity {
     /**
      * 点表
      */
-    private String datapointId;
+    private Long datapointId;
     /**
      * 单位
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblUnit.java

@@ -0,0 +1,81 @@
+package com.ruoyi.data.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 单位对象 tbl_unit
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_unit")
+public class TblUnit extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 
+     */
+    private String name;
+    /**
+     * 
+     */
+    private String unitSymbol;
+    /**
+     * 
+     */
+    private String unitName;
+    /**
+     * 
+     */
+    private String isStandard;
+    /**
+     * 
+     */
+    private String unitType;
+    /**
+     * 
+     */
+    private Long toStandardRatio;
+    /**
+     * 
+     */
+    private Long toOffset;
+    /**
+     * 
+     */
+    private String remark;
+    /**
+     * 
+     */
+    private String creator;
+    /**
+     * 
+     */
+    private Date ctime;
+    /**
+     * 
+     */
+    private String modifier;
+    /**
+     * 
+     */
+    private Date utime;
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblVideo.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 视频对象 tbl_video
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblVideo extends BaseEntity {
      * id
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 摄像头名称
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblVideoDetail.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 摄像机详情对象 tbl_video_detail
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblVideoDetail extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 视频通道输入号
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblWarn.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 告警管理对象 tbl_warn
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class TblWarn extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 告警名称
      */
@@ -40,7 +40,7 @@ public class TblWarn extends BaseEntity {
     /**
      * 设备id
      */
-    private String equipmentId;
+    private Long equipmentId;
     /**
      * 告警设备
      */

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblBreakdownBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 故障管理业务对象 tbl_breakdown
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblBreakdownBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 故障名称
@@ -44,8 +44,8 @@ public class TblBreakdownBo extends BaseEntity {
     /**
      * 设备id
      */
-    @NotBlank(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentId;
+    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
 
     /**
      * 故障设备

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblDatapointBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 点位数据业务对象 tbl_datapoint
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblDatapointBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 名称
@@ -38,8 +38,8 @@ public class TblDatapointBo extends BaseEntity {
     /**
      * 设备id
      */
-    @NotBlank(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String deviceId;
+    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long deviceId;
 
     /**
      * 数据类型

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 设备业务对象 tbl_equipment
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblEquipmentBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 设备名称
@@ -62,8 +62,8 @@ public class TblEquipmentBo extends BaseEntity {
     /**
      * 设备分类
      */
-    @NotBlank(message = "设备分类不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentTypeId;
+    @NotNull(message = "设备分类不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentTypeId;
 
     /**
      * 生产商

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentCodeBo.java

@@ -0,0 +1,61 @@
+package com.ruoyi.data.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备编码业务对象 tbl_equipment_code
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TblEquipmentCodeBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 设备信息
+     */
+    @NotBlank(message = "设备信息不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String equipmentInfoId;
+
+    /**
+     * 前缀
+     */
+    @NotBlank(message = "前缀不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String prefix;
+
+    /**
+     * 编码序号规则
+     */
+    @NotBlank(message = "编码序号规则不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String serialNumRule;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentOrganizationalBo.java

@@ -10,24 +10,24 @@ import java.util.Date;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.TreeEntity;
 
 /**
  * 设备组织机构业务对象 tbl_equipment_organizational
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class TblEquipmentOrganizationalBo extends BaseEntity {
+public class TblEquipmentOrganizationalBo extends TreeEntity<TblEquipmentOrganizationalBo> {
 
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 区域编码
@@ -36,12 +36,6 @@ public class TblEquipmentOrganizationalBo extends BaseEntity {
     private String sn;
 
     /**
-     * 上层位置
-     */
-    @NotBlank(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String parentId;
-
-    /**
      * 区域名称
      */
     @NotBlank(message = "区域名称不能为空", groups = { AddGroup.class, EditGroup.class })

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentSbookBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 设备台账业务对象 tbl_equipment_sbook
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,14 +26,14 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 上层位置
      */
-    @NotBlank(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentTreeId;
+    @NotNull(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentTreeId;
 
     /**
      * 设备编码
@@ -74,8 +74,8 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 所属类型
      */
-    @NotBlank(message = "所属类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentTypeId;
+    @NotNull(message = "所属类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentTypeId;
 
     /**
      * 负责人

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentSenesorBo.java

@@ -0,0 +1,43 @@
+package com.ruoyi.data.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备传感器连接业务对象 tbl_equipment_senesor
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TblEquipmentSenesorBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 设备Id
+     */
+    @NotNull(message = "设备Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
+
+    /**
+     * 传感器Id
+     */
+    @NotNull(message = "传感器Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sensorId;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentTagBo.java

@@ -0,0 +1,49 @@
+package com.ruoyi.data.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设备标签业务对象 tbl_equipment_tag
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TblEquipmentTagBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 编码
+     */
+    @NotBlank(message = "编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sn;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblGatewayBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 网关管理业务对象 tbl_gateway
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblGatewayBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 序列号

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusRtuBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * modbus_rtu配置业务对象 tbl_modbus_rtu
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblModbusRtuBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusTcpBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * modbus_tcp协议配置业务对象 tbl_modbus_tcp
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblModbusTcpBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 协议名称

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblMqttBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * mqtt配置业务对象 tbl_mqtt
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblMqttBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 协议名称

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 规则业务对象 tbl_rule
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblRuleBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 规则编号
@@ -50,14 +50,14 @@ public class TblRuleBo extends BaseEntity {
     /**
      * 设备ID
      */
-    @NotBlank(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentId;
+    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
 
     /**
      * 传感器Id
      */
-    @NotBlank(message = "传感器Id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String sensorId;
+    @NotNull(message = "传感器Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sensorId;
 
     /**
      * 时间

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleExecuteBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 规则条件列业务对象 tbl_rule_execute
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -44,8 +44,8 @@ public class TblRuleExecuteBo extends BaseEntity {
     /**
      * 设备ID
      */
-    @NotBlank(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentId;
+    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
 
     /**
      * 执行动作
@@ -95,5 +95,17 @@ public class TblRuleExecuteBo extends BaseEntity {
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
+    /**
+     * 规则id
+     */
+    @NotNull(message = "规则id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long ruleId;
+
+    /**
+     * 条件id
+     */
+    @NotNull(message = "条件id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long executeId;
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleFilterBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 规则执行列业务对象 tbl_rule_filter
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSeneorBo.java

@@ -0,0 +1,67 @@
+package com.ruoyi.data.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 传感器列业务对象 tbl_seneor
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TblSeneorBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 传感器名称
+     */
+    @NotBlank(message = "传感器名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 传感器编号
+     */
+    @NotBlank(message = "传感器编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sn;
+
+    /**
+     * 传感器类型
+     */
+    @NotBlank(message = "传感器类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sensorType;
+
+    /**
+     * 描述
+     */
+    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sensorDesc;
+
+    /**
+     * 状态
+     */
+    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSensorSbookBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 传感器台账业务对象 tbl_sensor_sbook
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 编号
@@ -44,14 +44,14 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 上层位置
      */
-    @NotBlank(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentTreeId;
+    @NotNull(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentTreeId;
 
     /**
      * 设备ID
      */
-    @NotBlank(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentId;
+    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
 
     /**
      * 设备名称
@@ -74,8 +74,8 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 点表
      */
-    @NotBlank(message = "点表不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String datapointId;
+    @NotNull(message = "点表不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long datapointId;
 
     /**
      * 单位

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblUnitBo.java

@@ -0,0 +1,105 @@
+package com.ruoyi.data.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 单位业务对象 tbl_unit
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TblUnitBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String unitSymbol;
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String unitName;
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isStandard;
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String unitType;
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long toStandardRatio;
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long toOffset;
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String creator;
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date ctime;
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String modifier;
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date utime;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 视频业务对象 tbl_video
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblVideoBo extends BaseEntity {
     /**
      * id
      */
-    @NotBlank(message = "id不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 摄像头名称

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoDetailBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 摄像机详情业务对象 tbl_video_detail
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblVideoDetailBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 视频通道输入号

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblWarnBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 告警管理业务对象 tbl_warn
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 
 @Data
@@ -26,8 +26,8 @@ public class TblWarnBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 告警名称
@@ -44,8 +44,8 @@ public class TblWarnBo extends BaseEntity {
     /**
      * 设备id
      */
-    @NotBlank(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String equipmentId;
+    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long equipmentId;
 
     /**
      * 告警设备

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblBreakdownVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 故障管理视图对象 tbl_breakdown
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblBreakdownVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 故障名称
@@ -45,7 +45,7 @@ public class TblBreakdownVo implements Serializable {
      * 设备id
      */
     @ExcelProperty(value = "设备id")
-    private String equipmentId;
+    private Long equipmentId;
 
     /**
      * 故障设备

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblDatapointVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 点位数据视图对象 tbl_datapoint
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblDatapointVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 名称
@@ -39,7 +39,7 @@ public class TblDatapointVo implements Serializable {
      * 设备id
      */
     @ExcelProperty(value = "设备id")
-    private String deviceId;
+    private Long deviceId;
 
     /**
      * 数据类型

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentCodeVo.java

@@ -0,0 +1,61 @@
+package com.ruoyi.data.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 设备编码视图对象 tbl_equipment_code
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class TblEquipmentCodeVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * 设备信息
+     */
+    @ExcelProperty(value = "设备信息")
+    private String equipmentInfoId;
+
+    /**
+     * 前缀
+     */
+    @ExcelProperty(value = "前缀")
+    private String prefix;
+
+    /**
+     * 编码序号规则
+     */
+    @ExcelProperty(value = "编码序号规则")
+    private String serialNumRule;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentOrganizationalVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 设备组织机构视图对象 tbl_equipment_organizational
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblEquipmentOrganizationalVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 区域编码
@@ -39,7 +39,7 @@ public class TblEquipmentOrganizationalVo implements Serializable {
      * 上层位置
      */
     @ExcelProperty(value = "上层位置")
-    private String parentId;
+    private Long parentId;
 
     /**
      * 区域名称

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentSbookVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 设备台账视图对象 tbl_equipment_sbook
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,13 +27,13 @@ public class TblEquipmentSbookVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 上层位置
      */
     @ExcelProperty(value = "上层位置")
-    private String equipmentTreeId;
+    private Long equipmentTreeId;
 
     /**
      * 设备编码
@@ -75,7 +75,7 @@ public class TblEquipmentSbookVo implements Serializable {
      * 所属类型
      */
     @ExcelProperty(value = "所属类型")
-    private String equipmentTypeId;
+    private Long equipmentTypeId;
 
     /**
      * 负责人

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentSenesorVo.java

@@ -0,0 +1,43 @@
+package com.ruoyi.data.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 设备传感器连接视图对象 tbl_equipment_senesor
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class TblEquipmentSenesorVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 设备Id
+     */
+    @ExcelProperty(value = "设备Id")
+    private Long equipmentId;
+
+    /**
+     * 传感器Id
+     */
+    @ExcelProperty(value = "传感器Id")
+    private Long sensorId;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentTagVo.java

@@ -0,0 +1,49 @@
+package com.ruoyi.data.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 设备标签视图对象 tbl_equipment_tag
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class TblEquipmentTagVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 编码
+     */
+    @ExcelProperty(value = "编码")
+    private String sn;
+
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 设备视图对象 tbl_equipment
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblEquipmentVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 设备名称
@@ -63,7 +63,7 @@ public class TblEquipmentVo implements Serializable {
      * 设备分类
      */
     @ExcelProperty(value = "设备分类")
-    private String equipmentTypeId;
+    private Long equipmentTypeId;
 
     /**
      * 生产商

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblGatewayVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 网关管理视图对象 tbl_gateway
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblGatewayVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 序列号

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblModbusRtuVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * modbus_rtu配置视图对象 tbl_modbus_rtu
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblModbusRtuVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblModbusTcpVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * modbus_tcp协议配置视图对象 tbl_modbus_tcp
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblModbusTcpVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 协议名称

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblMqttVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * mqtt配置视图对象 tbl_mqtt
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblMqttVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 协议名称

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleExecuteVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 规则条件列视图对象 tbl_rule_execute
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -45,7 +45,7 @@ public class TblRuleExecuteVo implements Serializable {
      * 设备ID
      */
     @ExcelProperty(value = "设备ID")
-    private String equipmentId;
+    private Long equipmentId;
 
     /**
      * 执行动作
@@ -95,5 +95,17 @@ public class TblRuleExecuteVo implements Serializable {
     @ExcelProperty(value = "")
     private String expr2;
 
+    /**
+     * 规则id
+     */
+    @ExcelProperty(value = "规则id")
+    private Long ruleId;
+
+    /**
+     * 条件id
+     */
+    @ExcelProperty(value = "条件id")
+    private Long executeId;
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleFilterVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 规则执行列视图对象 tbl_rule_filter
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblRuleVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 规则视图对象 tbl_rule
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblRuleVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 规则编号
@@ -51,13 +51,13 @@ public class TblRuleVo implements Serializable {
      * 设备ID
      */
     @ExcelProperty(value = "设备ID")
-    private String equipmentId;
+    private Long equipmentId;
 
     /**
      * 传感器Id
      */
     @ExcelProperty(value = "传感器Id")
-    private String sensorId;
+    private Long sensorId;
 
     /**
      * 时间

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblSeneorVo.java

@@ -0,0 +1,67 @@
+package com.ruoyi.data.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 传感器列视图对象 tbl_seneor
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class TblSeneorVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 传感器名称
+     */
+    @ExcelProperty(value = "传感器名称")
+    private String name;
+
+    /**
+     * 传感器编号
+     */
+    @ExcelProperty(value = "传感器编号")
+    private String sn;
+
+    /**
+     * 传感器类型
+     */
+    @ExcelProperty(value = "传感器类型")
+    private String sensorType;
+
+    /**
+     * 描述
+     */
+    @ExcelProperty(value = "描述")
+    private String sensorDesc;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblSensorSbookVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 传感器台账视图对象 tbl_sensor_sbook
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblSensorSbookVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 编号
@@ -45,13 +45,13 @@ public class TblSensorSbookVo implements Serializable {
      * 上层位置
      */
     @ExcelProperty(value = "上层位置")
-    private String equipmentTreeId;
+    private Long equipmentTreeId;
 
     /**
      * 设备ID
      */
     @ExcelProperty(value = "设备ID")
-    private String equipmentId;
+    private Long equipmentId;
 
     /**
      * 设备名称
@@ -75,7 +75,7 @@ public class TblSensorSbookVo implements Serializable {
      * 点表
      */
     @ExcelProperty(value = "点表")
-    private String datapointId;
+    private Long datapointId;
 
     /**
      * 单位

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblUnitVo.java

@@ -0,0 +1,105 @@
+package com.ruoyi.data.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 单位视图对象 tbl_unit
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class TblUnitVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String name;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String unitSymbol;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String unitName;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String isStandard;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String unitType;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long toStandardRatio;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long toOffset;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String remark;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String creator;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Date ctime;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String modifier;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Date utime;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblVideoDetailVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 摄像机详情视图对象 tbl_video_detail
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblVideoDetailVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 视频通道输入号

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblVideoVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 视频视图对象 tbl_video
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblVideoVo implements Serializable {
      * id
      */
     @ExcelProperty(value = "id")
-    private String id;
+    private Long id;
 
     /**
      * 摄像头名称

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblWarnVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 告警管理视图对象 tbl_warn
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class TblWarnVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
      * 告警名称
@@ -45,7 +45,7 @@ public class TblWarnVo implements Serializable {
      * 设备id
      */
     @ExcelProperty(value = "设备id")
-    private String equipmentId;
+    private Long equipmentId;
 
     /**
      * 告警设备

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblBreakdownMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 故障管理Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblBreakdownMapper extends BaseMapperPlus<TblBreakdownMapper, TblBreakdown, TblBreakdownVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblDatapointMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 点位数据Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblDatapointMapper extends BaseMapperPlus<TblDatapointMapper, TblDatapoint, TblDatapointVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentCodeMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.data.mapper;
+
+import com.ruoyi.data.domain.TblEquipmentCode;
+import com.ruoyi.data.domain.vo.TblEquipmentCodeVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备编码Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+public interface TblEquipmentCodeMapper extends BaseMapperPlus<TblEquipmentCodeMapper, TblEquipmentCode, TblEquipmentCodeVo> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblEquipmentMapper extends BaseMapperPlus<TblEquipmentMapper, TblEquipment, TblEquipmentVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentOrganizationalMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备组织机构Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblEquipmentOrganizationalMapper extends BaseMapperPlus<TblEquipmentOrganizationalMapper, TblEquipmentOrganizational, TblEquipmentOrganizationalVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentSbookMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 设备台账Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblEquipmentSbookMapper extends BaseMapperPlus<TblEquipmentSbookMapper, TblEquipmentSbook, TblEquipmentSbookVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentSenesorMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.data.mapper;
+
+import com.ruoyi.data.domain.TblEquipmentSenesor;
+import com.ruoyi.data.domain.vo.TblEquipmentSenesorVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备传感器连接Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+public interface TblEquipmentSenesorMapper extends BaseMapperPlus<TblEquipmentSenesorMapper, TblEquipmentSenesor, TblEquipmentSenesorVo> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentTagMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.data.mapper;
+
+import com.ruoyi.data.domain.TblEquipmentTag;
+import com.ruoyi.data.domain.vo.TblEquipmentTagVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备标签Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-11-28
+ */
+public interface TblEquipmentTagMapper extends BaseMapperPlus<TblEquipmentTagMapper, TblEquipmentTag, TblEquipmentTagVo> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblGatewayMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 网关管理Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblGatewayMapper extends BaseMapperPlus<TblGatewayMapper, TblGateway, TblGatewayVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblModbusRtuMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * modbus_rtu配置Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblModbusRtuMapper extends BaseMapperPlus<TblModbusRtuMapper, TblModbusRtu, TblModbusRtuVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblModbusTcpMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * modbus_tcp协议配置Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblModbusTcpMapper extends BaseMapperPlus<TblModbusTcpMapper, TblModbusTcp, TblModbusTcpVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblMqttMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * mqtt配置Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-24
+ * @date 2023-11-28
  */
 public interface TblMqttMapper extends BaseMapperPlus<TblMqttMapper, TblMqtt, TblMqttVo> {