From 3bef373309a02d0697021eeb6ec8d1d45aa2f622 Mon Sep 17 00:00:00 2001 From: George Date: Sat, 11 Apr 2026 12:16:28 +0800 Subject: [PATCH] =?UTF-8?q?20260411:=E7=BB=86=E8=8A=82=EF=BC=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=8F=AA=E4=BF=9D=E7=95=997=E5=A4=A9=EF=BC=9B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E6=8E=A5=E5=8F=A3=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BF=AE=E6=94=B9[=E9=85=8D=E7=BD=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0/=E9=80=9A=E7=9F=A5=E6=A8=A1=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastbee-admin/src/main/resources/logback.xml | 8 ++++---- .../controller/push/ThingsModelPushController.java | 2 +- .../iot/service/impl/DataCenterServiceImpl.java | 12 ++++++------ .../impl/ThingsModelPushConfigServiceImpl.java | 3 ++- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fastbee-admin/src/main/resources/logback.xml b/fastbee-admin/src/main/resources/logback.xml index 90f5f198..96368940 100644 --- a/fastbee-admin/src/main/resources/logback.xml +++ b/fastbee-admin/src/main/resources/logback.xml @@ -71,8 +71,8 @@ ${log.path}/sys-all.%d{yyyy-MM-dd}.log - - 10 + + 7 ${log.pattern} @@ -89,8 +89,8 @@ ${log.path}/sys-user.%d{yyyy-MM-dd}.log - - 10 + + 7 ${log.pattern} diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/push/ThingsModelPushController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/push/ThingsModelPushController.java index d81fbb8a..31672faa 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/push/ThingsModelPushController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/push/ThingsModelPushController.java @@ -60,7 +60,7 @@ public class ThingsModelPushController extends BaseController { return toAjax(pushConfigService.insertConfig(config)); } - /** 修改 */ + /** 修改配置（名称、--设备--、模板、间隔、物模型项、接收用户等；不含仅改状态时请用 /status） */ @ApiOperation("修改推送配置") @PreAuthorize("@ss.hasPermi('iot:push:edit')") @Log(title = "推送配置", businessType = BusinessType.UPDATE) diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DataCenterServiceImpl.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DataCenterServiceImpl.java index 44a674db..04d5b68b 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DataCenterServiceImpl.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DataCenterServiceImpl.java @@ -2,23 +2,20 @@ package com.fastbee.iot.service.impl; import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.enums.scenemodel.SceneModelVariableTypeEnum; +import com.fastbee.common.utils.CalculateUtils; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.SecurityUtils; import com.fastbee.common.utils.StringUtils; -import com.fastbee.common.utils.CalculateUtils; import com.fastbee.iot.cache.SceneModelTagCache; import com.fastbee.iot.domain.*; -import com.fastbee.iot.model.AlertCountVO; -import com.fastbee.iot.model.DeviceHistoryParam; -import com.fastbee.iot.model.HistoryModel; -import com.fastbee.iot.model.SubDeviceCompareParam; -import com.fastbee.iot.model.ThingsModelLogCountVO; +import com.fastbee.iot.model.*; import com.fastbee.iot.model.dto.ThingsModelDTO; import com.fastbee.iot.model.gateWay.ProductSubGatewayVO; import com.fastbee.iot.model.gateWay.SubDeviceListVO; import com.fastbee.iot.model.param.DataCenterParam; import com.fastbee.iot.model.scenemodel.SceneHistoryParam; import com.fastbee.iot.service.*; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -35,6 +32,7 @@ import java.util.stream.Collectors; * @description: 数据中心服务类 * @date 2024-06-13 15:29 */ +@Slf4j @Service public class DataCenterServiceImpl implements DataCenterService { @@ -387,6 +385,8 @@ public class DataCenterServiceImpl implements DataCenterService { hm.setValue(computed); computedHistory.add(hm); } catch (Exception ignored) { + // 网关计算跨设备公式失败 + log.error("The gateway failed to calculate the formula across devices", ignored); } } } diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/ThingsModelPushConfigServiceImpl.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/ThingsModelPushConfigServiceImpl.java index fbce3518..e9f8fe68 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/ThingsModelPushConfigServiceImpl.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/ThingsModelPushConfigServiceImpl.java @@ -71,7 +71,8 @@ public class ThingsModelPushConfigServiceImpl implements IThingsModelPushConfigS public int updateConfig(ThingsModelPushConfig config) { ThingsModelPushConfig update = new ThingsModelPushConfig(); update.setId(config.getId()); - update.setStatus(config.getStatus()); + update.setConfigName(config.getConfigName()); + update.setTemplateId(config.getTemplateId()); update.setUpdateBy(SecurityUtils.getUsername()); update.setUpdateTime(DateUtils.getNowDate()); if (config.getPushInterval() != null) {