海南版本提交

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

@@ -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;