Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5

V0.5.x
regan 2023-06-17 17:45:35 +08:00
commit d802d68aaa
4 changed files with 8 additions and 15 deletions

View File

@ -2524,7 +2524,7 @@
"isFrame": "1",
"menuName": "设备列表",
"menuType": "C",
"orderNum": 4,
"orderNum": 3,
"parentId": 2200,
"path": "devices",
"perms": null,
@ -2546,7 +2546,7 @@
"isFrame": "1",
"menuName": "虚拟设备",
"menuType": "C",
"orderNum": 5,
"orderNum": 4,
"parentId": 2200,
"path": "virtualDevices",
"perms": null,

View File

@ -1,28 +1,22 @@
package cc.iotkit.manager.dto.vo.thingmodel;
import cc.iotkit.model.product.ThingModel;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
import io.github.linpeilie.annotations.ReverseAutoMapping;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
import java.util.Date;
import java.io.Serializable;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
@ApiModel(value = "ThingModelVo")
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ThingModel.class)
public class ThingModelVo implements Serializable {
private static final long serialVersionUID = -1L;
@ -33,9 +27,7 @@ public class ThingModelVo implements Serializable {
@ApiModelProperty(value = "模型内容")
@ExcelProperty(value = "模型内容")
@AutoMapping(ignore = true)
@ReverseAutoMapping(ignore = true)
private String model;
private ThingModel.Model model;
@ApiModelProperty(value = "产品key")
@ExcelProperty(value = "产品key")

View File

@ -103,7 +103,6 @@ public class ProductServiceImpl implements IProductService {
@Override
public ThingModelVo getThingModelByProductKey(String productKey) {
ThingModel thingModel = thingModelData.findByProductKey(productKey);
return MapstructUtils.convert(thingModel, ThingModelVo.class);
}

View File

@ -16,3 +16,5 @@ sonerlint扫描按建议修改相关不规范的代码
sql 日志打印的话加个拦截器简化sql
增加requestid 基于MDC
## **数据权限**
将原有的checkOwner做成通用的