修复设备BUG

ruoyi-demo/src/main/java/com/ruoyi/demo/enums/EquipmentOnStateEnum.java

@@ -1,8 +1,8 @@
 package com.ruoyi.demo.enums;
 
 public enum EquipmentOnStateEnum {
-    ON_LINE(0,"在线"),
-    OFF_LINE(1,"失联");
+    ON_LINE(0,"休眠"),
+    OFF_LINE(1,"启动");
 
     private int state;
     private String name;

ruoyi-demo/src/main/java/com/ruoyi/demo/enums/EquipmentStateEnum.java

@@ -2,9 +2,9 @@ package com.ruoyi.demo.enums;
 
 
 public enum EquipmentStateEnum {
-    ON_POWER(0,"开启"),
-    OFF_POWER(1,"关闭"),
-    MAINTAIN_POWER(2,"维修中");
+    ON_POWER(0,"关闭"),
+    OFF_POWER(1,"开启");
+    //MAINTAIN_POWER(2,"维修中");
 
     private int state;
     private String name;

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -95,7 +95,7 @@ public class EquipmentServiceImpl implements EquipmentService {
     @Override
     public R updateEquipment(EquipmentVo equipmentVo) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("equipment_name","addr_info","addr_code","addr_code_info","on_state");
+        queryWrapper.select("equipment_name","equipment_code","addr_info","addr_code","addr_code_info","on_state");
         queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
         Equipment equipment = equipmentMapper.selectOne(queryWrapper);
 
@@ -133,9 +133,8 @@ public class EquipmentServiceImpl implements EquipmentService {
                 .set("maintain_telephone",equipmentVo.getMaintainTelephone())
                 .set("update_time",equipmentVo.getUpdateTime());
             equipmentMapper.update(null,updateWrapper);
-
             //修改冗余字段
-            if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode()) || !equipment.getAddrCode().equals(equipmentVo.getAddrCode()) || !equipment.getAddrCodeInfo().equals(equipmentVo.getAddrCodeInfo())){
+            if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode()) || !equipment.getAddrCode().equals(equipmentVo.getAddrCode())){
                 UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();
                 updateWrapper1.eq("equipment_id",equipmentVo.getEquipmentId());
                 updateWrapper1.set("equipment_name",equipmentVo.getEquipmentName())