From c25f288b6c86e20e581905aaa19184fcac41738f Mon Sep 17 00:00:00 2001 From: George Date: Sat, 28 Mar 2026 19:32:06 +0800 Subject: [PATCH] =?UTF-8?q?20260328:=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?= =?UTF-8?q?=EF=BC=9A=E7=BA=A2=E7=BB=BF=E9=BB=84=E5=80=BC=E9=83=BD=E4=B8=8D?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E9=BB=98=E8=AE=A4=E7=BB=BF=E8=89=B2=EF=BC=9B?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=A0=E4=B8=8A=E8=AE=BE=E5=A4=87=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fastbee/common/enums/DataLevelEnum.java | 2 +- .../com/fastbee/iot/data/push/ThingsModelPushHandler.java | 8 ++++++-- .../com/fastbee/iot/domain/ThingsModelPushConfig.java | 3 +++ .../resources/mapper/iot/ThingsModelPushConfigMapper.xml | 6 +++--- sql/iot_things_model_push.sql | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/fastbee-common/src/main/java/com/fastbee/common/enums/DataLevelEnum.java b/fastbee-common/src/main/java/com/fastbee/common/enums/DataLevelEnum.java index cecd79b3..b6500feb 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/enums/DataLevelEnum.java +++ b/fastbee-common/src/main/java/com/fastbee/common/enums/DataLevelEnum.java @@ -77,7 +77,7 @@ public enum DataLevelEnum { private static boolean inNumericRange(double v, String min, String max) { if (min == null && max == null) { - return false; + return true; // 区间值都不填就是绿色通知 } boolean lowerOk = StringUtils.isBlank(min) || v >= Double.parseDouble(min); boolean upperOk = StringUtils.isBlank(max) || v <= Double.parseDouble(max); diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/push/ThingsModelPushHandler.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/push/ThingsModelPushHandler.java index 687b7c1f..dc5eb64c 100644 --- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/push/ThingsModelPushHandler.java +++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/push/ThingsModelPushHandler.java @@ -204,16 +204,20 @@ public class ThingsModelPushHandler { List varNames = extractVarNames(msgParams.getContent()); Map map = new LinkedHashMap<>(); + String deviceDisplay = StringUtils.isNotEmpty(config.getDeviceName()) + ? config.getDeviceName() : serialNumber; for (int i = 0; i < varNames.size(); i++) { String varName = varNames.get(i); if (i == 0) { - map.put(varName, serialNumber); + map.put(varName, deviceDisplay); } else if (i == 1) { map.put(varName, level.getLabel()); } else if (i == 2) { map.put(varName, dataText); - } else { + } else if (i == 3) { map.put(varName, simpleDateFormat.format(new Date())); + } else { + map.put(varName, config.getDeviceAddress()); } } diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/ThingsModelPushConfig.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/ThingsModelPushConfig.java index 8d5fbb84..18e4f2a6 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/ThingsModelPushConfig.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/ThingsModelPushConfig.java @@ -40,6 +40,9 @@ public class ThingsModelPushConfig extends BaseEntity { @ApiModelProperty("设备名称（非持久化，JOIN查询）") private String deviceName; + @ApiModelProperty("设备地址（非持久化，JOIN查询）") + private String deviceAddress; + @ApiModelProperty("设备类型：1=直连 2=网关（非持久化，JOIN查询）") private Integer deviceType; diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/ThingsModelPushConfigMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/ThingsModelPushConfigMapper.xml index 84d84876..09b80d84 100644 --- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/ThingsModelPushConfigMapper.xml +++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/ThingsModelPushConfigMapper.xml @@ -53,9 +53,9 @@ c.id, c.config_name, c.product_id, c.device_id, c.serial_number, c.template_id, c.push_interval, c.last_push_time, c.status, - c.tenant_id, c.tenant_name, - c.create_by, c.create_time, c.update_by, c.update_time, - p.product_name, p.device_type, d.device_name, nt.name AS template_name + c.tenant_id, c.tenant_name, c.create_by, c.create_time, + c.update_by, c.update_time,p.product_name, p.device_type, + d.device_name,d.network_address AS device_address, nt.name AS template_name diff --git a/sql/iot_things_model_push.sql b/sql/iot_things_model_push.sql index 2f02a208..b890bf07 100644 --- a/sql/iot_things_model_push.sql +++ b/sql/iot_things_model_push.sql @@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `iot_push_user` ( -- ============================================================ INSERT INTO `sys_menu` (menu_id, menu_name, parent_id, order_num, `path`, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -VALUES (3430, '数据推送配置', 3051, 9, 'pushConfig', 'iot/push/index', NULL, 1, 0, 'C', '0', '0', 'iot:push:list', 'notification', 'admin', now(), 'admin', now(), '微信服务号物模型数据推送'); +VALUES (3430, '数据联动', 3343, 9, 'pushConfig', 'iot/push/index', NULL, 1, 0, 'C', '0', '0', 'iot:push:list', 'notification', 'admin', now(), 'admin', now(), '微信服务号物模型数据推送'); INSERT INTO `sys_menu` (menu_id, menu_name, parent_id, order_num, `path`, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (3431, '推送配置查询', 3430, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'iot:push:query', '#', 'admin', now(), 'admin', now(), '');