diff --git a/springboot/sql/update/iot_things_model_template.sql b/springboot/sql/update/iot_things_model_template.sql new file mode 100644 index 00000000..5539adc5 --- /dev/null +++ b/springboot/sql/update/iot_things_model_template.sql @@ -0,0 +1,61 @@ +/* + Navicat Premium Data Transfer + + Source Server : 阿里云 + Source Server Type : MySQL + Source Server Version : 50726 + Source Host : 114.55.33.198:3306 + Source Schema : wumei-smart + + Target Server Type : MySQL + Target Server Version : 50726 + File Encoding : 65001 + + Date: 15/04/2022 23:32:21 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for iot_things_model_template +-- ---------------------------- +DROP TABLE IF EXISTS `iot_things_model_template`; +CREATE TABLE `iot_things_model_template` ( + `template_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '物模型ID', + `template_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '物模型名称', + `tenant_id` bigint(20) NOT NULL COMMENT '租户ID', + `tenant_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '租户名称', + `identifier` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标识符，产品下唯一', + `type` tinyint(1) NOT NULL COMMENT '模型类别（1-属性，2-功能，3-事件）', + `datatype` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据类型（integer、decimal、string、bool、array、enum）', + `specs` json NOT NULL COMMENT '数据定义', + `is_sys` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否系统通用（0-否，1-是）', + `is_Top` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否首页显示（0-否，1-是）', + `is_Monitor` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否实时监测（0-否，1-是）', + `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`template_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '物模型模板' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of iot_things_model_template +-- ---------------------------- +INSERT INTO `iot_things_model_template` VALUES (1, '空气温度', 1, 'admin', 'temperature', 1, 'decimal', '{\"max\": 120, \"min\": -20, \"step\": 0.1, \"type\": \"decimal\", \"unit\": \"℃\"}', 1, 1, 1, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-09 20:58:06', NULL); +INSERT INTO `iot_things_model_template` VALUES (2, '空气湿度', 1, 'admin', 'humidity', 1, 'decimal', '{\"max\": 100, \"min\": 0, \"step\": 0.1, \"type\": \"decimal\", \"unit\": \"%\"}', 1, 1, 1, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-11 00:11:08', NULL); +INSERT INTO `iot_things_model_template` VALUES (3, '二氧化碳', 1, 'admin', 'co2', 1, 'integer', '{\"max\": 6000, \"min\": 100, \"step\": 1, \"type\": \"integer\", \"unit\": \"ppm\"}', 1, 0, 1, '0', 'admin', '2022-03-09 17:41:49', '', '2022-04-12 16:06:23', NULL); +INSERT INTO `iot_things_model_template` VALUES (4, '室内亮度', 1, 'admin', 'brightness', 1, 'integer', '{\"max\": 10000, \"min\": 0, \"step\": 1, \"type\": \"integer\", \"unit\": \"cd/m2\"}', 1, 0, 1, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-11 00:10:17', NULL); +INSERT INTO `iot_things_model_template` VALUES (5, '设备开关', 1, 'admin', 'switch', 2, 'bool', '{\"type\": \"bool\", \"trueText\": \"打开\", \"falseText\": \"关闭\"}', 1, 1, 0, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-09 17:41:49', NULL); +INSERT INTO `iot_things_model_template` VALUES (6, '运行档位', 1, 'admin', 'gear', 2, 'enum', '{\"type\": \"enum\", \"enumList\": [{\"text\": \"低速档位\", \"value\": \"0\"}, {\"text\": \"中速档位\", \"value\": \"1\"}, {\"text\": \"中高速档位\", \"value\": \"2\"}, {\"text\": \"高速档位\", \"value\": \"3\"}]}', 1, 1, 0, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-09 17:41:49', NULL); +INSERT INTO `iot_things_model_template` VALUES (7, '灯光颜色', 1, 'admin', 'light_color', 2, 'array', '{\"type\": \"array\", \"arrayType\": \"int\"}', 1, 0, 0, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-11 00:54:11', NULL); +INSERT INTO `iot_things_model_template` VALUES (8, '屏显消息', 1, 'admin', 'message', 2, 'string', '{\"type\": \"string\", \"maxLength\": 1024}', 1, 0, 0, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-09 17:41:49', NULL); +INSERT INTO `iot_things_model_template` VALUES (9, '上报监测数据', 1, 'admin', 'report_monitor', 2, 'integer', '{\"max\": 10, \"min\": 1, \"step\": 1, \"type\": \"integer\", \"unit\": \"次数\"}', 1, 0, 0, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-09 17:41:49', NULL); +INSERT INTO `iot_things_model_template` VALUES (10, '环境温度过高', 1, 'admin', 'height_temperature', 3, 'decimal', '{\"max\": 100, \"min\": 0, \"step\": 0.1, \"type\": \"decimal\", \"unit\": \"℃\"}', 1, 0, 0, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-11 14:48:21', NULL); +INSERT INTO `iot_things_model_template` VALUES (11, '设备发生异常', 1, 'admin', 'exception', 3, 'string', '{\"type\": \"string\", \"maxLength\": 1024}', 1, 0, 0, '0', 'admin', '2022-03-09 17:41:49', '', '2022-03-09 17:41:49', NULL); +INSERT INTO `iot_things_model_template` VALUES (15, '管理员测试通用物', 1, 'admin', '1111111', 1, 'integer', '{\"max\": 1111, \"min\": 11, \"step\": null, \"type\": \"integer\"}', 1, 0, 0, '0', 'admin', '2022-04-15 23:30:23', '', NULL, NULL); + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/springboot/sql/update/sys_role_menu.sql b/springboot/sql/update/sys_role_menu.sql index 88f83646..f56944d8 100644 --- a/springboot/sql/update/sys_role_menu.sql +++ b/springboot/sql/update/sys_role_menu.sql @@ -11,7 +11,7 @@ Target Server Version : 50726 File Encoding : 65001 - Date: 14/04/2022 23:28:40 + Date: 15/04/2022 23:33:21 */ SET NAMES utf8mb4; @@ -31,7 +31,6 @@ CREATE TABLE `sys_role_menu` ( -- Records of sys_role_menu -- ---------------------------- INSERT INTO `sys_role_menu` VALUES (2, 108); -INSERT INTO `sys_role_menu` VALUES (2, 112); INSERT INTO `sys_role_menu` VALUES (2, 2000); INSERT INTO `sys_role_menu` VALUES (2, 2001); INSERT INTO `sys_role_menu` VALUES (2, 2002); diff --git a/springboot/wumei-admin/src/main/resources/application-druid.yml b/springboot/wumei-admin/src/main/resources/application-druid.yml index 153f3778..ca08ffff 100644 --- a/springboot/wumei-admin/src/main/resources/application-druid.yml +++ b/springboot/wumei-admin/src/main/resources/application-druid.yml @@ -8,8 +8,8 @@ spring: master: url: jdbc:mysql://localhost/wumei-smart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root -# password: wumei-smart - password: 123456 + password: wumei-smart +# password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/springboot/wumei-admin/src/main/resources/application.yml b/springboot/wumei-admin/src/main/resources/application.yml index 636091da..de4a59e0 100644 --- a/springboot/wumei-admin/src/main/resources/application.yml +++ b/springboot/wumei-admin/src/main/resources/application.yml @@ -65,8 +65,8 @@ spring: # 数据库索引 database: 0 # 密码 -# password: wumei-smart - password: 123456 + password: wumei-smart +# password: 123456 # 连接超时时间 timeout: 10s lettuce: diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java index 3e4a1896..0d22c397 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java @@ -1,5 +1,6 @@ package com.ruoyi.iot.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -48,7 +49,14 @@ public class CategoryController extends BaseController public TableDataInfo list(Category category) { startPage(); - List list = categoryService.selectCategoryList(category); + List list = new ArrayList<>(); + if(category.getTenantName()== null || category.getTenantName()=="") + { + list = categoryService.selectCategoryList(category); + }else { + list = categoryService.selectCategoryList1(category); + } + return getDataTable(list); } @@ -58,9 +66,15 @@ public class CategoryController extends BaseController @PreAuthorize("@ss.hasPermi('iot:category:list')") @GetMapping("/shortlist") @ApiOperation("分类简短列表") - public AjaxResult shortlist() + public AjaxResult shortlist(Category category) { - List list = categoryService.selectCategoryShortList(); + List list = new ArrayList<>(); + if(category.getTenantName()==""||category.getTenantName()==null) + { + list = categoryService.selectCategoryShortList(); + }else { + list = categoryService.selectCategoryShortList1(category); + } return AjaxResult.success(list); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java index 32993ae9..b91256e0 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java @@ -18,6 +18,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -43,7 +44,16 @@ public class DeviceController extends BaseController public TableDataInfo list(Device device) { startPage(); - List list = deviceService.selectDeviceList(device); + List list = new ArrayList<>(); + if(device.getUserName()==null || device.getUserName()=="" ) + { + list = deviceService.selectDeviceList(device); + System.out.print("进入模糊查询"); + }else { + // 精确查询 + System.out.print("进入精准查询"+device.getUserName()); + list = deviceService.selectDeviceList1(device); + } return getDataTable(list); } @@ -56,7 +66,14 @@ public class DeviceController extends BaseController public TableDataInfo shortList(Device device) { startPage(); - List list = deviceService.selectDeviceShortList(device); + List list = new ArrayList<>(); + if(device.getUserName()==null || device.getUserName()=="" ) + { + list = deviceService.selectDeviceShortList(device); + }else { + // 精确查询 + list = deviceService.selectDeviceShortList1(device); + } return getDataTable(list); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java index 110ebd23..82382719 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java @@ -59,6 +59,7 @@ public class FirmwareController extends BaseController public TableDataInfo list(Firmware firmware) { startPage(); + System.out.print("租户名称"+firmware.getTenantName()+"hs"); List list = firmwareService.selectFirmwareList(firmware); return getDataTable(list); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java index 335c3a6f..2913a5ba 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java @@ -1,5 +1,6 @@ package com.ruoyi.iot.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -49,7 +50,16 @@ public class GroupController extends BaseController public TableDataInfo list(Group group) { startPage(); - List list = groupService.selectGroupList(group); + List list = new ArrayList<>(); + if(group.getUserName() == null || group.getUserName() == "") + { +// 搜索查询 ,mapper使用的是模糊查询 + list = groupService.selectGroupList(group); + + }else { +// 精准查询 + list = groupService.selectGroupList1(group); + } return getDataTable(list); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java index c803b87a..bf2a48b6 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java @@ -17,6 +17,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -42,7 +43,13 @@ public class ProductController extends BaseController public TableDataInfo list(Product product) { startPage(); - List list = productService.selectProductList(product); + List list = new ArrayList<>(); + if(product.getTenantName()=="" ||product.getTenantName()==null) + { + list = productService.selectProductList(product); + }else { + list = productService.selectProductList1(product); + } return getDataTable(list); } @@ -52,9 +59,10 @@ public class ProductController extends BaseController @PreAuthorize("@ss.hasPermi('iot:product:list')") @GetMapping("/shortList") @ApiOperation("产品简短列表") - public AjaxResult shortList() + public AjaxResult shortList(Product product) { - List list = productService.selectProductShortList(); + + List list = productService.selectProductShortList(); return AjaxResult.success(list); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java index e7941fb0..cd91eb67 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java @@ -1,5 +1,6 @@ package com.ruoyi.iot.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -47,8 +48,14 @@ public class ThingsModelTemplateController extends BaseController public TableDataInfo list(ThingsModelTemplate thingsModelTemplate) { startPage(); - List list = thingsModelTemplateService.selectThingsModelTemplateList(thingsModelTemplate); - return getDataTable(list); + List list = new ArrayList<>(); + if (thingsModelTemplate.getTenantName() == ""|| thingsModelTemplate.getTenantName() == null){ + list = thingsModelTemplateService.selectThingsModelTemplateList(thingsModelTemplate); + }else{ +// 精准查询 + list = thingsModelTemplateService.selectThingsModelTemplateList1(thingsModelTemplate); + } + return getDataTable(list); } /** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java index 3e536013..29cdc487 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java @@ -77,4 +77,8 @@ public interface CategoryMapper * @return 结果 */ public int productCountInCategorys(Long[] categoryIds); + // 精准查询 + List selectCategoryList1(Category category); + + List selectCategoryShortList1(Category category); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java index 5bd5516a..4527855a 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java @@ -161,6 +161,10 @@ public interface DeviceMapper * @return */ public int deleteDeviceGroupByDeviceIds(Long[] deviceIds); -// 查询简短设备列表 +// 查询所有简短设备列表 List selectAllDeviceShortList1(String userName); +//精准查询 + List selectDeviceList1(Device device); + + List selectDeviceShortList1(Device device); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java index 230a7fa2..3004f9f9 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java @@ -83,4 +83,7 @@ public interface GroupMapper * @return */ public int deleteDeviceGroupByGroupIds(Long[] groupIds); + +// 精准查询所有 + List selectGroupList1(Group group); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java index dae480a1..7f6b901f 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java @@ -116,4 +116,6 @@ public interface ProductMapper * @return 结果 */ public int thingsCountInProduct(Long productId); + // 精准查询 + List selectProductList1(Product product); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java index bbfa24fb..82c970f4 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java @@ -68,4 +68,6 @@ public interface ThingsModelTemplateMapper * @return 结果 */ public int deleteThingsModelTemplateByTemplateIds(Long[] templateIds); + // 精准查询 + List selectThingsModelTemplateList1(ThingsModelTemplate thingsModelTemplate); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java index 45833cde..ab9c4df9 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java @@ -68,4 +68,9 @@ public interface ICategoryService * @return 结果 */ public int deleteCategoryByCategoryId(Long categoryId); + +// 精准查询 + List selectCategoryList1(Category category); + + List selectCategoryShortList1(Category category); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java index 45f229a9..99350e32 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java @@ -154,4 +154,10 @@ public interface IDeviceService // 获取所有简短设备列表 List selectAllDeviceShortList1(String userName); + +// 精准查询 + List selectDeviceList1(Device device); + +// 精准查询所有条件设备的简短信息 + List selectDeviceShortList1(Device device); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java index 3c140fa3..8bbd00c6 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java @@ -74,4 +74,6 @@ public interface IGroupService */ public int deleteGroupByGroupId(Long groupId); +// 精准查询 + List selectGroupList1(Group group); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java index 92931e51..59e0cf0b 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java @@ -77,4 +77,7 @@ public interface IProductService * @return 结果 */ public int deleteProductByProductId(Long productId); + +// 精准查询 + List selectProductList1(Product product); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java index e4bb54e2..59367c6f 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java @@ -58,4 +58,7 @@ public interface IThingsModelTemplateService * @return 结果 */ public int deleteThingsModelTemplateByTemplateId(Long templateId); + +// 精准查询 + List selectThingsModelTemplateList1(ThingsModelTemplate thingsModelTemplate); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java index 6f09b18c..cc92509d 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java @@ -97,6 +97,11 @@ public class CategoryServiceImpl implements ICategoryService return categoryMapper.updateCategory(category); } + @Override + public List selectCategoryShortList1(Category category) { + return categoryMapper.selectCategoryShortList1(category); + } + /** * 批量删除产品分类 * @@ -127,4 +132,9 @@ public class CategoryServiceImpl implements ICategoryService { return categoryMapper.deleteCategoryByCategoryId(categoryId); } + + @Override + public List selectCategoryList1(Category category) { + return categoryMapper.selectCategoryList1(category); + } } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java index 43a4af92..88ac044d 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java @@ -250,6 +250,12 @@ public class DeviceServiceImpl implements IDeviceService { return deviceList; } +// 精准查询所有条件的设备 + @Override + public List selectDeviceShortList1(Device device) { + return deviceMapper.selectDeviceShortList1(device); + } + /** * Json物模型集合转换为对象中的分类集合 * @@ -538,6 +544,11 @@ public class DeviceServiceImpl implements IDeviceService { public List selectAllDeviceShortList1(String userName) { return deviceMapper.selectAllDeviceShortList1(userName); } +// 精准查询 + @Override + public List selectDeviceList1(Device device) { + return deviceMapper.selectDeviceList1(device); + } /** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java index ec23e3c2..6e30dada 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java @@ -139,4 +139,10 @@ public class GroupServiceImpl implements IGroupService return groupMapper.deleteGroupByGroupId(groupId); } + +// 精准查询所有 + @Override + public List selectGroupList1(Group group) { + return groupMapper.selectGroupList1(group); + } } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java index 0c9788c7..fadf43ba 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java @@ -180,6 +180,7 @@ public class ProductServiceImpl implements IProductService return AjaxResult.error("删除失败"); } + /** * 删除产品信息 * @@ -193,4 +194,9 @@ public class ProductServiceImpl implements IProductService redisCache.deleteObject(tslPreKey+productId); return productMapper.deleteProductByProductId(productId); } + // 精准查询 + @Override + public List selectProductList1(Product product) { + return productMapper.selectProductList1(product); + } } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java index 1a5930f8..07a03596 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java @@ -108,4 +108,9 @@ public class ThingsModelTemplateServiceImpl implements IThingsModelTemplateServi { return thingsModelTemplateMapper.deleteThingsModelTemplateByTemplateId(templateId); } + // 精准查询 + @Override + public List selectThingsModelTemplateList1(ThingsModelTemplate thingsModelTemplate) { + return thingsModelTemplateMapper.selectThingsModelTemplateList1(thingsModelTemplate); + } } diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml index 2d1d9e0b..0f7d9326 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml @@ -34,12 +34,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by order_num - + + + + diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml index e73bcac9..562de0df 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml @@ -31,6 +31,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by group_order + + diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml index 45e5aa97..ad476501 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml @@ -34,6 +34,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc +