Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加用户

Browse Source
This commit is contained in:
huangzj
2023-06-09 09:03:51 +08:00
parent 5058931d4f
commit 18e945b058
12 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java
View File

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
/**
@@ -27,6 +28,10 @@ public class CsDevModelAddParm {
@ApiModelProperty(value = "装置型号")
private String devType;
@ApiModelProperty(value = "装置型号")
@NotBlank(message="装置型号名称不能为空！")
private String devTypeName;
@ApiModelProperty(value = "模板名称")
private String name;

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java
View File

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
@@ -28,6 +29,8 @@ public class CsDevModelAuditParm {
*/
@ApiModelProperty(value = "装置型号")
private String devType;
@ApiModelProperty(value = "装置型号")
private String devTypeName;
@ApiModelProperty(value = "模板名称")
private String name;
/**

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java
View File

@@ -31,6 +31,9 @@ public class CsEdDataAddParm {
@ApiModelProperty(value = "装置型号")
@NotBlank(message="装置型号不能为空！")
private String devType;
@ApiModelProperty(value = "装置型号")
@NotBlank(message="装置型号名称不能为空！")
private String devTypeName;
@ApiModelProperty(value = "装置类型")
private String type;
/**

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java
View File

@@ -6,6 +6,7 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
@@ -30,6 +31,8 @@ public class CsEdDataAuditParm {
*/
@ApiModelProperty(value = "装置型号")
private String devType;
@ApiModelProperty(value = "装置型号")
private String devTypeName;
@ApiModelProperty(value = "装置类型")
private String type;
/**

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java
View File

@@ -36,6 +36,9 @@ public class CsDevModelPO extends BaseEntity {
@TableField(value = "dev_type")
private String devType;
@TableField(value = "dev_type_name")
private String devTypeName;
/**
* 模板名称
*/

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEdDataPO.java
View File

@@ -37,6 +37,10 @@ public class CsEdDataPO extends BaseEntity {
*/
@TableField(value = "dev_type")
private String devType;
@TableField(value = "dev_type_name")
private String devTypeName;
/**
* 装置类型(直连设备、网关设备)
*/

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppProjectVO.java
View File

@@ -45,7 +45,7 @@ public class AppProjectVO {
/**
* 拓扑图路径
*/
private List<String> topologyDiagramPaths;
private List<AppTopologyDiagramVO> topologyDiagramPaths;
/**
* 中心点经度

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java
View File

@@ -32,8 +32,8 @@ public class CsDevModelPageVO extends BaseEntity {
*/
@ApiModelProperty(value = "设备模板型号id")
private String devType;
@ApiModelProperty(value = "设备模板型号id名称")
private String devName;
private String devTypeName;
@ApiModelProperty(value = "模板名称")
private String name;

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java
View File

@@ -30,8 +30,8 @@ public class CsEdDataVO extends BaseEntity {
*/
@ApiModelProperty(value = "装置型号")
private String devType;
@ApiModelProperty(value = "装置名称")
private String devName;
private String devTypeName;
@ApiModelProperty(value = "装置类型")
private String type;