有功功率趋势2
This commit is contained in:
@@ -25,6 +25,6 @@ public interface RActivePowerRangeFeignClient {
|
||||
HttpResult<Boolean> record();
|
||||
|
||||
@GetMapping("/getDataByLineId")
|
||||
HttpResult<RActivePowerRangePO> getDataByLineId(@RequestParam("lineId") String lineId);
|
||||
HttpResult<RActivePowerRangePO> getDataByLineId(@RequestParam("lineId") String lineId,@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime);
|
||||
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public class RActivePowerRangeFeignClientFallbackFactory implements FallbackFact
|
||||
}
|
||||
|
||||
@Override
|
||||
public HttpResult<RActivePowerRangePO> getDataByLineId(String lineId) {
|
||||
public HttpResult<RActivePowerRangePO> getDataByLineId(String lineId,String startTime,String endTime) {
|
||||
log.error("{}异常,降级处理,异常为:{}", "根据监测点ID获取有功功率趋势信息: ", throwable.toString());
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 0%~10%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot0;
|
||||
private Integer isOrNot0 = 0;
|
||||
|
||||
/**
|
||||
* 10%~20%区间时间Json
|
||||
@@ -59,7 +59,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 10%~20%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot1;
|
||||
private Integer isOrNot1 = 0;
|
||||
|
||||
/**
|
||||
* 20%~30%区间时间Json
|
||||
@@ -74,7 +74,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 20%~30%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot2;
|
||||
private Integer isOrNot2 = 0;
|
||||
|
||||
/**
|
||||
* 30%~40%区间时间Json
|
||||
@@ -89,7 +89,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 30%~40%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot3;
|
||||
private Integer isOrNot3 = 0;
|
||||
|
||||
/**
|
||||
* 40%~50%区间时间Json
|
||||
@@ -104,7 +104,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 40%~50%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot4;
|
||||
private Integer isOrNot4 = 0;
|
||||
|
||||
/**
|
||||
* 50%~60%区间时间Json
|
||||
@@ -119,7 +119,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 50%~60%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot5;
|
||||
private Integer isOrNot5 = 0;
|
||||
|
||||
/**
|
||||
* 60%~70%区间时间Json
|
||||
@@ -134,7 +134,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 60%~70%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot6;
|
||||
private Integer isOrNot6 = 0;
|
||||
|
||||
/**
|
||||
* 70%~80%区间时间Json
|
||||
@@ -149,7 +149,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 70%~80%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot7;
|
||||
private Integer isOrNot7 = 0;
|
||||
|
||||
/**
|
||||
* 80%~90%区间时间Json
|
||||
@@ -164,7 +164,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 80%~90%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot8;
|
||||
private Integer isOrNot8 = 0;
|
||||
|
||||
/**
|
||||
* 90%~100%区间时间Json
|
||||
@@ -179,7 +179,7 @@ public class RActivePowerRangePO extends BaseEntity {
|
||||
/**
|
||||
* 90%~100%区间是否越限
|
||||
*/
|
||||
private Integer isOrNot9;
|
||||
private Integer isOrNot9 = 0;
|
||||
|
||||
/**
|
||||
* 状态:0-删除 1-正常
|
||||
|
||||
@@ -42,10 +42,10 @@ public class RActivePowerRangeController extends BaseController {
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
|
||||
@GetMapping("/getDataByLineId")
|
||||
@ApiOperation("根据监测点ID获取有功功率趋势信息")
|
||||
public HttpResult<RActivePowerRangePO> getDataByLineId(@RequestParam("lineId") String lineId) {
|
||||
@ApiOperation("根据监测点ID及时间获取有功功率趋势")
|
||||
public HttpResult<RActivePowerRangePO> getDataByLineId(@RequestParam("lineId") String lineId,@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime) {
|
||||
String methodDescribe = getMethodDescribe("getDataByLineId");
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rActivePowerRangeService.getDataByLineId(lineId), methodDescribe);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rActivePowerRangeService.getDataByLineId(lineId,startTime,endTime), methodDescribe);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -121,9 +121,34 @@ public class RActivePowerRangeServiceImpl extends MppServiceImpl<RActivePowerRan
|
||||
}
|
||||
|
||||
@Override
|
||||
public RActivePowerRangePO getDataByLineId(String lineId) {
|
||||
public RActivePowerRangePO getDataByLineId(String lineId,String startTime,String endTime) {
|
||||
LambdaQueryWrapper<RActivePowerRangePO> lambdaQueryWrapper = new LambdaQueryWrapper();
|
||||
lambdaQueryWrapper.eq(RActivePowerRangePO::getLineId,lineId).eq(RActivePowerRangePO::getState,"1");
|
||||
return this.baseMapper.selectOne(lambdaQueryWrapper);
|
||||
lambdaQueryWrapper.eq(RActivePowerRangePO::getLineId,lineId).eq(RActivePowerRangePO::getState,"1")
|
||||
.between(RActivePowerRangePO::getTimeId,startTime,endTime);
|
||||
List<RActivePowerRangePO> rActivePowerRangePOS = this.baseMapper.selectList(lambdaQueryWrapper);
|
||||
RActivePowerRangePO rActivePowerRangePO = new RActivePowerRangePO();
|
||||
for(RActivePowerRangePO rangePO : rActivePowerRangePOS){
|
||||
rActivePowerRangePO.setMinsNum0(rangePO.getMinsNum0()+rActivePowerRangePO.getMinsNum0());
|
||||
rActivePowerRangePO.setMinsNum1(rangePO.getMinsNum1()+rActivePowerRangePO.getMinsNum1());
|
||||
rActivePowerRangePO.setMinsNum2(rangePO.getMinsNum2()+rActivePowerRangePO.getMinsNum2());
|
||||
rActivePowerRangePO.setMinsNum3(rangePO.getMinsNum3()+rActivePowerRangePO.getMinsNum3());
|
||||
rActivePowerRangePO.setMinsNum4(rangePO.getMinsNum4()+rActivePowerRangePO.getMinsNum4());
|
||||
rActivePowerRangePO.setMinsNum5(rangePO.getMinsNum5()+rActivePowerRangePO.getMinsNum5());
|
||||
rActivePowerRangePO.setMinsNum6(rangePO.getMinsNum6()+rActivePowerRangePO.getMinsNum6());
|
||||
rActivePowerRangePO.setMinsNum7(rangePO.getMinsNum7()+rActivePowerRangePO.getMinsNum7());
|
||||
rActivePowerRangePO.setMinsNum8(rangePO.getMinsNum8()+rActivePowerRangePO.getMinsNum8());
|
||||
rActivePowerRangePO.setMinsNum9(rangePO.getMinsNum9()+rActivePowerRangePO.getMinsNum9());
|
||||
rActivePowerRangePO.setIsOrNot0(rangePO.getIsOrNot0()+rActivePowerRangePO.getIsOrNot0());
|
||||
rActivePowerRangePO.setIsOrNot1(rangePO.getIsOrNot1()+rActivePowerRangePO.getIsOrNot1());
|
||||
rActivePowerRangePO.setIsOrNot2(rangePO.getIsOrNot2()+rActivePowerRangePO.getIsOrNot2());
|
||||
rActivePowerRangePO.setIsOrNot3(rangePO.getIsOrNot3()+rActivePowerRangePO.getIsOrNot3());
|
||||
rActivePowerRangePO.setIsOrNot4(rangePO.getIsOrNot4()+rActivePowerRangePO.getIsOrNot4());
|
||||
rActivePowerRangePO.setIsOrNot5(rangePO.getIsOrNot5()+rActivePowerRangePO.getIsOrNot5());
|
||||
rActivePowerRangePO.setIsOrNot6(rangePO.getIsOrNot6()+rActivePowerRangePO.getIsOrNot6());
|
||||
rActivePowerRangePO.setIsOrNot7(rangePO.getIsOrNot7()+rActivePowerRangePO.getIsOrNot7());
|
||||
rActivePowerRangePO.setIsOrNot8(rangePO.getIsOrNot8()+rActivePowerRangePO.getIsOrNot8());
|
||||
rActivePowerRangePO.setIsOrNot9(rangePO.getIsOrNot9()+rActivePowerRangePO.getIsOrNot9());
|
||||
}
|
||||
return rActivePowerRangePO;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +16,8 @@ public interface RActivePowerRangeService extends IMppService<RActivePowerRangeP
|
||||
void record();
|
||||
|
||||
/**
|
||||
* 根据监测点ID获取有功功率趋势信息
|
||||
* 根据监测点ID及时间获取有功功率趋势
|
||||
*/
|
||||
RActivePowerRangePO getDataByLineId(String lineId);
|
||||
RActivePowerRangePO getDataByLineId(String lineId,String startTime,String endTime);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user