Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/controller/AppPatrolstationController.java

@@ -1,15 +1,19 @@
 package com.sooka.sponest.data.emergency.appmin.patrolstation.controller;
 
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicChannelBlueline;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.domain.AppPatrolstationVO;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.service.AppPatrolstationService;
+import com.sooka.sponest.data.emergency.domain.TBusPatrolstation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("AppPatrolstationController")
-public class AppPatrolstationController {
+public class AppPatrolstationController extends BaseController {
 
     @Resource
     AppPatrolstationService appPatrolstationService;
@@ -18,10 +22,14 @@ public class AppPatrolstationController {
     public AjaxResult addPatrolstation(@RequestBody AppPatrolstationVO vo){
         return appPatrolstationService.addPatrolstation(vo);
     }
+
     @GetMapping("getPatrolstationList")
     public AjaxResult getPatrolstationList(AppPatrolstationVO vo){
-        return appPatrolstationService.getPatrolstationList(vo);
+        startPage();
+        List<TBusPatrolstation> list = appPatrolstationService.getPatrolstationList(vo);
+        return AjaxResult.success(getDataTable(list).getRows());
     }
+
     @RequestMapping("getPatrolstationDetail")
     public AjaxResult getPatrolstationDetail(AppPatrolstationVO vo){
         return appPatrolstationService.getPatrolstationDetail(vo);
@@ -32,7 +40,7 @@ public class AppPatrolstationController {
         return appPatrolstationService.edittPatrolstationList(vo);
     }
     @RequestMapping("deletePatrolstationList")
-    public AjaxResult deletePatrolstationList(AppPatrolstationVO vo){
+    public AjaxResult deletePatrolstationList(@RequestBody AppPatrolstationVO vo){
         return appPatrolstationService.deletePatrolstationList(vo);
     }
 

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/service/AppPatrolstationService.java

@@ -2,12 +2,15 @@ package com.sooka.sponest.data.emergency.appmin.patrolstation.service;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.domain.AppPatrolstationVO;
+import com.sooka.sponest.data.emergency.domain.TBusPatrolstation;
+
+import java.util.List;
 
 public interface AppPatrolstationService {
 
     public AjaxResult addPatrolstation(AppPatrolstationVO vo);
 
-    public AjaxResult getPatrolstationList(AppPatrolstationVO vo);
+    public List<TBusPatrolstation> getPatrolstationList(AppPatrolstationVO vo);
 
     public AjaxResult edittPatrolstationList(AppPatrolstationVO vo);
 

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/service/impl/AppPatrolstationServiceImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
+import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicChannelBlueline;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.domain.AppPatrolstationVO;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.service.AppPatrolstationService;
@@ -57,17 +58,12 @@ public class AppPatrolstationServiceImpl extends BaseServiceImpl implements AppP
     }
 
     @Override
-    public AjaxResult getPatrolstationList(AppPatrolstationVO vo) {
-        try {
-            TBusPatrolstation tBusPatrolstation = new TBusPatrolstation();
-            tBusPatrolstation.setBusEnterpriseId(vo.getBusEnterpriseId());
-            tBusPatrolstation.setSearchValue(vo.getSearchValue());
-            List patrolstation_list = tBusPatrolstationMapper.selectTBusPatrolstationList(tBusPatrolstation);
-            return AjaxResult.success(patrolstation_list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return AjaxResult.error("查询失败");
-        }
+    public List<TBusPatrolstation> getPatrolstationList(AppPatrolstationVO vo) {
+        TBusPatrolstation tBusPatrolstation = new TBusPatrolstation();
+        tBusPatrolstation.setBusEnterpriseId(vo.getBusEnterpriseId());
+        tBusPatrolstation.setSearchValue(vo.getSearchValue());
+        return tBusPatrolstationMapper.selectTBusPatrolstationList(tBusPatrolstation);
+
     }
 
     @Override