From 2a74003fa84cd9adb076905565f022ba26fbfb99 Mon Sep 17 00:00:00 2001 From: wuweigang Date: Mon, 5 May 2025 20:55:36 +0800 Subject: [PATCH] =?UTF-8?q?optimise-=E5=BD=93=E5=90=8C=E6=97=B6=E5=90=AF?= =?UTF-8?q?=E5=8A=A8mall=E5=92=8Ciot=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=9A?= =?UTF-8?q?=E5=87=BA=E7=8E=B0bean=E5=86=B2=E7=AA=81[produt=E5=92=8Cproduct?= =?UTF-8?q?Category=E7=9B=B8=E5=85=B3=E7=9A=84bean],=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=BA=86=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/IotProductCategoryController.java | 14 +++++----- .../admin/product/IotProductController.java | 22 ++++++++-------- .../statistics/IotStatisticsController.java | 14 +++++----- .../service/device/IotDeviceServiceImpl.java | 8 +++--- .../data/IotDevicePropertyServiceImpl.java | 4 +-- .../ota/IotOtaFirmwareServiceImpl.java | 6 ++--- .../IotProductCategoryServiceImpl.java | 26 +++++++++---------- .../thingmodel/IotThingModelServiceImpl.java | 4 +-- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java index bc1c1fbf2..f690cbb75 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java @@ -30,20 +30,20 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. public class IotProductCategoryController { @Resource - private IotProductCategoryService productCategoryService; + private IotProductCategoryService iotProductCategoryService; @PostMapping("/create") @Operation(summary = "创建产品分类") @PreAuthorize("@ss.hasPermission('iot:product-category:create')") public CommonResult createProductCategory(@Valid @RequestBody IotProductCategorySaveReqVO createReqVO) { - return success(productCategoryService.createProductCategory(createReqVO)); + return success(iotProductCategoryService.createProductCategory(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新产品分类") @PreAuthorize("@ss.hasPermission('iot:product-category:update')") public CommonResult updateProductCategory(@Valid @RequestBody IotProductCategorySaveReqVO updateReqVO) { - productCategoryService.updateProductCategory(updateReqVO); + iotProductCategoryService.updateProductCategory(updateReqVO); return success(true); } @@ -52,7 +52,7 @@ public class IotProductCategoryController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('iot:product-category:delete')") public CommonResult deleteProductCategory(@RequestParam("id") Long id) { - productCategoryService.deleteProductCategory(id); + iotProductCategoryService.deleteProductCategory(id); return success(true); } @@ -61,7 +61,7 @@ public class IotProductCategoryController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('iot:product-category:query')") public CommonResult getProductCategory(@RequestParam("id") Long id) { - IotProductCategoryDO productCategory = productCategoryService.getProductCategory(id); + IotProductCategoryDO productCategory = iotProductCategoryService.getProductCategory(id); return success(BeanUtils.toBean(productCategory, IotProductCategoryRespVO.class)); } @@ -69,7 +69,7 @@ public class IotProductCategoryController { @Operation(summary = "获得产品分类分页") @PreAuthorize("@ss.hasPermission('iot:product-category:query')") public CommonResult> getProductCategoryPage(@Valid IotProductCategoryPageReqVO pageReqVO) { - PageResult pageResult = productCategoryService.getProductCategoryPage(pageReqVO); + PageResult pageResult = iotProductCategoryService.getProductCategoryPage(pageReqVO); return success(BeanUtils.toBean(pageResult, IotProductCategoryRespVO.class)); } @@ -77,7 +77,7 @@ public class IotProductCategoryController { @Operation(summary = "获得所有产品分类列表") @PreAuthorize("@ss.hasPermission('iot:product-category:query')") public CommonResult> getSimpleProductCategoryList() { - List list = productCategoryService.getProductCategoryListByStatus( + List list = iotProductCategoryService.getProductCategoryListByStatus( CommonStatusEnum.ENABLE.getStatus()); return success(convertList(list, category -> new IotProductCategoryRespVO().setId(category.getId()).setName(category.getName()))); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java index 2d8c85640..f662d8a9f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java @@ -39,22 +39,22 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. public class IotProductController { @Resource - private IotProductService productService; + private IotProductService iotProductService; @Resource - private IotProductCategoryService categoryService; + private IotProductCategoryService iotProductCategoryService; @PostMapping("/create") @Operation(summary = "创建产品") @PreAuthorize("@ss.hasPermission('iot:product:create')") public CommonResult createProduct(@Valid @RequestBody IotProductSaveReqVO createReqVO) { - return success(productService.createProduct(createReqVO)); + return success(iotProductService.createProduct(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新产品") @PreAuthorize("@ss.hasPermission('iot:product:update')") public CommonResult updateProduct(@Valid @RequestBody IotProductSaveReqVO updateReqVO) { - productService.updateProduct(updateReqVO); + iotProductService.updateProduct(updateReqVO); return success(true); } @@ -65,7 +65,7 @@ public class IotProductController { @PreAuthorize("@ss.hasPermission('iot:product:update')") public CommonResult updateProductStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { - productService.updateProductStatus(id, status); + iotProductService.updateProductStatus(id, status); return success(true); } @@ -74,7 +74,7 @@ public class IotProductController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('iot:product:delete')") public CommonResult deleteProduct(@RequestParam("id") Long id) { - productService.deleteProduct(id); + iotProductService.deleteProduct(id); return success(true); } @@ -83,9 +83,9 @@ public class IotProductController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('iot:product:query')") public CommonResult getProduct(@RequestParam("id") Long id) { - IotProductDO product = productService.getProduct(id); + IotProductDO product = iotProductService.getProduct(id); // 拼接数据 - IotProductCategoryDO category = categoryService.getProductCategory(product.getCategoryId()); + IotProductCategoryDO category = iotProductCategoryService.getProductCategory(product.getCategoryId()); return success(BeanUtils.toBean(product, IotProductRespVO.class, bean -> { if (category != null) { bean.setCategoryName(category.getName()); @@ -97,9 +97,9 @@ public class IotProductController { @Operation(summary = "获得产品分页") @PreAuthorize("@ss.hasPermission('iot:product:query')") public CommonResult> getProductPage(@Valid IotProductPageReqVO pageReqVO) { - PageResult pageResult = productService.getProductPage(pageReqVO); + PageResult pageResult = iotProductService.getProductPage(pageReqVO); // 拼接数据 - Map categoryMap = categoryService.getProductCategoryMap( + Map categoryMap = iotProductCategoryService.getProductCategoryMap( convertList(pageResult.getList(), IotProductDO::getCategoryId)); return success(BeanUtils.toBean(pageResult, IotProductRespVO.class, bean -> { MapUtils.findAndThen(categoryMap, bean.getCategoryId(), @@ -123,7 +123,7 @@ public class IotProductController { @GetMapping("/simple-list") @Operation(summary = "获取产品的精简信息列表", description = "主要用于前端的下拉选项") public CommonResult> getSimpleProductList() { - List list = productService.getProductList(); + List list = iotProductService.getProductList(); return success(convertList(list, product -> // 只返回 id、name 字段 new IotProductRespVO().setId(product.getId()).setName(product.getName()) .setDeviceType(product.getDeviceType()))); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/IotStatisticsController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/IotStatisticsController.java index a9c195656..6f49d8e92 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/IotStatisticsController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/IotStatisticsController.java @@ -32,9 +32,9 @@ public class IotStatisticsController { @Resource private IotDeviceService deviceService; @Resource - private IotProductCategoryService productCategoryService; + private IotProductCategoryService iotProductCategoryService; @Resource - private IotProductService productService; + private IotProductService iotProductService; @Resource private IotDeviceLogService deviceLogService; @@ -43,20 +43,20 @@ public class IotStatisticsController { public CommonResult getIotStatisticsSummary(){ IotStatisticsSummaryRespVO respVO = new IotStatisticsSummaryRespVO(); // 1.1 获取总数 - respVO.setProductCategoryCount(productCategoryService.getProductCategoryCount(null)); - respVO.setProductCount(productService.getProductCount(null)); + respVO.setProductCategoryCount(iotProductCategoryService.getProductCategoryCount(null)); + respVO.setProductCount(iotProductService.getProductCount(null)); respVO.setDeviceCount(deviceService.getDeviceCount(null)); respVO.setDeviceMessageCount(deviceLogService.getDeviceLogCount(null)); // 1.2 获取今日新增数量 // TODO @super：使用 LocalDateTimeUtils.getToday() LocalDateTime todayStart = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0); - respVO.setProductCategoryTodayCount(productCategoryService.getProductCategoryCount(todayStart)); - respVO.setProductTodayCount(productService.getProductCount(todayStart)); + respVO.setProductCategoryTodayCount(iotProductCategoryService.getProductCategoryCount(todayStart)); + respVO.setProductTodayCount(iotProductService.getProductCount(todayStart)); respVO.setDeviceTodayCount(deviceService.getDeviceCount(todayStart)); respVO.setDeviceMessageTodayCount(deviceLogService.getDeviceLogCount(todayStart)); // 2. 获取各个品类下设备数量统计 - respVO.setProductCategoryDeviceCounts(productCategoryService.getProductCategoryDeviceCountMap()); + respVO.setProductCategoryDeviceCounts(iotProductCategoryService.getProductCategoryDeviceCountMap()); // 3. 获取设备状态数量统计 Map deviceCountMap = deviceService.getDeviceCountMapByState(); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java index 989f10a09..d6864341b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java @@ -55,7 +55,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { private IotDeviceMapper deviceMapper; @Resource - private IotProductService productService; + private IotProductService iotProductService; @Resource @Lazy // 延迟加载，解决循环依赖 private IotDeviceGroupService deviceGroupService; @@ -63,7 +63,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { @Override public Long createDevice(IotDeviceSaveReqVO createReqVO) { // 1.1 校验产品是否存在 - IotProductDO product = productService.getProduct(createReqVO.getProductId()); + IotProductDO product = iotProductService.getProduct(createReqVO.getProductId()); if (product == null) { throw exception(PRODUCT_NOT_EXISTS); } @@ -84,7 +84,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { public IotDeviceDO createDevice(String productKey, String deviceName, Long gatewayId) { String deviceKey = generateDeviceKey(); // 1.1 校验产品是否存在 - IotProductDO product = TenantUtils.executeIgnore(() -> productService.getProductByProductKey(productKey)); + IotProductDO product = TenantUtils.executeIgnore(() -> iotProductService.getProductByProductKey(productKey)); if (product == null) { throw exception(PRODUCT_NOT_EXISTS); } @@ -348,7 +348,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { return; } // 2.1.2 校验产品是否存在 - IotProductDO product = productService.validateProductExists(importDevice.getProductKey()); + IotProductDO product = iotProductService.validateProductExists(importDevice.getProductKey()); // 2.1.3 校验父设备是否存在 Long gatewayId = null; if (StrUtil.isNotEmpty(importDevice.getParentDeviceName())) { diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDevicePropertyServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDevicePropertyServiceImpl.java index 77dde64a6..decee4772 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDevicePropertyServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDevicePropertyServiceImpl.java @@ -64,7 +64,7 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { @Resource private IotThingModelService thingModelService; @Resource - private IotProductService productService; + private IotProductService iotProductService; @Resource private DevicePropertyRedisDAO deviceDataRedisDAO; @@ -79,7 +79,7 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { @Override public void defineDevicePropertyData(Long productId) { // 1.1 查询产品和物模型 - IotProductDO product = productService.validateProductExists(productId); + IotProductDO product = iotProductService.validateProductExists(productId); List thingModels = filterList(thingModelService.getThingModelListByProductId(productId), thingModel -> IotThingModelTypeEnum.PROPERTY.getType().equals(thingModel.getType())); // 1.2 解析 DB 里的字段 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareServiceImpl.java index 7c0ddba7c..bf6bd8dc9 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareServiceImpl.java @@ -33,7 +33,7 @@ public class IotOtaFirmwareServiceImpl implements IotOtaFirmwareService { private IotOtaFirmwareMapper otaFirmwareMapper; @Lazy @Resource - private IotProductService productService; + private IotProductService iotProductService; @Override public Long createOtaFirmware(IotOtaFirmwareCreateReqVO saveReqVO) { @@ -43,8 +43,8 @@ public class IotOtaFirmwareServiceImpl implements IotOtaFirmwareService { // 2.1.转化数据格式，准备存储到数据库中 IotOtaFirmwareDO firmware = BeanUtils.toBean(saveReqVO, IotOtaFirmwareDO.class); // 2.2.查询ProductKey - // TODO @li：productService.getProduct(Convert.toLong(firmware.getProductId())) 放到 1. 后面，先做参考校验。逻辑两段：1）先参数校验；2）构建对象 + 存储 - IotProductDO product = productService.getProduct(Convert.toLong(firmware.getProductId())); + // TODO @li：iotProductService.getProduct(Convert.toLong(firmware.getProductId())) 放到 1. 后面，先做参考校验。逻辑两段：1）先参数校验；2）构建对象 + 存储 + IotProductDO product = iotProductService.getProduct(Convert.toLong(firmware.getProductId())); firmware.setProductKey(Objects.requireNonNull(product).getProductKey()); // TODO @芋艿: 附件、附件签名等属性的计算 otaFirmwareMapper.insert(firmware); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java index f03186866..aee8662e7 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java @@ -29,10 +29,10 @@ import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.PRODUCT_CATEG public class IotProductCategoryServiceImpl implements IotProductCategoryService { @Resource - private IotProductCategoryMapper productCategoryMapper; + private IotProductCategoryMapper iotProductCategoryMapper; @Resource - private IotProductService productService; + private IotProductService iotProductService; @Resource private IotDeviceService deviceService; @@ -40,7 +40,7 @@ public class IotProductCategoryServiceImpl implements IotProductCategoryService public Long createProductCategory(IotProductCategorySaveReqVO createReqVO) { // 插入 IotProductCategoryDO productCategory = BeanUtils.toBean(createReqVO, IotProductCategoryDO.class); - productCategoryMapper.insert(productCategory); + iotProductCategoryMapper.insert(productCategory); // 返回 return productCategory.getId(); } @@ -51,7 +51,7 @@ public class IotProductCategoryServiceImpl implements IotProductCategoryService validateProductCategoryExists(updateReqVO.getId()); // 更新 IotProductCategoryDO updateObj = BeanUtils.toBean(updateReqVO, IotProductCategoryDO.class); - productCategoryMapper.updateById(updateObj); + iotProductCategoryMapper.updateById(updateObj); } @Override @@ -59,18 +59,18 @@ public class IotProductCategoryServiceImpl implements IotProductCategoryService // 校验存在 validateProductCategoryExists(id); // 删除 - productCategoryMapper.deleteById(id); + iotProductCategoryMapper.deleteById(id); } private void validateProductCategoryExists(Long id) { - if (productCategoryMapper.selectById(id) == null) { + if (iotProductCategoryMapper.selectById(id) == null) { throw exception(PRODUCT_CATEGORY_NOT_EXISTS); } } @Override public IotProductCategoryDO getProductCategory(Long id) { - return productCategoryMapper.selectById(id); + return iotProductCategoryMapper.selectById(id); } @Override @@ -78,29 +78,29 @@ public class IotProductCategoryServiceImpl implements IotProductCategoryService if (CollUtil.isEmpty(ids)) { return CollUtil.newArrayList(); } - return productCategoryMapper.selectBatchIds(ids); + return iotProductCategoryMapper.selectBatchIds(ids); } @Override public PageResult getProductCategoryPage(IotProductCategoryPageReqVO pageReqVO) { - return productCategoryMapper.selectPage(pageReqVO); + return iotProductCategoryMapper.selectPage(pageReqVO); } @Override public List getProductCategoryListByStatus(Integer status) { - return productCategoryMapper.selectListByStatus(status); + return iotProductCategoryMapper.selectListByStatus(status); } @Override public Long getProductCategoryCount(LocalDateTime createTime) { - return productCategoryMapper.selectCountByCreateTime(createTime); + return iotProductCategoryMapper.selectCountByCreateTime(createTime); } @Override public Map getProductCategoryDeviceCountMap() { // 1. 获取所有数据 - List categoryList = productCategoryMapper.selectList(); - List productList = productService.getProductList(); + List categoryList = iotProductCategoryMapper.selectList(); + List productList = iotProductService.getProductList(); // TODO @super：不要 list 查询，返回内存，而是查询一个 Map Map deviceCountMapByProductId = deviceService.getDeviceCountMapByProductId(); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java index 9487ff2de..680757c85 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java @@ -50,7 +50,7 @@ public class IotThingModelServiceImpl implements IotThingModelService { private IotThingModelMapper thingModelMapper; @Resource - private IotProductService productService; + private IotProductService iotProductService; @Override @Transactional(rollbackFor = Exception.class) @@ -184,7 +184,7 @@ public class IotThingModelServiceImpl implements IotThingModelService { } private void validateProductStatus(Long createReqVO) { - IotProductDO product = productService.validateProductExists(createReqVO); + IotProductDO product = iotProductService.validateProductExists(createReqVO); if (Objects.equals(product.getStatus(), IotProductStatusEnum.PUBLISHED.getStatus())) { throw exception(PRODUCT_STATUS_NOT_ALLOW_THING_MODEL); }