opensource/iboot
3
0
Fork 0
mirror of https://gitee.com/iteaj/iboot.git synced 2026-08-31 01:40:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

!9 upd： 同步develop fix-配置模型熟悉（属性）后选择事件或功能模型绑定该字段后，在配置模型属性修改字段类型后，绑定过该属性的上行值没有更新问题

Browse Source 
Merge pull request !9 from Stuil/dev_jdk17
This commit is contained in:
iteaj
2025-10-22 02:24:31 +00:00
committed by Gitee
parent b950927e6a 5fd7b8f3e9
commit 32df3b612e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap/src/main/java/com/iteaj/iboot/module/iot/controller/ModelAttrController.java
+14 -1
View File
@@ -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<Long> saveOrUpdate(@Validated @RequestBody ModelAttr entity) {
this.modelAttrService.saveOrUpdate(entity);
ListResult<ModelApiConfig> list = modelApiConfigService.list(Wrappers.<ModelApiConfig>lambdaQuery().eq(ModelApiConfig::getModelAttrId, entity.getId()));
if(!list.isEmpty())
{
modelApiConfigService.saveOrUpdate(null,Wrappers.<ModelApiConfig>lambdaUpdate()
.eq(ModelApiConfig::getModelAttrId,entity.getId()).
set(ModelApiConfig::getDataType,entity.getDataType()));
}
return success(entity.getId());
}