增加查询结果设备名称
jokelone
6 years ago
parent
d91fa61c88
commit
2238bee7d4
@ -0,0 +1,98 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\15 17:20
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesDatasourceModel implements Serializable {
|
||||
@ApiParam("id")
|
||||
private Long id;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam( "有效性")
|
||||
public Integer isValid;
|
||||
|
||||
@ApiParam( "是否已删除")
|
||||
public Integer isDeleted;
|
||||
|
||||
@ApiParam( "创建用户")
|
||||
public String createUser;
|
||||
|
||||
@ApiParam( "创建日期")
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam( "修改人")
|
||||
public String modifyUser;
|
||||
|
||||
@ApiParam( "修改日期")
|
||||
public String modifyDatetime;
|
||||
|
||||
@ApiParam("组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam("数据源代码")
|
||||
private String dsCode;
|
||||
|
||||
@ApiParam("数据源名称")
|
||||
private String dsName;
|
||||
|
||||
@ApiParam("数据源类型")
|
||||
private String dsType;
|
||||
|
||||
@ApiParam("主机")
|
||||
private String dsHost;
|
||||
|
||||
@ApiParam("端口")
|
||||
private Integer dsPort;
|
||||
|
||||
@ApiParam("用户名")
|
||||
private String dsUser;
|
||||
|
||||
@ApiParam("密码")
|
||||
private String dsPassword;
|
||||
|
||||
@ApiParam("数据库名称")
|
||||
private String dsDbName;
|
||||
|
||||
public MesDatasourceModel() {
|
||||
|
||||
}
|
||||
|
||||
public MesDatasourceModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
|
||||
String modifyUser, String modifyDatetime, String organizeCode, String dsCode, String dsName, String dsType,
|
||||
String dsHost, Integer dsPort, String dsUser, String dsPassword, String dsDbName) {
|
||||
this.id = id;
|
||||
this.equipmentCode = equipmentCode;
|
||||
this.equipmentName = equipmentName;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
this.organizeCode = organizeCode;
|
||||
this.dsCode = dsCode;
|
||||
this.dsName = dsName;
|
||||
this.dsType = dsType;
|
||||
this.dsHost = dsHost;
|
||||
this.dsPort = dsPort;
|
||||
this.dsUser = dsUser;
|
||||
this.dsPassword = dsPassword;
|
||||
this.dsDbName = dsDbName;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,122 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\15 15:58
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesPlcModel implements Serializable {
|
||||
@ApiParam("id")
|
||||
private Long id;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam( "有效性")
|
||||
public Integer isValid;
|
||||
|
||||
@ApiParam( "是否已删除")
|
||||
public Integer isDeleted;
|
||||
|
||||
@ApiParam( "创建用户")
|
||||
public String createUser;
|
||||
|
||||
@ApiParam( "创建日期")
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam( "修改人")
|
||||
public String modifyUser;
|
||||
|
||||
@ApiParam( "修改日期")
|
||||
public String modifyDatetime;
|
||||
|
||||
@ApiParam("组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam("PLC代码")
|
||||
private String plcCode;
|
||||
|
||||
@ApiParam("PLC名称")
|
||||
private String plcName;
|
||||
|
||||
@ApiParam("PLC型号")
|
||||
private String plcModel;
|
||||
|
||||
@ApiParam("PLC IP")
|
||||
private String plcIp;
|
||||
|
||||
@ApiParam("通道")
|
||||
private String channel;
|
||||
|
||||
@ApiParam("标签名称")
|
||||
private String tagName;
|
||||
|
||||
@ApiParam("标签地址")
|
||||
private String tagAddress;
|
||||
|
||||
@ApiParam("标签数据类型")
|
||||
private String dataType;
|
||||
|
||||
@ApiParam("分组名称")
|
||||
private String groupName;
|
||||
|
||||
@ApiParam("生产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工位")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("PLC的值的设定")
|
||||
private String plcCfg;
|
||||
|
||||
@ApiParam("解析规则")
|
||||
private String analysisRule;
|
||||
|
||||
@ApiParam("是否解析")
|
||||
private String isAnalysis;
|
||||
|
||||
public MesPlcModel(){
|
||||
|
||||
}
|
||||
|
||||
public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
|
||||
String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
|
||||
String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
|
||||
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis){
|
||||
this.id = id;
|
||||
this.equipmentCode = equipmentCode;
|
||||
this.equipmentName = equipmentName;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
this.organizeCode = organizeCode;
|
||||
this.plcCode = plcCode;
|
||||
this.plcName = plcName;
|
||||
this.plcModel = plcModel;
|
||||
this.plcIp = plcIp;
|
||||
this.channel = channel;
|
||||
this.tagName = tagName;
|
||||
this.tagAddress = tagAddress;
|
||||
this.dataType = dataType;
|
||||
this.groupName = groupName;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.plcCfg = plcCfg;
|
||||
this.analysisRule = analysisRule;
|
||||
this.isAnalysis = isAnalysis;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue