diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java index b38095a..544e511 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/controller/CustomerController.java @@ -3,6 +3,7 @@ package com.fuyuanshen.customer.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.crypto.digest.BCrypt; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.core.domain.ResponseVO; import com.fuyuanshen.common.core.utils.StringUtils; import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; @@ -51,43 +52,43 @@ public class CustomerController { @GetMapping(value = "/allCustomer") @Operation(summary = "查询所有客户") - public ResponseVO> queryAllCustomer(UserQueryCriteria criteria) { + public R> queryAllCustomer(UserQueryCriteria criteria) { List customers = customerService.queryAllCustomers(criteria); - return ResponseVO.success(customers); + return R.ok(customers); } // @Log("新增客户") @Operation(summary = "新增客户") @PostMapping(value = "/addCustomer") - public ResponseVO addCustomer(@Validated @RequestBody Customer customer) throws BadRequestException { + public R addCustomer(@Validated @RequestBody Customer customer) throws BadRequestException { if (StringUtils.isBlank(customer.getPassword())) { throw new BadRequestException("账号密码不能为空"); } customer.setPassword(BCrypt.hashpw(customer.getPassword())); customerService.addCustomer(customer); - return ResponseVO.success("新增客户成功!!!"); + return R.ok(); } // @Log("修改客户") @Operation(summary = "修改客户") @PutMapping(value = "updateCustomer") - public ResponseVO updateCustomer(@RequestBody Customer resources) throws Exception { + public R updateCustomer(@RequestBody Customer resources) throws Exception { customerService.updateCustomer(resources); - return ResponseVO.success(null); + return R.ok(); } // @Log("删除客户") @Operation(summary = "删除客户") @DeleteMapping(value = "/deleteCustomer") - public ResponseVO deleteCustomer(@RequestBody Set ids) throws BadRequestException { + public R deleteCustomer(@RequestBody Set ids) throws BadRequestException { if (CollectionUtil.isEmpty(ids)) { throw new BadRequestException("请选择要删除的客户"); } customerService.delete(ids); - return ResponseVO.success(null); + return R.ok(); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java index 3e5d8be..70f186d 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java @@ -1,6 +1,7 @@ package com.fuyuanshen.equipment.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.core.domain.ResponseVO; import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.equipment.domain.DeviceType; @@ -40,43 +41,45 @@ public class DeviceTypeController { @GetMapping(value = "/all") @Operation(summary = "查询所有设备类型") - public ResponseVO queryDeviceTypes() { + public R> queryDeviceTypes() { List deviceTypes = deviceTypeService.queryDeviceTypes(); - return ResponseVO.success(deviceTypes); + return R.ok(deviceTypes); } // @Log("新增设备类型") @Operation(summary = "新增设备类型") @PostMapping(value = "/add") - public ResponseVO createDeviceType(@Validated @RequestBody DeviceType resources) { + public R createDeviceType(@Validated @RequestBody DeviceType resources) { deviceTypeService.create(resources); - return ResponseVO.success(null); + return R.ok(); } // @Log("修改设备类型") @Operation(summary = "修改设备类型") @PutMapping(value = "/update") - public ResponseVO updateDeviceType(@Validated @RequestBody DeviceTypeForm resources) { + public R updateDeviceType(@Validated @RequestBody DeviceTypeForm resources) { deviceTypeService.update(resources); - return ResponseVO.success(null); + return R.ok(); } // @Log("删除设备类型") @Operation(summary = "删除设备类型") @DeleteMapping(value = "/delete") - public ResponseVO deleteDeviceType(@Parameter(name = "传ID数组[]") @RequestBody List ids) { + public R deleteDeviceType(@Parameter(name = "传ID数组[]") @RequestBody List ids) { deviceTypeService.deleteAll(ids); - return ResponseVO.success("删除成功!!!"); + return R.ok(); } @GetMapping(value = "/communicationMode") @Operation(summary = "获取设备类型通讯方式") - public ResponseVO getCommunicationMode(@Parameter(name = "设备类型ID", required = true) Long id) { - return ResponseVO.success(deviceTypeService.getCommunicationMode(id)); + public R getCommunicationMode(@Parameter(name = "设备类型ID", required = true) Long id) { + DeviceType communicationMode = deviceTypeService.getCommunicationMode(id); + return R.ok(communicationMode); + } }