物联网修改

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/device/IotDeviceVO.java

@@ -3,6 +3,7 @@ package com.yihu.jw.restmodel.iot.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yihu.jw.restmodel.iot.common.BaseVO;
import com.yihu.jw.restmodel.iot.product.IotProductBaseInfoPropertyVO;
import com.yihu.jw.restmodel.iot.product.IotProductDataTransmissionVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -75,6 +76,30 @@ public class IotDeviceVO extends BaseVO implements Serializable {
    private String categoryCode;//设备类型标识
    @ApiModelProperty("设备类型名称")
    private String categoryName;//设备类型名称
    @ApiModelProperty("产品属性")
    private IotProductBaseInfoPropertyVO productBaseInfoPropertyVO;
    @ApiModelProperty("设备通用名")
    private String propertyName;
    @ApiModelProperty("组合方式")
    private String propertyCombination;
    @ApiModelProperty("用途")
    private String propertyUse;
    @ApiModelProperty("网络传输")
    private String propertyNetwork;
    @ApiModelProperty("投放位置")
    private String propertyLocation;
    @ApiModelProperty("数据采集字典")
    private String propertyDataAcquisitionDict;
    @ApiModelProperty("物联网卡ICCID")
    private String  iotIccid;
    @ApiModelProperty("物联网卡IMSI")
    private String  iotImsi;
    @ApiModelProperty("sim卡")
    private String sim;
    public String getName() {
        return name;
    }
@@ -290,4 +315,84 @@ public class IotDeviceVO extends BaseVO implements Serializable {
    public void setCategoryName(String categoryName) {
        this.categoryName = categoryName;
    }
    public IotProductBaseInfoPropertyVO getProductBaseInfoPropertyVO() {
        return productBaseInfoPropertyVO;
    }
    public void setProductBaseInfoPropertyVO(IotProductBaseInfoPropertyVO productBaseInfoPropertyVO) {
        this.productBaseInfoPropertyVO = productBaseInfoPropertyVO;
    }
    public String getPropertyName() {
        return propertyName;
    }
    public void setPropertyName(String propertyName) {
        this.propertyName = propertyName;
    }
    public String getPropertyCombination() {
        return propertyCombination;
    }
    public void setPropertyCombination(String propertyCombination) {
        this.propertyCombination = propertyCombination;
    }
    public String getPropertyUse() {
        return propertyUse;
    }
    public void setPropertyUse(String propertyUse) {
        this.propertyUse = propertyUse;
    }
    public String getPropertyNetwork() {
        return propertyNetwork;
    }
    public void setPropertyNetwork(String propertyNetwork) {
        this.propertyNetwork = propertyNetwork;
    }
    public String getPropertyLocation() {
        return propertyLocation;
    }
    public void setPropertyLocation(String propertyLocation) {
        this.propertyLocation = propertyLocation;
    }
    public String getPropertyDataAcquisitionDict() {
        return propertyDataAcquisitionDict;
    }
    public void setPropertyDataAcquisitionDict(String propertyDataAcquisitionDict) {
        this.propertyDataAcquisitionDict = propertyDataAcquisitionDict;
    }
    public String getIotIccid() {
        return iotIccid;
    }
    public void setIotIccid(String iotIccid) {
        this.iotIccid = iotIccid;
    }
    public String getIotImsi() {
        return iotImsi;
    }
    public void setIotImsi(String iotImsi) {
        this.iotImsi = iotImsi;
    }
    public String getSim() {
        return sim;
    }
    public void setSim(String sim) {
        this.sim = sim;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/device/IotPatientDeviceVO.java

@@ -5,7 +5,6 @@ import com.yihu.jw.restmodel.iot.common.BaseVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.persistence.Column;
import java.io.Serializable;
/**
@@ -79,6 +78,8 @@ public class IotPatientDeviceVO extends BaseVO implements Serializable {
    private String propertyNetwork;
    @ApiModelProperty("投放位置")
    private String propertyLocation;
    @ApiModelProperty("数据采集字典")
    private String propertyDataAcquisitionDict;
    @ApiModelProperty("物联网卡ICCID")
    private String  iotIccid;
@@ -381,4 +382,12 @@ public class IotPatientDeviceVO extends BaseVO implements Serializable {
    public void setPropertyLocation(String propertyLocation) {
        this.propertyLocation = propertyLocation;
    }
    public String getPropertyDataAcquisitionDict() {
        return propertyDataAcquisitionDict;
    }
    public void setPropertyDataAcquisitionDict(String propertyDataAcquisitionDict) {
        this.propertyDataAcquisitionDict = propertyDataAcquisitionDict;
    }
}