查询模组档位统计分布图 修改
This commit is contained in:
@@ -36,8 +36,10 @@ import springfox.documentation.annotations.ApiIgnore;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
|
||||
/**
|
||||
@@ -124,33 +126,72 @@ public class WoPackagingBoxSubstrateController {
|
||||
return new Result<Long>().ok(dto.getId());
|
||||
}
|
||||
|
||||
@ApiOperation("查询模组档位统计分布图powerReportTY")
|
||||
@LogOperation("查询模组档位统计分布图powerReportTY")
|
||||
@PostMapping("/powerReportTY")
|
||||
public Result<Boolean> powerReportTY(@RequestBody PowerReportQueryParam queryParam){
|
||||
List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam);
|
||||
System.out.println(powerReportDTOS);
|
||||
return new Result<Boolean>().ok(true);
|
||||
}
|
||||
|
||||
@ApiOperation("查询模组档位统计分布图")
|
||||
@LogOperation("查询模组档位统计分布图")
|
||||
@PostMapping("/powerReport")
|
||||
public Result<PowerReportVo> powerReport(@RequestBody PowerReportQueryParam queryParam){
|
||||
List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam);
|
||||
System.out.println(powerReportDTOS.toString());
|
||||
List<PowerReportDTO> powerReportList = new ArrayList<>();
|
||||
powerReportList.add(new PowerReportDTO(0,"115",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"120",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"125",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"130",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"135",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"140",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"145",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"150",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"155",0f,"0%"));
|
||||
powerReportList.add(new PowerReportDTO(0,"160",0f,"0%"));
|
||||
|
||||
|
||||
for(PowerReportDTO power : powerReportList){
|
||||
for(PowerReportDTO inner : powerReportDTOS){
|
||||
if(Objects.equals(power.getSubLevel(), inner.getSubLevel())){
|
||||
power.setProportion(inner.getProportion());
|
||||
power.setSubNum(inner.getSubNum());
|
||||
power.setSumPMPP(inner.getSumPMPP());
|
||||
power.setSubLevel(inner.getSubLevel());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println(powerReportList.toString());
|
||||
PowerReportVo powerReportVo = new PowerReportVo();
|
||||
Float totalLevelPower = new Float(0);
|
||||
Float totalCompensatePower = new Float(0);
|
||||
Float diversePower = new Float(0);
|
||||
Integer totalSubNum = 0;
|
||||
for(PowerReportDTO power : powerReportDTOS){
|
||||
for(PowerReportDTO power : powerReportList){
|
||||
Integer subLevel = Integer.valueOf(power.getSubLevel());
|
||||
Integer subNum = power.getSubNum();
|
||||
if(power.getSumPMPP()==null){
|
||||
return new Result<PowerReportVo>().error("基板等级:"+subLevel+",基板数量:"+subNum+", 的总和为null");
|
||||
}
|
||||
Float sumPMPP = power.getSumPMPP();
|
||||
totalLevelPower += subLevel*subNum;
|
||||
totalCompensatePower += sumPMPP*subNum;
|
||||
totalSubNum+= subNum;
|
||||
}
|
||||
for(PowerReportDTO power : powerReportDTOS){
|
||||
for(PowerReportDTO power : powerReportList){
|
||||
Float prop = (Float.valueOf(power.getSubNum())/Float.valueOf(totalSubNum))*100;
|
||||
DecimalFormat df = new DecimalFormat("0.00");
|
||||
String propS = df.format(prop)+"%";
|
||||
power.setProportion(propS);
|
||||
}
|
||||
|
||||
|
||||
diversePower = totalCompensatePower - totalLevelPower;
|
||||
powerReportVo.setPowerReports(powerReportDTOS);
|
||||
powerReportVo.setPowerReports(powerReportList);
|
||||
powerReportVo.setDiversePower(diversePower);
|
||||
powerReportVo.setTotalCompensatePower(totalCompensatePower);
|
||||
powerReportVo.setTotalLevelPower(totalLevelPower);
|
||||
|
||||
Reference in New Issue
Block a user