Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加站点设备多项统计接口

This commit is contained in:
zhangyue 2026-07-28 15:42:50 +08:00
parent fe786d39ce
commit fbed36dfc2
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/DataCenterController.java
View File

@ -85,7 +85,6 @@ public class DataCenterController {
@PostMapping(value = "/deviceAlertStatistic") @PostMapping(value = "/deviceAlertStatistic")
public Result<SurvSummaryVo> deviceAlertStatistic(@RequestBody SurvSummaryDTO survSummaryDTO) { public Result<SurvSummaryVo> deviceAlertStatistic(@RequestBody SurvSummaryDTO survSummaryDTO) {
survSummaryDTO.setTenantId(TenantContext.getTenant());
SurvSummaryVo survSummaryVo = commonService.getSurvSummary(survSummaryDTO); SurvSummaryVo survSummaryVo = commonService.getSurvSummary(survSummaryDTO);
return Result.OK(survSummaryVo); return Result.OK(survSummaryVo);

5
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java
View File

@ -12,6 +12,7 @@ import org.jeecg.common.constant.enums.PollutionEnum;
import org.jeecg.common.dto.CommonDTO; import org.jeecg.common.dto.CommonDTO;
import org.jeecg.common.dto.SurvSummaryDTO; import org.jeecg.common.dto.SurvSummaryDTO;
import org.jeecg.common.entity.*; import org.jeecg.common.entity.*;
import org.jeecg.common.tenant.TenantContextHolder;
import org.jeecg.common.util.*; import org.jeecg.common.util.*;
import org.jeecg.common.vo.VOHisResult; import org.jeecg.common.vo.VOHisResult;
import org.jeecg.common.vo.iot.common.SurvItemInfo; import org.jeecg.common.vo.iot.common.SurvItemInfo;
@ -473,6 +474,10 @@ public class CommonServiceImpl {
public SurvSummaryVo getSurvSummary(SurvSummaryDTO survSummaryDTO) { public SurvSummaryVo getSurvSummary(SurvSummaryDTO survSummaryDTO) {
if(StringUtils.isNotBlank(survSummaryDTO.getTenantId())){
TenantContext.setTenant(survSummaryDTO.getTenantId());
}
SurvSummaryVo survSummaryVo = new SurvSummaryVo(); SurvSummaryVo survSummaryVo = new SurvSummaryVo();
Map<String, SurvItemInfo> itemInfo = new HashMap<>(); Map<String, SurvItemInfo> itemInfo = new HashMap<>();
List<SurvItemInfo> itemList = new ArrayList<>(); List<SurvItemInfo> itemList = new ArrayList<>();

3
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvAlertRecordController.java
View File

@ -11,6 +11,7 @@ import org.jeecg.system.applet.annotation.ApiLogin;
import org.jeecg.system.applet.client.ZhAdminFeignClient; import org.jeecg.system.applet.client.ZhAdminFeignClient;
import org.jeecg.system.applet.dto.AlertSummaryDTO; import org.jeecg.system.applet.dto.AlertSummaryDTO;
import org.jeecg.system.applet.service.ISurvAlertRecordService; import org.jeecg.system.applet.service.ISurvAlertRecordService;
import org.jeecg.system.applet.util.TenantUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -43,6 +44,8 @@ public class SurvAlertRecordController {
@PostMapping(value = "/alertSummary") @PostMapping(value = "/alertSummary")
@ApiLogin @ApiLogin
public R<SurvSummaryVo> alertSummary(@RequestBody SurvSummaryDTO survSummaryDTO) { public R<SurvSummaryVo> alertSummary(@RequestBody SurvSummaryDTO survSummaryDTO) {
String tenantId = TenantUtil.getCurTenant(null);
survSummaryDTO.setTenantId(tenantId);
SurvSummaryVo survSummaryVo = zhAdminFeignClient.stationDeviceSummary(survSummaryDTO); SurvSummaryVo survSummaryVo = zhAdminFeignClient.stationDeviceSummary(survSummaryDTO);
return R.ok(survSummaryVo); return R.ok(survSummaryVo);
} }