线路台账增加最大允许电流字段

common/common-core/src/main/java/com/hdkj/lt/core/bizms/modle/po/DwdShbDsFeederBase.java

@@ -365,6 +365,11 @@ public class DwdShbDsFeederBase implements Serializable {
      */
     private String sourceName;
 
+    /**
+     * 最大允许电流
+     */
+    private BigDecimal maxAllowableCurrent;
+
     /**
      * 创建时间
      */
@@ -380,251 +385,4 @@ public class DwdShbDsFeederBase implements Serializable {
      */
     private String delFlag;
 
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        DwdShbDsFeederBase other = (DwdShbDsFeederBase) that;
-        return (this.getPsrId() == null ? other.getPsrId() == null : this.getPsrId().equals(other.getPsrId()))
-            && (this.getAstId() == null ? other.getAstId() == null : this.getAstId().equals(other.getAstId()))
-            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
-            && (this.getVoltageLevel() == null ? other.getVoltageLevel() == null : this.getVoltageLevel().equals(other.getVoltageLevel()))
-            && (this.getVoltageLevelName() == null ? other.getVoltageLevelName() == null : this.getVoltageLevelName().equals(other.getVoltageLevelName()))
-            && (this.getCableLength() == null ? other.getCableLength() == null : this.getCableLength().equals(other.getCableLength()))
-            && (this.getCableMethod() == null ? other.getCableMethod() == null : this.getCableMethod().equals(other.getCableMethod()))
-            && (this.getCableMethodName() == null ? other.getCableMethodName() == null : this.getCableMethodName().equals(other.getCableMethodName()))
-            && (this.getPsrState() == null ? other.getPsrState() == null : this.getPsrState().equals(other.getPsrState()))
-            && (this.getPsrStateName() == null ? other.getPsrStateName() == null : this.getPsrStateName().equals(other.getPsrStateName()))
-            && (this.getPubPrivFlag() == null ? other.getPubPrivFlag() == null : this.getPubPrivFlag().equals(other.getPubPrivFlag()))
-            && (this.getPubPrivFlagName() == null ? other.getPubPrivFlagName() == null : this.getPubPrivFlagName().equals(other.getPubPrivFlagName()))
-            && (this.getReferenceLength() == null ? other.getReferenceLength() == null : this.getReferenceLength().equals(other.getReferenceLength()))
-            && (this.getRunDevName() == null ? other.getRunDevName() == null : this.getRunDevName().equals(other.getRunDevName()))
-            && (this.getStartBay() == null ? other.getStartBay() == null : this.getStartBay().equals(other.getStartBay()))
-            && (this.getStartStation() == null ? other.getStartStation() == null : this.getStartStation().equals(other.getStartStation()))
-            && (this.getStartStationName() == null ? other.getStartStationName() == null : this.getStartStationName().equals(other.getStartStationName()))
-            && (this.getStartStationType() == null ? other.getStartStationType() == null : this.getStartStationType().equals(other.getStartStationType()))
-            && (this.getStartSwitch() == null ? other.getStartSwitch() == null : this.getStartSwitch().equals(other.getStartSwitch()))
-            && (this.getStartSwitchName() == null ? other.getStartSwitchName() == null : this.getStartSwitchName().equals(other.getStartSwitchName()))
-            && (this.getStartSwitchType() == null ? other.getStartSwitchType() == null : this.getStartSwitchType().equals(other.getStartSwitchType()))
-            && (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime()))
-            && (this.getSupplyRadius() == null ? other.getSupplyRadius() == null : this.getSupplyRadius().equals(other.getSupplyRadius()))
-            && (this.getSupplyArea() == null ? other.getSupplyArea() == null : this.getSupplyArea().equals(other.getSupplyArea()))
-            && (this.getSupplyAreaName() == null ? other.getSupplyAreaName() == null : this.getSupplyAreaName().equals(other.getSupplyAreaName()))
-            && (this.getRegionalism() == null ? other.getRegionalism() == null : this.getRegionalism().equals(other.getRegionalism()))
-            && (this.getRegionalismName() == null ? other.getRegionalismName() == null : this.getRegionalismName().equals(other.getRegionalismName()))
-            && (this.getConsNo() == null ? other.getConsNo() == null : this.getConsNo().equals(other.getConsNo()))
-            && (this.getDispatchOrg() == null ? other.getDispatchOrg() == null : this.getDispatchOrg().equals(other.getDispatchOrg()))
-            && (this.getDispatchOrgName() == null ? other.getDispatchOrgName() == null : this.getDispatchOrgName().equals(other.getDispatchOrgName()))
-            && (this.getDispatchLevel() == null ? other.getDispatchLevel() == null : this.getDispatchLevel().equals(other.getDispatchLevel()))
-            && (this.getDispatchLevelName() == null ? other.getDispatchLevelName() == null : this.getDispatchLevelName().equals(other.getDispatchLevelName()))
-            && (this.getEquipmentOwner() == null ? other.getEquipmentOwner() == null : this.getEquipmentOwner().equals(other.getEquipmentOwner()))
-            && (this.getEquipmentOwnerName() == null ? other.getEquipmentOwnerName() == null : this.getEquipmentOwnerName().equals(other.getEquipmentOwnerName()))
-            && (this.getErectionMethod() == null ? other.getErectionMethod() == null : this.getErectionMethod().equals(other.getErectionMethod()))
-            && (this.getErectionMethodName() == null ? other.getErectionMethodName() == null : this.getErectionMethodName().equals(other.getErectionMethodName()))
-            && (this.getFeederRateCapacity() == null ? other.getFeederRateCapacity() == null : this.getFeederRateCapacity().equals(other.getFeederRateCapacity()))
-            && (this.getImportance() == null ? other.getImportance() == null : this.getImportance().equals(other.getImportance()))
-            && (this.getImportanceName() == null ? other.getImportanceName() == null : this.getImportanceName().equals(other.getImportanceName()))
-            && (this.getIsCentralizedelechtg() == null ? other.getIsCentralizedelechtg() == null : this.getIsCentralizedelechtg().equals(other.getIsCentralizedelechtg()))
-            && (this.getIsDaFeeder() == null ? other.getIsDaFeeder() == null : this.getIsDaFeeder().equals(other.getIsDaFeeder()))
-            && (this.getIsDistributedelechtg() == null ? other.getIsDistributedelechtg() == null : this.getIsDistributedelechtg().equals(other.getIsDistributedelechtg()))
-            && (this.getIsRural() == null ? other.getIsRural() == null : this.getIsRural().equals(other.getIsRural()))
-            && (this.getIsRuralName() == null ? other.getIsRuralName() == null : this.getIsRuralName().equals(other.getIsRuralName()))
-            && (this.getLength() == null ? other.getLength() == null : this.getLength().equals(other.getLength()))
-            && (this.getCity() == null ? other.getCity() == null : this.getCity().equals(other.getCity()))
-            && (this.getCityName() == null ? other.getCityName() == null : this.getCityName().equals(other.getCityName()))
-            && (this.getMaintOrg() == null ? other.getMaintOrg() == null : this.getMaintOrg().equals(other.getMaintOrg()))
-            && (this.getMaintOrgName() == null ? other.getMaintOrgName() == null : this.getMaintOrgName().equals(other.getMaintOrgName()))
-            && (this.getMaintGroup() == null ? other.getMaintGroup() == null : this.getMaintGroup().equals(other.getMaintGroup()))
-            && (this.getMaintGroupName() == null ? other.getMaintGroupName() == null : this.getMaintGroupName().equals(other.getMaintGroupName()))
-            && (this.getNormalEnergizingBusbar() == null ? other.getNormalEnergizingBusbar() == null : this.getNormalEnergizingBusbar().equals(other.getNormalEnergizingBusbar()))
-            && (this.getOverheadLength() == null ? other.getOverheadLength() == null : this.getOverheadLength().equals(other.getOverheadLength()))
-            && (this.getOverheadMethod() == null ? other.getOverheadMethod() == null : this.getOverheadMethod().equals(other.getOverheadMethod()))
-            && (this.getOverheadMethodName() == null ? other.getOverheadMethodName() == null : this.getOverheadMethodName().equals(other.getOverheadMethodName()))
-            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
-            && (this.getAstNature() == null ? other.getAstNature() == null : this.getAstNature().equals(other.getAstNature()))
-            && (this.getAstNatureName() == null ? other.getAstNatureName() == null : this.getAstNatureName().equals(other.getAstNatureName()))
-            && (this.getAstOrg() == null ? other.getAstOrg() == null : this.getAstOrg().equals(other.getAstOrg()))
-            && (this.getAstOrgName() == null ? other.getAstOrgName() == null : this.getAstOrgName().equals(other.getAstOrgName()))
-            && (this.getDeployState() == null ? other.getDeployState() == null : this.getDeployState().equals(other.getDeployState()))
-            && (this.getDeployStateName() == null ? other.getDeployStateName() == null : this.getDeployStateName().equals(other.getDeployStateName()))
-            && (this.getEquipCode() == null ? other.getEquipCode() == null : this.getEquipCode().equals(other.getEquipCode()))
-            && (this.getIsCommission() == null ? other.getIsCommission() == null : this.getIsCommission().equals(other.getIsCommission()))
-            && (this.getIsCommissionName() == null ? other.getIsCommissionName() == null : this.getIsCommissionName().equals(other.getIsCommissionName()))
-            && (this.getOperateDate() == null ? other.getOperateDate() == null : this.getOperateDate().equals(other.getOperateDate()))
-            && (this.getSource() == null ? other.getSource() == null : this.getSource().equals(other.getSource()))
-            && (this.getSourceName() == null ? other.getSourceName() == null : this.getSourceName().equals(other.getSourceName()))
-            && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime()))
-            && (this.getLastUpdateTime() == null ? other.getLastUpdateTime() == null : this.getLastUpdateTime().equals(other.getLastUpdateTime()))
-            && (this.getDelFlag() == null ? other.getDelFlag() == null : this.getDelFlag().equals(other.getDelFlag()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getPsrId() == null) ? 0 : getPsrId().hashCode());
-        result = prime * result + ((getAstId() == null) ? 0 : getAstId().hashCode());
-        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
-        result = prime * result + ((getVoltageLevel() == null) ? 0 : getVoltageLevel().hashCode());
-        result = prime * result + ((getVoltageLevelName() == null) ? 0 : getVoltageLevelName().hashCode());
-        result = prime * result + ((getCableLength() == null) ? 0 : getCableLength().hashCode());
-        result = prime * result + ((getCableMethod() == null) ? 0 : getCableMethod().hashCode());
-        result = prime * result + ((getCableMethodName() == null) ? 0 : getCableMethodName().hashCode());
-        result = prime * result + ((getPsrState() == null) ? 0 : getPsrState().hashCode());
-        result = prime * result + ((getPsrStateName() == null) ? 0 : getPsrStateName().hashCode());
-        result = prime * result + ((getPubPrivFlag() == null) ? 0 : getPubPrivFlag().hashCode());
-        result = prime * result + ((getPubPrivFlagName() == null) ? 0 : getPubPrivFlagName().hashCode());
-        result = prime * result + ((getReferenceLength() == null) ? 0 : getReferenceLength().hashCode());
-        result = prime * result + ((getRunDevName() == null) ? 0 : getRunDevName().hashCode());
-        result = prime * result + ((getStartBay() == null) ? 0 : getStartBay().hashCode());
-        result = prime * result + ((getStartStation() == null) ? 0 : getStartStation().hashCode());
-        result = prime * result + ((getStartStationName() == null) ? 0 : getStartStationName().hashCode());
-        result = prime * result + ((getStartStationType() == null) ? 0 : getStartStationType().hashCode());
-        result = prime * result + ((getStartSwitch() == null) ? 0 : getStartSwitch().hashCode());
-        result = prime * result + ((getStartSwitchName() == null) ? 0 : getStartSwitchName().hashCode());
-        result = prime * result + ((getStartSwitchType() == null) ? 0 : getStartSwitchType().hashCode());
-        result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode());
-        result = prime * result + ((getSupplyRadius() == null) ? 0 : getSupplyRadius().hashCode());
-        result = prime * result + ((getSupplyArea() == null) ? 0 : getSupplyArea().hashCode());
-        result = prime * result + ((getSupplyAreaName() == null) ? 0 : getSupplyAreaName().hashCode());
-        result = prime * result + ((getRegionalism() == null) ? 0 : getRegionalism().hashCode());
-        result = prime * result + ((getRegionalismName() == null) ? 0 : getRegionalismName().hashCode());
-        result = prime * result + ((getConsNo() == null) ? 0 : getConsNo().hashCode());
-        result = prime * result + ((getDispatchOrg() == null) ? 0 : getDispatchOrg().hashCode());
-        result = prime * result + ((getDispatchOrgName() == null) ? 0 : getDispatchOrgName().hashCode());
-        result = prime * result + ((getDispatchLevel() == null) ? 0 : getDispatchLevel().hashCode());
-        result = prime * result + ((getDispatchLevelName() == null) ? 0 : getDispatchLevelName().hashCode());
-        result = prime * result + ((getEquipmentOwner() == null) ? 0 : getEquipmentOwner().hashCode());
-        result = prime * result + ((getEquipmentOwnerName() == null) ? 0 : getEquipmentOwnerName().hashCode());
-        result = prime * result + ((getErectionMethod() == null) ? 0 : getErectionMethod().hashCode());
-        result = prime * result + ((getErectionMethodName() == null) ? 0 : getErectionMethodName().hashCode());
-        result = prime * result + ((getFeederRateCapacity() == null) ? 0 : getFeederRateCapacity().hashCode());
-        result = prime * result + ((getImportance() == null) ? 0 : getImportance().hashCode());
-        result = prime * result + ((getImportanceName() == null) ? 0 : getImportanceName().hashCode());
-        result = prime * result + ((getIsCentralizedelechtg() == null) ? 0 : getIsCentralizedelechtg().hashCode());
-        result = prime * result + ((getIsDaFeeder() == null) ? 0 : getIsDaFeeder().hashCode());
-        result = prime * result + ((getIsDistributedelechtg() == null) ? 0 : getIsDistributedelechtg().hashCode());
-        result = prime * result + ((getIsRural() == null) ? 0 : getIsRural().hashCode());
-        result = prime * result + ((getIsRuralName() == null) ? 0 : getIsRuralName().hashCode());
-        result = prime * result + ((getLength() == null) ? 0 : getLength().hashCode());
-        result = prime * result + ((getCity() == null) ? 0 : getCity().hashCode());
-        result = prime * result + ((getCityName() == null) ? 0 : getCityName().hashCode());
-        result = prime * result + ((getMaintOrg() == null) ? 0 : getMaintOrg().hashCode());
-        result = prime * result + ((getMaintOrgName() == null) ? 0 : getMaintOrgName().hashCode());
-        result = prime * result + ((getMaintGroup() == null) ? 0 : getMaintGroup().hashCode());
-        result = prime * result + ((getMaintGroupName() == null) ? 0 : getMaintGroupName().hashCode());
-        result = prime * result + ((getNormalEnergizingBusbar() == null) ? 0 : getNormalEnergizingBusbar().hashCode());
-        result = prime * result + ((getOverheadLength() == null) ? 0 : getOverheadLength().hashCode());
-        result = prime * result + ((getOverheadMethod() == null) ? 0 : getOverheadMethod().hashCode());
-        result = prime * result + ((getOverheadMethodName() == null) ? 0 : getOverheadMethodName().hashCode());
-        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
-        result = prime * result + ((getAstNature() == null) ? 0 : getAstNature().hashCode());
-        result = prime * result + ((getAstNatureName() == null) ? 0 : getAstNatureName().hashCode());
-        result = prime * result + ((getAstOrg() == null) ? 0 : getAstOrg().hashCode());
-        result = prime * result + ((getAstOrgName() == null) ? 0 : getAstOrgName().hashCode());
-        result = prime * result + ((getDeployState() == null) ? 0 : getDeployState().hashCode());
-        result = prime * result + ((getDeployStateName() == null) ? 0 : getDeployStateName().hashCode());
-        result = prime * result + ((getEquipCode() == null) ? 0 : getEquipCode().hashCode());
-        result = prime * result + ((getIsCommission() == null) ? 0 : getIsCommission().hashCode());
-        result = prime * result + ((getIsCommissionName() == null) ? 0 : getIsCommissionName().hashCode());
-        result = prime * result + ((getOperateDate() == null) ? 0 : getOperateDate().hashCode());
-        result = prime * result + ((getSource() == null) ? 0 : getSource().hashCode());
-        result = prime * result + ((getSourceName() == null) ? 0 : getSourceName().hashCode());
-        result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode());
-        result = prime * result + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
-        result = prime * result + ((getDelFlag() == null) ? 0 : getDelFlag().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", psrId=").append(psrId);
-        sb.append(", astId=").append(astId);
-        sb.append(", name=").append(name);
-        sb.append(", voltageLevel=").append(voltageLevel);
-        sb.append(", voltageLevelName=").append(voltageLevelName);
-        sb.append(", cableLength=").append(cableLength);
-        sb.append(", cableMethod=").append(cableMethod);
-        sb.append(", cableMethodName=").append(cableMethodName);
-        sb.append(", psrState=").append(psrState);
-        sb.append(", psrStateName=").append(psrStateName);
-        sb.append(", pubPrivFlag=").append(pubPrivFlag);
-        sb.append(", pubPrivFlagName=").append(pubPrivFlagName);
-        sb.append(", referenceLength=").append(referenceLength);
-        sb.append(", runDevName=").append(runDevName);
-        sb.append(", startBay=").append(startBay);
-        sb.append(", startStation=").append(startStation);
-        sb.append(", startStationName=").append(startStationName);
-        sb.append(", startStationType=").append(startStationType);
-        sb.append(", startSwitch=").append(startSwitch);
-        sb.append(", startSwitchName=").append(startSwitchName);
-        sb.append(", startSwitchType=").append(startSwitchType);
-        sb.append(", startTime=").append(startTime);
-        sb.append(", supplyRadius=").append(supplyRadius);
-        sb.append(", supplyArea=").append(supplyArea);
-        sb.append(", supplyAreaName=").append(supplyAreaName);
-        sb.append(", regionalism=").append(regionalism);
-        sb.append(", regionalismName=").append(regionalismName);
-        sb.append(", consNo=").append(consNo);
-        sb.append(", dispatchOrg=").append(dispatchOrg);
-        sb.append(", dispatchOrgName=").append(dispatchOrgName);
-        sb.append(", dispatchLevel=").append(dispatchLevel);
-        sb.append(", dispatchLevelName=").append(dispatchLevelName);
-        sb.append(", equipmentOwner=").append(equipmentOwner);
-        sb.append(", equipmentOwnerName=").append(equipmentOwnerName);
-        sb.append(", erectionMethod=").append(erectionMethod);
-        sb.append(", erectionMethodName=").append(erectionMethodName);
-        sb.append(", feederRateCapacity=").append(feederRateCapacity);
-        sb.append(", importance=").append(importance);
-        sb.append(", importanceName=").append(importanceName);
-        sb.append(", isCentralizedelechtg=").append(isCentralizedelechtg);
-        sb.append(", isDaFeeder=").append(isDaFeeder);
-        sb.append(", isDistributedelechtg=").append(isDistributedelechtg);
-        sb.append(", isRural=").append(isRural);
-        sb.append(", isRuralName=").append(isRuralName);
-        sb.append(", length=").append(length);
-        sb.append(", city=").append(city);
-        sb.append(", cityName=").append(cityName);
-        sb.append(", maintOrg=").append(maintOrg);
-        sb.append(", maintOrgName=").append(maintOrgName);
-        sb.append(", maintGroup=").append(maintGroup);
-        sb.append(", maintGroupName=").append(maintGroupName);
-        sb.append(", normalEnergizingBusbar=").append(normalEnergizingBusbar);
-        sb.append(", overheadLength=").append(overheadLength);
-        sb.append(", overheadMethod=").append(overheadMethod);
-        sb.append(", overheadMethodName=").append(overheadMethodName);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", astNature=").append(astNature);
-        sb.append(", astNatureName=").append(astNatureName);
-        sb.append(", astOrg=").append(astOrg);
-        sb.append(", astOrgName=").append(astOrgName);
-        sb.append(", deployState=").append(deployState);
-        sb.append(", deployStateName=").append(deployStateName);
-        sb.append(", equipCode=").append(equipCode);
-        sb.append(", isCommission=").append(isCommission);
-        sb.append(", isCommissionName=").append(isCommissionName);
-        sb.append(", operateDate=").append(operateDate);
-        sb.append(", source=").append(source);
-        sb.append(", sourceName=").append(sourceName);
-        sb.append(", ctime=").append(ctime);
-        sb.append(", lastUpdateTime=").append(lastUpdateTime);
-        sb.append(", delFlag=").append(delFlag);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
 }

services/ruoyi-job/src/main/java/com/hdkj/lt/job/entity/convert/EntityConvertor.java

@@ -22,6 +22,7 @@ public interface EntityConvertor {
     @Mapping(source = "assets.feederRateCapacity",target = "feederRateCapacity")
     @Mapping(source = "assets.ctime",target = "ctime")
     @Mapping(source = "assets.lastUpdateTime",target = "lastUpdateTime")
+    @Mapping(source = "assets.maxAllowableCurrent",target = "maxAllowableCurrent")
     @Mapping(expression = "java(new java.util.Date())",target = "updateTime")
     DwdShbDsFeederBase toDwdShbDsFeederBase(FeederBaseResponse.ResultDTO.DkxDTO.RecordsDTO.ResourceDTO resourceDTO, FeederBaseResponse.ResultDTO.DkxDTO.RecordsDTO.AssetsDTO assets);
 }

services/ruoyi-job/src/main/java/com/hdkj/lt/job/entity/po/FeederBaseResponse.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -165,7 +166,7 @@ public class FeederBaseResponse {
                     @JSONField(name = "deployState#Name")
                     private String deployStateName;
                     private String projectNum;
-                    private Double maxAllowableCurrent;
+                    private BigDecimal maxAllowableCurrent;
                     private String projectName;
                     private Date operateDate;
                     private String deployState;