From 2a06c18f352ddaade5331b127510df9e014222cd Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Sat, 5 Jul 2025 16:29:31 +0800 Subject: [PATCH] =?UTF-8?q?WEB=E7=AB=AF=E6=9F=A5=E7=9C=8BAPP=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/APPDeviceController.java | 27 +++++++------------ .../service/equipment/APPDeviceService.java | 5 ++-- .../impl/equipment/APPDeviceServiceImpl.java | 11 ++++---- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/equipment/APPDeviceController.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/equipment/APPDeviceController.java index df1098f..f71e136 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/equipment/APPDeviceController.java +++ b/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> appDeviceList(@RequestBody APPDeviceQueryCriteria criteria) { + public TableDataInfo appDeviceList(@RequestBody APPDeviceQueryCriteria criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - PageResult devices = null; - try { - devices = appDeviceService.appDeviceList(page, criteria); - } catch (Exception e) { - log.error("queryDevice error: " + e.getMessage()); - return ResponseVO.fail(""); - } - return ResponseVO.success(devices); + + TableDataInfo devices = appDeviceService.appDeviceList(page, criteria); + return devices; } @@ -65,16 +61,11 @@ public class APPDeviceController { @GetMapping @Operation(summary = "WEB端查看APP客户设备绑定") - public ResponseVO> queryAPPDevice(APPDeviceQueryCriteria criteria) { + public TableDataInfo queryAPPDevice(APPDeviceQueryCriteria criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - PageResult devices = null; - try { - devices = appDeviceService.queryAll(page, criteria); - } catch (Exception e) { - log.error("queryDevice error: " + e.getMessage()); - return ResponseVO.fail(""); - } - return ResponseVO.success(devices); + TableDataInfo devices = null; + devices = appDeviceService.queryAll(page, criteria); + return devices; } diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/equipment/APPDeviceService.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/equipment/APPDeviceService.java index 3f7160d..82e5ae6 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/equipment/APPDeviceService.java +++ b/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 { * * @param criteria */ - PageResult appDeviceList(Page page, APPDeviceQueryCriteria criteria); + TableDataInfo appDeviceList(Page page, APPDeviceQueryCriteria criteria); /** @@ -47,7 +48,7 @@ public interface APPDeviceService extends IService { * @param page * @return */ - PageResult queryAll(Page page, APPDeviceQueryCriteria criteria); + TableDataInfo queryAll(Page page, APPDeviceQueryCriteria criteria); /** * APP/小程序用户设备解绑 diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/equipment/APPDeviceServiceImpl.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/equipment/APPDeviceServiceImpl.java index b5715a7..480d457 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/equipment/APPDeviceServiceImpl.java +++ b/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 appDeviceList(Page page, APPDeviceQueryCriteria criteria) { + public TableDataInfo appDeviceList(Page page, APPDeviceQueryCriteria criteria) { // criteria.setCustomerId(SecurityUtils.getCurrentUserId()); // IPage devices = appDeviceMapper.appDeviceList(page, criteria); // return new PageResult<>(devices.getRecords(), devices.getTotal()); @@ -149,11 +150,9 @@ public class APPDeviceServiceImpl extends ServiceImpl queryAll(Page page, APPDeviceQueryCriteria criteria) { - // IPage devices = appDeviceMapper.queryAll(page, criteria); - // return new PageResult<>(devices.getRecords(), devices.getTotal()); - - return null; + public TableDataInfo queryAll(Page page, APPDeviceQueryCriteria criteria) { + IPage devices = appDeviceMapper.queryAll(page, criteria); + return new TableDataInfo<>(devices.getRecords(), devices.getTotal()); }