ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -263,7 +263,7 @@ if (StringUtils.isBlank(dto.getQueryType())) { return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "queryType不能为空"); } log.info("id={}", dto.getId()); PowerGenStatusEntity powerGenStatus = powerGenStatusDaoService.getById(dto.getId()); if (powerGenStatus == null) { log.info("未找到code对应的数据: {}", dto.getId()); @@ -271,6 +271,7 @@ } String queryType = dto.getQueryType().toUpperCase(); log.info("queryType={}", queryType); String pointNo; switch (queryType.toUpperCase()) { case "P": @@ -280,11 +281,12 @@ pointNo = powerGenStatus.getCurQ(); break; case "COS": pointNo = powerGenStatus.getCurCOS(); pointNo = powerGenStatus.getCurCos(); break; default: throw new IllegalArgumentException("不支持的queryType: " + queryType); } log.info("开始查询，pointNo={}", pointNo); // 默认查最近24小时 Date end = Optional.ofNullable(dto.getEndTime()).orElseGet(() -> { ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PowerGenStatusEntity.java
@@ -39,7 +39,7 @@ /** * 当前功率因数 */ private String curCOS; private String curCos; /** * 上限 */ ansteel-biz/src/main/resources/application-dev.yaml
@@ -70,10 +70,10 @@ access-log: # 访问日志的配置项 enable: false token: base-url: http://127.0.0.1:48080/admin-api #平台接口url，使用时需修改成真实的ip和端口 base-url: http://127.0.0.1:48080/admin-api/system #平台接口url，使用时需修改成真实的ip和端口 tenant-id: 176 #租户id client-id: ansteel #租户OAuth2客户端id client-secret: q3vY7K9PmFjW1xLbN6rTtZz2cV4B5sD0 #租户OAuth2客户端密钥 username: ansteel password: 123456 password: xY7^zW4.vU Binary files differ
