diff --git a/WebRoot/WEB-INF/views/setting/settings.jsp b/WebRoot/WEB-INF/views/setting/settings.jsp
index a43b9141f603a9f0f634bc4c58c51053df574ed5..ce25d424f62efea8cd104fc8272079bc08a74975 100644
--- a/WebRoot/WEB-INF/views/setting/settings.jsp
+++ b/WebRoot/WEB-INF/views/setting/settings.jsp
@@ -207,36 +207,40 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
                       <section id="section-flip-1">
                           <!--基础设置-->
                           <form class="form-horizontal" role="form" action="SetAction_saveOrUpdateBasicSetting.do" method="post">
+                              <s:if test="%{#request.basicSettings != null}">
+                              <s:iterator value="%{#request.basicSettings}" var="basicSetting">
                               <div class="form-group">
                                   <label for="overtime" class="col-sm-2 control-label">登陆超时</label>
                                   <div class="col-sm-10">
-                                      <input type="text" class="form-control" id="overtime" name="logintimeout">
+                                      <input type="text" class="form-control" id="overtime" name="logintimeout" value="<s:property value="%{#basicSetting.logintimeout}"/>">
                                   </div>
                               </div>
                               <div class="form-group">
                                   <label for="link" class="col-sm-2 control-label">链接路径</label>
                                   <div class="col-sm-10">
-                                      <input type="text" class="form-control" id="link" name="linkpath">
+                                      <input type="text" class="form-control" id="link" name="linkpath" value="<s:property value="%{#basicSetting.linkpath}"/>">
                                   </div>
                               </div>
                               <div class="form-group">
                                   <label for="compname" class="col-sm-2 control-label">公司名称</label>
                                   <div class="col-sm-10">
-                                      <input type="text" class="form-control" id="compname" name="companyname">
+                                      <input type="text" class="form-control" id="compname" name="companyname" value="<s:property value="%{#basicSetting.companyname}"/>">
                                   </div>
                               </div>
                               <div class="form-group">
                               <label for="contactway" class="col-sm-2 control-label">联系方式</label>
                               <div class="col-sm-10">
-                                  <input type="text" class="form-control" id="contactway" name="contactinfo">
+                                  <input type="text" class="form-control" id="contactway" name="contactinfo" value="<s:property value="%{#basicSetting.contactinfo}"/>">
                               </div>
                              </div>
                               <div class="form-group">
                                   <label for="welcomewords" class="col-sm-2 control-label">欢迎语</label>
                                   <div class="col-sm-10">
-                                      <textarea  class="form-control" id="welcomewords" name="welcomespeech"></textarea>
+                                      <textarea  class="form-control" id="welcomewords" name="welcomespeech"><s:property value="%{#basicSetting.welcomespeech}"/></textarea>
                                   </div>
                               </div>
+                                  </s:iterator>
+                                  </s:if>
                               <div class="form-group">
                                   <div class="col-sm-12">
                                       <button type="submit" class="btn btn-success center-block" style="margin-top: 10px;width: 130px;font-size: 18px">保存 <span class="glyphicon glyphicon-circle-arrow-right"> </span></button>
@@ -252,24 +256,28 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 
                           <!--故障设置-->
                           <form class="form-horizontal" role="form" action="SetAction_saveOrUpdateFaultSetting.do" method="post">
+                              <s:if test="%{#request.faultSettings != null}">
+                              <s:iterator value="%{#request.faultSettings}" var="faultSetting">
                           <div class="form-group">
                               <label for="troublewarning" class="col-sm-2 control-label">故障预警方式</label>
                               <div class="col-sm-10">
-                                  <input type="text" class="form-control" id="troublewarning" name="errorwarningmethod">
+                                  <input type="text" class="form-control" id="troublewarning" name="errorwarningmethod" value="<s:property value="%{#faultSetting.errorwarningmethod}"/>">
                               </div>
                           </div>
                           <div class="form-group">
                               <label for="warning" class="col-sm-2 control-label">预警方式</label>
                               <div class="col-sm-10">
-                                  <input type="text" class="form-control" id="warning" name="warningmethod">
+                                  <input type="text" class="form-control" id="warning" name="warningmethod" value="<s:property value="%{#faultSetting.warningmethod}"/>">
                               </div>
                           </div>
                           <div class="form-group">
                               <label for="informman" class="col-sm-2 control-label">通知人员</label>
                               <div class="col-sm-10">
-                                  <input type="text" class="form-control" id="informman" name="noticepersonnel">
+                                  <input type="text" class="form-control" id="informman" name="noticepersonnel" value="<s:property value="%{#faultSetting.noticepersonnel}"/>">
                               </div>
                           </div>
+                                  </s:iterator>
+                                  </s:if>
                           <div class="form-group">
                               <div class="col-sm-12">
                                   <button type="submit" class="btn btn-success center-block" style="margin-top: 10px;width: 130px;font-size: 18px">保存 <span class="glyphicon glyphicon-circle-arrow-right"> </span></button>
@@ -294,24 +302,35 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 
                           <!--应急设置-->
                           <form class="form-horizontal" role="form" action="SetAction_saveOrUpdateEmergencySetting.do" method="post">
+                              <s:if test="%{#request.emergencySettings != null}">
+                                  <c:forEach items="${requestScope.emergencySettings }" var="emergencySetting">
                           <div class="form-group">
                               <label for="arrivetime" class="col-sm-4 control-label">应急人员到场时间</label>
                               <div class="col-sm-8">
-                                  <input type="text" class="form-control" id="arrivetime" name="emergencypersonnelarrivaltime">
+                                  <input type="text" class="form-control" id="arrivetime" name="emergencypersonnelarrivaltime" value="${emergencySetting.emergencypersonnelarrivaltime}">
                               </div>
                           </div>
                           <div class="form-group">
                               <label for="sendtoW" class="col-sm-4 control-label left">报警后是否发送短信至维保人员</label>
                               <div class="col-sm-8">
-                                  <input type="checkbox" class="form-control" id="sendtoW" name="smstomaintenancer">
+                                  <c:if test="${emergencySetting.smstomaintenancer=='1'}">
+                                      <c:set scope="page" value="checked" var="smstomaintenancer"/>
+                                  </c:if>
+                                  <input type="checkbox" class="form-control" id="sendtoW" name="smstomaintenancer" ${smstomaintenancer } >
                               </div>
                           </div>
                           <div class="form-group">
                               <label for="sendtoS" class="col-sm-4 control-label">报警后是否发送短信至使用人员</label>
                               <div class="col-sm-8">
-                                  <input type="checkbox" class="form-control" id="sendtoS" name="smstouser">
+                                  <c:if test="${emergencySetting.smstouser=='1'}">
+                                         <c:set scope="page" value="checked" var="smstouser"/>
+                                  </c:if>
+                                  <input type="checkbox" class="form-control" id="sendtoS" name="smstouser" ${smstouser }>
                               </div>
+
                           </div>
+                                  </c:forEach>
+                              </s:if>
                           <div class="form-group">
                               <div class="col-sm-12">
                                   <button type="submit" class="btn btn-success center-block" style="margin-top: 10px;width: 130px;font-size: 18px">保存 <span class="glyphicon glyphicon-circle-arrow-right"> </span></button>
@@ -336,24 +355,31 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 
                           <!--预警设置-->
                           <form class="form-horizontal" role="form" action="SetAction_saveOrUpdateWarningSetting.do" method="post">
+                              <s:if test="%{#request.warningSettings != null}">
+                              <s:iterator value="%{#request.warningSettings}" var="warningSetting">
                               <div class="form-group">
                                   <label for="winadvance" class="col-sm-3 control-label">维保提前预警</label>
                                   <div class="col-sm-9">
-                                      <input type="text" class="form-control" id="winadvance" name="earlywarning">
+                                      <input type="text" class="form-control" id="winadvance" name="earlywarning" value="<s:property value="%{#warningSetting.earlywarning}"/>">
                                   </div>
                               </div>
                               <div class="form-group">
                                   <label for="ifsend" class="col-sm-3 control-label left">预警是否发送通知</label>
                                   <div class="col-sm-9">
-                                      <input type="checkbox" class="form-control" id="ifsend" name="sendnotice">
+                                      <c:if test="${warningSetting.sendnotice=='1'}">
+                                          <c:set scope="page" value="checked" var="sendnotice"/>
+                                      </c:if>
+                                      <input type="checkbox" class="form-control" id="ifsend" name="sendnotice" ${sendnotice }>
                                   </div>
                               </div>
                               <div class="form-group">
                                   <label for="yinadvance" class="col-sm-3 control-label">年检提前预警</label>
                                   <div class="col-sm-9">
-                                      <input type="text" class="form-control" id="yinadvance" name="annualadvancewarning">
+                                      <input type="text" class="form-control" id="yinadvance" name="annualadvancewarning" value="<s:property value="%{#warningSetting.annualadvancewarning}"/>">
                                   </div>
                               </div>
+                                  </s:iterator>
+                                  </s:if>
                               <div class="form-group">
                                   <div class="col-sm-12">
                                       <button type="submit" class="btn btn-success center-block" style="margin-top: 10px;width: 130px;font-size: 18px">保存 <span class="glyphicon glyphicon-circle-arrow-right"> </span></button>
@@ -376,24 +402,31 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 
                           <!--公告设置-->
                           <form class="form-horizontal" role="form" action="SetAction_saveOrUpdateAnnounceSetting.do" method="post">
+                              <s:if test="%{#request.announceSettings != null}">
+                              <s:iterator value="%{#request.announceSettings}" var="announceSetting">
                               <div class="form-group">
                                   <label for="updatawarn" class="col-sm-3 control-label">节目更新提醒</label>
                                   <div class="col-sm-9">
-                                      <input type="text" class="form-control" id="updatawarn" name="programupdatereminder">
+                                      <input type="text" class="form-control" id="updatawarn" name="programupdatereminder" value="<s:property value="%{#announceSetting.programupdatereminder}"/>">
                                   </div>
                               </div>
                               <div class="form-group">
                                   <label for="ifupload" class="col-sm-3 control-label left">是否实时上传</label>
                                   <div class="col-sm-9">
-                                      <input type="checkbox" class="form-control" id="ifupload" name="realtimeupload">
+                                      <c:if test="${announceSetting.realtimeupload=='1'}">
+                                          <c:set scope="page" value="checked" var="realtimeupload"/>
+                                      </c:if>
+                                      <input type="checkbox" class="form-control" id="ifupload" name="realtimeupload" ${realtimeupload}>
                                   </div>
                               </div>
                               <div class="form-group">
                                   <label for="updatefacility" class="col-sm-3 control-label">节目同时更新(设备)</label>
                                   <div class="col-sm-9">
-                                      <input type="text" class="form-control" id="updatefacility" name="programupdatedevice">
+                                      <input type="text" class="form-control" id="updatefacility" name="programupdatedevice" value="<s:property value="%{#announceSetting.programupdatedevice}"/>">
                                   </div>
                               </div>
+                                  </s:iterator>
+                                  </s:if>
                               <div class="form-group">
                                   <div class="col-sm-12">
                                       <button type="submit" class="btn btn-success center-block" style="margin-top: 10px;width: 130px;font-size: 18px">保存 <span class="glyphicon glyphicon-circle-arrow-right"> </span></button>
diff --git a/src/main/java/com/newage/iep/action/systemparametermanagement/SetAction.java b/src/main/java/com/newage/iep/action/systemparametermanagement/SetAction.java
index da6ea0b219844500533cf042aacc4013f0a739b8..0cb790d0b4ecd53e713a1f4224c4cea5bd6324cb 100644
--- a/src/main/java/com/newage/iep/action/systemparametermanagement/SetAction.java
+++ b/src/main/java/com/newage/iep/action/systemparametermanagement/SetAction.java
@@ -66,16 +66,21 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
      * @return
      */
     public String toSet(){
-        //查询基础设置信息
-
-        //查询故障设置信息
-
-        //查询应急设置信息
-
-        //查询预警设置信息
-
-        //查询公告设置信息
-
+        //查询基础设置信息  BasicSetting
+        List<BasicSetting> basicSettings = basicSettingService.selectAllBasicSettings();
+        //查询故障设置信息  FaultSetting
+        List<FaultSetting> faultSettings = faultSettingService.selectAllFaultSettings();
+        //查询应急设置信息  EmergencySetting
+        List<EmergencySetting> emergencySettings = emergencySettingService.selectAllEmergencySettings();
+        //查询预警设置信息  WarningSetting
+        List<WarningSetting> warningSettings = warningSettingService.selectAllWarningSettings();
+        //查询公告设置信息  AnnounceSetting
+        List<AnnounceSetting> announceSettings = announceSettingService.selectAllAnnounceSettings();
+        request.setAttribute("basicSettings",basicSettings);
+        request.setAttribute("faultSettings",faultSettings);
+        request.setAttribute("emergencySettings",emergencySettings);
+        request.setAttribute("warningSettings",warningSettings);
+        request.setAttribute("announceSettings",announceSettings);
         return "toSet";
     }
 
@@ -95,7 +100,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
             basicSetting.setWelcomespeech(welcomespeech);
             basicSetting.setLogintimeout(logintimeout);
             basicSettingService.updateBasicSetting(basicSetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }else{
             //保存用户填写的信息
             BasicSetting basicSetting = new BasicSetting();
@@ -105,7 +110,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
             basicSetting.setWelcomespeech(welcomespeech);
             basicSetting.setLogintimeout(logintimeout);
             basicSettingService.saveBasicSetting(basicSetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }
 
     }
@@ -123,7 +128,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
             faultSetting.setWarningmethod(warningmethod);
             faultSetting.setNoticepersonnel(noticepersonnel);
             faultSettingService.updateFaultSetting(faultSetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }else{
             //保存用户填写的信息
             FaultSetting faultSetting = new FaultSetting();
@@ -131,7 +136,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
             faultSetting.setWarningmethod(warningmethod);
             faultSetting.setNoticepersonnel(noticepersonnel);
             faultSettingService.saveFaultSetting(faultSetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }
 
     }
@@ -157,7 +162,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
                 emergencySetting.setSmstouser(0);
             }
             emergencySettingService.updateEmergencySetting(emergencySetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }else{
             //保存用户填写的信息
             EmergencySetting emergencySetting = new EmergencySetting();
@@ -173,7 +178,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
                 emergencySetting.setSmstouser(0);
             }
             emergencySettingService.saveEmergencySetting(emergencySetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }
     }
 
@@ -195,7 +200,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
                 warningSetting.setSendnotice(0);
             }
             warningSettingService.updateWarningSetting(warningSetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }else{
             //保存用户填写的信息
             WarningSetting warningSetting = new WarningSetting();
@@ -207,7 +212,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
                 warningSetting.setSendnotice(0);
             }
             warningSettingService.saveWarningSetting(warningSetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }
     }
 
@@ -229,7 +234,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
             }
 
             announceSettingService.updateAnnounceSetting(announceSetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }else{
             //保存用户填写的信息
             AnnounceSetting announceSetting = new AnnounceSetting();
@@ -241,7 +246,7 @@ public class SetAction extends ActionSupport implements ServletRequestAware,Serv
                 announceSetting.setRealtimeupload(0);
             }
             announceSettingService.saveAnnounceSetting(announceSetting);
-            return "toSet";
+            return "saveOrUpdateSetting";
         }
     }
     @Override
diff --git a/src/main/java/com/newage/iep/serivce/impl/account/set/AnnounceSettingServiceImpl.java b/src/main/java/com/newage/iep/serivce/impl/account/set/AnnounceSettingServiceImpl.java
index c7e538148b3d8b0f70a4b49a20fc6666c765febf..e3345f2cc7438d8b277266ca3a2abab3ba3d3654 100644
--- a/src/main/java/com/newage/iep/serivce/impl/account/set/AnnounceSettingServiceImpl.java
+++ b/src/main/java/com/newage/iep/serivce/impl/account/set/AnnounceSettingServiceImpl.java
@@ -40,4 +40,15 @@ public class AnnounceSettingServiceImpl extends GenericHibernateDAO implements A
             this.save(announceSetting);
         }
     }
+
+    /**
+     * 查询所有的公告设置
+     * @return
+     */
+    @Override
+    public List<AnnounceSetting> selectAllAnnounceSettings() {
+        Query query = this.createQuery(" from AnnounceSetting ");
+        List list = query.list();
+        return list;
+    }
 }
diff --git a/src/main/java/com/newage/iep/serivce/impl/account/set/BasicSettingServiceImpl.java b/src/main/java/com/newage/iep/serivce/impl/account/set/BasicSettingServiceImpl.java
index 6941a13a58da5de006cad6a0e4a0d4f0de8cca11..7de2770693ce09703684f2a8fc31f90fa024ef99 100644
--- a/src/main/java/com/newage/iep/serivce/impl/account/set/BasicSettingServiceImpl.java
+++ b/src/main/java/com/newage/iep/serivce/impl/account/set/BasicSettingServiceImpl.java
@@ -51,4 +51,15 @@ public class BasicSettingServiceImpl extends GenericHibernateDAO implements Basi
             this.save(basicSetting);
         }
     }
+
+    /**
+     * 查询所有的基础设置
+     * @return
+     */
+    @Override
+    public List<BasicSetting> selectAllBasicSettings() {
+        Query query = this.createQuery(" from BasicSetting ");
+        List list = query.list();
+        return list;
+    }
 }
diff --git a/src/main/java/com/newage/iep/serivce/impl/account/set/EmergencySettingServiceImpl.java b/src/main/java/com/newage/iep/serivce/impl/account/set/EmergencySettingServiceImpl.java
index c4319f38fd5a2e959119897aae34aff186cc5133..d570cc452eefa63209868dc7e256e8a12c606653 100644
--- a/src/main/java/com/newage/iep/serivce/impl/account/set/EmergencySettingServiceImpl.java
+++ b/src/main/java/com/newage/iep/serivce/impl/account/set/EmergencySettingServiceImpl.java
@@ -40,4 +40,11 @@ public class EmergencySettingServiceImpl extends GenericHibernateDAO implements
             this.save(emergencySetting);
         }
     }
+    //查询所有的应急设置
+    @Override
+    public List<EmergencySetting> selectAllEmergencySettings() {
+        Query query = this.createQuery(" from EmergencySetting ");
+        List list = query.list();
+        return list;
+    }
 }
diff --git a/src/main/java/com/newage/iep/serivce/impl/account/set/FaultSettingServiceImpl.java b/src/main/java/com/newage/iep/serivce/impl/account/set/FaultSettingServiceImpl.java
index f7a7b186586f80d8fa4ad61775881cdc7840e722..d65090eb8329e17edcbe40f58fee046e6680bd6e 100644
--- a/src/main/java/com/newage/iep/serivce/impl/account/set/FaultSettingServiceImpl.java
+++ b/src/main/java/com/newage/iep/serivce/impl/account/set/FaultSettingServiceImpl.java
@@ -52,4 +52,11 @@ public class FaultSettingServiceImpl extends GenericHibernateDAO implements Faul
             this.save(faultSetting);
         }
     }
+    //查询所有的故障记录
+    @Override
+    public List<FaultSetting> selectAllFaultSettings() {
+        Query query = this.createQuery(" from FaultSetting ");
+        List list = query.list();
+        return list;
+    }
 }
diff --git a/src/main/java/com/newage/iep/serivce/impl/account/set/WarningSettingServiceImpl.java b/src/main/java/com/newage/iep/serivce/impl/account/set/WarningSettingServiceImpl.java
index 7c8cabbb6432d4134695f4672b6f2b1cd070e8fd..1e325ee71188c0e4b4da15ba91c3f21a41187dc8 100644
--- a/src/main/java/com/newage/iep/serivce/impl/account/set/WarningSettingServiceImpl.java
+++ b/src/main/java/com/newage/iep/serivce/impl/account/set/WarningSettingServiceImpl.java
@@ -41,4 +41,11 @@ public class WarningSettingServiceImpl extends GenericHibernateDAO implements Wa
             this.save(warningSetting);
         }
     }
+    //查询所有的预警设置
+    @Override
+    public List<WarningSetting> selectAllWarningSettings() {
+        Query query = this.createQuery(" from WarningSetting ");
+        List list = query.list();
+        return list;
+    }
 }
diff --git a/src/main/java/com/newage/iep/serivce/set/AnnounceSettingService.java b/src/main/java/com/newage/iep/serivce/set/AnnounceSettingService.java
index 6264ad3250969d6f948af7c3cfc9a7116f57b450..08e9581dc897bbe626e5e201b616d6a7ab52f24a 100644
--- a/src/main/java/com/newage/iep/serivce/set/AnnounceSettingService.java
+++ b/src/main/java/com/newage/iep/serivce/set/AnnounceSettingService.java
@@ -15,4 +15,6 @@ public interface AnnounceSettingService {
     void updateAnnounceSetting(AnnounceSetting announceSetting);
     //保存公告设置
     void saveAnnounceSetting(AnnounceSetting announceSetting);
+    //查询所有的公告设置
+    List<AnnounceSetting> selectAllAnnounceSettings();
 }
diff --git a/src/main/java/com/newage/iep/serivce/set/BasicSettingService.java b/src/main/java/com/newage/iep/serivce/set/BasicSettingService.java
index 11a1cf010372fd5061b6095d3dc67e4dd7c3ff65..ae9afe616520730acd89fa367e7792668bd7c388 100644
--- a/src/main/java/com/newage/iep/serivce/set/BasicSettingService.java
+++ b/src/main/java/com/newage/iep/serivce/set/BasicSettingService.java
@@ -18,4 +18,6 @@ public interface BasicSettingService {
     void updateBasicSetting(BasicSetting basicSetting);
     //保存基础设置
     void saveBasicSetting(BasicSetting basicSetting);
+    //查询所有的基础设置
+    List<BasicSetting> selectAllBasicSettings();
 }
diff --git a/src/main/java/com/newage/iep/serivce/set/EmergencySettingService.java b/src/main/java/com/newage/iep/serivce/set/EmergencySettingService.java
index 18e692633ba7469c0fabf6044b964cc5875c7ad5..a85f10f5ccb0eba175aae2ea6db81127ca9bf82b 100644
--- a/src/main/java/com/newage/iep/serivce/set/EmergencySettingService.java
+++ b/src/main/java/com/newage/iep/serivce/set/EmergencySettingService.java
@@ -15,4 +15,6 @@ public interface EmergencySettingService {
     void updateEmergencySetting(EmergencySetting emergencySetting);
     //保存应急设置
     void saveEmergencySetting(EmergencySetting emergencySetting);
+    //查询所有的应急设置
+    List<EmergencySetting> selectAllEmergencySettings();
 }
diff --git a/src/main/java/com/newage/iep/serivce/set/FaultSettingService.java b/src/main/java/com/newage/iep/serivce/set/FaultSettingService.java
index a769d6f858292a326896eba0e3df5c6ba2d78778..5325937668d921221e05c8f4001e2449e376fa5f 100644
--- a/src/main/java/com/newage/iep/serivce/set/FaultSettingService.java
+++ b/src/main/java/com/newage/iep/serivce/set/FaultSettingService.java
@@ -15,4 +15,6 @@ public interface FaultSettingService {
     void updateFaultSetting(FaultSetting faultSetting);
     //保存故障信息
     void saveFaultSetting(FaultSetting faultSetting);
+    //查询所有的故障记录
+    List<FaultSetting> selectAllFaultSettings();
 }
diff --git a/src/main/java/com/newage/iep/serivce/set/WarningSettingService.java b/src/main/java/com/newage/iep/serivce/set/WarningSettingService.java
index 706fc1d6b30ca37044dbf9dd3550357dbe404d89..81da092836431fa6e2a8536e83ee43035f0a6184 100644
--- a/src/main/java/com/newage/iep/serivce/set/WarningSettingService.java
+++ b/src/main/java/com/newage/iep/serivce/set/WarningSettingService.java
@@ -15,4 +15,6 @@ public interface WarningSettingService {
     void updateWarningSetting(WarningSetting warningSetting);
     //保存预警设置
     void saveWarningSetting(WarningSetting warningSetting);
+    //查询所有的预警设置
+    List<WarningSetting> selectAllWarningSettings();
 }
diff --git a/src/main/resources/struts-config/struts_website.xml b/src/main/resources/struts-config/struts_website.xml
index 3b4350d5b008d82e3b5018f09f3df411a4b2f5e8..281e3604e2c57f838c7eee218cce0dbe690d75d5 100644
--- a/src/main/resources/struts-config/struts_website.xml
+++ b/src/main/resources/struts-config/struts_website.xml
@@ -164,6 +164,10 @@
         <!--系统参数设置-->
         <action name="SetAction_*" class="com.newage.iep.action.systemparametermanagement.SetAction" method="{1}">
             <result name="toSet">/WEB-INF/views/setting/settings.jsp</result>
+            <!--保存或更新系统设置-->
+            <result name="saveOrUpdateSetting" type="redirectAction">
+                <param name="actionName">SetAction_toSet</param>
+            </result>
         </action>
     </package>
 </struts>
\ No newline at end of file