pmsBUG提交

pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/excel/TerminalExcel.java

@@ -50,9 +50,9 @@ public class TerminalExcel implements Serializable {
 
     @Excel(name = "送检单位")
     @NotBlank(message = "送检单位不为空")
-    private String inspectionName;
+    private String inspectionUnit;
 
-    @Excel(name = "检测时间",format = "yyyy-MM-dd", width = 15)
+    @Excel(name = "检测时间(yyyy-MM-dd)",format = "yyyy-MM-dd", width = 30)
     @NotNull(message = "检测时间不为空")
     private LocalDate inspectionTime;
 

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java

@@ -79,10 +79,6 @@ public class StrategyParam {
         @NotEmpty(message = "指标类型集合不能为空")
         private List<String> indicatorTypes;
     }
-    @Data
-    public static class BindMonitorParam {
-
-    }
 
     @Data
     public static class StrategyUpdateParam {
@@ -121,6 +117,7 @@ public class StrategyParam {
         private Integer state;
 
     }
+
     @Data
     public static class MonitorTree {
 
@@ -131,10 +128,10 @@ public class StrategyParam {
         private String name;
 
         @ApiModelProperty("变电站信息")
-        private List<Power> childPower ;
+        private List<Power> childPower;
 
         @ApiModelProperty("子节点详细信息")
-        private List<MonitorTree> children ;
+        private List<MonitorTree> children;
     }
 
     @Data
@@ -146,7 +143,7 @@ public class StrategyParam {
         private String name;
 
         @ApiModelProperty("监测点信息")
-        private List<Power> childMonitor ;
+        private List<Power> childMonitor;
     }
 
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/TerminalParam.java

@@ -1,11 +1,16 @@
 package com.njcn.process.pojo.param;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.njcn.common.pojo.constant.PatternRegex;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.Pattern;
+import java.sql.Struct;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <功能描述>
@@ -16,7 +21,6 @@ import java.time.LocalDate;
 @Data
 public class TerminalParam {
 
-
     @ApiModelProperty("开始时间")
     @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
     private String startTime;
@@ -29,11 +33,17 @@ public class TerminalParam {
     private String id;
 
     public String getStartTime() {
-        return startTime + " 00:00:00";
+        if (StrUtil.isNotBlank(this.startTime)) {
+            return startTime + " 00:00:00";
+        }
+        return startTime;
     }
 
     public String getEndTime() {
-        return endTime + " 23:59:59";
+        if (StrUtil.isNotBlank(this.endTime)) {
+            return endTime + " 23:59:59";
+        }
+        return endTime;
     }
 
     @Data
@@ -48,18 +58,53 @@ public class TerminalParam {
         @ApiModelProperty("终端名称")
         private String name;
 
+        @ApiModelProperty(value = "检测结果(0:未开展 1:已开展)")
+        private Integer testResults;
+
+        @ApiModelProperty(value = "生产厂家(字典)")
+        private List<String> manufacture;
+
         @ApiModelProperty(value = "是否周期检测列表")
         private Integer type;
     }
 
     @Data
-    public static class TerminalCycleParam {
-
-        @ApiModelProperty("单位id")
+    public static class TerminalInsertParam {
+        @ApiModelProperty(value = "终端编号")
         private String id;
 
-        @ApiModelProperty(value = "检测结果")
-        private String testResults;
+        @ApiModelProperty(value = "终端名称")
+        private String name;
+
+        @ApiModelProperty(value = "组织机构名称")
+        private String orgName;
+
+        @ApiModelProperty(value = "组织机构ID(外键)")
+        private String orgNo;
+
+        @ApiModelProperty(value = "生产厂家")
+        private String manufacture;
+
+        @ApiModelProperty(value = "安装位置")
+        private String installPlace;
+
+        @ApiModelProperty(value = "检测时间")
+        private String inspectionTime;
+
+        @ApiModelProperty(value = "送检单位")
+        private String inspectionUnit;
+
+        @ApiModelProperty(value = "原始数据报告")
+        private String originalReport;
+//        @ApiModelProperty(value = "检测结果")
+//        private String testResults;
+//
+//
+//        @ApiModelProperty(value = "下次检测时间")
+//        private LocalDate nextInspectionTime;
+//
+//        @ApiModelProperty(value = "检测报告")
+//        private String inspectionReport;
 
     }
 
@@ -75,7 +120,7 @@ public class TerminalParam {
         private String orgName;
 
         @ApiModelProperty(value = "组织机构ID(外键)")
-        private String orgId;
+        private String orgNo;
 
         @ApiModelProperty(value = "生产厂家")
         private String manufacture;
@@ -83,24 +128,24 @@ public class TerminalParam {
         @ApiModelProperty(value = "安装位置")
         private String installPlace;
 
-        @ApiModelProperty(value = "送检单位")
-        private String inspectionName;
-
-        @ApiModelProperty(value = "检测结果")
-        private String testResults;
-
         @ApiModelProperty(value = "检测时间")
-        private LocalDate inspectionTime;
+        private String inspectionTime;
 
-        @ApiModelProperty(value = "下次检测时间")
-        private LocalDate nextInspectionTime;
-
-        @ApiModelProperty(value = "检测报告")
-        private String inspectionReport;
+        @ApiModelProperty(value = "送检单位")
+        private String inspectionUnit;
 
         @ApiModelProperty(value = "原始数据报告")
         private String originalReport;
     }
 
+    @Data
+    public static class DownloadParam {
+
+        @ApiModelProperty(value = "终端id")
+        private String id;
+
+        @ApiModelProperty(value = "(0：原始数据报告 1：检测报告)")
+        private Integer type;
+    }
 
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/PmsTerminalDetection.java

@@ -6,6 +6,8 @@ import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.njcn.db.bo.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,7 +25,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 @TableName("pms_terminal_detection")
 @ApiModel(value="PmsTerminalDetection对象", description="")
-public class PmsTerminalDetection implements Serializable {
+public class PmsTerminalDetection extends BaseEntity implements  Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -51,8 +53,8 @@ public class PmsTerminalDetection implements Serializable {
     private String installPlace;
 
     @ApiModelProperty(value = "送检单位")
-    @TableField("inspection_Name")
-    private String inspectionName;
+    @TableField("inspection_Unit")
+    private String inspectionUnit;
 
     @ApiModelProperty(value = "检测结果(0:未开展 1:已开展)")
     private Integer testResults;
@@ -65,10 +67,18 @@ public class PmsTerminalDetection implements Serializable {
     @TableField("next_inspection_Time")
     private LocalDate nextInspectionTime;
 
+    @ApiModelProperty(value = "检测报告文件名称")
+    @TableField("inspection_Name")
+    private String inspectionName;
+
     @ApiModelProperty(value = "检测报告")
     @TableField("inspection_Report")
     private String inspectionReport;
 
+    @ApiModelProperty(value = "原始数据报告文件名称")
+    @TableField("original_Name")
+    private String originalName;
+
     @ApiModelProperty(value = "原始数据报告")
     @TableField("original_Report")
     private String originalReport;

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java

@@ -1,10 +1,10 @@
 package com.njcn.process.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
+
+import com.njcn.db.bo.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,7 +22,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 @TableName("ths_warn_strategy")
 @ApiModel(value="ThsWarnStrategy对象", description="")
-public class ThsWarnStrategy implements Serializable {
+public class ThsWarnStrategy extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -47,6 +47,7 @@ public class ThsWarnStrategy implements Serializable {
 
     @ApiModelProperty(value = "0.删除 1.正常")
     @TableField("State")
+    @TableLogic
     private Integer state;
 
     @TableField("Create_By")

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/TerminalVO.java

@@ -1,10 +1,12 @@
 package com.njcn.process.pojo.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <功能描述>
@@ -27,7 +29,7 @@ public class TerminalVO implements Serializable {
     private String orgName;
 
     @ApiModelProperty(value = "组织机构编号")
-    private String orgNO;
+    private String orgNo;
 
     @ApiModelProperty(value = "生产厂家")
     private String manufacture;
@@ -36,7 +38,7 @@ public class TerminalVO implements Serializable {
     private String installPlace;
 
     @ApiModelProperty(value = "送检单位")
-    private String inspectionName;
+    private String inspectionUnit;
 
     @ApiModelProperty(value = "检测结果")
     private String testResults;
@@ -47,15 +49,31 @@ public class TerminalVO implements Serializable {
     @ApiModelProperty(value = "下次检测时间")
     private LocalDate nextInspectionTime;
 
+    @ApiModelProperty(value = "检测报告文件名称")
+    private String inspectionName;
+
     @ApiModelProperty(value = "检测报告")
     private String inspectionReport;
 
+    @ApiModelProperty(value = "原始数据报告文件名称")
+    private String originalName;
+
     @ApiModelProperty(value = "原始数据报告")
     private String originalReport;
 
     @Data
     public static class TerminalStatistics implements Serializable {
 
+        @ApiModelProperty(value = "单位统计")
+        List<OrgStatistics> orgStatistics;
+
+        @ApiModelProperty(value = "年度统计")
+        List<?> dateStatistics;
+
+    }
+
+    @Data
+    public static class OrgStatistics implements Serializable {
         @ApiModelProperty(value = "单位id")
         private String orgNo;
 
@@ -65,4 +83,30 @@ public class TerminalVO implements Serializable {
         @ApiModelProperty(value = "统计数量")
         private Integer count;
     }
+
+    @Data
+    public static class DateStatistics implements Serializable {
+
+        @ApiModelProperty(value = "时间")
+        private String statisticsDate;
+
+        @ApiModelProperty(value = "统计数量")
+        private Integer count;
+    }
+    @Data
+    public static class ResultsStatistics implements Serializable {
+
+        @ApiModelProperty(value = "单位名称")
+        private String orgName;
+
+        @ApiModelProperty(value = "未展开")
+        private Integer notExpanded;
+
+        @ApiModelProperty(value = "已展开")
+        private Integer expanded;
+
+
+    }
+
+
 }