添加通讯相关实体

forecast-dao/src/main/java/cn/oleauto/config/domain/ConfigChannel.java

@@ -0,0 +1,192 @@
+package cn.oleauto.config.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import cn.oleauto.common.annotation.Excel;
+import cn.oleauto.common.core.domain.BaseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 通道对象 config_channel
+ * 
+ * @author oleauto
+ * @date
+ */
+public class ConfigChannel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    private String code;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 通信模块 */
+    @Excel(name = "通信模块")
+    private Long configTransmitId;
+
+    /** 通信配置 */
+    @Excel(name = "通信配置")
+    private String transmitConfig;
+
+    /** 协议模块 */
+    @Excel(name = "协议模块")
+    private Long configProtocolId;
+
+    /** 协议配置 */
+    @Excel(name = "协议配置")
+    private String protocolConfig;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String disabled;
+
+    private List<ConfigDevice> configDeviceList = new ArrayList<>();
+
+    private ConfigTransmit configTransmit;
+    private ConfigProtocol configProtocol;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    public void setConfigTransmitId(Long configTransmitId) 
+    {
+        this.configTransmitId = configTransmitId;
+    }
+
+    public Long getConfigTransmitId() 
+    {
+        return configTransmitId;
+    }
+
+    public void setTransmitConfig(String transmitConfig) 
+    {
+        this.transmitConfig = transmitConfig;
+    }
+
+    public String getTransmitConfig() 
+    {
+        return transmitConfig;
+    }
+
+    public void setConfigProtocolId(Long configProtocolId) 
+    {
+        this.configProtocolId = configProtocolId;
+    }
+
+    public Long getConfigProtocolId() 
+    {
+        return configProtocolId;
+    }
+
+    public void setProtocolConfig(String protocolConfig) 
+    {
+        this.protocolConfig = protocolConfig;
+    }
+
+    public String getProtocolConfig() 
+    {
+        return protocolConfig;
+    }
+
+    public void setDisabled(String disabled) 
+    {
+        this.disabled = disabled;
+    }
+
+    public String getDisabled() 
+    {
+        return disabled;
+    }
+
+    public ConfigTransmit getConfigTransmit() {
+        return configTransmit;
+    }
+
+    public void setConfigTransmit(ConfigTransmit configTransmit) {
+        this.configTransmit = configTransmit;
+    }
+
+    public ConfigProtocol getConfigProtocol() {
+        return configProtocol;
+    }
+
+    public void setConfigProtocol(ConfigProtocol configProtocol) {
+        this.configProtocol = configProtocol;
+    }
+
+    public List<ConfigDevice> getConfigDeviceList() {
+        return configDeviceList;
+    }
+
+    public void setConfigDeviceList(List<ConfigDevice> configDeviceList) {
+        this.configDeviceList = configDeviceList;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (object == null || getClass() != object.getClass()) return false;
+        ConfigChannel that = (ConfigChannel) object;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(id);
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("name", getName())
+            .append("configTransmitId", getConfigTransmitId())
+            .append("transmitConfig", getTransmitConfig())
+            .append("configProtocolId", getConfigProtocolId())
+            .append("protocolConfig", getProtocolConfig())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("disabled", getDisabled())
+            .toString();
+    }
+}

forecast-dao/src/main/java/cn/oleauto/config/domain/ConfigDevice.java

@@ -0,0 +1,108 @@
+package cn.oleauto.config.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import cn.oleauto.common.annotation.Excel;
+import cn.oleauto.common.core.domain.BaseEntity;
+
+/**
+ * 设备信息对象 config_device
+ * 
+ * @author oleauto
+ * @date
+ */
+public class ConfigDevice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 通道 */
+    @Excel(name = "通道")
+    private Long configChannelId;
+
+    /** 设备类型 */
+    @Excel(name = "设备类型")
+    private String ilk;
+
+    /** 父级设备 */
+    @Excel(name = "父级设备")
+    private Long configDeviceId;
+
+    private ConfigChannel configChannel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    public void setConfigChannelId(Long configChannelId) 
+    {
+        this.configChannelId = configChannelId;
+    }
+
+    public Long getConfigChannelId() 
+    {
+        return configChannelId;
+    }
+
+    public void setIlk(String ilk) 
+    {
+        this.ilk = ilk;
+    }
+
+    public String getIlk() 
+    {
+        return ilk;
+    }
+
+    public void setConfigDeviceId(Long configDeviceId) 
+    {
+        this.configDeviceId = configDeviceId;
+    }
+
+    public Long getConfigDeviceId() 
+    {
+        return configDeviceId;
+    }
+
+    public ConfigChannel getConfigChannel() {
+        return configChannel;
+    }
+
+    public void setConfigChannel(ConfigChannel configChannel) {
+        this.configChannel = configChannel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("configChannelId", getConfigChannelId())
+            .append("ilk", getIlk())
+            .append("configDeviceId", getConfigDeviceId())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

forecast-dao/src/main/java/cn/oleauto/config/domain/ConfigPoint.java

@@ -0,0 +1,337 @@
+package cn.oleauto.config.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import cn.oleauto.common.annotation.Excel;
+import cn.oleauto.common.core.domain.BaseEntity;
+
+/**
+ * 测点对象 config_point
+ * 
+ * @author oleauto
+ * @date
+ */
+public class ConfigPoint extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 编码 */
+    @Excel(name = "编码")
+    private String code;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private Long addr;
+
+    /** 测点类型 */
+    @Excel(name = "测点类型",readConverterExp = "YX=遥信,YC=遥测,YM=遥脉")
+    private String category;
+
+    /** 设备号 */
+    // @Excel(name = "设备号", type= Excel.Type.EXPORT)
+    private Long configDeviceId;
+
+    /** 是否取反 */
+    @Excel(name = "是否取反", readConverterExp = "Y=是,N=否")
+    private String willInverse;
+
+    /** 初始值 */
+    @Excel(name = "初始值")
+    private String initValue;
+
+    /** 计算方式 */
+    @Excel(name = "计算方式", readConverterExp = "0=无,1=k*x + b,2=(x+b) * k")
+    private String kbComposite;
+
+    /** K */
+    @Excel(name = "K")
+    private Double k;
+
+    /** B */
+    @Excel(name = "B")
+    private Double b;
+
+    /** 零漂 */
+    @Excel(name = "零漂")
+    private Double zeroFilter;
+
+    @Excel(name = "越限检查", readConverterExp = "Y=是,N=否")
+    private String willCheckUd;
+
+    /** 上限1 */
+    @Excel(name = "上限1")
+    private Double up1;
+
+    /** 上限2 */
+    @Excel(name = "上限2")
+    private Double up2;
+
+    /** 下限1 */
+    @Excel(name = "下限1")
+    private Double down1;
+
+    /** 下限2 */
+    @Excel(name = "下限2")
+    private Double down2;
+
+    /** 滤波 */
+    @Excel(name = "滤波")
+    private Long hopFilter;
+
+    /** 呆值时间 */
+    @Excel(name = "呆值时间")
+    private Long lazyTm;
+
+    /** 报警模板id */
+    @Excel(name = "报警模板id")
+    private Long configAlarmTemplateId;
+
+    private ConfigDevice configDevice;
+    private ConfigAlarmTemplate configAlarmTemplate;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+
+    public void setAddr(Long addr) 
+    {
+        this.addr = addr;
+    }
+
+    public Long getAddr() 
+    {
+        return addr;
+    }
+
+    public void setCategory(String category) 
+    {
+        this.category = category;
+    }
+
+    public String getCategory() 
+    {
+        return category;
+    }
+
+    public void setConfigDeviceId(Long configDeviceId) 
+    {
+        this.configDeviceId = configDeviceId;
+    }
+
+    public Long getConfigDeviceId() 
+    {
+        return configDeviceId;
+    }
+
+    public void setWillInverse(String willInverse) 
+    {
+        this.willInverse = willInverse;
+    }
+
+    public String getWillInverse() 
+    {
+        return willInverse;
+    }
+
+    public void setInitValue(String initValue) 
+    {
+        this.initValue = initValue;
+    }
+
+    public String getInitValue() 
+    {
+        return initValue;
+    }
+
+    public void setKbComposite(String kbComposite) 
+    {
+        this.kbComposite = kbComposite;
+    }
+
+    public String getKbComposite() 
+    {
+        return kbComposite;
+    }
+
+    public void setK(Double k)
+    {
+        this.k = k;
+    }
+
+    public Double getK()
+    {
+        return k;
+    }
+
+    public void setB(Double b)
+    {
+        this.b = b;
+    }
+
+    public Double getB()
+    {
+        return b;
+    }
+
+    public void setZeroFilter(Double zeroFilter)
+    {
+        this.zeroFilter = zeroFilter;
+    }
+
+    public Double getZeroFilter()
+    {
+        return zeroFilter;
+    }
+
+    public String getWillCheckUd() {
+        return willCheckUd;
+    }
+
+    public void setWillCheckUd(String willCheckUd) {
+        this.willCheckUd = willCheckUd;
+    }
+
+    public void setUp1(Double up1)
+    {
+        this.up1 = up1;
+    }
+
+    public Double getUp1()
+    {
+        return up1;
+    }
+
+    public void setUp2(Double up2)
+    {
+        this.up2 = up2;
+    }
+
+    public Double getUp2()
+    {
+        return up2;
+    }
+
+    public void setDown1(Double down1)
+    {
+        this.down1 = down1;
+    }
+
+    public Double getDown1()
+    {
+        return down1;
+    }
+
+    public void setDown2(Double down2)
+    {
+        this.down2 = down2;
+    }
+
+    public Double getDown2()
+    {
+        return down2;
+    }
+
+    public void setHopFilter(Long hopFilter) 
+    {
+        this.hopFilter = hopFilter;
+    }
+
+    public Long getHopFilter() 
+    {
+        return hopFilter;
+    }
+
+    public void setLazyTm(Long lazyTm) 
+    {
+        this.lazyTm = lazyTm;
+    }
+
+    public Long getLazyTm() 
+    {
+        return lazyTm;
+    }
+
+    public void setConfigAlarmTemplateId(Long configAlarmTemplateId) 
+    {
+        this.configAlarmTemplateId = configAlarmTemplateId;
+    }
+
+    public Long getConfigAlarmTemplateId() 
+    {
+        return configAlarmTemplateId;
+    }
+
+    public ConfigDevice getConfigDevice() {
+        return configDevice;
+    }
+
+    public void setConfigDevice(ConfigDevice configDevice) {
+        this.configDevice = configDevice;
+    }
+
+    public ConfigAlarmTemplate getConfigAlarmTemplate() {
+        return configAlarmTemplate;
+    }
+
+    public void setConfigAlarmTemplate(ConfigAlarmTemplate configAlarmTemplate) {
+        this.configAlarmTemplate = configAlarmTemplate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("code", getCode())
+            .append("addr", getAddr())
+            .append("category", getCategory())
+            .append("configDeviceId", getConfigDeviceId())
+            .append("willInverse", getWillInverse())
+            .append("initValue", getInitValue())
+            .append("kbComposite", getKbComposite())
+            .append("k", getK())
+            .append("b", getB())
+            .append("zeroFilter", getZeroFilter())
+            .append("up1", getUp1())
+            .append("up2", getUp2())
+            .append("down1", getDown1())
+            .append("down2", getDown2())
+            .append("hopFilter", getHopFilter())
+            .append("lazyTm", getLazyTm())
+            .append("configAlarmTemplateId", getConfigAlarmTemplateId())
+            .toString();
+    }
+}

forecast-dao/src/main/java/cn/oleauto/config/domain/ConfigProtocol.java

@@ -0,0 +1,81 @@
+package cn.oleauto.config.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import cn.oleauto.common.annotation.Excel;
+import cn.oleauto.common.core.domain.BaseEntity;
+
+/**
+ * 
+ * @author oleauto
+ * @date
+ */
+public class ConfigProtocol extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 全类名 */
+    @Excel(name = "全类名")
+    private String protocolClass;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String configExample;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    public void setProtocolClass(String protocolClass) 
+    {
+        this.protocolClass = protocolClass;
+    }
+
+    public String getProtocolClass() 
+    {
+        return protocolClass;
+    }
+
+    public void setConfigExample(String configExample) 
+    {
+        this.configExample = configExample;
+    }
+
+    public String getConfigExample() 
+    {
+        return configExample;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("protocolClass", getProtocolClass())
+            .append("configExample", getConfigExample())
+            .toString();
+    }
+}

forecast-dao/src/main/java/cn/oleauto/config/domain/ConfigStation.java

@@ -0,0 +1,237 @@
+package cn.oleauto.config.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import cn.oleauto.common.annotation.Excel;
+import cn.oleauto.common.core.domain.BaseEntity;
+
+/**
+ * 光伏场站对象 config_station
+ * 
+ * @author oleauto
+ * @date
+ */
+public class ConfigStation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 调度分配标识序号 */
+    @Excel(name = "调度分配标识序号")
+    private String dispatchSeq;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String name;
+
+    /** 有功容量-单位是-瓦(W) */
+    @Excel(name = "有功容量-单位是-瓦(W)")
+    private BigDecimal activePowerCapacity;
+
+    /** 无功容量-单位是-乏(var) */
+    @Excel(name = "无功容量-单位是-乏(var)")
+    private BigDecimal reactivePowerCapacity;
+
+    /** 面积-单位是(平方米) */
+    @Excel(name = "面积-单位是(平方米)")
+    private BigDecimal areaSize;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 投运时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "投运时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmtBegin;
+
+    /** 场站类型(0:分布式, 1:地面） */
+    @Excel(name = "场站类型(0:分布式, 1:地面）")
+    private String category;
+
+    /** 地形 */
+    @Excel(name = "地形")
+    private String terrain;
+
+    /** 建设地址 */
+    @Excel(name = "建设地址")
+    private String address;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date updateTime;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setDispatchSeq(String dispatchSeq) 
+    {
+        this.dispatchSeq = dispatchSeq;
+    }
+
+    public String getDispatchSeq() 
+    {
+        return dispatchSeq;
+    }
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    public void setActivePowerCapacity(BigDecimal activePowerCapacity) 
+    {
+        this.activePowerCapacity = activePowerCapacity;
+    }
+
+    public BigDecimal getActivePowerCapacity() 
+    {
+        return activePowerCapacity;
+    }
+
+    public void setReactivePowerCapacity(BigDecimal reactivePowerCapacity) 
+    {
+        this.reactivePowerCapacity = reactivePowerCapacity;
+    }
+
+    public BigDecimal getReactivePowerCapacity() 
+    {
+        return reactivePowerCapacity;
+    }
+
+    public void setAreaSize(BigDecimal areaSize) 
+    {
+        this.areaSize = areaSize;
+    }
+
+    public BigDecimal getAreaSize() 
+    {
+        return areaSize;
+    }
+
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+
+    public void setGmtBegin(Date gmtBegin) 
+    {
+        this.gmtBegin = gmtBegin;
+    }
+
+    public Date getGmtBegin() 
+    {
+        return gmtBegin;
+    }
+
+    public void setCategory(String category)
+    {
+        this.category = category;
+    }
+
+    public String getCategory()
+    {
+        return category;
+    }
+
+    public void setTerrain(String terrain) 
+    {
+        this.terrain = terrain;
+    }
+
+    public String getTerrain() 
+    {
+        return terrain;
+    }
+
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+
+    public void setCreateTime(Date createTime)
+    {
+        this.createTime = createTime;
+    }
+
+    public Date getCreateTime()
+    {
+        return createTime;
+    }
+
+    public void setUpdateTime(Date updateTime)
+    {
+        this.updateTime = updateTime;
+    }
+
+    public Date getUpdateTime()
+    {
+        return updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("dispatchSeq", getDispatchSeq())
+            .append("name", getName())
+            .append("activePowerCapacity", getActivePowerCapacity())
+            .append("reactivePowerCapacity", getReactivePowerCapacity())
+            .append("areaSize", getAreaSize())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("gmtBegin", getGmtBegin())
+            .append("category", getCategory())
+            .append("terrain", getTerrain())
+            .append("address", getAddress())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

gateway/forecast-modbus-tcp/src/main/java/cn/oleauto/modbus/tcp/ModbusTcp.java

@@ -1,14 +1,5 @@
-package cn.oleauto;
+package cn.oleauto.modbus.tcp;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+public class ModbusTcp {
 
-@SpringBootApplication()
-public class ForecastDeviceGateway {
-    public static void main(String[] args)
-    {
-        SpringApplication.run(ForecastDeviceGateway.class, args);
-    }
 }