WEB端查看APP客户设备绑定

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/equipment/APPDeviceController.java

@@ -8,6 +8,7 @@ import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
 import com.fuyuanshen.app.service.equipment.APPDeviceService;
 import com.fuyuanshen.common.core.domain.PageResult;
 import com.fuyuanshen.common.core.domain.ResponseVO;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -34,16 +35,11 @@ public class APPDeviceController {
 
     @PostMapping(value = "/list")
     @Operation(summary = "APP客户设备列表")
-    public ResponseVO<PageResult<APPDevice>> appDeviceList(@RequestBody APPDeviceQueryCriteria criteria) {
+    public TableDataInfo<APPDevice> appDeviceList(@RequestBody APPDeviceQueryCriteria criteria) {
         Page<APPDevice> page = new Page<>(criteria.getPage(), criteria.getSize());
-        PageResult<APPDevice> devices = null;
+
-        try {
+        TableDataInfo<APPDevice> devices = appDeviceService.appDeviceList(page, criteria);
-            devices = appDeviceService.appDeviceList(page, criteria);
+        return devices;
-        } catch (Exception e) {
-            log.error("queryDevice error: " + e.getMessage());
-            return ResponseVO.fail("");
-        }
-        return ResponseVO.success(devices);
     }
 
 
@@ -65,16 +61,11 @@ public class APPDeviceController {
 
     @GetMapping
     @Operation(summary = "WEB端查看APP客户设备绑定")
-    public ResponseVO<PageResult<APPDevice>> queryAPPDevice(APPDeviceQueryCriteria criteria) {
+    public TableDataInfo<APPDevice> queryAPPDevice(APPDeviceQueryCriteria criteria) {
         Page<APPDevice> page = new Page<>(criteria.getPage(), criteria.getSize());
-        PageResult<APPDevice> devices = null;
+        TableDataInfo<APPDevice> devices = null;
-        try {
         devices = appDeviceService.queryAll(page, criteria);
-        } catch (Exception e) {
+        return devices;
-            log.error("queryDevice error: " + e.getMessage());
-            return ResponseVO.fail("");
-        }
-        return ResponseVO.success(devices);
     }
 
 

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/equipment/APPDeviceService.java

@@ -7,6 +7,7 @@ import com.fuyuanshen.app.domain.APPDeviceType;
 import com.fuyuanshen.app.domain.dto.APPUnbindDTO;
 import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
 import com.fuyuanshen.common.core.domain.PageResult;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface APPDeviceService extends IService<APPDevice> {
      *
      * @param criteria
      */
-    PageResult<APPDevice> appDeviceList(Page<APPDevice> page, APPDeviceQueryCriteria criteria);
+    TableDataInfo<APPDevice> appDeviceList(Page<APPDevice> page, APPDeviceQueryCriteria criteria);
 
 
     /**
@@ -47,7 +48,7 @@ public interface APPDeviceService extends IService<APPDevice> {
      * @param page
      * @return
      */
-    PageResult<APPDevice> queryAll(Page<APPDevice> page, APPDeviceQueryCriteria criteria);
+    TableDataInfo<APPDevice> queryAll(Page<APPDevice> page, APPDeviceQueryCriteria criteria);
 
     /**
      * APP/小程序用户设备解绑

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/equipment/APPDeviceServiceImpl.java

@@ -16,6 +16,7 @@ import com.fuyuanshen.app.mapper.equipment.AppDeviceTypeMapper;
 import com.fuyuanshen.app.service.equipment.APPDeviceService;
 import com.fuyuanshen.common.core.domain.PageResult;
 import com.fuyuanshen.common.core.exception.BadRequestException;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceType;
@@ -55,7 +56,7 @@ public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice
      * @param criteria
      */
     @Override
-    public PageResult<APPDevice> appDeviceList(Page<APPDevice> page, APPDeviceQueryCriteria criteria) {
+    public TableDataInfo<APPDevice> appDeviceList(Page<APPDevice> page, APPDeviceQueryCriteria criteria) {
         // criteria.setCustomerId(SecurityUtils.getCurrentUserId());
         // IPage<APPDevice> devices = appDeviceMapper.appDeviceList(page, criteria);
         // return new PageResult<>(devices.getRecords(), devices.getTotal());
@@ -149,11 +150,9 @@ public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice
      * @return
      */
     @Override
-    public PageResult<APPDevice> queryAll(Page<APPDevice> page, APPDeviceQueryCriteria criteria) {
+    public TableDataInfo<APPDevice> queryAll(Page<APPDevice> page, APPDeviceQueryCriteria criteria) {
-        // IPage<APPDevice> devices = appDeviceMapper.queryAll(page, criteria);
+        IPage<APPDevice> devices = appDeviceMapper.queryAll(page, criteria);
-        // return new PageResult<>(devices.getRecords(), devices.getTotal());
+        return new TableDataInfo<>(devices.getRecords(), devices.getTotal());
-
-        return null;
     }