diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index a3ffd67..10f6d8f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -78,7 +78,15 @@ private IDeviceTypeService deviceTypeService; @Autowired private IDeviceModelsService deviceModelsService; - + @ApiOperation("获取设备列表") + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper(); + query.eq("id",0); + return ResponseData.success( super.packForBT(deviceService.selectPage(page,query))); + } @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index a3ffd67..10f6d8f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -78,7 +78,15 @@ private IDeviceTypeService deviceTypeService; @Autowired private IDeviceModelsService deviceModelsService; - + @ApiOperation("获取设备列表") + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper(); + query.eq("id",0); + return ResponseData.success( super.packForBT(deviceService.selectPage(page,query))); + } @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 494ad07..f6d1fd5 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -54,6 +54,16 @@ com.casic casic-core ${core.version} + + + org.mybatis + mybatis + + + org.apache.shiro + shiro-core + + com.casic @@ -61,35 +71,81 @@ ${admin.version} + com.alibaba + fastjson + 1.2.72 + + + org.mybatis + mybatis + 3.5.7 + + com.casic casic-admin-core ${admin.version} + + + org.mybatis + mybatis + + com.casic casic-admin-area ${admin.version} + + + org.mybatis + mybatis + + com.casic casic-device ${pro.version} + + + org.mybatis + mybatis + + com.casic casic-sluicewell ${pro.version} + + + org.mybatis + mybatis + + com.casic casic-analysis ${pro.version} + + + org.mybatis + mybatis + + com.casic casic-alarm ${pro.version} + + + org.mybatis + mybatis + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index a3ffd67..10f6d8f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -78,7 +78,15 @@ private IDeviceTypeService deviceTypeService; @Autowired private IDeviceModelsService deviceModelsService; - + @ApiOperation("获取设备列表") + @RequestMapping(value = "/listPage") + @ResponseBody + public Object listPage() { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper(); + query.eq("id",0); + return ResponseData.success( super.packForBT(deviceService.selectPage(page,query))); + } @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 494ad07..f6d1fd5 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -54,6 +54,16 @@ com.casic casic-core ${core.version} + + + org.mybatis + mybatis + + + org.apache.shiro + shiro-core + + com.casic @@ -61,35 +71,81 @@ ${admin.version} + com.alibaba + fastjson + 1.2.72 + + + org.mybatis + mybatis + 3.5.7 + + com.casic casic-admin-core ${admin.version} + + + org.mybatis + mybatis + + com.casic casic-admin-area ${admin.version} + + + org.mybatis + mybatis + + com.casic casic-device ${pro.version} + + + org.mybatis + mybatis + + com.casic casic-sluicewell ${pro.version} + + + org.mybatis + mybatis + + com.casic casic-analysis ${pro.version} + + + org.mybatis + mybatis + + com.casic casic-alarm ${pro.version} + + + org.mybatis + mybatis + + diff --git a/pom.xml b/pom.xml index 63cd85c..c9d80c7 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 1.0.5 1.7.0 2.1.8 - 1.2.44 + 1.2.72 2.5 1.7 2.3.2