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

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

This commit is contained in:
zhangyue 2026-07-28 16:10:19 +08:00
parent e7543cfdd4
commit caee3bbce3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.dto.SurvSummaryDTO; import org.jeecg.common.dto.SurvSummaryDTO;
import org.jeecg.common.util.DateParseUtils;
import org.jeecg.common.util.R; import org.jeecg.common.util.R;
import org.jeecg.common.vo.statistic.AlertSummaryVo; import org.jeecg.common.vo.statistic.AlertSummaryVo;
import org.jeecg.common.vo.statistic.SurvSummaryVo; import org.jeecg.common.vo.statistic.SurvSummaryVo;
@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
/** /**
* @Description: surv_alert_record * @Description: surv_alert_record
@ -48,9 +51,10 @@ public class SurvAlertRecordController {
String tenantId = TenantUtil.getCurTenant(null); String tenantId = TenantUtil.getCurTenant(null);
survSummaryDTO.setTenantId(tenantId); survSummaryDTO.setTenantId(tenantId);
if(StringUtils.isNotBlank(survSummaryDTO.getStartTime())){ if(StringUtils.isNotBlank(survSummaryDTO.getStartTime())){
if(survSummaryDTO.getStartTime().equals(survSummaryDTO.getEndTime())){//开始时间与结束时间相同，则清空，避免查询到空数据 if(survSummaryDTO.getStartTime().equals(survSummaryDTO.getEndTime())){
survSummaryDTO.setStartTime(""); LocalDateTime startTime = DateParseUtils.parseToLocalDateTime(survSummaryDTO.getStartTime());
survSummaryDTO.setEndTime(""); startTime=startTime.minusDays(30);
survSummaryDTO.setStartTime(DateParseUtils.formatLocalDateTime(startTime,"yyyy-MM-dd"));//开始时间改为结束时间的30天前
} }
} }
SurvSummaryVo survSummaryVo = zhAdminFeignClient.stationDeviceSummary(survSummaryDTO); SurvSummaryVo survSummaryVo = zhAdminFeignClient.stationDeviceSummary(survSummaryDTO);