修改商户、app、设备修改

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/CommercialBo.java

@@ -16,6 +16,7 @@ public class CommercialBo {
     private String commercialName;
     private String code;
     private String commercialType;
+    private int state;
     private String principalName;
     private String principalTelephone;
     private String prove1;
@@ -35,6 +36,7 @@ public class CommercialBo {
         this.commercialName = commercial.getCommercialName();
         this.code = commercial.getCode();
         this.commercialType = commercial.getCommercialType();
+        this.state = commercial.getState();
         this.principalName = commercial.getPrincipalName();
         this.principalTelephone = commercial.getPrincipalTelephone();
         this.prove1 = commercial.getProve1();

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

@@ -85,7 +85,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");
+        queryWrapper.select("equipment_name","addr_info","addr_code","addr_code_info","on_state");
         queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
         Equipment equipment = equipmentMapper.selectOne(queryWrapper);
 
@@ -104,6 +104,7 @@ public class EquipmentServiceImpl implements EquipmentService {
                 .set("addr_code",equipmentVo.getAddrCode())
                 .set("addr_code_info",equipmentVo.getAddrCode())
                 .set("state",equipmentVo.getState())
+                .set("on_state",equipmentVo.getOnState())
                 .set("lat",equipmentVo.getLat())
                 .set("lng",equipmentVo.getLng())
                 .set("manufacturers",equipmentVo.getManufacturers())
@@ -112,6 +113,15 @@ public class EquipmentServiceImpl implements EquipmentService {
                 .set("update_time",equipmentVo.getUpdateTime());
             equipmentMapper.update(null,updateWrapper);
 
+            if (equipmentVo.getOnState() != equipment.getOnState()){
+                if (equipmentVo.getOnState() == 0){
+                    //唤醒
+                }else {
+                    //休眠
+
+                }
+            }
+
             //修改冗余字段
             if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode()) || !equipment.getAddrCode().equals(equipmentVo.getAddrCode()) || !equipment.getAddrCodeInfo().equals(equipmentVo.getAddrCodeInfo())){
                 UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();