diff --git a/ics-admin/src/main/java/com/ics/admin/controller/PolicyBannerController.java b/ics-admin/src/main/java/com/ics/admin/controller/PolicyBannerController.java
index 415bacb..79c0bd6 100644
--- a/ics-admin/src/main/java/com/ics/admin/controller/PolicyBannerController.java
+++ b/ics-admin/src/main/java/com/ics/admin/controller/PolicyBannerController.java
@@ -50,6 +50,7 @@ public class PolicyBannerController extends BaseController {
     @PostMapping("save")
     public R addSave(@RequestBody PolicyBanner policyBanner) {
         ValidatorUtils.validateEntity(policyBanner);
+        policyBanner.setParkId(25L);
         return toAjax(policyBannerService.insertPolicyBanner(policyBanner));
     }
 
diff --git a/ics-admin/src/main/java/com/ics/admin/controller/PolicyController.java b/ics-admin/src/main/java/com/ics/admin/controller/PolicyController.java
index ab28a52..aa55626 100644
--- a/ics-admin/src/main/java/com/ics/admin/controller/PolicyController.java
+++ b/ics-admin/src/main/java/com/ics/admin/controller/PolicyController.java
@@ -50,6 +50,7 @@ public class PolicyController extends BaseController {
     @PostMapping("save")
     public R addSave(@RequestBody Policy policy) {
         ValidatorUtils.validateEntity(policy);
+        policy.setParkId(25L);
         return toAjax(policyService.insertPolicy(policy));
     }
 
diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java
index ce93c0b..c47fb33 100644
--- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java
+++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/EquipmentController.java
@@ -185,13 +185,15 @@ public class EquipmentController extends BaseController {
         int i = equipmentService.insertEquipment(equipment);
         Assert.isTrue(i > 0, "添加失败");
 
+        boolean ping = DeviceUtils.ping(equipment.getIp(), 1, 2000);
+        if (ping){
+            equipment.setEquipmentNum(String.valueOf((new Date()).getTime()));
 
-        equipment.setEquipmentNum(String.valueOf((new Date()).getTime()));
-
-        String s = DeviceUtils.setDeviceInfo(equipment.getEquipmentNum(), equipment.getEquipmentName(), equipment.getIp());
-        JSONObject jsonObject = JSONUtil.parseObj(s);
-        Integer status = (Integer) jsonObject.get("status");
-        Assert.isTrue(status == 0, "未找到对应设备");
+            String s = DeviceUtils.setDeviceInfo(equipment.getEquipmentNum(), equipment.getEquipmentName(), equipment.getIp());
+            JSONObject jsonObject = JSONUtil.parseObj(s);
+            Integer status = (Integer) jsonObject.get("status");
+            Assert.isTrue(status == 0, "未找到对应设备");
+        }
 
 
         if (equipment.getRoomId() != null) {
diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
index d135e92..bb9e535 100644
--- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
+++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
@@ -107,6 +107,7 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
         queryWrapper.eq(roomContent.getTenantId() !=null,"tenant_id", roomContent.getTenantId());
         queryWrapper.eq(roomContent.getRoomId() !=null,"room_id", roomContent.getRoomId());
         queryWrapper.in(roomContent.getRoomIds() !=null,"room_id", roomContent.getRoomIds());
+        queryWrapper.orderByAsc("create_time");
         return roomContentMapper.selectList(queryWrapper);
     }
 
diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml
index bf7296c..16cee30 100644
--- a/ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml
+++ b/ics-admin/src/main/resources/mapper/admin/meeting/RoomContentMapper.xml
@@ -50,6 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tenantId != null  and tenantId != ''"> AND tenant_id =#{tenantId}</if>
             and  is_show = 0
         </where>
+        order by create_time asc
+
     </select>
     
     <select id="selectRoomContentById" parameterType="Long" resultMap="RoomContentResult">
diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
index 16c618b..6ff4125 100644
--- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
+++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
@@ -657,7 +657,7 @@ public class ApiRoomContentController extends BaseController {
         Calendar end = Calendar.getInstance();
         end.setTime(endTime);
 
-        return date.after(begin) && date.before(end);
+        return date.compareTo(begin) >=0 && date.compareTo(end) <=0;
     }