diff --git a/src/main/java/org/springblade/modules/monitor/controller/BusinessMonitorController.java b/src/main/java/org/springblade/modules/monitor/controller/BusinessMonitorController.java
index 57603d9..1de5bbd 100644
--- a/src/main/java/org/springblade/modules/monitor/controller/BusinessMonitorController.java
+++ b/src/main/java/org/springblade/modules/monitor/controller/BusinessMonitorController.java
@@ -73,7 +73,7 @@ public class BusinessMonitorController {
 	 * @return
 	 */
 	@GetMapping("/getWarnMsg")
-	public R getWarnMsg(@RequestParam("equipCode") String equipCode,@RequestParam("equipName") String equipName) {
+	public R getWarnMsg(String equipCode,String equipName) {
 		return R.data(businessMonitorService.getWarnMsg(equipCode,equipName));
 	}
 
@@ -84,7 +84,7 @@ public class BusinessMonitorController {
 	 * @return
 	 */
 	@GetMapping("/getWarnHisList")
-	public R getWarnHisList(Integer currentPage, Integer pageSize, @RequestParam("equipCode") String equipCode,@RequestParam("equipName") String equipName) {
+	public R getWarnHisList(Integer currentPage, Integer pageSize, String equipCode,String equipName) {
 		return R.data(businessMonitorService.getWarnHisList(currentPage, pageSize, equipCode,equipName));
 	}
 }
diff --git a/src/main/java/org/springblade/modules/monitor/mapper/MonitorMapper.xml b/src/main/java/org/springblade/modules/monitor/mapper/MonitorMapper.xml
index f8f5e8d..757dc9a 100644
--- a/src/main/java/org/springblade/modules/monitor/mapper/MonitorMapper.xml
+++ b/src/main/java/org/springblade/modules/monitor/mapper/MonitorMapper.xml
@@ -29,6 +29,7 @@
         <if test = "equipCode != null and equipCode != ''">
             and equip_code like CONCAT('%', #{equipCode}, '%')
         </if>
+        order by warn_date desc,equip_code
         limit #{offset}, #{size}
     </select>
     <select id = "getEquipListTotal" resultType = "int">
@@ -52,13 +53,14 @@
                warn_content                                as warnContent,
                DATE_FORMAT(warn_date, '%Y-%m-%d %H:%i:%s') AS warnDate
         from t_data_warn
-        where status = 1
+        <where>
         <if test = "equipName != null and equipName != ''">
             and equip_name = #{equipName}
         </if>
         <if test = "equipCode != null and equipCode != ''">
             and equip_code = #{equipCode}
         </if>
+        </where>
         order by warn_date desc limit 1
     </select>
 
@@ -75,13 +77,14 @@
                DATE_FORMAT(recovery_date, '%Y-%m-%d %H:%i:%s') AS recoveryDate,
                status                                          as status
         from t_data_warn
-        where status = 1
+        <where>
         <if test = "equipName != null and equipName != ''">
             and equip_name = #{equipName}
         </if>
         <if test = "equipCode != null and equipCode != ''">
             and equip_code = #{equipCode}
         </if>
+        </where>
         order by warn_date desc
             limit #{offset}, #{size}
     </select>
@@ -89,12 +92,13 @@
     <select id = "getWarnHisListTotal" resultType = "int">
         select count(equip_code) as count
         from t_data_warn
-        where status = 1
+        <where>
         <if test = "equipName != null and equipName != ''">
             and equip_name = #{equipName}
         </if>
         <if test = "equipCode != null and equipCode != ''">
             and equip_code = #{equipCode}
         </if>
+        </where>
     </select>
 </mapper>
diff --git a/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java b/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java
index 6cdff88..4afb471 100644
--- a/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java
+++ b/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java
@@ -75,9 +75,10 @@ public class ConfigMonitorServiceImpl extends ServiceImpl<ConfigMonitorMapper, C
     @Override
     public void updateMonitorInfo() {
         try {
-            LambdaQueryWrapper<ConfigMonitor> queryWrapper = null;
-            queryWrapper = new LambdaQueryWrapper<>();
+            LambdaQueryWrapper<ConfigMonitor> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(BaseEntity::getIsDeleted,"0");
+			List<String> types = Arrays.asList("web","redis","mysql","service");
+			queryWrapper.in(ConfigMonitor::getType,types);
             List<ConfigMonitor> list = baseMapper.selectList(queryWrapper);
             if(CollectionUtils.isNotEmpty(list)){
                 for(ConfigMonitor monitor : list){
@@ -137,6 +138,7 @@ public class ConfigMonitorServiceImpl extends ServiceImpl<ConfigMonitorMapper, C
 		dictList.forEach(item ->{
 			dictMap.put(item.getDictKey(),item.getDictValue());
 		});
+		List<Long> parents = new ArrayList<>();
         for(Map.Entry<Long,List<ConfigMonitor>> entry : map.entrySet()){
 			Long parentId = entry.getKey();
             List<ConfigMonitor> monitorList = entry.getValue();
@@ -164,8 +166,12 @@ public class ConfigMonitorServiceImpl extends ServiceImpl<ConfigMonitorMapper, C
 			ConfigMonitor serviceConfigMonitor = baseMapper.selectOne(serviceWrapper);
 			if(serviceConfigMonitor.getType().equals(MonitorConstant.SERVICE) && breakList.size() > 0){
 				serviceConfigMonitor.setColor("red");
+				parents.add(serviceId);
 			}else{
-				serviceConfigMonitor.setColor("green");
+				//如果之前已经是红色的了，不能改为绿色
+				if(!parents.contains(serviceId)){
+					serviceConfigMonitor.setColor("green");
+				}
 			}
 			baseMapper.updateById(serviceConfigMonitor);