海南版本提交

This commit is contained in:
hzj
2024-03-22 08:59:10 +08:00
parent 0bc9186375
commit 2e0607028b
18 changed files with 499 additions and 217 deletions

View File

@@ -39,6 +39,7 @@ public enum AdvanceResponseEnum {
DATA_UNDERRUN("A0104","数据量不足,请根据模版上传充足近两周数据"),
DOCUMENT_FORMAT_ERROR("A0105","数据缺失,导入失败!请检查导入文档的格式是否正确"),
DEVICE_LOST("A0104","用户下缺少设备"),
USER_LOST("A0106","干扰源用户缺失"),
UNCOMPLETE_STRATEGY("A0106","配置安全III级预警,II级预警,I级预警4条完整策略"),

View File

@@ -80,57 +80,57 @@ public enum CarryingCapacityEnum {
I_INV_35("I_INV_35","0.072","35次典型谐波电流含有率"),
//电弧炉谐波电流含有率
EAF_I_2("EAF_I_2","0.6112","2次电弧炉谐波电流含有率"),
EAF_I_3("EAF_I_3","0.68935","3次电弧炉谐波电流含有率"),
EAF_I_4("EAF_I_4","0.9906","4次电弧炉谐波电流含有率"),
EAF_I_5("EAF_I_5","6.9575","5次电弧炉谐波电流含有率"),
EAF_I_6("EAF_I_6","0.5750","6次电弧炉谐波电流含有率"),
EAF_I_7("EAF_I_7","3.2731","7次电弧炉谐波电流含有率"),
EAF_I_8("EAF_I_8","0.4782","8次电弧炉谐波电流含有率"),
EAF_I_9("EAF_I_9","0.5197","9次电弧炉谐波电流含有率"),
EAF_I_10("EAF_I_10","0.6003","10次电弧炉谐波电流含有率"),
EAF_I_11("EAF_I_11","4.5631","11次电弧炉谐波电流含有率"),
EAF_I_12("EAF_I_12","0.5242","12次电弧炉谐波电流含有率"),
EAF_I_13("EAF_I_13","2.9196","13次电弧炉谐波电流含有率"),
EAF_I_14("EAF_I_14","0.5720","14次电弧炉谐波电流含有率"),
EAF_I_15("EAF_I_15","0.5956","15次电弧炉谐波电流含有率"),
EAF_I_16("EAF_I_16","0.8234","16次电弧炉谐波电流含有率"),
EAF_I_17("EAF_I_17","5.4185","17次电弧炉谐波电流含有率"),
EAF_I_18("EAF_I_18","0.8848","18次电弧炉谐波电流含有率"),
EAF_I_19("EAF_I_19","2.3503","19次电弧炉谐波电流含有率"),
EAF_I_20("EAF_I_20","0.6789","20次电弧炉谐波电流含有率"),
// EAF_I_2("EAF_I_2","0.6112","2次电弧炉谐波电流含有率"),
EAF_I_3("EAF_I_3","0.13484","3次电弧炉谐波电流含有率"),
// EAF_I_4("EAF_I_4","0.9906","4次电弧炉谐波电流含有率"),
EAF_I_5("EAF_I_5","0.017327","5次电弧炉谐波电流含有率"),
// EAF_I_6("EAF_I_6","0.5750","6次电弧炉谐波电流含有率"),
EAF_I_7("EAF_I_7","0.015288","7次电弧炉谐波电流含有率"),
// EAF_I_8("EAF_I_8","0.4782","8次电弧炉谐波电流含有率"),
EAF_I_9("EAF_I_9","0.001495","9次电弧炉谐波电流含有率"),
// EAF_I_10("EAF_I_10","0.6003","10次电弧炉谐波电流含有率"),
EAF_I_11("EAF_I_11","0.001203","11次电弧炉谐波电流含有率"),
// EAF_I_12("EAF_I_12","0.5242","12次电弧炉谐波电流含有率"),
EAF_I_13("EAF_I_13","0.001407","13次电弧炉谐波电流含有率"),
// EAF_I_14("EAF_I_14","0.5720","14次电弧炉谐波电流含有率"),
EAF_I_15("EAF_I_15","0.001676","15次电弧炉谐波电流含有率"),
// EAF_I_16("EAF_I_16","0.8234","16次电弧炉谐波电流含有率"),
EAF_I_17("EAF_I_17","0.001555","17次电弧炉谐波电流含有率"),
// EAF_I_18("EAF_I_18","0.8848","18次电弧炉谐波电流含有率"),
EAF_I_19("EAF_I_19","0.001159","19次电弧炉谐波电流含有率"),
// EAF_I_20("EAF_I_20","0.6789","20次电弧炉谐波电流含有率"),
//充电桩谐波电流含有率
CP_I_2("CP_I_2","5.00","2次电弧炉谐波电流含有率"),
CP_I_3("CP_I_3","7.00","3次电弧炉谐波电流含有率"),
CP_I_4("CP_I_4","4.00","4次电弧炉谐波电流含有率"),
CP_I_5("CP_I_5","5.00","5次电弧炉谐波电流含有率"),
CP_I_6("CP_I_6","4.00","6次电弧炉谐波电流含有率"),
CP_I_7("CP_I_7","2.00","7次电弧炉谐波电流含有率"),
CP_I_8("CP_I_8","2.00","8次电弧炉谐波电流含有率"),
CP_I_9("CP_I_9","1.00","9次电弧炉谐波电流含有率"),
CP_I_10("CP_I_10","1.50","10次电弧炉谐波电流含有率"),
CP_I_11("CP_I_11","1.50","11次电弧炉谐波电流含有率"),
CP_I_12("CP_I_12","0.50","12次电弧炉谐波电流含有率"),
CP_I_13("CP_I_13","0.50","13次电弧炉谐波电流含有率"),
CP_I_14("CP_I_14","0.00","14次电弧炉谐波电流含有率"),
CP_I_15("CP_I_15","0.00","15次电弧炉谐波电流含有率"),
CP_I_16("CP_I_16","0.00","16次电弧炉谐波电流含有率"),
CP_I_17("CP_I_17","0.00","17次电弧炉谐波电流含有率"),
CP_I_18("CP_I_18","0.00","18次电弧炉谐波电流含有率"),
CP_I_19("CP_I_19","0.00","19次电弧炉谐波电流含有率"),
CP_I_20("CP_I_20","0.00","20次电弧炉谐波电流含有率"),
// CP_I_2("CP_I_2","5.00","2次电弧炉谐波电流含有率"),
CP_I_3("CP_I_3","0.2011","3次电弧炉谐波电流含有率"),
// CP_I_4("CP_I_4","4.00","4次电弧炉谐波电流含有率"),
CP_I_5("CP_I_5","0.1069","5次电弧炉谐波电流含有率"),
// CP_I_6("CP_I_6","4.00","6次电弧炉谐波电流含有率"),
CP_I_7("CP_I_7","0.0647","7次电弧炉谐波电流含有率"),
// CP_I_8("CP_I_8","2.00","8次电弧炉谐波电流含有率"),
CP_I_9("CP_I_9","0.0376","9次电弧炉谐波电流含有率"),
// CP_I_10("CP_I_10","1.50","10次电弧炉谐波电流含有率"),
CP_I_11("CP_I_11","0.0232","11次电弧炉谐波电流含有率"),
// CP_I_12("CP_I_12","0.50","12次电弧炉谐波电流含有率"),
CP_I_13("CP_I_13","0.0155","13次电弧炉谐波电流含有率"),
// CP_I_14("CP_I_14","0.00","14次电弧炉谐波电流含有率"),
CP_I_15("CP_I_15","0.005956","15次电弧炉谐波电流含有率"),
// CP_I_16("CP_I_16","0.00","16次电弧炉谐波电流含有率"),
CP_I_17("CP_I_17","0.054185","17次电弧炉谐波电流含有率"),
// CP_I_18("CP_I_18","0.00","18次电弧炉谐波电流含有率"),
CP_I_19("CP_I_19","0.023503","19次电弧炉谐波电流含有率"),
// CP_I_20("CP_I_20","0.00","20次电弧炉谐波电流含有率"),
//电气化铁路典型
ER_I_3("ER_I_3","20.11","3次电弧炉谐波电流含有率"),
ER_I_5("ER_I_5","10.69","5次电弧炉谐波电流含有率"),
ER_I_7("ER_I_7","6.47","7次电弧炉谐波电流含有率"),
ER_I_9("ER_I_9","3.76","9次电弧炉谐波电流含有率"),
ER_I_11("ER_I_11","2.32","11次电弧炉谐波电流含有率"),
ER_I_13("ER_I_13","1.55","13次电弧炉谐波电流含有率"),
ER_I_15("ER_I_15","1.17","15次电弧炉谐波电流含有率"),
ER_I_17("ER_I_17","0.95","17次电弧炉谐波电流含有率"),
ER_I_19("ER_I_19","0.80","19次电弧炉谐波电流含有率"),
ER_I_3("ER_I_3","0.0068935","3次电弧炉谐波电流含有率"),
ER_I_5("ER_I_5","0.069575","5次电弧炉谐波电流含有率"),
ER_I_7("ER_I_7","0.032731","7次电弧炉谐波电流含有率"),
ER_I_9("ER_I_9","0.005197","9次电弧炉谐波电流含有率"),
ER_I_11("ER_I_11","0.045631","11次电弧炉谐波电流含有率"),
ER_I_13("ER_I_13","0.029196","13次电弧炉谐波电流含有率"),
ER_I_15("ER_I_15","0.017","15次电弧炉谐波电流含有率"),
ER_I_17("ER_I_17","0.0095","17次电弧炉谐波电流含有率"),
ER_I_19("ER_I_19","0.0080","19次电弧炉谐波电流含有率"),
;
/**

View File

@@ -0,0 +1,51 @@
package com.njcn.advance.pojo.carrycapacity.param;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
/**
* Description:
* Date: 2024/3/20 9:59【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class CarryCapacityDeviceParam {
private String userId;
/**
* 设备名称
*/
private String devName;
private String devScale;
/**
* 设备用户协议容量(MVA)
*/
private Double protocolCapacity;
@Data
@EqualsAndHashCode(callSuper = true)
public static class CarryCapacityDeviceUpdateParam extends CarryCapacityDeviceParam {
@ApiModelProperty("设备Id")
@NotBlank(message = "设备Id不能为空")
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
private String devId;
}
@Data
@EqualsAndHashCode(callSuper = true)
public static class CarryCapacityDeviceQueryParam extends CarryCapacityDeviceParam {
@ApiModelProperty("设备Id")
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
private String devId;
}
}

View File

@@ -1,6 +1,6 @@
package com.njcn.advance.pojo.carrycapacity.param;
import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityUserVO;
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityDevicePO;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -46,6 +46,6 @@ public class CarryCapacityEvaluateParam {
@ApiModelProperty(name = "deviceCapacity",value = "设备容量")
private Float deviceCapacity;
@ApiModelProperty(name = "userList",value = "干扰源用户列表")
private List<CarryCapacityUserVO> userList;
@ApiModelProperty(name = "userList",value = "干扰源用户设备列表")
private List<CarryCapacityDevicePO> devList;
}

View File

@@ -12,6 +12,7 @@ import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.util.List;
/**
*
@@ -95,6 +96,8 @@ public class CarryCapacityUserParam {
@ApiModelProperty(value="结束时间")
private String endTime;
private List<String> userTypeList;
}
}

View File

@@ -0,0 +1,50 @@
package com.njcn.advance.pojo.carrycapacity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* Description:
* Date: 2024/3/19 16:36【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
@NoArgsConstructor
@TableName(value = "carry_capacity_device")
public class CarryCapacityDevicePO extends BaseEntity {
/**
* 设备id
*/
@TableId(value = "dev_id", type = IdType.ASSIGN_UUID)
private String devId;
@TableField(value = "user_id")
private String userId;
/**
* 设备名称
*/
@TableField(value = "dev_name")
private String devName;
/**
* 设备额定电压
*/
@TableField(value = "dev_scale")
private String devScale;
/**
* 设备用户协议容量(MVA)
*/
@TableField(value = "protocol_capacity")
private Double protocolCapacity;
}

View File

@@ -1,6 +1,5 @@
package com.njcn.advance.pojo.carrycapacity.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -80,9 +79,9 @@ public class CarryCapacityDResultVO {
private List<CarryCapacityDResultVO.CarryCapacityIResult> iResultList;
@TableField(value = "pt_type")
private String connectionMode;
private Double k;
private String ptType;
private String userMode;