1.污区图
2.过程监督-终端 代码提交
This commit is contained in:
wurui
@@ -0,0 +1,73 @@
|
||||
package com.njcn.process.pojo.dto.excel;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.njcn.common.pojo.constant.PatternRegex;
|
||||
import com.njcn.device.pq.pojo.constant.DeviceValidMessage;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* <功能描述>
|
||||
*
|
||||
* @author wr
|
||||
* @createTime: 2023-02-27
|
||||
*/
|
||||
@Data
|
||||
public class TerminalExcel implements Serializable {
|
||||
|
||||
|
||||
@Excel(name = "终端编号",width = 15)
|
||||
@NotBlank(message = "终端编号不为空")
|
||||
@Pattern(regexp = "^[A-Za-z0-9]{1,32}$", message = "终端编号违规长度不能超过32位(数字 、 字母)")
|
||||
private String id;
|
||||
|
||||
@Excel(name = "终端名称",width = 15)
|
||||
@NotBlank(message = "终端名称不为空")
|
||||
@Pattern(regexp = PatternRegex.DEPT_NAME_REGEX, message = DeviceValidMessage.PROJECT_NAME_RULE)
|
||||
private String name;
|
||||
|
||||
@Excel(name = "组织机构名称",width = 15)
|
||||
@NotBlank(message = "组织机构名称不为空")
|
||||
private String orgName;
|
||||
|
||||
@Excel(name = "生产厂家",width = 15)
|
||||
@NotBlank(message = "生产厂家不为空")
|
||||
private String manufacture;
|
||||
|
||||
@Excel(name = "安装位置")
|
||||
@NotBlank(message = "安装位置不为空")
|
||||
private String installPlace;
|
||||
|
||||
@Excel(name = "送检单位")
|
||||
@NotBlank(message = "送检单位不为空")
|
||||
private String inspectionName;
|
||||
|
||||
@Excel(name = "检测时间",format = "yyyy-MM-dd", width = 15)
|
||||
@NotNull(message = "检测时间不为空")
|
||||
private LocalDate inspectionTime;
|
||||
|
||||
// @Excel(name = "检测结果")
|
||||
// @NotBlank(message = "检测结果不为空")
|
||||
// private String testResults;
|
||||
//
|
||||
// @Excel(name = "下次检测时间",format = "yyyy-MM-dd", width = 15)
|
||||
// @NotNull(message = "下次检测时间不为空")
|
||||
// private LocalDate nextInspectionTime;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class TerminalExcelMsg extends TerminalExcel implements Serializable {
|
||||
@Excel(name = "错误信息描述", width = 30)
|
||||
private String msg;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
package com.njcn.process.pojo.param;
|
||||
|
||||
import com.njcn.common.pojo.constant.PatternRegex;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.Pattern;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* <功能描述>
|
||||
*
|
||||
* @author wr
|
||||
* @createTime: 2023-02-27
|
||||
*/
|
||||
@Data
|
||||
public class TerminalParam {
|
||||
|
||||
|
||||
@ApiModelProperty("开始时间")
|
||||
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
|
||||
private String startTime;
|
||||
|
||||
@ApiModelProperty("结束时间")
|
||||
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
|
||||
private String endTime;
|
||||
|
||||
@ApiModelProperty("单位id")
|
||||
private String id;
|
||||
|
||||
@Data
|
||||
public static class TerminalPageParam extends TerminalParam{
|
||||
|
||||
@ApiModelProperty(value = "页码")
|
||||
private Integer PageNum;
|
||||
|
||||
@ApiModelProperty(value = "条数")
|
||||
private Integer PageSize;
|
||||
|
||||
@ApiModelProperty(value = "是否周期检测列表")
|
||||
private Integer type;
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class TerminalCycleParam {
|
||||
|
||||
@ApiModelProperty("单位id")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "检测结果")
|
||||
private String testResults;
|
||||
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class TerminalUpdateParam {
|
||||
@ApiModelProperty(value = "终端编号")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "终端名称")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(value = "组织机构名称")
|
||||
private String orgName;
|
||||
|
||||
@ApiModelProperty(value = "组织机构ID(外键)")
|
||||
private String orgId;
|
||||
|
||||
@ApiModelProperty(value = "生产厂家")
|
||||
private String manufacture;
|
||||
|
||||
@ApiModelProperty(value = "安装位置")
|
||||
private String installPlace;
|
||||
|
||||
@ApiModelProperty(value = "送检单位")
|
||||
private String inspectionName;
|
||||
|
||||
@ApiModelProperty(value = "检测结果")
|
||||
private String testResults;
|
||||
|
||||
@ApiModelProperty(value = "检测时间")
|
||||
private LocalDate inspectionTime;
|
||||
|
||||
@ApiModelProperty(value = "下次检测时间")
|
||||
private LocalDate nextInspectionTime;
|
||||
|
||||
@ApiModelProperty(value = "检测报告")
|
||||
private String inspectionReport;
|
||||
|
||||
@ApiModelProperty(value = "原始数据报告")
|
||||
private String originalReport;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
package com.njcn.process.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import java.time.LocalDate;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import java.io.Serializable;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @author wr
|
||||
* @since 2023-02-27
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@TableName("pms_terminal_detection")
|
||||
@ApiModel(value="PmsTerminalDetection对象", description="")
|
||||
public class PmsTerminalDetection implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "终端编号")
|
||||
@TableId(value = "Id", type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "终端名称")
|
||||
@TableField("Name")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(value = "组织机构名称")
|
||||
@TableField("Org_Name")
|
||||
private String orgName;
|
||||
|
||||
@ApiModelProperty(value = "组织机构ID(外键)")
|
||||
@TableField("Org_No")
|
||||
private String orgNo;
|
||||
|
||||
@ApiModelProperty(value = "生产厂家(字典)")
|
||||
@TableField("Manufacture")
|
||||
private String manufacture;
|
||||
|
||||
@ApiModelProperty(value = "安装位置")
|
||||
private String installPlace;
|
||||
|
||||
@ApiModelProperty(value = "送检单位")
|
||||
@TableField("inspection_Name")
|
||||
private String inspectionName;
|
||||
|
||||
@ApiModelProperty(value = "检测结果(0:未开展 1:已开展)")
|
||||
private Integer testResults;
|
||||
|
||||
@ApiModelProperty(value = "检测时间")
|
||||
@TableField("inspection_Time")
|
||||
private LocalDate inspectionTime;
|
||||
|
||||
@ApiModelProperty(value = "下次检测时间")
|
||||
@TableField("next_inspection_Time")
|
||||
private LocalDate nextInspectionTime;
|
||||
|
||||
@ApiModelProperty(value = "检测报告")
|
||||
@TableField("inspection_Report")
|
||||
private String inspectionReport;
|
||||
|
||||
@ApiModelProperty(value = "原始数据报告")
|
||||
@TableField("original_Report")
|
||||
private String originalReport;
|
||||
|
||||
@ApiModelProperty(value = "数据状态：0-删除；1-正常； ")
|
||||
@TableField("Status")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty(value = "创建用户")
|
||||
@TableField("Create_By")
|
||||
private String createBy;
|
||||
|
||||
@ApiModelProperty(value = "更新用户")
|
||||
@TableField("Update_By")
|
||||
private String updateBy;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package com.njcn.process.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* <功能描述>
|
||||
*
|
||||
* @author wr
|
||||
* @createTime: 2023-02-27
|
||||
*/
|
||||
@Data
|
||||
public class TerminalVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "终端编号")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "终端名称")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(value = "组织机构名称")
|
||||
private String orgName;
|
||||
|
||||
@ApiModelProperty(value = "组织机构编号")
|
||||
private String orgNO;
|
||||
|
||||
@ApiModelProperty(value = "生产厂家")
|
||||
private String manufacture;
|
||||
|
||||
@ApiModelProperty(value = "安装位置")
|
||||
private String installPlace;
|
||||
|
||||
@ApiModelProperty(value = "送检单位")
|
||||
private String inspectionName;
|
||||
|
||||
@ApiModelProperty(value = "检测结果")
|
||||
private String testResults;
|
||||
|
||||
@ApiModelProperty(value = "检测时间")
|
||||
private LocalDate inspectionTime;
|
||||
|
||||
@ApiModelProperty(value = "下次检测时间")
|
||||
private LocalDate nextInspectionTime;
|
||||
|
||||
@ApiModelProperty(value = "检测报告")
|
||||
private String inspectionReport;
|
||||
|
||||
@ApiModelProperty(value = "原始数据报告")
|
||||
private String originalReport;
|
||||
|
||||
@Data
|
||||
public static class TerminalStatistics implements Serializable {
|
||||
|
||||
@ApiModelProperty(value = "单位id")
|
||||
private String orgNo;
|
||||
|
||||
@ApiModelProperty(value = "单位名称")
|
||||
private String orgName;
|
||||
|
||||
@ApiModelProperty(value = "统计数量")
|
||||
private Integer count;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user