From 5fd7b8f3e90d6b3f7f0a486d7c5df5f81c36bc53 Mon Sep 17 00:00:00 2001 From: zwh <1634829010@qq.com> Date: Tue, 21 Oct 2025 10:11:54 +0800 Subject: [PATCH] =?UTF-8?q?upd=EF=BC=9A=20=E5=90=8C=E6=AD=A5develop=20=20?= =?UTF-8?q?=20=20fix-=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9E=8B=E7=86=9F?= =?UTF-8?q?=E6=82=89=EF=BC=88=E5=B1=9E=E6=80=A7=EF=BC=89=E5=90=8E=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BA=8B=E4=BB=B6=E6=88=96=E5=8A=9F=E8=83=BD=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=BB=91=E5=AE=9A=E8=AF=A5=E5=AD=97=E6=AE=B5=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9E=8B=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=BB=91=E5=AE=9A=E8=BF=87=E8=AF=A5=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E7=9A=84=E4=B8=8A=E8=A1=8C=E5=80=BC=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/controller/ModelAttrController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bootstrap/src/main/java/com/iteaj/iboot/module/iot/controller/ModelAttrController.java b/bootstrap/src/main/java/com/iteaj/iboot/module/iot/controller/ModelAttrController.java index a2d32b95..9f42f653 100644 --- a/bootstrap/src/main/java/com/iteaj/iboot/module/iot/controller/ModelAttrController.java +++ b/bootstrap/src/main/java/com/iteaj/iboot/module/iot/controller/ModelAttrController.java @@ -5,11 +5,14 @@ import java.util.List; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.iteaj.framework.logger.Logger; +import com.iteaj.framework.result.ListResult; import com.iteaj.framework.result.Result; import com.iteaj.framework.security.Logical; import com.iteaj.framework.spi.iot.consts.AttrType; import com.iteaj.iboot.module.iot.dto.StatusSwitchDto; +import com.iteaj.iboot.module.iot.entity.ModelApiConfig; import com.iteaj.iboot.module.iot.entity.ModelAttrDict; +import com.iteaj.iboot.module.iot.service.IModelApiConfigService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import com.iteaj.framework.security.CheckPermission; @@ -30,8 +33,11 @@ public class ModelAttrController extends BaseController { private final IModelAttrService modelAttrService; - public ModelAttrController(IModelAttrService modelAttrService) { + private final IModelApiConfigService modelApiConfigService; + + public ModelAttrController(IModelAttrService modelAttrService, IModelApiConfigService modelApiConfigService) { this.modelAttrService = modelAttrService; + this.modelApiConfigService = modelApiConfigService; } /** @@ -83,6 +89,13 @@ public class ModelAttrController extends BaseController { @CheckPermission(value = {"iot:modelAttr:edit", "iot:modelAttr:add"}, logical = Logical.OR) public Result saveOrUpdate(@Validated @RequestBody ModelAttr entity) { this.modelAttrService.saveOrUpdate(entity); + ListResult list = modelApiConfigService.list(Wrappers.lambdaQuery().eq(ModelApiConfig::getModelAttrId, entity.getId())); + if(!list.isEmpty()) + { + modelApiConfigService.saveOrUpdate(null,Wrappers.lambdaUpdate() + .eq(ModelApiConfig::getModelAttrId,entity.getId()). + set(ModelApiConfig::getDataType,entity.getDataType())); + } return success(entity.getId()); }