1.excel公共导出模板调整,解决下拉框最大字符255问题，才用隐藏表单来设置下拉框
2.解决冀北试运行报告bug部分 3.解决数据完整性，小数点问题 4.终端监测导出模板和导入功能编写,
This commit is contained in:
wr
@@ -23,6 +23,7 @@ public enum SupervisionResponseEnum {
|
||||
NO_POWER("A00550","不能操作非自己创建的任务！"),
|
||||
NO_USER_REPORT_UPDATE("A00550","常态化干扰源用户管理信息更新失败，不存在该条信息"),
|
||||
NO_DEPT_POWER("A00550","不能操作非自己部门创建的任务"),
|
||||
IMPORT_DEV_ERROR("A00550","导入终端检测失败"),
|
||||
;
|
||||
|
||||
private final String code;
|
||||
|
||||
@@ -0,0 +1,257 @@
|
||||
package com.njcn.supervision.pojo.dto;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* Date: 2024/5/10 18:16【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class SupervisionDevMainReportExcel {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 工程预期投产日期
|
||||
*/
|
||||
@Excel(name = "*工程预期投产日期", width = 30)
|
||||
@NotBlank(message = "不能为空")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate expectedProductionDate;
|
||||
|
||||
/**
|
||||
* 所属地市
|
||||
*/
|
||||
@Excel(name = "*所属地市", width = 30)
|
||||
@NotBlank(message = "所属地市不能为空")
|
||||
private String city;
|
||||
|
||||
|
||||
//------------------------基本信息---------------------------------------------
|
||||
|
||||
/**
|
||||
* 并网变电站
|
||||
*/
|
||||
@Excel(name = "*所属变电站名称", width = 30)
|
||||
@NotBlank(message = "所属变电站名称不能为空")
|
||||
private String substation;
|
||||
|
||||
/**
|
||||
* 所属供电公司
|
||||
*/
|
||||
@Excel(name = "*所属供电公司", width = 30)
|
||||
@NotBlank(message = "所属供电公司不能为空")
|
||||
private String powerCompany;
|
||||
|
||||
/**
|
||||
* 终端型号
|
||||
*/
|
||||
@Excel(name = "*终端型号", width = 30)
|
||||
@NotBlank(message = "终端型号不能为空")
|
||||
private String terminalType;
|
||||
|
||||
|
||||
/**
|
||||
* 监测终端名称
|
||||
*/
|
||||
@Excel(name = "*终端名称", width = 30)
|
||||
@NotBlank(message = "终端名称不能为空")
|
||||
private String monitoringTerminalName;
|
||||
|
||||
|
||||
/**
|
||||
* 通讯类型
|
||||
*/
|
||||
@Excel(name = "*通讯类型", width = 30)
|
||||
@NotBlank(message = "通讯类型不能为空")
|
||||
private String frontType;
|
||||
|
||||
/**
|
||||
* 监测终端编码
|
||||
*/
|
||||
@Excel(name = "*监测终端编码", width = 30)
|
||||
@NotBlank(message = "监测终端编码不能为空")
|
||||
private String monitoringTerminalCode;
|
||||
|
||||
/**
|
||||
* 终端IP
|
||||
*/
|
||||
@Excel(name = "*终端IP", width = 30)
|
||||
@NotBlank(message = "*终端IP不能为空")
|
||||
private String terminalIp;
|
||||
|
||||
|
||||
/**
|
||||
* 端口
|
||||
*/
|
||||
@Excel(name = "*端口", width = 30)
|
||||
@NotBlank(message = "*端口不能为空")
|
||||
private String terminalPort;
|
||||
|
||||
/**
|
||||
* 投运时间
|
||||
*/
|
||||
@Excel(name = "*投运时间", width = 30)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@NotBlank(message = "投运时间不能为空")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime commissioningTime;
|
||||
|
||||
/**
|
||||
* 数据更新时间
|
||||
*/
|
||||
@Excel(name = "数据更新时间", width = 30)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dataUpdateTime;
|
||||
|
||||
/**
|
||||
* 所属前置机
|
||||
*/
|
||||
@Excel(name = "*所属前置机", width = 30)
|
||||
@NotBlank(message = "所属前置机不能为空")
|
||||
private String frontEndMachine;
|
||||
|
||||
/**
|
||||
* 监测终端安装位置
|
||||
*/
|
||||
@Excel(name = "*监测终端安装位置", width = 30, replace = {"电网侧_0", "用户侧_1", "_0"})
|
||||
@NotBlank(message = "监测终端安装位置不能为空")
|
||||
private String monitoringDeviceInstallationPosition;
|
||||
|
||||
/**
|
||||
* 识别码
|
||||
*/
|
||||
@Excel(name = "识别码", width = 30)
|
||||
private String identificationCode;
|
||||
|
||||
/**
|
||||
* 终端秘钥
|
||||
*/
|
||||
@Excel(name = "终端秘钥", width = 30)
|
||||
private String terminalSecretKey;
|
||||
|
||||
/**
|
||||
* 终端模型
|
||||
*/
|
||||
@Excel(name = "终端模型", width = 30, replace = {"虚拟终端_0", "实际终端_1", "离线_2", "_1"})
|
||||
private String terminalModel;
|
||||
|
||||
/**
|
||||
* 数据类型
|
||||
*/
|
||||
@Excel(name = "数据类型", width = 30, replace = {"暂态系统_0", "稳态系统_1", "两个系统_2", "_2"})
|
||||
private String dataType;
|
||||
|
||||
/**
|
||||
* 终端接线方式类型
|
||||
*/
|
||||
@Excel(name = "*终端接线方式类型", width = 30)
|
||||
@NotBlank(message = "终端接线方式类型不能为空")
|
||||
private String terminalWiringMethodType;
|
||||
|
||||
/**
|
||||
* 厂家
|
||||
*/
|
||||
@Excel(name = "*厂家", width = 30)
|
||||
@NotBlank(message = "厂家不能为空")
|
||||
private String manufacturer;
|
||||
|
||||
|
||||
/**
|
||||
* 本次终端检测时间
|
||||
*/
|
||||
@Excel(name = "*本次终端检测时间", width = 30)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@NotBlank(message = "本次终端检测时间不能为空")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime currentTerminalDetectionTime;
|
||||
|
||||
|
||||
/**
|
||||
* 电压互感器类型
|
||||
*/
|
||||
@Excel(name = "*电压互感器类型", width = 30)
|
||||
@NotBlank(message = "*电压互感器类型不能为空")
|
||||
private String voltageTransformerType;
|
||||
|
||||
|
||||
/**
|
||||
* 中性点接线方式
|
||||
*/
|
||||
@Excel(name = "*中性点接线方式", width = 30)
|
||||
@NotBlank(message = "中性点接线方式不能为空")
|
||||
private String neutralPointWiringMethod;
|
||||
|
||||
|
||||
/**
|
||||
* 厂家终端编号
|
||||
*/
|
||||
@Excel(name = "*厂家终端编号", width = 30)
|
||||
@NotBlank(message = "厂家终端编号不能为空")
|
||||
private String manufacturerDeviceNumber;
|
||||
|
||||
|
||||
/**
|
||||
* SIM卡号
|
||||
*/
|
||||
@Excel(name = "SIM卡号", width = 30)
|
||||
@NotBlank(message = "不能为空")
|
||||
private String simCardNumber;
|
||||
|
||||
/**
|
||||
* 对时功能
|
||||
*/
|
||||
@Excel(name = "对时功能", width = 30, replace = {"关闭_0", "开启_1", "_0"})
|
||||
private String timeSyncFunction;
|
||||
|
||||
/**
|
||||
* 电镀功能
|
||||
*/
|
||||
@Excel(name = "电镀功能", width = 30, replace = {"关闭_0", "开启_1", "_0"})
|
||||
private String electroplatingFunction;
|
||||
|
||||
|
||||
/**
|
||||
* 召换标志
|
||||
*/
|
||||
@Excel(name = "召换标志", width = 30, replace = {"周期触发_0", "变位触发_1", "_0"})
|
||||
private String summonFlag;
|
||||
|
||||
/**
|
||||
* 告警功能
|
||||
*/
|
||||
@Excel(name = "告警功能", width = 30, replace = {"否_0", "是_1", "_0"})
|
||||
private String alarmFunction;
|
||||
|
||||
/**
|
||||
* 合同号
|
||||
*/
|
||||
@Excel(name = "合同号", width = 30)
|
||||
private String contractNumber;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class ExcelMsg extends SupervisionDevMainReportExcel implements Serializable {
|
||||
|
||||
@Excel(name = "错误信息描述", width = 30)
|
||||
private String msg;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import com.njcn.db.bo.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@@ -51,6 +52,7 @@ public class SupervisionDevMainReportPO extends BaseEntity {
|
||||
* 工程预期投产日期
|
||||
*/
|
||||
@TableField(value = "expected_production_date")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate expectedProductionDate;
|
||||
|
||||
/**
|
||||
@@ -152,4 +154,10 @@ public class SupervisionDevMainReportPO extends BaseEntity {
|
||||
*/
|
||||
@TableField(value = "`State`")
|
||||
private Integer state;
|
||||
|
||||
/**
|
||||
* 状态：0：系统建档 1：外部导入
|
||||
*/
|
||||
@TableField(value = "`import_type`")
|
||||
private Integer importType;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user