修改bug:20231202

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EquipmentController.java

@@ -223,4 +223,26 @@ public class EquipmentController {
         }
         return R.ok(list);
     }
+
+    /**
+     * 改变设备状态（休眠）
+     * @return
+     */
+    @SaCheckPermission("szzs:equipment:query")
+    @PostMapping("/equipmentOnStatedormancy")
+    public R equipmentOnStatedormancy(@RequestParam("equipmentCode") String equipmentCode){
+        String s = equipmentService.equipmentOnStatedormancy(equipmentCode);
+        return R.ok(s);
+    }
+
+    /**
+     * 改变设备状态（唤醒）
+     * @return
+     */
+    @SaCheckPermission("szzs:equipment:query")
+    @PutMapping ("/equipmentOnStateWakeup")
+    public R equipmentOnStateWakeup(@RequestParam("equipmentCode") String equipmentCode){
+        String s = equipmentService.equipmentOnStateWakeup(equipmentCode);
+        return R.ok(s);
+    }
 }

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

@@ -45,5 +45,6 @@ public class EquipmentBo {
         this.enterTime = equipment.getEnterTime();
         this.updateTime = equipment.getUpdateTime();
         this.deleted = equipment.getDeleted();
+        this.addrCodeInfo = equipment.getAddrCodeInfo();
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/EquipmentService.java

@@ -40,4 +40,8 @@ public interface EquipmentService {
     void deleteStoreEquipment(String[] equipmentIds);
 
     void deleteEquipmentPlan(String[] planItemIds);
+
+    String equipmentOnStatedormancy(String equipmentCode);
+
+    String equipmentOnStateWakeup(String equipmentCode);
 }

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

@@ -95,22 +95,11 @@ public class EquipmentServiceImpl implements EquipmentService {
     @Override
     public R updateEquipment(EquipmentVo equipmentVo) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("equipment_name","equipment_code","addr_info","addr_code","addr_code_info","on_state");
+        queryWrapper.select("equipment_name","equipment_code","addr_info","addr_code","addr_code_info");
         queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
         Equipment equipment = equipmentMapper.selectOne(queryWrapper);
 
         if (equipment != null){
-            String state = "";
-            if (equipmentVo.getOnState() != equipment.getOnState()){
-                if (equipmentVo.getOnState() == 1){
-                    //唤醒
-                    state = mtStarUtil.wakeup(equipmentVo.getEquipmentCode());
-                }else {
-                    //休眠
-                    state = mtStarUtil.dormancy(equipmentVo.getEquipmentCode());
-                }
-            }
-
             //2.更新时间
             equipmentVo.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
             UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
@@ -169,7 +158,7 @@ public class EquipmentServiceImpl implements EquipmentService {
                 planPushStatisticsMapper.update(null,updateWrapper5);
             }
 
-            return R.ok("修改成功,"+state);
+            return R.ok("修改成功");
         }else {
             return R.fail("设备不存在");
         }
@@ -388,5 +377,16 @@ public class EquipmentServiceImpl implements EquipmentService {
         planItemMapper.deleteBatchIds(Arrays.asList(planItemIds));
     }
 
+    @Override
+    public String equipmentOnStatedormancy(String equipmentCode) {
+        //调用接口
+        return mtStarUtil.dormancy(equipmentCode);
+    }
+
+    @Override
+    public String equipmentOnStateWakeup(String equipmentCode) {
+        return mtStarUtil.wakeup(equipmentCode);
+    }
+
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/MtStarUtil.java

@@ -36,15 +36,19 @@ public class MtStarUtil {
         map.put("startIndex", 0);
         map.put("queryCount", 1);
         map.put("select_name", equipmentCode);
-        String post = HttpUtil.post(mtStarProperties.getUrl() + "dev_get_devs_cmarks", map);
-        JSONObject obj = JSONUtil.parseObj(post);
-        if (obj.get("retCode",Integer.class) == 0){
-            List<String> list = obj.getBeanList("cMarkList", String.class);
-            if (list != null && !list.isEmpty()){
-                JSONObject entries = JSONUtil.parseObj(list.get(0));
-                return entries.get("cMark", String.class);
-            }
+        try {
+            String post = HttpUtil.post(mtStarProperties.getUrl() + "dev_get_devs_cmarks", map);
+            JSONObject obj = JSONUtil.parseObj(post);
+            if (obj.get("retCode",Integer.class) == 0){
+                List<String> list = obj.getBeanList("cMarkList", String.class);
+                if (list != null && !list.isEmpty()){
+                    JSONObject entries = JSONUtil.parseObj(list.get(0));
+                    return entries.get("cMark", String.class);
+                }
 
+            }
+        }catch (Exception e){
+            return "error";
         }
         return "error";
     }
@@ -66,10 +70,14 @@ public class MtStarUtil {
         sCmd.put("subcmd", "ctrl_lcd_onoff_ontime");
         map.put("params", sCmd.toString());
         map.put("retry", 0);
-        String post = HttpUtil.post(mtStarProperties.getUrl() + "sendClientParams", map);
-        JSONObject obj = JSONUtil.parseObj(post);
-        if (0 == obj.get("retCode", Integer.class))
-            return "success";
+        try {
+            String post = HttpUtil.post(mtStarProperties.getUrl() + "sendClientParams", map);
+            JSONObject obj = JSONUtil.parseObj(post);
+            if (0 == obj.get("retCode", Integer.class))
+                return "success";
+        }catch (Exception e){
+            return "error";
+        }
         return "error";
     }