diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
index 6edc085d0..0c0020a0b 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
@@ -16,6 +16,7 @@ import org.dromara.system.domain.vo.SysDictDataVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.ISysDictTypeService;
 import org.dromara.system.service.ISysUserService;
+import org.dromara.web.device.iot.DeviceByDeviceName;
 import org.dromara.web.device.iot.DeviceDto;
 import org.dromara.web.domain.bo.*;
 import org.dromara.web.domain.vo.*;
@@ -178,13 +179,21 @@ public class EqDeviceController extends BaseController {
      */
     @PostMapping("/saveDeviceLogs")
     public void saveDeviceLogs(@RequestBody EqEquipmentLogBo eqEquipmentLogBo){
-
+        String equipmentName = eqEquipmentLogBo.getEquipmentName();
+        Integer status = eqEquipmentLogBo.getStatus();
+        //设备id查询
+        DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断
+        if (deviceByNameDto==null) throw new RuntimeException("设备不存在");
+        String equipmentCode = deviceByNameDto.getId().getId();
+        //设备查询
         EqEquipmentBo eqEquipmentBo = new EqEquipmentBo();
-        eqEquipmentBo.setEquipmentCode(eqEquipmentLogBo.getEquipmentCode());
+        eqEquipmentBo.setEquipmentCode(equipmentCode);
         List<EqEquipmentVo> eqEquipmentVos = eqEquipmentService.queryList(eqEquipmentBo);
         if (CollectionUtils.isEmpty(eqEquipmentVos)) return;
         EqEquipmentVo eqEquipmentVo = eqEquipmentVos.get(0);
-        eqEquipmentBo.setEquipmentId(eqEquipmentVo.getEquipmentId());
+        //日志数据组装
+        eqEquipmentLogBo.setEquipmentCode(equipmentCode);
+        eqEquipmentLogBo.setEquipmentName(equipmentName);
         eqEquipmentLogBo.setUserId(eqEquipmentVo.getUserId());
         eqEquipmentLogBo.setUserName(eqEquipmentVo.getUserName());
         eqEquipmentLogBo.setNickName(eqEquipmentVo.getNickName());
@@ -199,6 +208,7 @@ public class EqDeviceController extends BaseController {
         String[] timeStr = formattedDate.split(" ");
         eqEquipmentLogBo.setCreatedYearDay(timeStr[0]);//年月日
         eqEquipmentLogBo.setCreatedHourSecond(timeStr[1]);//时分秒
+        eqEquipmentLogBo.setStatus(status);//状态
         //星期
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(createTime);
@@ -209,6 +219,7 @@ public class EqDeviceController extends BaseController {
         logService.insertByBo(eqEquipmentLogBo);
 
         //更新开合度状态到设备
+        eqEquipmentBo.setEquipmentId(eqEquipmentVo.getEquipmentId());
         eqEquipmentBo.setStatus(eqEquipmentLogBo.getOpenStatus());
         eqEquipmentBo.setFaultStatus(eqEquipmentBo.getFaultStatus());
         eqEquipmentBo.setLineStatus(eqEquipmentBo.getLineStatus());
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java
index 1427c29a7..813a65d41 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java
@@ -74,7 +74,7 @@ public class EqEquipmentBo extends BaseEntity {
     /**
      * 设备状态
      */
-    @NotNull(message = "设备状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "设备运行状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer status;
 
     /**