Merge remote-tracking branch 'origin/master'

This commit is contained in:
2023-11-28 10:20:12 +08:00
18 changed files with 886 additions and 67 deletions

View File

@@ -1,12 +1,13 @@
package com.njcn.harmonic.pojo.po.dim;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDate;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
/**
* <p>
*
@@ -21,30 +22,29 @@ import lombok.Setter;
public class RDimObjGlobalD extends BaseEntity {
private static final long serialVersionUID = 1L;
@MppMultiId(value = "Org_Id")
private String orgId;
@MppMultiId(value = "Statis_Date")
private LocalDate statisDate;
/**
* 源荷对象类型
*/
@MppMultiId(value = "Object_Type")
private String objectType;
/**
* **源荷对象监测率(%
*/
private Float monitorRate;
/**
* **源荷对象超标占比(%
*/
private Float limitRate;
private Double limitRate;
/**
* **源荷对象平均超标占比(%
*/
private Float limitAvgRate;
private Double limitAvgRate;
}

View File

@@ -1,12 +1,14 @@
package com.njcn.harmonic.pojo.po.dim;
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 java.time.LocalDate;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
/**
* <p>
*
@@ -22,29 +24,33 @@ public class RDimObjGlobalM extends BaseEntity {
private static final long serialVersionUID = 1L;
@MppMultiId(value = "Org_Id")
private String orgId;
@MppMultiId(value = "Statis_Date")
private LocalDate statisDate;
/**
* 源荷对象类型
*/
@MppMultiId(value = "Object_Type")
private String objectType;
/**
* **源荷对象监测率(%
*/
private Float monitorRate;
//
// /**
// * **源荷对象监测率(%
// */
// private Double monitorRate;
/**
* **源荷对象超标占比(%
*/
private Float limitRate;
private Double limitRate;
/**
* **源荷对象平均超标占比(%
*/
private Float limitAvgRate;
private Double limitAvgRate;
@TableField(value = "Limit_Avg_Day")
private Double limitAvgDay;
}

View File

@@ -1,12 +1,14 @@
package com.njcn.harmonic.pojo.po.dim;
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 java.time.LocalDate;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
/**
* <p>
*
@@ -22,29 +24,33 @@ public class RDimObjGlobalY extends BaseEntity {
private static final long serialVersionUID = 1L;
@MppMultiId(value = "Org_Id")
private String orgId;
@MppMultiId(value = "Statis_Date")
private LocalDate statisDate;
/**
* 源荷对象类型
*/
@MppMultiId(value = "Object_Type")
private String objectType;
/**
* **源荷对象监测率(%
*/
private Float monitorRate;
//
// /**
// * **源荷对象监测率(%
// */
// private Double monitorRate;
/**
* **源荷对象超标占比(%
*/
private Float limitRate;
private Double limitRate;
/**
* **源荷对象平均超标占比(%
*/
private Float limitAvgRate;
private Double limitAvgRate;
@TableField(value = "Limit_Avg_Day")
private Double limitAvgDay;
}

View File

@@ -43,17 +43,14 @@ public class RDimObjTargetM extends BaseEntity {
/**
* **源荷对象**指标超标占比(%
*/
private Float monitorRate;
private Double monitorRate;
/**
* **源荷对象**指标平均超标占比(%
*/
private Float limitRate;
private Double limitRate;
/**
* **源荷对象**指标平均超标天数(天)
*/
private Float limitAvgRate;
}

View File

@@ -43,17 +43,17 @@ public class RDimObjTargetY extends BaseEntity {
/**
* **源荷对象**指标超标占比(%
*/
private Float monitorRate;
private Double monitorRate;
/**
* **源荷对象**指标平均超标占比(%
*/
private Float limitRate;
/**
* **源荷对象**指标平均超标天数(天)
*/
private Float limitAvgRate;
private Double limitRate;
//
// /**
// * **源荷对象**指标平均超标天数(天)
// */
// private Float limitAvgRate;
}