Skip to content

A
amos-boot-biz
Commit 481df91d authored by tianyiming's avatar tianyiming
Browse files
Options

修改bug

parent a80fe8d2
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 4 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @ 481df91d
...@@ -203,6 +203,7 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -203,6 +203,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
if (commonPageable.getPageNumber() == 0) { if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1); commonPageable.setPageNumber(1);
} }
ReginParams reginParams = getSelectedOrgInfo();
List<CommonRequest> queryRequests = new ArrayList<>(); List<CommonRequest> queryRequests = new ArrayList<>();
CommonRequest request7 = new CommonRequest(); CommonRequest request7 = new CommonRequest();
request7.setName("system"); request7.setName("system");
...@@ -212,10 +213,12 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -212,10 +213,12 @@ public class SupervisionConfigureController extends AbstractBaseController {
request8.setName("specificIndexKey"); request8.setName("specificIndexKey");
request8.setValue(StringUtil.isNotEmpty(typeCode) ? StringUtils.trimToNull(typeCode) : null); request8.setValue(StringUtil.isNotEmpty(typeCode) ? StringUtils.trimToNull(typeCode) : null);
queryRequests.add(request8); queryRequests.add(request8);
CommonRequest request13 = new CommonRequest(); if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
request13.setName("bizOrgCode"); CommonRequest request13 = new CommonRequest();
request13.setValue(StringUtil.isNotEmpty(bizOrgCode) ? StringUtils.trimToNull(typeCode) : null); request13.setName("bizOrgCode");
queryRequests.add(request13); request13.setValue(StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null);
queryRequests.add(request13);
}
CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable); CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
return CommonResponseUtil.success(equipmentSpecificAlarmService.fireAlarmLogPage(param)); return CommonResponseUtil.success(equipmentSpecificAlarmService.fireAlarmLogPage(param));
} }
...@@ -226,6 +229,10 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -226,6 +229,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "报警类型趋势", produces = "application/json;charset=UTF-8", notes = "报警类型趋势") @ApiOperation(httpMethod = "GET", value = "报警类型趋势", produces = "application/json;charset=UTF-8", notes = "报警类型趋势")
public ResponseModel alarmTrend(@RequestParam(required = false) String bizOrgCode) { public ResponseModel alarmTrend(@RequestParam(required = false) String bizOrgCode) {
if (StringUtils.isEmpty(bizOrgCode)) {
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
}
return CommonResponseUtil.success(equipmentSpecificAlarmService.alarmTrend(bizOrgCode)); return CommonResponseUtil.success(equipmentSpecificAlarmService.alarmTrend(bizOrgCode));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment