update DLG_Progress、Ld9testdata、Ld9testdata_inf、Ld9testdatastop and related...

whycrzh

2021-01-26 2da88e0ad99dce340f0d25bff5b50fa629bcce15

update DLG_Progress、Ld9testdata、Ld9testdata_inf、Ld9testdatastop and relatedReference

 src/main/java/com/fgkj/dto/DLG_Progress.java

@@ -7,7 +7,7 @@
@Alias("DLG_Progress")
public class DLG_Progress implements Serializable{
    private boolean judge=false;                //进程是否结束
    private Integer  Completedcount;            //完成数目
    private Integer  completedcount;            //完成数目
    private Integer uploadOkcount;                //成功上传的文件个数
    private Integer total;                        //总数目
    private boolean isCompleteed=false;            //是否上传结束
@@ -35,13 +35,13 @@
    public void setJudge(boolean judge) {
        this.judge = judge;
    }
	

    public Integer getCompletedcount() {
        return Completedcount;
        return completedcount;
    }

    public void setCompletedcount(Integer completedcount) {
        Completedcount = completedcount;
        this.completedcount = completedcount;
    }

    public Integer getUploadOkcount() {
@@ -75,9 +75,13 @@

    @Override
    public String toString() {
        return "DLG_Progress [judge=" + judge + ", Completedcount="
                + Completedcount + ", total=" + total + ", isCompleteed="
                + isCompleteed + ", tableData=" + Arrays.toString(tableData)
                + "]";
    }	
        return "DLG_Progress{" +
                "judge=" + judge +
                ", completedcount=" + completedcount +
                ", uploadOkcount=" + uploadOkcount +
                ", total=" + total +
                ", isCompleteed=" + isCompleteed +
                ", tableData=" + Arrays.toString(tableData) +
                '}';
    }
}

 src/main/java/com/fgkj/dto/Ld9testdata.java

@@ -8,7 +8,7 @@
@Alias("Ld9testdata")
public class Ld9testdata implements Serializable{
    private Integer num;
    private Integer BattGroupId;
    private Integer battGroupId;
    private Integer test_record_count;
    private Integer test_type;
    private Integer record_num;
@@ -31,12 +31,15 @@
    public void setNum(Integer num) {
        this.num = num;
    }

    public Integer getBattGroupId() {
        return BattGroupId;
        return battGroupId;
    }

    public void setBattGroupId(Integer battGroupId) {
        BattGroupId = battGroupId;
        this.battGroupId = battGroupId;
    }

    public Integer getTest_record_count() {
        return test_record_count;
    }
@@ -121,18 +124,26 @@
    public void setTest_monnum(int test_monnum) {
        this.test_monnum = test_monnum;
    }

    @Override
    public String toString() {
        return "Ld9testdata [num=" + num + ", BattGroupId=" + BattGroupId
                + ", test_record_count=" + test_record_count + ", test_type="
                + test_type + ", record_num=" + record_num
                + ", test_starttime=" + test_starttime + ", record_time="
                + record_time + ", test_timelong=" + test_timelong
                + ", online_vol=" + online_vol + ", group_vol=" + group_vol
                + ", test_curr=" + test_curr + ", test_cap=" + test_cap
                + ", mon_num=" + mon_num + ", mon_vol=" + mon_vol
                + ", mon_tmp=" + mon_tmp + ", test_monnum=" + test_monnum + "]";
        return "Ld9testdata{" +
                "num=" + num +
                ", battGroupId=" + battGroupId +
                ", test_record_count=" + test_record_count +
                ", test_type=" + test_type +
                ", record_num=" + record_num +
                ", test_starttime=" + test_starttime +
                ", record_time=" + record_time +
                ", test_timelong=" + test_timelong +
                ", online_vol=" + online_vol +
                ", group_vol=" + group_vol +
                ", test_curr=" + test_curr +
                ", test_cap=" + test_cap +
                ", mon_num=" + mon_num +
                ", mon_vol=" + mon_vol +
                ", mon_tmp=" + mon_tmp +
                ", test_monnum=" + test_monnum +
                '}';
    }
	
	
}

 src/main/java/com/fgkj/dto/Ld9testdata_inf.java

@@ -8,7 +8,7 @@
@Alias("Ld9testdata_inf")
public class Ld9testdata_inf implements Serializable{
    private Integer num;
    private Integer BattGroupId;
    private Integer battGroupId;
    private Integer test_record_count;
    private Integer test_record_count_ex;
    private Integer test_type;
@@ -36,12 +36,15 @@
    public void setNum(Integer num) {
        this.num = num;
    }

    public Integer getBattGroupId() {
        return BattGroupId;
        return battGroupId;
    }

    public void setBattGroupId(Integer battGroupId) {
        BattGroupId = battGroupId;
        this.battGroupId = battGroupId;
    }

    public Integer getTest_record_count() {
        return test_record_count;
    }
@@ -150,24 +153,30 @@
    public void setMin_monvol(float min_monvol) {
        this.min_monvol = min_monvol;
    }

    @Override
    public String toString() {
        return "Ld9testdata_inf [num=" + num + ", BattGroupId=" + BattGroupId
                + ", test_record_count=" + test_record_count
                + ", test_record_count_ex=" + test_record_count_ex
                + ", test_type=" + test_type + ", record_time_interval="
                + record_time_interval + ", record_num=" + record_num
                + ", test_starttime=" + test_starttime + ", test_starttime_ex="
                + test_starttime_ex + ", record_time=" + record_time
                + ", test_timelong=" + test_timelong + ", test_stoptype="
                + test_stoptype + ", test_stopreason=" + test_stopreason
                + ", group_vol=" + group_vol + ", test_curr=" + test_curr
                + ", test_cap=" + test_cap + ", mon_num=" + mon_num
                + ", mon_vol=" + mon_vol + ", max_monvol=" + max_monvol
                + ", min_monvol=" + min_monvol + "]";
        return "Ld9testdata_inf{" +
                "num=" + num +
                ", battGroupId=" + battGroupId +
                ", test_record_count=" + test_record_count +
                ", test_record_count_ex=" + test_record_count_ex +
                ", test_type=" + test_type +
                ", record_time_interval=" + record_time_interval +
                ", record_num=" + record_num +
                ", test_starttime=" + test_starttime +
                ", test_starttime_ex=" + test_starttime_ex +
                ", record_time=" + record_time +
                ", test_timelong=" + test_timelong +
                ", test_stoptype=" + test_stoptype +
                ", test_stopreason=" + test_stopreason +
                ", group_vol=" + group_vol +
                ", test_curr=" + test_curr +
                ", test_cap=" + test_cap +
                ", mon_num=" + mon_num +
                ", mon_vol=" + mon_vol +
                ", max_monvol=" + max_monvol +
                ", min_monvol=" + min_monvol +
                '}';
    }
	
	
	
	
}

 src/main/java/com/fgkj/dto/Ld9testdatastop.java

@@ -9,7 +9,7 @@
@Alias("Ld9testdatastop")
public class Ld9testdatastop implements Serializable{
    private Integer num;
    private Integer BattGroupId;
    private Integer battGroupId;
    private Integer test_record_count;
    private Integer test_type;
    private Integer record_num;
@@ -36,12 +36,15 @@
    public void setNum(Integer num) {
        this.num = num;
    }

    public Integer getBattGroupId() {
        return BattGroupId;
        return battGroupId;
    }

    public void setBattGroupId(Integer battGroupId) {
        BattGroupId = battGroupId;
        this.battGroupId = battGroupId;
    }

    public Integer getTest_record_count() {
        return test_record_count;
    }
@@ -144,19 +147,29 @@
    public void setTest_stopreason(int test_stopreason) {
        this.test_stopreason = test_stopreason;
    }

    @Override
    public String toString() {
        return "Ld9testdatastop [num=" + num + ", BattGroupId=" + BattGroupId
                + ", test_record_count=" + test_record_count + ", test_type="
                + test_type + ", record_num=" + record_num
                + ", test_starttime=" + test_starttime + ", record_time="
                + record_time + ", test_timelong=" + test_timelong
                + ", online_vol=" + online_vol + ", group_vol=" + group_vol
                + ", test_curr=" + test_curr + ", test_cap=" + test_cap
                + ", mon_num=" + mon_num + ", mon_vol=" + mon_vol
                + ", mon_tmp=" + mon_tmp + ", test_monnum=" + test_monnum
                + ", max_monvol=" + max_monvol + ", min_monvol=" + min_monvol
                + ", test_stopreason=" + test_stopreason + "]";
        return "Ld9testdatastop{" +
                "num=" + num +
                ", battGroupId=" + battGroupId +
                ", test_record_count=" + test_record_count +
                ", test_type=" + test_type +
                ", record_num=" + record_num +
                ", test_starttime=" + test_starttime +
                ", record_time=" + record_time +
                ", test_timelong=" + test_timelong +
                ", online_vol=" + online_vol +
                ", group_vol=" + group_vol +
                ", test_curr=" + test_curr +
                ", test_cap=" + test_cap +
                ", mon_num=" + mon_num +
                ", mon_vol=" + mon_vol +
                ", mon_tmp=" + mon_tmp +
                ", test_monnum=" + test_monnum +
                ", max_monvol=" + max_monvol +
                ", min_monvol=" + min_monvol +
                ", test_stopreason=" + test_stopreason +
                '}';
    }
	
}

 src/main/java/com/fgkj/mapper/impl/Ld9/Ld9testdataMapper.java

@@ -9,13 +9,13 @@

    //历史监测
    @Select("select num,BattGroupId,test_record_count,test_type,record_num,test_starttime,record_time,test_timelong,online_vol,group_vol,test_curr,test_cap,mon_num,mon_vol,mon_tmp,test_monnum " +
            "  from db_ld9_testdata.tb_ld9testdata_#{BattGroupId} " +
            "  from db_ld9_testdata.tb_ld9testdata_#{battGroupId} " +
            " where test_record_count=#{test_record_count}  and (record_num%#{num}=0 ) and test_monnum=#{test_monnum} ")
    public List<Ld9testdata> serchByCondition(Ld9testdata ld9);

    //查询某次测试下电池组节数放电情况
    @Select("select test_monnum,max(record_num) as record_num,BattGroupId,test_record_count " +
            "from db_ld9_testdata.tb_ld9testdata_#{BattGroupId} " +
            "from db_ld9_testdata.tb_ld9testdata_#{battGroupId} " +
            "where test_record_count=#{test_record_count} GROUP BY test_monnum  order by test_monnum asc")
    public List<Ld9testdata> serchByInfo(Ld9testdata ld9);


 src/main/java/com/fgkj/mapper/impl/Ld9/Ld9testdatastopMapper.java

@@ -10,14 +10,14 @@
    //历史监测容量的柱状图
    @Select("select num,BattGroupId,test_record_count,test_type,test_starttime,record_time," +
            "test_timelong,group_vol,test_curr,test_cap,mon_num,mon_vol,test_monnum,max_monvol," +
            "min_monvol,test_stopreason from db_ld9_testdata.tb_ld9testdatastop_#{BattGroupId} " +
            "min_monvol,test_stopreason from db_ld9_testdata.tb_ld9testdatastop_#{battGroupId} " +
            "where test_record_count=#{test_record_count}")
    public List<Ld9testdatastop> serchByCondition(Ld9testdatastop ld9);
    
    //根据电池组id;单体编号，test_record_count查询测试结束的信息
    @Select("select num,BattGroupId,test_record_count,test_type,test_starttime,record_time," +
            "test_timelong,group_vol,test_curr,test_cap,mon_num,mon_vol,test_monnum,max_monvol," +
            "min_monvol,test_stopreason from db_ld9_testdata.tb_ld9testdatastop_#{BattGroupId} " +
            "min_monvol,test_stopreason from db_ld9_testdata.tb_ld9testdatastop_#{battGroupId} " +
            "where test_record_count=#{test_record_count} and test_monnum=#{test_monnum}")
    public List<Ld9testdatastop> serchByInfo(Ld9testdatastop ld9);