电源近半小时历史实时数据

whyclxw

2025-06-07 9b62b1b23cf7b547b231c91f5dec9fd6e9a719d7

电源近半小时历史实时数据

 src/main/java/com/whyc/dto/InfoDto.java

@@ -66,6 +66,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
    private Date powerInuseTime;

    @ApiModelProperty(value = "整流器使能[bit0-模块1 bit15-模块16]【1-可用 0-不可以】")
    private Long modelCfg;



    @ApiModelProperty(value = "设备id")

 src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java

@@ -110,4 +110,5 @@

    @ApiModelProperty(value = "模块16输出电压")
    private Float m16OutVol;

}

 src/main/java/com/whyc/factory/InfoFactory.java

@@ -14,6 +14,7 @@
                .setPowerModel(info.getPowerModel())
                .setProtocol(info.getProtocol())
                .setPowerIp(info.getPowerIp())
                .setModelCfg(info.getModelCfg())
                .setPowerInuseTime(info.getPowerInuseTime());
        if(info.getPowerId()!=null){
            pinf.setPowerId(info.getPowerId());

 src/main/java/com/whyc/pojo/db_data_history/BattRealdataId.java

@@ -36,6 +36,9 @@
    @ApiModelProperty(value = "电池组ID")
    private Integer battgroupId;

    @ApiModelProperty(value = "编号")
    private Integer recordNum;

    @ApiModelProperty(value = "记录时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    private Date recordTime;
@@ -96,6 +99,12 @@
    @ApiModelProperty(value = "备注")
    private String note;

    @ApiModelProperty(value = "接触器阻抗")
    private Float dev_conresist;

    @ApiModelProperty(value = "导通压降")
    private Float dev_condvoldp;

    @TableField(exist = false)
    private String tableName;


 src/main/java/com/whyc/pojo/db_data_history/PwrdevHistorydataId.java

@@ -40,6 +40,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    private Date recordDatetime;

    @ApiModelProperty(value = "编号")
    private Integer recordNum;

    @ApiModelProperty(value = "1路交流输入A相电压")
    private Float acin1Vola;


 src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParamStand.java

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "参数类型")
    private Integer paramType;

    @ApiModelProperty(value = "标准参数对应数据名称")
    private Integer paramName;

    @ApiModelProperty(value = "基准值")
    private Float basisVal;


 src/main/java/com/whyc/pojo/db_station/PowerInf.java

@@ -62,6 +62,9 @@
    @ApiModelProperty(value = "电源类型:1:直流，2：通讯，3配网")
    private Integer powerType;

    @ApiModelProperty(value = "整流器使能[bit0-模块1 bit15-模块16]【1-可用 0-不可以】")
    private Long modelCfg;

    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
    private Date powerInuseTime;


 src/main/java/com/whyc/service/BattInfService.java

@@ -227,6 +227,9 @@
        if(pinf.getPowerInuseTime()!=null){
            wrapper2.set("power_inuse_time",pinf.getPowerInuseTime());
        }
        if(pinf.getModelCfg()!=null){
            wrapper2.set("model_cfg",pinf.getModelCfg());
        }
        /*if(pinf.getPowerName()!=null){
            //检测该机房下要修改的电源名是否存在
            QueryWrapper queryWrapper1=new QueryWrapper();

 src/main/java/com/whyc/service/PwrdevHistorydataIdService.java

@@ -6,6 +6,7 @@
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
import com.whyc.pojo.db_station.PowerInf;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,6 +21,9 @@
    private SubTablePageInfoService subTablePageInfoService;
    @Resource
    private CommonMapper commonMapper;

    @Autowired
    private PowerInfService  powerInfService;

    //系统概览获取半小时交流输入统计
    public Response getHalfHourPwrHisAcinData(Integer powerId,Integer granularity) {
@@ -42,6 +46,11 @@
            return new Response().set(1,false,"当前电源不存在前面小时数据");
        }
        List<PwrHisRealDcoutInDto> datalist=subTablePageInfoService.getHalfHourPwrHisDcoutData(tableName,granularity);
        return new Response().setII(1,datalist.size()>0,datalist,"获取半小时内直流输出统计");
        Long modelCfg=0l;
        PowerInf pinf=powerInfService.getPowerInfById(powerId);
        if(pinf!=null){
            modelCfg=pinf.getModelCfg();
        }
        return new Response().setIII(1,datalist.size()>0,datalist,modelCfg,"获取半小时内直流输出统计");
    }
}

 src/main/java/com/whyc/service/SubTablePageInfoService.java

@@ -655,22 +655,22 @@
                    data.setM14Outcurr(rs.getFloat("m14_outcurr"));
                    data.setM15Outcurr(rs.getFloat("m15_outcurr"));
                    data.setM16Outcurr(rs.getFloat("m16_outcurr"));
                    data.setM1OutVol(rs.getFloat("m1_outvol"));
                    data.setM2OutVol(rs.getFloat("m2_outvol"));
                    data.setM3OutVol(rs.getFloat("m3_outvol"));
                    data.setM4OutVol(rs.getFloat("m4_outvol"));
                    data.setM5OutVol(rs.getFloat("m5_outvol"));
                    data.setM6OutVol(rs.getFloat("m6_outvol"));
                    data.setM7OutVol(rs.getFloat("m7_outvol"));
                    data.setM8OutVol(rs.getFloat("m8_outvol"));
                    data.setM9OutVol(rs.getFloat("m9_outvol"));
                    data.setM10OutVol(rs.getFloat("m10_outvol"));
                    data.setM11OutVol(rs.getFloat("m11_outvol"));
                    data.setM12OutVol(rs.getFloat("m12_outvol"));
                    data.setM13OutVol(rs.getFloat("m13_outvol"));
                    data.setM14OutVol(rs.getFloat("m14_outvol"));
                    data.setM15OutVol(rs.getFloat("m15_outvol"));
                    data.setM16OutVol(rs.getFloat("m16_outvol"));
                    data.setM1OutVol(rs.getFloat("m1_out_vol"));
                    data.setM2OutVol(rs.getFloat("m2_out_vol"));
                    data.setM3OutVol(rs.getFloat("m3_out_vol"));
                    data.setM4OutVol(rs.getFloat("m4_out_vol"));
                    data.setM5OutVol(rs.getFloat("m5_out_vol"));
                    data.setM6OutVol(rs.getFloat("m6_out_vol"));
                    data.setM7OutVol(rs.getFloat("m7_out_vol"));
                    data.setM8OutVol(rs.getFloat("m8_out_vol"));
                    data.setM9OutVol(rs.getFloat("m9_out_vol"));
                    data.setM10OutVol(rs.getFloat("m10_out_vol"));
                    data.setM11OutVol(rs.getFloat("m11_out_vol"));
                    data.setM12OutVol(rs.getFloat("m12_out_vol"));
                    data.setM13OutVol(rs.getFloat("m13_out_vol"));
                    data.setM14OutVol(rs.getFloat("m14_out_vol"));
                    data.setM15OutVol(rs.getFloat("m15_out_vol"));
                    data.setM16OutVol(rs.getFloat("m16_out_vol"));
                    list.add(data);
                }
                return list;