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

谐波普测模块修改

Browse Source
This commit is contained in:
huangzj
2023-03-15 18:46:18 +08:00
parent c29e445933
commit 61216a0b37
25 changed files with 1192 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java
View File

@@ -1,7 +1,6 @@
package com.njcn.process.pojo.param;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -41,10 +40,10 @@ public class RGeneralSurveyPlanAddParm {
@ApiModelProperty(value="详细情况")
private String description;
@ApiModelProperty(value="计划详细情况母线相关")
private List<RGeneralSurveyPlanDetailAddParm> rGeneralSurveyPlanDetailAddParm;
@Data
@ApiModel(value="计划详细情况母线相关")
@ApiModelProperty(value="选中的电站集合")
private List<String> subIds;
/* @Data
@ApiModel(value="计划详细情况电站相关")
public static class RGeneralSurveyPlanDetailAddParm{
@ApiModelProperty(value = "组织id")
@@ -69,33 +68,33 @@ public class RGeneralSurveyPlanAddParm {
@ApiModelProperty(value="离线监测点id")
private String measurementPointId;
/**
*//**
* 测试开始时间
*/
*//*
@ApiModelProperty(value="测试开始时间")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date generalSurveyStartTime;
/**
*//**
* 测试结束时间
*/
*//*
@ApiModelProperty(value="测试结束时间")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date generalSurveyEndTime;
/**
*//**
* 测试日期
*/
*//*
@ApiModelProperty(value="测试日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date generalSurveyTime;
/**
*//**
* 测试负责人
*/
*//*
@ApiModelProperty(value="测试负责人")
private String generalSurveyLeader;
}
}*/
}

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java
View File

@@ -37,7 +37,7 @@ public class RGeneralSurveyPlanDetail {
* 母线ID
*/
@MppMultiId(value = "busbar_id")
@TableField(value = "busbar_id")
private String busbarId;
/**
@@ -67,7 +67,7 @@ public class RGeneralSurveyPlanDetail {
/**
* 变电站ID
*/
@TableField(value = "sub_id")
@MppMultiId(value = "sub_id")
private String subId;
/**

6
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java
View File

@@ -35,6 +35,12 @@ public class RGeneralSurveyPlanPO {
*/
@MppMultiId(value = "plan_no")
private String planNo;
/**
* 普测周期id
*
*/
@TableField(value = "cycle_id")
private String cycleId;
/**
* 普测计划名称

32
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RSurveyCyclePO.java Normal file
View File

@@ -0,0 +1,32 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDate;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/13 9:23【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
@TableName(value = "r_survey_cycle")
public class RSurveyCyclePO {
@TableField(value = "id")
private String id;
@TableField(value = "start_year")
private LocalDate startYear;
@TableField(value = "end_year")
private LocalDate endYear;
@TableField(value = "survey_cycle")
private Integer surveyCycle;
}

117
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RSurveyPlanConfigPO.java Normal file
View File

@@ -0,0 +1,117 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/9 10:13【需求编号】
*
* @author clam
* @version V1.0.0
*/
@TableName(value = "r_survey_plan_config")
public class RSurveyPlanConfigPO {
/**
* 组织机构名称
*/
@TableField(value = "Org_Name")
private String orgName;
/**
* 组织机构ID(外键)
*/
@MppMultiId(value = "Org_Id")
private String orgId;
/**
* 普测电站总数
*/
@TableField(value = "stat_num")
private Integer statNum;
/**
* 该机构普测占比
*/
@TableField(value = "proportion")
private Double proportion;
/**
* 获取组织机构名称
*
* @return Org_Name - 组织机构名称
*/
public String getOrgName() {
return orgName;
}
/**
* 设置组织机构名称
*
* @param orgName 组织机构名称
*/
public void setOrgName(String orgName) {
this.orgName = orgName;
}
/**
* 获取组织机构ID(外键)
*
* @return Org_Id - 组织机构ID(外键)
*/
public String getOrgId() {
return orgId;
}
/**
* 设置组织机构ID(外键)
*
* @param orgId 组织机构ID(外键)
*/
public void setOrgId(String orgId) {
this.orgId = orgId;
}
/**
* 获取普测电站总数
*
* @return stat_num - 普测电站总数
*/
public Integer getStatNum() {
return statNum;
}
/**
* 设置普测电站总数
*
* @param statNum 普测电站总数
*/
public void setStatNum(Integer statNum) {
this.statNum = statNum;
}
/**
* 获取该机构普测占比
*
* @return proportion - 该机构普测占比
*/
public Double getProportion() {
return proportion;
}
/**
* 设置该机构普测占比
*
* @param proportion 该机构普测占比
*/
public void setProportion(Double proportion) {
this.proportion = proportion;
}
}

40
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/DeptSubstationVO.java Normal file
View File

@@ -0,0 +1,40 @@
package com.njcn.process.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/9 14:00【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class DeptSubstationVO {
@ApiModelProperty(name = "id",value = "id")
private String id;
@ApiModelProperty(name = "pid",value = "父级id")
private String pid;
@ApiModelProperty(name = "name",value = "名称")
private String name;
@ApiModelProperty(name = "code",value = "单位编号")
private String code;
@ApiModelProperty(name = "disabled",value = "是否可以选择，电站不用塞，部门塞disabled: true")
private boolean disabled;
@ApiModelProperty(name = "flag",value = "前端标志")
private boolean flag;
@ApiModelProperty(name = "children",value = "子级")
private List<DeptSubstationVO> children = new ArrayList<> ();
}

11
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java
View File

@@ -41,7 +41,7 @@ public class RGeneralSurveyPlanVO {
private Date planEndTime;
@ApiModelProperty(value="变电站数量")
private Long subCount;
private Integer subCount;
@ApiModelProperty(value="母线数量")
private Long busCount;
@@ -51,7 +51,7 @@ public class RGeneralSurveyPlanVO {
@ApiModelProperty(value="文件是否上传(0:否 1:是)")
private Integer isFileUpload;
private String leader;
/**
* 上传文件数量
*/
@@ -77,9 +77,10 @@ public class RGeneralSurveyPlanVO {
*/
@ApiModelProperty(value="上传时间")
private Date uploadTime;
@ApiModelProperty(value="计划详细情况母线相关")
private List<RGeneralSurveyPlanDetailVO> rGeneralSurveyPlanDetailVOList;
@ApiModelProperty(value="选中的电站集合")
private List<String> subIds;
// @ApiModelProperty(value="计划详细情况母线相关")
// private List<RGeneralSurveyPlanDetailVO> rGeneralSurveyPlanDetailVOList;
@Data
@ApiModel(value="计划详细情况母线相关")
public static class RGeneralSurveyPlanDetailVO{

27
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RSurveyCycleVO.java Normal file
View File

@@ -0,0 +1,27 @@
package com.njcn.process.pojo.vo;
import lombok.Data;
import java.time.LocalDate;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/13 9:23【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class RSurveyCycleVO {
private String id;
private LocalDate startYear;
private LocalDate endYear;
private Integer surveyCycle;
private Boolean flag;
}

110
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RSurveyPlanConfigVO.java Normal file
View File

@@ -0,0 +1,110 @@
package com.njcn.process.pojo.vo;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/9 10:13【需求编号】
*
* @author clam
* @version V1.0.0
*/
public class RSurveyPlanConfigVO {
/**
* 组织机构名称
*/
private String orgName;
/**
* 组织机构ID(外键)
*/
private String orgId;
/**
* 普测电站总数
*/
private Integer statNum;
/**
* 该机构普测占比
*/
private Double proportion;
/**
* 获取组织机构名称
*
* @return Org_Name - 组织机构名称
*/
public String getOrgName() {
return orgName;
}
/**
* 设置组织机构名称
*
* @param orgName 组织机构名称
*/
public void setOrgName(String orgName) {
this.orgName = orgName;
}
/**
* 获取组织机构ID(外键)
*
* @return Org_Id - 组织机构ID(外键)
*/
public String getOrgId() {
return orgId;
}
/**
* 设置组织机构ID(外键)
*
* @param orgId 组织机构ID(外键)
*/
public void setOrgId(String orgId) {
this.orgId = orgId;
}
/**
* 获取普测电站总数
*
* @return stat_num - 普测电站总数
*/
public Integer getStatNum() {
return statNum;
}
/**
* 设置普测电站总数
*
* @param statNum 普测电站总数
*/
public void setStatNum(Integer statNum) {
this.statNum = statNum;
}
/**
* 获取该机构普测占比
*
* @return proportion - 该机构普测占比
*/
public Double getProportion() {
return proportion;
}
/**
* 设置该机构普测占比
*
* @param proportion 该机构普测占比
*/
public void setProportion(Double proportion) {
this.proportion = proportion;
}
}

73
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/StatationStatExcel.java Normal file
View File

@@ -0,0 +1,73 @@
package com.njcn.process.pojo.vo;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2023/3/8 15:18【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class StatationStatExcel implements Serializable {
@Excel(name = "电站", width = 15)
private String powerId;
/**
* 电站名称
*/
@Excel(name = "电站名称", width = 15)
private String powerName;
/**
* 机构组织id
*/
@Excel(name = "机构组织", width = 15)
private String orgId;
/**
* 机构组织名称
*/
@Excel(name = "机构组织名称", width = 15)
private String orgName;
/**
* 应设点数量
*/
@Excel(name = "应设点数量", width = 15)
private Integer shouldBeNum;
/**
* 电压等级
*/
@Excel(name = "电压等级", width = 15)
private String voltageLevel;
/**
* 经度
*/
@Excel(name = "经度", width = 15)
private Double longitude;
/**
* 维度
*/
@Excel(name = "维度", width = 15)
private Double latitude;
/**
* 数据状态：0-删除；1-正常；
*/
@Excel(name = "数据状态", width = 15)
private Integer status;
@Excel(name = "数据状态", width = 15)
private String exceptionMessage;
}