JensionDzero 1 год назад
Родитель
Сommit
b0a89e5e60

+ 2 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/AppServiceImpl.java

@@ -99,11 +99,11 @@ public class AppServiceImpl implements AppService {
         App app = appMapper.selectOne(queryWrapper);
         if (app != null){
             //1.判断是否关闭小程序权限
-            if((appVo.getState() != app.getState()) && appVo.getState() == 1 ){
+            if((appVo.getState() != app.getState()) && appVo.getState() == 0 ){
                 //禁用,并下架所有的广告
                 UpdateWrapper<Plan> planUpdateWrapper = new UpdateWrapper<>();
                 planUpdateWrapper.eq("appkey",appVo.getAppkey());
-                planUpdateWrapper.set("on_state",1);
+                planUpdateWrapper.set("on_state",0);
                 if (!appVo.equals(app.getAppName()))
                     planUpdateWrapper.set("app_name",app.getAppName());
                 planMapper.update(null,planUpdateWrapper);

+ 4 - 4
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/CommercialServiceImpl.java

@@ -133,23 +133,23 @@ public class CommercialServiceImpl implements CommericalService {
         if (commercial != null){
             //1.判断是否修改商户状态
             if (commercialVo.getState() != commercial.getState()){
-                if (commercialVo.getState() == 1){
+                if (commercialVo.getState() == 0){
                     //1.修改app状态 ——> 关闭
                     UpdateWrapper<App> updateWrapper1 = new UpdateWrapper<>();
                     updateWrapper1.eq("commercial_id",commercialVo.getCommercialId());
-                    updateWrapper1.set("state",1);
+                    updateWrapper1.set("state",0);
                     appMapper.update(null,updateWrapper1);
 
                     //2.下架所有广告
                     UpdateWrapper<Plan> updateWrapper2 = new UpdateWrapper<>();
                     updateWrapper2.eq("commercial_id",commercialVo.getCommercialId());
-                    updateWrapper2.set("on_state",1);
+                    updateWrapper2.set("on_state",0);
                     planMapper.update(null,updateWrapper2);
                 }else {
                     //1.修改app状态 ——> 启动
                     UpdateWrapper<App> updateWrapper1 = new UpdateWrapper<>();
                     updateWrapper1.eq("commercial_id",commercialVo.getCommercialId());
-                    updateWrapper1.set("state",0);
+                    updateWrapper1.set("state",1);
                     appMapper.update(null,updateWrapper1);
                 }
             }

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

@@ -80,8 +80,12 @@ public class EquipmentServiceImpl implements EquipmentService {
             //2.新增创建时间
             equipment.setEnterTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
 
-            if (equipment.getOnState() == 1){
-
+            if (equipmentVo.getOnState() == 1){
+                //唤醒
+                mtStarUtil.wakeup(equipmentVo.getEquipmentCode());
+            }else {
+                //休眠
+                mtStarUtil.dormancy(equipmentVo.getEquipmentCode());
             }
             return equipmentMapper.insert(equipment);
         }
@@ -101,7 +105,7 @@ public class EquipmentServiceImpl implements EquipmentService {
 
             String state = "";
             if (equipmentVo.getOnState() != equipment.getOnState()){
-                if (equipmentVo.getOnState() == 0){
+                if (equipmentVo.getOnState() == 1){
                     //唤醒
                     state = mtStarUtil.wakeup(equipmentVo.getEquipmentCode());
                 }else {
@@ -265,7 +269,7 @@ public class EquipmentServiceImpl implements EquipmentService {
             planItemBoQueryWrapper.eq("dl_plan.state",1);
         });
         queryWrapper.and(planItemBoQueryWrapper -> {
-            planItemBoQueryWrapper.eq("dl_plan.on_state",0);
+            planItemBoQueryWrapper.eq("dl_plan.on_state",1);
         });
         queryWrapper.and(planItemBoQueryWrapper -> {
             planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));