diff --git a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/controller/TWTempertureDataController.java b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/controller/TWTempertureDataController.java
index 16b0fc1..ab8b13f 100644
--- a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/controller/TWTempertureDataController.java
+++ b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/controller/TWTempertureDataController.java
@@ -31,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 物联网实时数据Controller
- * 
+ *
  * @author Caoql
  * @date 2024-08-21
  */
@@ -70,7 +70,7 @@ public class TWTempertureDataController extends BaseController
         EmsIOTData emsIOTData = new EmsIOTData();
         int energyTypeid = Integer.parseInt(emsBaseMonitorInfoService.selectEmsBaseMonitorTypeByMonitorCode(tWTempertureData.getMonitorId()));
         String energyName = emsBaseEnergyTypeService.queryEnergyNameByEnergyTypeId(energyTypeid);
-        if("温湿度".equals(energyName)){
+        if("温湿度".equals(energyName) || "湿度".equals(energyName)){
             emsIOTData.monitorTypeArr.add("温度");
             emsIOTData.monitorTypeArr.add("湿度");
         }
@@ -89,20 +89,29 @@ public class TWTempertureDataController extends BaseController
 
     /**
      * 查询物联网设备实时监控数据
-     * @param monitorCodeList
-     * @return
+     * 该方法通过接收监控代码列表来查询相应设备的实时监控数据，并返回这些数据
+     * 主要步骤包括：解析监控代码列表、为每个监控代码查询最近的监控数据、整理并返回查询结果
+     *
+     * @param monitorCodeList 监控代码列表，多个代码以逗号分隔
+     * @return 返回包含设备实时监控数据的AjaxResult对象
      */
     @GetMapping("/iotInstantMonitoring")
     public AjaxResult iotInstantMonitoring(String monitorCodeList){
+        // 初始化一个列表，用于存储查询到的监控数据
         List<TWTempertureData> list = new ArrayList<TWTempertureData>();
+
+        // 检查传入的监控代码列表是否不为空
         if(StringUtils.isNotEmpty(monitorCodeList)){
+            // 分割监控代码列表，以便逐个处理每个监控代码
             String[] split = monitorCodeList.split(",");
             for (String monitorId : split) {
-
+                // 创建一个TWTempertureData对象，用于存储单个监控点的数据
                 TWTempertureData tWTempertureData = new TWTempertureData();
                 tWTempertureData.setMonitorId(monitorId);
+                // 初始化参数Map，用于查询特定时间范围内的监控数据
                 Map<String,Object> params = new HashMap<>();
 
+                // 获取当前时间，并计算5分钟前的时间，作为查询的开始时间
                 Calendar calendar = Calendar.getInstance();
                 calendar.add(Calendar.MINUTE,-5);
                 Calendar startTime = (Calendar) calendar.clone();
@@ -110,18 +119,22 @@ public class TWTempertureDataController extends BaseController
                 params.put("endRecordTime",sdf.format(new Date()));
                 tWTempertureData.setParams(params);
 
+                // 调用服务方法，查询指定监控点在特定时间范围内的监控数据
                 List<TWTempertureData> twTempertureData = tWTempertureDataService.selectIotInstantList(tWTempertureData);
                 if(twTempertureData.size()>0){
-                    Optional<TWTempertureData> first = twTempertureData.stream().sorted(Comparator.comparing(TWTempertureData::getRecodeTime)).findFirst();
+                    // 如果查询到数据，则选取记录时间最早的那条数据添加到结果列表中
+                    Optional<TWTempertureData> first = twTempertureData.stream()
+                            .sorted(Comparator.comparing(TWTempertureData::getRecodeTime))
+                            .findFirst();
 
                     list.add(first.get());
                 }
-
-
             }
         }
 
+        // 打印查询结果的JSON格式字符串
         System.out.println(JSONArray.toJSONString(list));
+        // 返回包含查询结果的成功响应
         return success(list);
     }
 
diff --git a/ruoyi-ui/src/views/ems/record/recordIOTInstant/generate.vue b/ruoyi-ui/src/views/ems/record/recordIOTInstant/generate.vue
new file mode 100644
index 0000000..a04d146
--- /dev/null
+++ b/ruoyi-ui/src/views/ems/record/recordIOTInstant/generate.vue
@@ -0,0 +1,531 @@
+<!--
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      &lt;!&ndash;      <el-form-item label="主键标识" prop="objid">
+              <el-input
+                v-model="queryParams.objid"
+                placeholder="请输入主键标识"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="设备编号" prop="monitorId">
+              <el-input
+                v-model="queryParams.monitorId"
+                placeholder="请输入设备编号"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="温度" prop="tempreture">
+              <el-input
+                v-model="queryParams.tempreture"
+                placeholder="请输入温度"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="湿度" prop="humidity">
+              <el-input
+                v-model="queryParams.humidity"
+                placeholder="请输入湿度"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="照度" prop="illuminance">
+              <el-input
+                v-model="queryParams.illuminance"
+                placeholder="请输入照度"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="噪声" prop="noise">
+              <el-input
+                v-model="queryParams.noise"
+                placeholder="请输入噪声"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="硫化氢浓度" prop="concentration">
+              <el-input
+                v-model="queryParams.concentration"
+                placeholder="请输入硫化氢浓度"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="pm1.0" prop="pm1">
+              <el-input
+                v-model="queryParams.pm1"
+                placeholder="请输入pm1.0"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="pm2.5" prop="pm2">
+              <el-input
+                v-model="queryParams.pm2"
+                placeholder="请输入pm2.5"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="pm10.0" prop="pm10">
+              <el-input
+                v-model="queryParams.pm10"
+                placeholder="请输入pm10.0"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="粉尘" prop="standby">
+              <el-input
+                v-model="queryParams.standby"
+                placeholder="请输入粉尘"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>&ndash;&gt;
+      <el-form-item label="采集时间">
+        <el-date-picker
+          v-model="daterangeCollectTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="记录时间">
+        <el-date-picker
+          v-model="daterangeRecodeTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="报警类型" prop="alarmType">
+        <el-select v-model="queryParams.alarmType" placeholder="请选择报警类型" clearable>
+          <el-option
+            v-for="dict in dict.type.alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      &lt;!&ndash;      <el-form-item label="${comment}" prop="confirmPersonID">
+              <el-input
+                v-model="queryParams.confirmPersonID"
+                placeholder="请输入${comment}"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="${comment}" prop="confirmTime">
+              <el-date-picker clearable
+                              v-model="queryParams.confirmTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择${comment}">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="${comment}" prop="confirmFlag">
+              <el-input
+                v-model="queryParams.confirmFlag"
+                placeholder="请输入${comment}"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>&ndash;&gt;
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:recordIOTInstant:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:recordIOTInstant:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:recordIOTInstant:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:recordIOTInstant:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordIOTInstantList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键标识" align="center" prop="objid" />
+      <el-table-column label="设备编号" align="center" prop="monitorId" />
+      <el-table-column label="温度" align="center" prop="tempreture" />
+      <el-table-column label="湿度" align="center" prop="humidity" />
+      <el-table-column label="照度" align="center" prop="illuminance" />
+      <el-table-column label="噪声" align="center" prop="noise" />
+      <el-table-column label="硫化氢浓度" align="center" prop="concentration" />
+      <el-table-column label="pm1.0" align="center" prop="pm1" />
+      <el-table-column label="pm2.5" align="center" prop="pm2" />
+      <el-table-column label="pm10.0" align="center" prop="pm10" />
+      <el-table-column label="粉尘" align="center" prop="standby" />
+      <el-table-column label="采集时间" align="center" prop="collectTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="记录时间" align="center" prop="recodeTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="报警类型" align="center" prop="alarmType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="confirmPersonID" />
+      <el-table-column label="${comment}" align="center" prop="confirmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.confirmTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="confirmFlag" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:recordIOTInstant:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:recordIOTInstant:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    &lt;!&ndash; 添加或修改动力环境数据对话框 &ndash;&gt;
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备编号" prop="monitorId">
+          <el-input v-model="form.monitorId" placeholder="请输入设备编号" />
+        </el-form-item>
+        <el-form-item label="温度" prop="tempreture">
+          <el-input v-model="form.tempreture" placeholder="请输入温度" />
+        </el-form-item>
+        <el-form-item label="湿度" prop="humidity">
+          <el-input v-model="form.humidity" placeholder="请输入湿度" />
+        </el-form-item>
+        <el-form-item label="照度" prop="illuminance">
+          <el-input v-model="form.illuminance" placeholder="请输入照度" />
+        </el-form-item>
+        <el-form-item label="噪声" prop="noise">
+          <el-input v-model="form.noise" placeholder="请输入噪声" />
+        </el-form-item>
+        <el-form-item label="硫化氢浓度" prop="concentration">
+          <el-input v-model="form.concentration" placeholder="请输入硫化氢浓度" />
+        </el-form-item>
+        <el-form-item label="pm1.0" prop="pm1">
+          <el-input v-model="form.pm1" placeholder="请输入pm1.0" />
+        </el-form-item>
+        <el-form-item label="pm2.5" prop="pm2">
+          <el-input v-model="form.pm2" placeholder="请输入pm2.5" />
+        </el-form-item>
+        <el-form-item label="pm10.0" prop="pm10">
+          <el-input v-model="form.pm10" placeholder="请输入pm10.0" />
+        </el-form-item>
+        <el-form-item label="粉尘" prop="standby">
+          <el-input v-model="form.standby" placeholder="请输入粉尘" />
+        </el-form-item>
+        <el-form-item label="采集时间" prop="collectTime">
+          <el-date-picker clearable
+                          v-model="form.collectTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择采集时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="记录时间" prop="recodeTime">
+          <el-date-picker clearable
+                          v-model="form.recodeTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择记录时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="报警类型" prop="alarmType">
+          <el-select v-model="form.alarmType" placeholder="请选择报警类型">
+            <el-option
+              v-for="dict in dict.type.alarm_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="${comment}" prop="confirmPersonID">
+          <el-input v-model="form.confirmPersonID" placeholder="请输入${comment}" />
+        </el-form-item>
+        <el-form-item label="${comment}" prop="confirmTime">
+          <el-date-picker clearable
+                          v-model="form.confirmTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="${comment}" prop="confirmFlag">
+          <el-input v-model="form.confirmFlag" placeholder="请输入${comment}" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRecordIOTInstant, getRecordIOTInstant, delRecordIOTInstant, addRecordIOTInstant, updateRecordIOTInstant } from "@/api/system/recordIOTInstant";
+
+export default {
+  name: "RecordIOTInstant",
+  dicts: ['alarm_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 动力环境数据表格数据
+      recordIOTInstantList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // $comment时间范围
+      daterangeCollectTime: [],
+      // $comment时间范围
+      daterangeRecodeTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        objid: null,
+        monitorId: null,
+        tempreture: null,
+        humidity: null,
+        illuminance: null,
+        noise: null,
+        concentration: null,
+        pm1: null,
+        pm2: null,
+        pm10: null,
+        standby: null,
+        collectTime: null,
+        recodeTime: null,
+        alarmType: null,
+        confirmPersonID: null,
+        confirmTime: null,
+        confirmFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        monitorId: [
+          { required: true, message: "设备编号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询动力环境数据列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+        this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0];
+        this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1];
+      }
+      if (null != this.daterangeRecodeTime && '' != this.daterangeRecodeTime) {
+        this.queryParams.params["beginRecodeTime"] = this.daterangeRecodeTime[0];
+        this.queryParams.params["endRecodeTime"] = this.daterangeRecodeTime[1];
+      }
+      listRecordIOTInstant(this.queryParams).then(response => {
+        this.recordIOTInstantList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objid: null,
+        monitorId: null,
+        tempreture: null,
+        humidity: null,
+        illuminance: null,
+        noise: null,
+        concentration: null,
+        pm1: null,
+        pm2: null,
+        pm10: null,
+        standby: null,
+        collectTime: null,
+        recodeTime: null,
+        alarmType: null,
+        confirmPersonID: null,
+        confirmTime: null,
+        confirmFlag: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCollectTime = [];
+      this.daterangeRecodeTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objid)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加动力环境数据";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objid = row.objid || this.ids
+      getRecordIOTInstant(objid).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改动力环境数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objid != null) {
+            updateRecordIOTInstant(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRecordIOTInstant(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objids = row.objid || this.ids;
+      this.$modal.confirm('是否确认删除动力环境数据编号为"' + objids + '"的数据项？').then(function() {
+        return delRecordIOTInstant(objids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/recordIOTInstant/export', {
+        ...this.queryParams
+      }, `recordIOTInstant_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+-->
diff --git a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
index 6568ce1..97d3d60 100644
--- a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
+++ b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
@@ -245,7 +245,7 @@ export default {
 
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      getMonitorInfoTree({ monitorTypeList: [3],monitorType:this.$route.query.monitorType}).then(response => {
+      getMonitorInfoTree({ monitorTypeList: [3]}).then(response => {
         this.monitorInfoOptions = response.data
       })
     },