Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5
荭琪枫
commit
af192adda9
|
|
@ -1120,7 +1120,7 @@
|
|||
"model": {
|
||||
"properties": [
|
||||
{
|
||||
"identifier": "9010",
|
||||
"identifier": "p9010",
|
||||
"dataType": {
|
||||
"type": "text",
|
||||
"specs": {
|
||||
|
|
@ -1131,7 +1131,7 @@
|
|||
"accessMode": "r"
|
||||
},
|
||||
{
|
||||
"identifier": "9410",
|
||||
"identifier": "p9410",
|
||||
"dataType": {
|
||||
"type": "text",
|
||||
"specs": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package cc.iotkit.manager.dto.vo.ota;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -15,9 +14,10 @@ import java.io.Serializable;
|
|||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@ApiModel(value = "OtaPackageUploadVo")
|
||||
@AutoMapper(target = OtaPackageUploadVo.class)
|
||||
public class OtaPackageUploadVo implements Serializable {
|
||||
private String url;
|
||||
private Long size;
|
||||
private String md5;
|
||||
private Long ossId;
|
||||
private String originalName;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,59 +15,56 @@ import java.io.Serializable;
|
|||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = Product.class)
|
||||
public class ProductVo implements Serializable {
|
||||
|
||||
public class ProductVo implements Serializable {
|
||||
private static final long serialVersionUID = -1L;
|
||||
|
||||
private static final long serialVersionUID = -1L;
|
||||
|
||||
@ApiModelProperty(value="产品id")
|
||||
@ApiModelProperty(value = "产品id")
|
||||
@ExcelProperty(value = "产品id")
|
||||
private Long id;
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value="产品id")
|
||||
@ExcelProperty(value = "产品id")
|
||||
private String productKey;
|
||||
@ApiModelProperty(value = "产品id")
|
||||
@ExcelProperty(value = "产品id")
|
||||
private String productKey;
|
||||
|
||||
@ApiModelProperty(value="产品密钥")
|
||||
@ExcelProperty(value = "产品密钥")
|
||||
private String productSecret;
|
||||
@ApiModelProperty(value = "产品密钥")
|
||||
@ExcelProperty(value = "产品密钥")
|
||||
private String productSecret;
|
||||
|
||||
@ApiModelProperty(value="品类")
|
||||
@ApiModelProperty(value = "品类")
|
||||
@ExcelProperty(value = "品类")
|
||||
private String category;
|
||||
private String category;
|
||||
|
||||
@ApiModelProperty(value="创建时间")
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@ExcelProperty(value = "创建时间")
|
||||
private Long createAt;
|
||||
private Long createAt;
|
||||
|
||||
@ApiModelProperty(value="图片")
|
||||
@ApiModelProperty(value = "图片")
|
||||
@ExcelProperty(value = "图片")
|
||||
private String img;
|
||||
private String img;
|
||||
|
||||
@ApiModelProperty(value="产品名称")
|
||||
@ApiModelProperty(value = "产品名称")
|
||||
@ExcelProperty(value = "产品名称")
|
||||
private String name;
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(value="节点类型")
|
||||
@ApiModelProperty(value = "节点类型")
|
||||
@ExcelProperty(value = "节点类型")
|
||||
private Integer nodeType;
|
||||
private Integer nodeType;
|
||||
|
||||
@ApiModelProperty(value="是否透传,true/false")
|
||||
@ApiModelProperty(value = "是否透传,true/false")
|
||||
@ExcelProperty(value = "是否透传,true/false")
|
||||
private Boolean transparent;
|
||||
private Boolean transparent;
|
||||
|
||||
@ApiModelProperty(value="是否开启设备定位,true/false")
|
||||
@ExcelProperty(value = "是否开启设备定位,true/false")
|
||||
private Boolean isOpenLocate;
|
||||
@ApiModelProperty(value = "是否开启设备定位,true/false")
|
||||
@ExcelProperty(value = "是否开启设备定位,true/false")
|
||||
private Boolean isOpenLocate;
|
||||
|
||||
@ApiModelProperty(value="定位更新方式")
|
||||
@ExcelProperty(value = "定位更新方式")
|
||||
private String locateUpdateType;
|
||||
@ApiModelProperty(value = "定位更新方式")
|
||||
@ExcelProperty(value = "定位更新方式")
|
||||
private String locateUpdateType;
|
||||
|
||||
@ApiModelProperty(value="用户ID")
|
||||
@ApiModelProperty(value = "用户ID")
|
||||
@ExcelProperty(value = "用户ID")
|
||||
private String uid;
|
||||
|
||||
|
||||
private String uid;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,13 +65,15 @@ public class OtaService {
|
|||
oss.setFileName(uploadResult.getFilename());
|
||||
oss.setOriginalName(originalFileName);
|
||||
oss.setService(storage.getConfigKey());
|
||||
sysOssData.save(oss);
|
||||
oss = sysOssData.save(oss);
|
||||
|
||||
String md5 = md5OfFile(file);
|
||||
OtaPackageUploadVo otaPackageUploadVo = new OtaPackageUploadVo();
|
||||
otaPackageUploadVo.setUrl(uploadResult.getUrl());
|
||||
otaPackageUploadVo.setSize(file.getSize());
|
||||
otaPackageUploadVo.setMd5(md5);
|
||||
otaPackageUploadVo.setOriginalName(originalFileName);
|
||||
otaPackageUploadVo.setOssId(oss.getId());
|
||||
return otaPackageUploadVo;
|
||||
}
|
||||
|
||||
|
|
|
|||
12
待优化项.md
12
待优化项.md
|
|
@ -1,4 +1,4 @@
|
|||
# **后端待优化项**
|
||||
# 1.**后端待优化项**
|
||||
|
||||
## **主键**
|
||||
统一主键名称id，属性Long
|
||||
|
|
@ -26,7 +26,6 @@ sql 日志打印的话加个拦截器，简化sql
|
|||
## **产品**
|
||||
按产品生成密钥
|
||||
产品分类
|
||||
产品删除
|
||||
修改产品图片未生效
|
||||
|
||||
## **消息中心**
|
||||
|
|
@ -70,6 +69,13 @@ sql 日志打印的话加个拦截器，简化sql
|
|||
统一上传接口，组件jar上传requestId封装，本地上传实现，文件上传类型配置修改
|
||||
|
||||
## **代码生成器**
|
||||
目前代码生成器改成了jpa,但是还存在大量错误
|
||||
前端代码生成器完善
|
||||
|
||||
# 2.待开发
|
||||
|
||||
| 功能 | 模块 | 说明 |
|
||||
|---------| --- |----------|
|
||||
| 多租户 | | 目前租户功能缺失 |
|
||||
| 视频流管理 | | |
|
||||
| 智能边缘端管理 | | |
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue