添加补招小时批处理
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.njcn.advance.controller.carrycapacity;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityQueryDataParam;
|
||||
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityResultParam;
|
||||
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityResultPO;
|
||||
import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDResultVO;
|
||||
@@ -45,6 +46,15 @@ public class CarryCapacityResultController extends BaseController {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/queryResultbyCondition")
|
||||
@ApiOperation("承载能力评估列表查询")
|
||||
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
|
||||
public HttpResult<CarryCapacityDResultVO> queryResultbyCondition(@RequestBody @Validated CarryCapacityQueryDataParam queryParam) {
|
||||
String methodDescribe = getMethodDescribe("queryResultbyCondition");
|
||||
CarryCapacityDResultVO vo = carryCapacityResultPOService.queryResultbyCondition(queryParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
|
||||
}
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/remove")
|
||||
@ApiOperation("承载能力评估用户批量删除")
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.njcn.advance.service.carrycapacity;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityQueryDataParam;
|
||||
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityResultParam;
|
||||
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityResultPO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
@@ -18,4 +19,6 @@ public interface CarryCapacityResultPOService extends IService<CarryCapacityResu
|
||||
|
||||
|
||||
IPage<CarryCapacityDResultVO> queryResultList(CarryCapacityResultParam.CarryCapacityResultPageParam queryParam);
|
||||
}
|
||||
|
||||
CarryCapacityDResultVO queryResultbyCondition(CarryCapacityQueryDataParam queryParam);
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njcn.advance.mapper.carrycapacity.CarryCapacityResultPOMapper;
|
||||
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityQueryDataParam;
|
||||
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityResultParam;
|
||||
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityResultPO;
|
||||
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityUserPO;
|
||||
@@ -83,4 +84,21 @@ public class CarryCapacityResultPOServiceImpl extends ServiceImpl<CarryCapacityR
|
||||
|
||||
return returnpage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CarryCapacityDResultVO queryResultbyCondition(CarryCapacityQueryDataParam queryParam) {
|
||||
CarryCapacityDResultVO vo = new CarryCapacityDResultVO();
|
||||
|
||||
CarryCapacityResultPO one = this.lambdaQuery().eq(CarryCapacityResultPO::getLineId, queryParam.getLineId())
|
||||
.eq(CarryCapacityResultPO::getStartTime, queryParam.getStartTime())
|
||||
.eq(CarryCapacityResultPO::getEndTime, queryParam.getEndTime())
|
||||
.eq(CarryCapacityResultPO::getUserId, queryParam.getUserId())
|
||||
.eq(CarryCapacityResultPO::getStatus, 1).one();
|
||||
if(Objects.nonNull(one)){
|
||||
BeanUtils.copyProperties(one, vo);
|
||||
}
|
||||
return vo;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -476,11 +476,14 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
|
||||
List<String> phaseType = Stream.of("A", "B", "C").collect(Collectors.toList());
|
||||
List<Double> uList = new ArrayList<>();
|
||||
List<Double> pftList = new ArrayList<>();
|
||||
List<Double> btList = new ArrayList<>();
|
||||
|
||||
for (String phase : phaseType) {
|
||||
Double pMin = calParam.getP_βminMap().get(phase);
|
||||
Double qMin = calParam.getQ_βminMap().get(phase);
|
||||
Double pMin = calParam.getP_βminMap().get(phase)/1000;
|
||||
Double qMin = calParam.getQ_βminMap().get(phase)/1000;
|
||||
Double[] res = calParam.getStringMap().get(phase);
|
||||
// double bt = CZNLPG.calculateB(pMin, qMin, Double.parseDouble(CarryingCapacityEnum.K.getValue()), sT, sPv, pPv);
|
||||
double bt = CZNLPG.calculateB(pMin, qMin, Double.parseDouble(CarryingCapacityEnum.K.getValue()), sT, sPv, pPv);
|
||||
btList.add(bt);
|
||||
double pft = CZNLPG.calculatePF_T(pMin, qMin, Double.parseDouble(CarryingCapacityEnum.K.getValue()), sPv);
|
||||
pftList.add(pft);
|
||||
double u = CZNLPG.calculateU(res[0], res[1], res[2], pMin, Double.parseDouble(CarryingCapacityEnum.K.getValue()), qMin, sPv, Double.parseDouble(scaleValue));
|
||||
@@ -491,6 +494,11 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
|
||||
.max()
|
||||
.getAsDouble();
|
||||
|
||||
|
||||
double btMax = btList.stream().mapToDouble(Double::doubleValue)
|
||||
.max()
|
||||
.getAsDouble();
|
||||
|
||||
double pftMax = pftList.stream().mapToDouble(Double::doubleValue)
|
||||
.max()
|
||||
.getAsDouble();
|
||||
@@ -500,7 +508,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
|
||||
Integer pftLevel = CZNLPG.evaluatePowerFactorLevel(pftMax);
|
||||
carryCapacitydResultVO.setPfTLevel(pftLevel);
|
||||
|
||||
Integer btLevel = CZNLPG.evaluateEquivalentLoadRateLevel(pftMax);
|
||||
Integer btLevel = CZNLPG.evaluateEquivalentLoadRateLevel(btMax);
|
||||
carryCapacitydResultVO.setBTLevel(btLevel);
|
||||
//谐波电流幅值判断
|
||||
//获取限值
|
||||
|
||||
@@ -198,8 +198,8 @@ public class CZNLPG {
|
||||
// term2 = Math.pow(k * S_pv * I_inv / 220, 2);
|
||||
// term3 = K * I_cp95 * (k * S_pv * I_inv / 220);
|
||||
// } else if (voltage == 380) {
|
||||
term2 = Math.pow(k * S_pv * I_inv / 3 * 220, 2);
|
||||
term3 = K * I_cp95 * (k * S_pv * I_inv / 3 * 220);
|
||||
term2 = Math.pow(k * S_pv * I_inv /(3 * 220) , 2);
|
||||
term3 = K * I_cp95 * (k * S_pv * I_inv / (3 * 220));
|
||||
// } else {
|
||||
// return 0;
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user