diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
index 7100cb30..973f506c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
@@ -23,40 +23,23 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/${restPath}/sys/EarlyWarning")
-@Api(tags = "标准预警")
+@Api(tags = "sarStandWarning")
 public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
     @Resource
     private EarlyWarningEOServiceImpl earlyWarningEOService;
 
     @GetMapping("/StandWarning")
-    @ApiOperation("分页查询标准预警")
+    @ApiOperation("标准预警查询")
     public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "current1")int current1, @RequestParam(defaultValue = "10", value = "pageSize1") int pageSize1,
                                        @RequestParam(defaultValue = "1", value = "current2")int current2, @RequestParam(defaultValue = "10", value = "pageSize2") int pageSize2,
                                        @RequestParam(defaultValue = "1", value = "current3")int current3, @RequestParam(defaultValue = "10", value = "pageSize3") int pageSize3,
                                        @RequestParam(defaultValue = "1", value = "current4")int current4, @RequestParam(defaultValue = "10", value = "pageSize4") int pageSize4,String applyType) {
-        IPage<EarlyWarningEO> list1 = earlyWarningEOService.newQueryAll(current1,pageSize1,applyType);//新车标准预警
-        IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldQueryAll(current2,pageSize2,applyType);//在产车标准预警
-        IPage<EarlyWarningEO> list3 = earlyWarningEOService.newItemsQueryAll(current3,pageSize3,applyType);//新车条款预警
-        IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQueryAll(current4,pageSize4,applyType);//在产车条款预警
-
+        IPage<EarlyWarningEO> list1 = earlyWarningEOService.newStandQuery(current1,pageSize1,applyType);//新车标准预警
+        IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldStandQuery(current2,pageSize2,applyType);//在产车标准预警
+        IPage<EarlyWarningEO> list3 = earlyWarningEOService.newItemsQuery(current3,pageSize3,applyType);//新车条款预警
+        IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(current4,pageSize4,applyType);//在产车条款预警
         return getResponseMessage(list1, list2, list3, list4);
     }
-//    @GetMapping("/queryStandByApplyType")
-//    @ApiOperation("分页根据适用车型查询标准预警")
-//    public ResponseMessage queryByApplyType(@RequestParam(defaultValue = "1", value = "current1")int current1, @RequestParam(defaultValue = "10", value = "pageSize1") int pageSize1,
-//                                            @RequestParam(defaultValue = "1", value = "current2")int current2, @RequestParam(defaultValue = "10", value = "pageSize2") int pageSize2,
-//                                            @RequestParam(defaultValue = "1", value = "current3")int current3, @RequestParam(defaultValue = "10", value = "pageSize3") int pageSize3,
-//                                            @RequestParam(defaultValue = "1", value = "current4")int current4, @RequestParam(defaultValue = "10", value = "pageSize4") int pageSize4,String applyType) {
-//
-//            IPage<EarlyWarningEO> list1 = earlyWarningEOService.query1ByApplyType(current1,pageSize1,applyType);
-//            IPage<EarlyWarningEO> list2 = earlyWarningEOService.query2ByApplyType(current2,pageSize2,applyType);
-//            IPage<EarlyWarningEO> list3 = earlyWarningEOService.query3ByApplyType(current3,pageSize3,applyType);
-//            IPage<EarlyWarningEO> list4 = earlyWarningEOService.query4ByApplyType(current4,pageSize4,applyType);
-//            return getResponseMessage(list1, list2, list3, list4);
-//
-//
-//    }
-
     private ResponseMessage getResponseMessage(IPage<EarlyWarningEO> list1, IPage<EarlyWarningEO> list2, IPage<EarlyWarningEO> list3, IPage<EarlyWarningEO> list4) {
         List<Map<String, Object>> listMap = new ArrayList<Map<String,Object>>();
         Map<String, Object> map = new HashMap<String, Object>();
@@ -76,11 +59,11 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
     }
 
     @GetMapping("/PolicyWarning")
-    @ApiOperation("分页查询政策预警")
+    @ApiOperation("政策预警查询")
     public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "current1")int current1, @RequestParam(defaultValue = "10", value = "pageSize1") int pageSize1,
                                              @RequestParam(defaultValue = "1", value = "current2")int current2, @RequestParam(defaultValue = "10", value = "pageSize2") int pageSize2) {
-        IPage<EarlyWarningEO> list1 = earlyWarningEOService.newPolicyQueryAll(current1,pageSize1);
-        IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldPolicyQueryAll(current2,pageSize2);
+        IPage<EarlyWarningEO> list1 = earlyWarningEOService.newPolicyQuery(current1,pageSize1);
+        IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldPolicyQuery(current2,pageSize2);
         List<Map<String, Object>> listMap = new ArrayList<Map<String,Object>>();
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("newPolicy", list1);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java
index 1b32a64c..6a32b26f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java
@@ -8,19 +8,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
 
 public interface EarlyWarningEOService extends IService<EarlyWarningEO> {
-    IPage<EarlyWarningEO> newQueryAll(int current,int pageSize,String applyType);
-    IPage<EarlyWarningEO> oldQueryAll(int current,int pageSize,String applyType);
-    IPage<EarlyWarningEO> newItemsQueryAll(int current,int pageSize,String applyType);
-    IPage<EarlyWarningEO> oldItemsQueryAll(int current,int pageSize,String applyType);
-    IPage<EarlyWarningEO> newPolicyQueryAll(int current,int pageSize);
-    IPage<EarlyWarningEO> oldPolicyQueryAll(int current,int pageSize);
-//    IPage<EarlyWarningEO> query1ByApplyType(int current, int pageSize, String applyType);
-//    IPage<EarlyWarningEO> query2ByApplyType(int current, int pageSize, String applyType);
-//    IPage<EarlyWarningEO> query3ByApplyType(int current, int pageSize, String applyType);
-//    IPage<EarlyWarningEO> query4ByApplyType(int current, int pageSize, String applyType);
+    IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,String applyType);
+    IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,String applyType);
+    IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,String applyType);
+    IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,String applyType);
+    IPage<EarlyWarningEO> newPolicyQuery(int current,int pageSize);
+    IPage<EarlyWarningEO> oldPolicyQuery(int current,int pageSize);
     String batchSave(List<EarlyWarningEO> earlyWarningEOS);
     String ChangePermissions(String id);
-
-
-
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
index f205494e..b8965a78 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
@@ -34,7 +34,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         6：在产车政策预警
      */
     @Override
-    public IPage<EarlyWarningEO> newQueryAll(int current,int pageSize,String applyType){
+    public IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,String applyType){
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         if (applyType!=null&&applyType.length()!=0){
             wrapper.like("APPLY_TYPE",applyType);
@@ -43,7 +43,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
     @Override
-    public IPage<EarlyWarningEO> oldQueryAll(int current,int pageSize,String applyType){
+    public IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,String applyType){
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         if (applyType!=null&&applyType.length()!=0){
             wrapper.like("APPLY_TYPE",applyType);
@@ -52,7 +52,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
     @Override
-    public IPage<EarlyWarningEO> newItemsQueryAll(int current,int pageSize,String applyType){
+    public IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,String applyType){
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         if (applyType!=null&&applyType.length()!=0){
             wrapper.like("APPLY_TYPE",applyType);
@@ -61,7 +61,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
     @Override
-    public IPage<EarlyWarningEO> oldItemsQueryAll(int current,int pageSize,String applyType){
+    public IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,String applyType){
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         if (applyType!=null&&applyType.length()!=0){
             wrapper.like("APPLY_TYPE",applyType);
@@ -71,47 +71,18 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
     }
 
     @Override
-    public IPage<EarlyWarningEO> newPolicyQueryAll(int current,int pageSize) {
+    public IPage<EarlyWarningEO> newPolicyQuery(int current,int pageSize) {
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         wrapper.eq("mark",5);
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
     @Override
-    public IPage<EarlyWarningEO> oldPolicyQueryAll(int current,int pageSize) {
+    public IPage<EarlyWarningEO> oldPolicyQuery(int current,int pageSize) {
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         wrapper.eq("mark",6);
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
 
-//    @Override
-//    public IPage<EarlyWarningEO> query1ByApplyType(int current, int pageSize, String applyType) {
-//        QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
-//
-//        wrapper.like("APPLY_TYPE",applyType)
-//                .eq("mark",1);
-//        return getEarlyWarningEOIPage(current, pageSize, wrapper);
-//    }
-//    @Override
-//    public IPage<EarlyWarningEO> query2ByApplyType(int current, int pageSize, String applyType) {
-//        QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
-//        wrapper.like("APPLY_TYPE",applyType)
-//                .eq("mark",2);
-//        return getEarlyWarningEOIPage(current, pageSize, wrapper);
-//    }
-//    @Override
-//    public IPage<EarlyWarningEO> query3ByApplyType(int current, int pageSize, String applyType) {
-//        QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
-//        wrapper.like("APPLY_TYPE",applyType)
-//                .eq("mark",3);
-//        return getEarlyWarningEOIPage(current, pageSize, wrapper);
-//    }
-//    @Override
-//    public IPage<EarlyWarningEO> query4ByApplyType(int current, int pageSize, String applyType) {
-//        QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
-//        wrapper.like("APPLY_TYPE",applyType)
-//                .eq("mark",4);
-//        return getEarlyWarningEOIPage(current, pageSize, wrapper);
-//    }
     //批量插入
     @Override
     public String batchSave(List<EarlyWarningEO> earlyWarningEOS) {
@@ -124,15 +95,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         try {
             QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
             EarlyWarningEO earlyWarningEO =earlyWarningEODao.selectById(id);
+            if(earlyWarningEO==null){
+                return "id不存在，更改失败";
+            }
             earlyWarningEO.setPower("0");
             earlyWarningEODao.updateById(earlyWarningEO);
         }catch (Exception e){
             e.printStackTrace();
-            return "false";
+            return "更改失败";
         }
-        return "成功";
-
-
+        return "更改成功";
     }
     private IPage<EarlyWarningEO> getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper<EarlyWarningEO> wrapper) {
         wrapper.eq("power",1);
@@ -142,7 +114,4 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         System.out.println("总页数"+userIPage.getPages());
         return userIPage;
     }
-
-
-
 }