提交关于逆变器和风机

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/EquipmentAttribute.java

@@ -0,0 +1,79 @@
+package com.jiayue.ipfcst.common.data.entity;
+
+import com.jiayue.ipfcst.common.data.constant.enums.EquipmentTypeEnum;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+
+/**
+ * 各个装备的属性值提取出来
+ *
+ * @author 修唯xiuwei
+ * @version 3.0
+ */
+@Data
+@Entity
+public class EquipmentAttribute {
+
+    /**
+     * Id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "myid")
+    @GenericGenerator(name = "myid", strategy = "com.jiayue.ipfcst.common.data.entity.id.CustomIDGenerator")
+    Integer id;
+
+    /**
+     * 属性的定义
+     */
+    @Column(length = 50)
+    String explanation;
+
+
+    /**
+     * 属性所对应的的类的属性
+     */
+    @Column(length = 90)
+    String fieldName;
+
+
+    /**
+     * 计量单位
+     */
+    @Column(length = 5)
+    String measurementUnits;
+
+
+    /**
+     * Equipment type
+     */
+    @Column(length = 200)
+    @Enumerated(EnumType.STRING)
+    EquipmentTypeEnum equipmentType;
+
+    /**
+     * 场站标识
+     */
+    @Column
+    private String stationCode;
+
+    /**
+     * 字段类型
+     */
+    @Column()
+    @Enumerated(EnumType.STRING)
+    private EquipmentAttributeTypeEnum equipmentAttributeTypeEnum;
+
+    enum EquipmentAttributeTypeEnum{
+        /**
+         * INVARIANT 固定字段 不可修改的
+         * SPARE 备用字段
+         * CUSTOM 自定义字段
+         */
+         INVARIANT,SPARE,CUSTOM
+    }
+
+
+
+}

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/ProtocolGatherDataPoint.java

@@ -0,0 +1,67 @@
+package com.jiayue.ipfcst.common.data.entity;
+
+import com.jiayue.ipfcst.common.data.constant.enums.DataSourceEnum;
+import com.jiayue.ipfcst.common.data.constant.enums.EquipmentTypeEnum;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+
+/**
+ * 通道采集点表
+ *
+ * @author 修唯xiuwei
+ * @version 3.0
+ */
+@Data
+@Entity
+public class ProtocolGatherDataPoint {
+
+    /**
+     * id主键
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "myid")
+    @GenericGenerator(name = "myid", strategy = "com.jiayue.ipfcst.common.data.entity.id.CustomIDGenerator")
+    private Integer id;
+
+    /**
+     * 测点
+     */
+    @Column
+    private String measuringPoint;
+
+    /**
+     * 该测点对应的设备id
+     */
+    @Column(length = 5)
+    private Integer equipmentId;
+
+    /**
+     * 测点描述的设备属性
+     */
+    @OneToOne
+    @JoinColumn(name = "equipmentAttributeId", foreignKey = @ForeignKey(value = ConstraintMode.NO_CONSTRAINT))
+    private EquipmentAttribute equipmentAttribute;
+
+
+    public EquipmentTypeEnum getEquipmentType() {
+        if (getEquipmentAttribute() == null) {
+            return null;
+        } else {
+            return this.getEquipmentAttribute().getEquipmentType();
+        }
+    }
+
+    public void setEquipmentType(EquipmentTypeEnum equipmentType) {
+        if (getEquipmentAttribute() == null) {
+            EquipmentAttribute att = new EquipmentAttribute();
+            att.setEquipmentType(equipmentType);
+            setEquipmentAttribute(att);
+        } else {
+            getEquipmentAttribute().setEquipmentType(equipmentType);
+        }
+    }
+
+
+}

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/InverterInfoService.java

@@ -16,8 +16,10 @@ import org.springframework.util.StringUtils;
 
 import javax.persistence.criteria.Predicate;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * 逆变器业务层
@@ -263,4 +265,21 @@ public class InverterInfoService extends BaseService {
             inverterInfoRepository.saveAll(beans);
         }
     }
+
+  /**
+   * 根据场站编号查询逆变器
+   *
+   * @param stationCode 场站编号
+   * @return
+   * @throws BusinessException 业务异常
+   */
+  @Transactional(propagation = Propagation.NOT_SUPPORTED, readOnly = true)
+  public List<InverterInfo> getByStationCode(String stationCode) {
+    List<InverterInfo> resultList = new ArrayList<>();
+    resultList =  this.inverterInfoRepository.findAll();
+    if (!"ALL".equals(stationCode)){
+      resultList = resultList.stream().filter(s->s.getStationCode().equals(stationCode)).collect(Collectors.toList());
+    }
+    return resultList.stream().sorted(Comparator.comparing(InverterInfo::getStationCode)).collect(Collectors.toList());
+  }
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/WindTurbineInfoService.java

@@ -14,8 +14,11 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * 风机业务层
@@ -99,6 +102,23 @@ public class WindTurbineInfoService extends BaseService {
         }
     }
 
+  /**
+   * 根据场站编号查询风机
+   *
+   * @param stationCode 场站编号
+   * @return
+   * @throws BusinessException 业务异常
+   */
+  @Transactional(propagation = Propagation.NOT_SUPPORTED, readOnly = true)
+  public List<WindTurbineInfo> getByStationCode(String stationCode) {
+    List<WindTurbineInfo> resultList = new ArrayList<>();
+    resultList =  this.windTurbineInfoRepository.findAll();
+    if (!"ALL".equals(stationCode)){
+      resultList = resultList.stream().filter(s->s.getStationCode().equals(stationCode)).collect(Collectors.toList());
+    }
+    return resultList.stream().sorted(Comparator.comparing(WindTurbineInfo::getStationCode)).collect(Collectors.toList());
+  }
+
     /**
      * 查询风机【分页查询】
      *