Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.技术监督通用文件表调整

Browse Source 
2.终端检测导入功能调整
3.技术监督计划增加其他附件上传
This commit is contained in:
wr
2024-08-19 16:19:23 +08:00
parent 9e23373878
commit 25ee513246
18 changed files with 91 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java
View File

@@ -8,7 +8,6 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
@Data
public class SensitiveReportExcel implements Serializable {
@@ -55,9 +54,8 @@ public class SensitiveReportExcel implements Serializable {
// private String orgId;
@Excel(name = "工程预期投产日期", width = 30)
//@NotBlank(message = "工程预期投产日期不能为空")
private LocalDate expectedProductionDate;
@Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30)
private String expectedProductionDate;
@Excel(name = "电压等级", width = 30)
//@NotBlank(message = "电压等级不能为空")

8
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java
View File

@@ -3,13 +3,10 @@ package com.njcn.supervision.pojo.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
@Data
public class SensitiveUserSExcel implements Serializable {
@@ -60,10 +57,9 @@ public class SensitiveUserSExcel implements Serializable {
// private String orgId;
@Excel(name = "工程预期投产日期", width = 30)
@Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30)
//@NotBlank(message = "工程预期投产日期不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate expectedProductionDate;
private String expectedProductionDate;
@Excel(name = "电压等级", width = 30)
//@NotBlank(message = "电压等级不能为空")

57
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java
View File

@@ -1,17 +1,13 @@
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:
@@ -26,14 +22,12 @@ import java.time.LocalDateTime;
public class SupervisionDevMainReportExcel {
/**
* 工程预期投产日期
*/
@Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30)
@Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30, height = 6)
@NotBlank(message = "不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate expectedProductionDate;
private String expectedProductionDate;
/**
* 所属地市
@@ -107,19 +101,15 @@ public class SupervisionDevMainReportExcel {
/**
* 投运时间
*/
@Excel(name = "*投运时间(yyyy-MM-dd HH:mm:ss)", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "*投运时间(yyyy-MM-dd HH:mm:ss)", width = 40)
@NotBlank(message = "投运时间不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime commissioningTime;
private String commissioningTime;
/**
* 数据更新时间
*/
@Excel(name = "数据更新时间(yyyy-MM-dd HH:mm:ss)", 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 = "数据更新时间(yyyy-MM-dd HH:mm:ss)", width = 40)
private String dataUpdateTime;
/**
* 所属前置机
@@ -131,9 +121,9 @@ public class SupervisionDevMainReportExcel {
/**
* 监测终端安装位置
*/
@Excel(name = "*监测终端安装位置", width = 30, replace = {"电网侧_0", "用户侧_1", "_0"})
@Excel(name = "*监测终端安装位置", width = 30, replace = {"电网侧_0", "用户侧_1"})
@NotBlank(message = "监测终端安装位置不能为空")
private String monitoringDeviceInstallationPosition;
private String monitoringDeviceInstallationPosition = "0";
/**
* 识别码
@@ -150,14 +140,14 @@ public class SupervisionDevMainReportExcel {
/**
* 终端模型
*/
@Excel(name = "终端模型", width = 30, replace = {"虚拟终端_0", "实际终端_1", "离线_2", "_1"})
private String terminalModel;
@Excel(name = "终端模型", width = 30, replace = {"虚拟终端_0", "实际终端_1", "离线_2"})
private String terminalModel = "1";
/**
* 数据类型
*/
@Excel(name = "数据类型", width = 30, replace = {"暂态系统_0", "稳态系统_1", "两个系统_2", "_2"})
private String dataType;
@Excel(name = "数据类型", width = 30, replace = {"暂态系统_0", "稳态系统_1", "两个系统_2"})
private String dataType = "2";
/**
* 终端接线方式类型
@@ -177,11 +167,9 @@ public class SupervisionDevMainReportExcel {
/**
* 本次终端检测时间
*/
@Excel(name = "*本次终端检测时间(yyyy-MM-dd HH:mm:ss)", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "*本次终端检测时间(yyyy-MM-dd HH:mm:ss)", width = 40)
@NotBlank(message = "本次终端检测时间不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime currentTerminalDetectionTime;
private String currentTerminalDetectionTime;
/**
@@ -212,33 +200,32 @@ public class SupervisionDevMainReportExcel {
* 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"})
private String timeSyncFunction = "0";
/**
* 电镀功能
*/
@Excel(name = "电镀功能", width = 30, replace = {"关闭_0", "开启_1", "_0"})
private String electroplatingFunction;
@Excel(name = "电镀功能", width = 30, replace = {"关闭_0", "开启_1"})
private String electroplatingFunction = "0";
/**
* 召换标志
*/
@Excel(name = "召换标志", width = 30, replace = {"周期触发_0", "变位触发_1", "_0"})
private String summonFlag;
@Excel(name = "召换标志", width = 30, replace = {"周期触发_0", "变位触发_1"})
private String summonFlag = "0";
/**
* 告警功能
*/
@Excel(name = "告警功能", width = 30, replace = {"否_0", "是_1", "_0"})
private String alarmFunction;
@Excel(name = "告警功能", width = 30, replace = {"否_0", "是_1"})
private String alarmFunction = "0";
/**
* 合同号

6
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java
View File

@@ -64,6 +64,12 @@ public class SurveyTestParam implements Serializable {
@ApiModelProperty(value = "技术监督报告")
private String supervisionReport;
/**
* 其他报告
*/
@ApiModelProperty(value = "其他报告")
private String otherReport;
/**
* 是否有问题 0 没有问题 1 有问题
*/

24
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/file/FileUrl.java
View File

@@ -1,45 +1,51 @@
package com.njcn.supervision.pojo.po.file;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import lombok.Getter;
import lombok.Setter;
import lombok.Data;
/**
* <p>
* 用户档案信息表
* 用户档案信息表
* </p>
*
* @author wr
* @since 2024-08-14
*/
@Getter
@Setter
@Data
@TableName("supervision_file_url")
public class FileUrl extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* id(对应表数据id一样)
*/
private String id;
@MppMultiId
@TableField(value = "supervision_Id")
private String supervisionId;
/**
* 字段名称
*/
@MppMultiId
@TableField(value = "name")
private String name;
/**
* 文件地址
*/
@TableField(value = "url")
private String url;
/**
* 状态：0-删除 1-正常
*/
private Integer state;
@TableField(value = "state")
private Integer state = 1;
}

9
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java
View File

@@ -5,11 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
@@ -72,6 +69,12 @@ public class SurveyTest extends BaseEntity implements Serializable {
*/
private String supervisionReport;
/**
* 其他报告
*/
private String otherReport;
/**
* 是否有问题 0 没有问题 1 有问题
*/

4
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java
View File

@@ -175,4 +175,8 @@ public class SupervisionDevMainReportVO {
private String createBy;
/**
* 状态：0：系统建档 1：外部导入
*/
private Integer importType;
}