diff --git a/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/domain/CyysjIntegratedMoldingEquipment.java b/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/domain/CyysjIntegratedMoldingEquipment.java
index 0c1edd38..35e0a1ee 100644
--- a/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/domain/CyysjIntegratedMoldingEquipment.java
+++ b/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/domain/CyysjIntegratedMoldingEquipment.java
@@ -9,7 +9,7 @@ import com.god.common.core.domain.BaseEntity;
  * 集成型设备对象 cyysj_integrated_molding_equipment
  * 
  * @author liweijie
- * @date 2024-01-04
+ * @date 2024-01-05
  */
 public class CyysjIntegratedMoldingEquipment extends BaseEntity
 {
@@ -26,6 +26,14 @@ public class CyysjIntegratedMoldingEquipment extends BaseEntity
     @Excel(name = "密码")
     private String password;
 
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 设备监控位置 */
+    @Excel(name = "设备监控位置")
+    private String equipmentMonitoringPosition;
+
     /** 厂商类型 */
     @Excel(name = "厂商类型")
     private String vendorType;
@@ -47,6 +55,7 @@ public class CyysjIntegratedMoldingEquipment extends BaseEntity
     private String integrationUrl;
 
     /** 视频上传 */
+    @Excel(name = "视频上传")
     private String videoUpload;
 
     public void setId(String id) 
@@ -76,6 +85,24 @@ public class CyysjIntegratedMoldingEquipment extends BaseEntity
     {
         return password;
     }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setEquipmentMonitoringPosition(String equipmentMonitoringPosition) 
+    {
+        this.equipmentMonitoringPosition = equipmentMonitoringPosition;
+    }
+
+    public String getEquipmentMonitoringPosition() 
+    {
+        return equipmentMonitoringPosition;
+    }
     public void setVendorType(String vendorType) 
     {
         this.vendorType = vendorType;
@@ -137,6 +164,8 @@ public class CyysjIntegratedMoldingEquipment extends BaseEntity
             .append("id", getId())
             .append("username", getUsername())
             .append("password", getPassword())
+            .append("deviceName", getDeviceName())
+            .append("equipmentMonitoringPosition", getEquipmentMonitoringPosition())
             .append("vendorType", getVendorType())
             .append("deviceModel", getDeviceModel())
             .append("deviceStatus", getDeviceStatus())
diff --git a/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/service/impl/CyysjIntegratedMoldingEquipmentServiceImpl.java b/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/service/impl/CyysjIntegratedMoldingEquipmentServiceImpl.java
index fff656b0..9024f527 100644
--- a/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/service/impl/CyysjIntegratedMoldingEquipmentServiceImpl.java
+++ b/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/service/impl/CyysjIntegratedMoldingEquipmentServiceImpl.java
@@ -53,7 +53,7 @@ public class CyysjIntegratedMoldingEquipmentServiceImpl implements ICyysjIntegra
     @Override
     public int insertCyysjIntegratedMoldingEquipment(CyysjIntegratedMoldingEquipment cyysjIntegratedMoldingEquipment)
     {
-        cyysjIntegratedMoldingEquipment.setId(IdUtils.fastSimpleUUID());
+        cyysjIntegratedMoldingEquipment.setId(IdUtils.fastSimpleUUID() );
         return cyysjIntegratedMoldingEquipmentMapper.insertCyysjIntegratedMoldingEquipment(cyysjIntegratedMoldingEquipment);
     }
 
diff --git a/God-Vue-master/god-system/src/main/resources/mapper/cyysjIntegrated/CyysjIntegratedMoldingEquipmentMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/cyysjIntegrated/CyysjIntegratedMoldingEquipmentMapper.xml
index 7619912d..847e06dc 100644
--- a/God-Vue-master/god-system/src/main/resources/mapper/cyysjIntegrated/CyysjIntegratedMoldingEquipmentMapper.xml
+++ b/God-Vue-master/god-system/src/main/resources/mapper/cyysjIntegrated/CyysjIntegratedMoldingEquipmentMapper.xml
@@ -8,6 +8,8 @@
         <result property="id"    column="id"    />
         <result property="username"    column="username"    />
         <result property="password"    column="password"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="equipmentMonitoringPosition"    column="equipment_monitoring_position"    />
         <result property="vendorType"    column="vendor_type"    />
         <result property="deviceModel"    column="device_model"    />
         <result property="deviceStatus"    column="device_status"    />
@@ -17,7 +19,7 @@
     </resultMap>
 
     <sql id="selectCyysjIntegratedMoldingEquipmentVo">
-        select id, username, password, vendor_type, device_model, device_status, last_update_time, integration_url, video_upload from cyysj_integrated_molding_equipment
+        select id, username, password, device_name, equipment_monitoring_position, vendor_type, device_model, device_status, last_update_time, integration_url, video_upload from cyysj_integrated_molding_equipment
     </sql>
 
     <select id="selectCyysjIntegratedMoldingEquipmentList" parameterType="CyysjIntegratedMoldingEquipment" resultMap="CyysjIntegratedMoldingEquipmentResult">
@@ -25,11 +27,14 @@
         <where>
             <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
             <if test="password != null  and password != ''"> and password like concat('%', #{password}, '%')</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="equipmentMonitoringPosition != null  and equipmentMonitoringPosition != ''"> and equipment_monitoring_position like concat('%', #{equipmentMonitoringPosition}, '%')</if>
             <if test="vendorType != null  and vendorType != ''"> and vendor_type like concat('%', #{vendorType}, '%')</if>
             <if test="deviceModel != null  and deviceModel != ''"> and device_model like concat('%', #{deviceModel}, '%')</if>
             <if test="deviceStatus != null  and deviceStatus != ''"> and device_status like concat('%', #{deviceStatus}, '%')</if>
             <if test="params.beginLastUpdateTime != null and params.beginLastUpdateTime != '' and params.endLastUpdateTime != null and params.endLastUpdateTime != ''"> and last_update_time between #{params.beginLastUpdateTime} and #{params.endLastUpdateTime}</if>
             <if test="integrationUrl != null  and integrationUrl != ''"> and integration_url like concat('%', #{integrationUrl}, '%')</if>
+            <if test="videoUpload != null  and videoUpload != ''"> and video_upload like concat('%', #{videoUpload}, '%')</if>
         </where>
     </select>
 
@@ -44,6 +49,8 @@
             <if test="id != null">id,</if>
             <if test="username != null">username,</if>
             <if test="password != null">password,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="equipmentMonitoringPosition != null">equipment_monitoring_position,</if>
             <if test="vendorType != null">vendor_type,</if>
             <if test="deviceModel != null">device_model,</if>
             <if test="deviceStatus != null">device_status,</if>
@@ -55,6 +62,8 @@
             <if test="id != null">#{id},</if>
             <if test="username != null">#{username},</if>
             <if test="password != null">#{password},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="equipmentMonitoringPosition != null">#{equipmentMonitoringPosition},</if>
             <if test="vendorType != null">#{vendorType},</if>
             <if test="deviceModel != null">#{deviceModel},</if>
             <if test="deviceStatus != null">#{deviceStatus},</if>
@@ -69,6 +78,8 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="username != null">username = #{username},</if>
             <if test="password != null">password = #{password},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="equipmentMonitoringPosition != null">equipment_monitoring_position = #{equipmentMonitoringPosition},</if>
             <if test="vendorType != null">vendor_type = #{vendorType},</if>
             <if test="deviceModel != null">device_model = #{deviceModel},</if>
             <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
diff --git a/god-ui/src/views/cyysjIntegrated/cyysjIntegrated/moldingEquipment/index.vue b/god-ui/src/views/cyysjIntegrated/cyysjIntegrated/moldingEquipment/index.vue
index 4a72f6ae..836d6c2b 100644
--- a/god-ui/src/views/cyysjIntegrated/cyysjIntegrated/moldingEquipment/index.vue
+++ b/god-ui/src/views/cyysjIntegrated/cyysjIntegrated/moldingEquipment/index.vue
@@ -18,6 +18,23 @@
         />
       </el-form-item>
 
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input
+          v-model="queryParams.deviceName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备监控位置" prop="equipmentMonitoringPosition">
+        <el-input
+          v-model="queryParams.equipmentMonitoringPosition"
+          placeholder="请输入设备监控位置"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="厂商类型" prop="deviceStatus">
         <el-input
           v-model="queryParams.deviceStatus"
@@ -121,6 +138,8 @@
       <!-- <el-table-column label="主键" align="center" prop="id" /> -->
       <el-table-column label="用户名" align="center" prop="username" />
       <el-table-column label="密码" align="center" prop="password" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <el-table-column label="设备监控位置" align="center" prop="equipmentMonitoringPosition" />
       <el-table-column label="厂商类型" align="center" prop="vendorType" />
       <el-table-column label="设备型号" align="center" prop="deviceModel" :show-overflow-tooltip="true"/>
       <el-table-column label="设备状态" align="center" prop="deviceStatus" >
@@ -190,6 +209,12 @@
         <el-form-item label="密码" prop="password">
           <el-input v-model="form.password" placeholder="请输入密码" />
         </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="设备监控位置" prop="equipmentMonitoringPosition">
+          <el-input v-model="form.equipmentMonitoringPosition" placeholder="请输入设备监控位置" />
+        </el-form-item>
         <el-form-item label="厂商类型" prop="vendorType">
           <el-input v-model="form.vendorType" placeholder="请输入厂商类型" />
         </el-form-item>
@@ -290,6 +315,8 @@ export default {
         pageSize: 10,
         username: null,
         password: null,
+        deviceName: null,
+        equipmentMonitoringPosition: null,
         vendorType: null,
         deviceModel: null,
         deviceStatus: null,
@@ -431,6 +458,8 @@ export default {
         id: null,
         username: null,
         password: null,
+        deviceName: null,
+        equipmentMonitoringPosition: null,
         vendorType: null,
         deviceModel: null,
         deviceStatus: null,