审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

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

@@ -1,5 +1,8 @@
package com.whyc.service;

import com.whyc.dto.PowerDevDataAC;
import com.whyc.dto.PowerDevDataACDC;
import com.whyc.dto.PowerDevDataDC;
import com.whyc.dto.Response;
import com.whyc.dto.paramter.PwrdevReportParam;
import com.whyc.mapper.PwrdevDataHistoryMapper;
@@ -12,6 +15,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@Service
public class PwrdevDataHistoryService {
@@ -48,7 +52,7 @@
        List<String> tableNameList = mapper.getTableNameList(deviceId+"_"+sqlend);
        //如果未查询到表名，则没有数据
        if (tableNameList.size()==0){
            return null;
            return new Response().set(1, false, "数据表不存在");
        }
        //数据结果
        List<PwrdevDataHistory> result = new ArrayList<>();
@@ -88,7 +92,100 @@
            }
        }

        return new Response().set(1,result,"查询成功");
        //追加 ac,acdc,dc分开返回
        String dataType = pwrdevReportParam.getDataType();
        Object dataResult;
        if(dataType.equals("ac")){
            dataResult = result.stream().map(data -> {
                PowerDevDataAC ac = new PowerDevDataAC();
                ac.setRecordTime(data.getRecordTime());
                ac.setAcAcIn1VolA(data.getAcAcIn1VolA());
                ac.setAcAcIn1VolB(data.getAcAcIn1VolB());
                ac.setAcAcIn1VolC(data.getAcAcIn1VolC());
                ac.setAcAcIn1CurrA(data.getAcAcIn1CurrA());
                ac.setAcAcIn1CurrB(data.getAcAcIn1CurrB());
                ac.setAcAcIn1CurrC(data.getAcAcIn1CurrC());
                ac.setAcAcIn2VolA(data.getAcAcIn2VolA());
                ac.setAcAcIn2VolB(data.getAcAcIn2VolB());
                ac.setAcAcIn2VolC(data.getAcAcIn2VolC());
                ac.setAcAcIn2CurrA(data.getAcAcIn2CurrA());
                ac.setAcAcIn2CurrB(data.getAcAcIn2CurrB());
                ac.setAcAcIn2CurrC(data.getAcAcIn2CurrC());
                ac.setAcTemprature(data.getAcTemprature());
                ac.setAcAcVolHLimit(data.getAcAcVolHLimit());
                ac.setAcAcVolLLimit(data.getAcAcVolLLimit());
                return ac;
            }).collect(Collectors.toList());
        }else if(dataType.equals("acdc")){
            dataResult = result.stream().map(data -> {
                PowerDevDataACDC acdc = new PowerDevDataACDC();
                acdc.setRecordTime(data.getRecordTime());
                acdc.setAcdcAcdcmTemp(data.getAcdcAcdcmTemp());
                acdc.setAcdcAcIn1VolA(data.getAcdcAcIn1VolA());
                acdc.setAcdcAcIn1VolB(data.getAcdcAcIn1VolB());
                acdc.setAcdcAcIn1VolC(data.getAcdcAcIn1VolC());
                acdc.setAcdcAcIn2VolA(data.getAcdcAcIn2VolA());
                acdc.setAcdcAcIn2VolB(data.getAcdcAcIn2VolB());
                acdc.setAcdcAcIn2VolC(data.getAcdcAcIn2VolC());
                acdc.setAcdcAcOutCurrA(data.getAcdcAcOutCurrA());
                acdc.setAcdcAcOutCurrB(data.getAcdcAcOutCurrB());
                acdc.setAcdcAcOutCurrC(data.getAcdcAcOutCurrC());
                acdc.setAcdcAcOutVolA(data.getAcdcAcOutVolA());
                acdc.setAcdcAcOutVolB(data.getAcdcAcOutVolB());
                acdc.setAcdcAcOutVolC(data.getAcdcAcOutVolC());
                acdc.setAcdcAcVolHLimit(data.getAcdcAcVolHLimit());
                acdc.setAcdcAcVolLLimit(data.getAcdcAcVolLLimit());
                acdc.setAcdcBattgroup1Curr(data.getAcdcBattgroup1Curr());
                acdc.setAcdcBattgroup1Vol(data.getAcdcBattgroup1Vol());
                acdc.setAcdcBattgroup2Curr(data.getAcdcBattgroup2Curr());
                acdc.setAcdcBattgroup2Vol(data.getAcdcBattgroup2Vol());
                acdc.setAcdcChargLimitCurr(data.getAcdcChargLimitCurr());
                acdc.setAcdcDcOutVol(data.getAcdcDcOutVol());
                acdc.setAcdcDcOutVolHLimit(data.getAcdcDcOutVolHLimit());
                acdc.setAcdcDcOutVolLLimit(data.getAcdcDcOutVolLLimit());
                acdc.setAcdcFloatChargeVol(data.getAcdcFloatChargeVol());
                acdc.setAcdcJunChargeVol(data.getAcdcJunChargeVol());
                acdc.setAcdcLoaderCurr(data.getAcdcLoaderCurr());
                acdc.setAcdcM10OutCurr(data.getAcdcM10OutCurr());
                acdc.setAcdcM11OutCurr(data.getAcdcM11OutCurr());
                acdc.setAcdcM12OutCurr(data.getAcdcM12OutCurr());
                acdc.setAcdcM13OutCurr(data.getAcdcM13OutCurr());
                acdc.setAcdcM14OutCurr(data.getAcdcM14OutCurr());
                acdc.setAcdcM15OutCurr(data.getAcdcM15OutCurr());
                acdc.setAcdcM16OutCurr(data.getAcdcM16OutCurr());
                acdc.setAcdcM1OutCurr(data.getAcdcM1OutCurr());
                acdc.setAcdcM2OutCurr(data.getAcdcM2OutCurr());
                acdc.setAcdcM3OutCurr(data.getAcdcM3OutCurr());
                acdc.setAcdcM4OutCurr(data.getAcdcM4OutCurr());
                acdc.setAcdcM5OutCurr(data.getAcdcM5OutCurr());
                acdc.setAcdcM6OutCurr(data.getAcdcM6OutCurr());
                acdc.setAcdcM7OutCurr(data.getAcdcM7OutCurr());
                acdc.setAcdcM8OutCurr(data.getAcdcM8OutCurr());
                acdc.setAcdcM9OutCurr(data.getAcdcM9OutCurr());

                return acdc;
            }).collect(Collectors.toList());
        }else if(dataType.equals("dc")){
            dataResult = result.stream().map(data -> {
                PowerDevDataDC dc = new PowerDevDataDC();
                dc.setRecordTime(data.getRecordTime());
                dc.setDcDcIn1Vol(data.getDcDcIn1Vol());
                dc.setDcDcIn2Vol(data.getDcDcIn2Vol());
                dc.setDcDcOut1Curr(data.getDcDcOut1Curr());
                dc.setDcDcOut1Vol(data.getDcDcOut1Vol());
                dc.setDcDcOut2Curr(data.getDcDcOut2Curr());
                dc.setDcDcOut2Vol(data.getDcDcOut2Vol());
                dc.setDcDcVolHLimit(data.getDcDcVolHLimit());
                dc.setDcDcVolLLimit(data.getDcDcVolLLimit());
                dc.setDcTemprature(data.getDcTemprature());

                return dc;
            }).collect(Collectors.toList());
        }else{
            return new Response().set(1,false,"传参dataType不匹配,查询失败");
        }
        //return new Response().set(1,result,"查询成功");
        return new Response().set(1,dataResult,"查询成功");
    }

}