diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MqttServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MqttServiceImpl.java
index 6b5ad11..251a6d6 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MqttServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MqttServiceImpl.java
@@ -87,25 +87,15 @@ public class MqttServiceImpl implements MqttService {
                     msg.setCmd("setCaptureTimesTaskParameter");
                     Integer group = Integer.parseInt(map.get("group"));
                     paras.setGroupNumber(group);
-                    if (group == 3) {
-                        List<ParamArray> paramArrayList = new ArrayList<>();
-                        ParamArray paramArray1 = new ParamArray();
-                        paramArray1.setHour(Integer.parseInt(map.get("hour1")));
-                        paramArray1.setMinute(Integer.parseInt(map.get("min1")));
-                        paramArray1.setPresetPosition(Integer.parseInt(map.get("preset1")));
-                        paramArrayList.add(paramArray1);
-                        ParamArray paramArray2 = new ParamArray();
-                        paramArray2.setHour(Integer.parseInt(map.get("hour2")));
-                        paramArray2.setMinute(Integer.parseInt(map.get("min2")));
-                        paramArray2.setPresetPosition(Integer.parseInt(map.get("preset2")));
-                        paramArrayList.add(paramArray2);
-                        ParamArray paramArray3 = new ParamArray();
-                        paramArray3.setHour(Integer.parseInt(map.get("hour3")));
-                        paramArray3.setMinute(Integer.parseInt(map.get("min3")));
-                        paramArray3.setPresetPosition(Integer.parseInt(map.get("preset3")));
-                        paramArrayList.add(paramArray3);
-                        paras.setParamArray(paramArrayList);
+                    List<ParamArray> paramArrayList = new ArrayList<>();
+                    for (int i = 1; i <= group; i++) {
+                        ParamArray paramArray = new ParamArray();
+                        paramArray.setHour(Integer.parseInt(map.get("hour"+i)));
+                        paramArray.setMinute(Integer.parseInt(map.get("min"+i)));
+                        paramArray.setPresetPosition(Integer.parseInt(map.get("preset"+i)));
+                        paramArrayList.add(paramArray);
                     }
+                    paras.setParamArray(paramArrayList);
                 }
                 break;
             default: