diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java index 7a0d440..5b0e5e1 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java @@ -101,7 +101,7 @@ public class BusinessAlertStatisticsController extends BaseController { * @param businessAlertBo * @return */ - @Operation(summary="综治管理-资规/农水/环保(高发分析)", description="综治管理-资规/农水/环保(高发分析)") + @Operation(summary="综治管理-资规/农水/环保(高发分析)/住建(高发分析)", description="综治管理-资规/农水/环保(高发分析)/住建(高发分析)") @GetMapping(value = "/comprehensive/manage") public R> comprehensiveManage(BusinessAlertBo businessAlertBo) { return R.ok(statisticsService.comprehensiveManage(businessAlertBo)); @@ -124,7 +124,7 @@ public class BusinessAlertStatisticsController extends BaseController { * @param businessAlertBo * @return */ - @Operation(summary="综治管理-城管/环保(事件处理情况)", description="综治管理-城管/环保(事件处理情况)") + @Operation(summary="综治管理-城管/环保(事件处理情况)/住建(事件处理情况)", description="综治管理-城管/环保(事件处理情况)/住建(事件处理情况)") @GetMapping(value = "/city/comprehensive/manage") public R>> cityComprehensiveManage(BusinessAlertBo businessAlertBo) { return R.ok(statisticsService.cityComprehensiveManage(businessAlertBo)); @@ -136,7 +136,7 @@ public class BusinessAlertStatisticsController extends BaseController { * @param businessAlertBo * @return */ - @Operation(summary="预警信息-城管/环保", description="预警信息-城管/环保") + @Operation(summary="预警信息-城管/环保/住建", description="预警信息-城管/环保/住建") @GetMapping(value = "/city/alert/list") public R>> cityListAlert(BusinessAlertBo businessAlertBo) { return R.ok(businessAlertService.cityListAlert(businessAlertBo)); diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java index 16b398f..705cd17 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java @@ -9,9 +9,8 @@ import org.dromara.business.domain.model.StatObj; import org.dromara.business.mapper.BusinessAlertMapper; import org.dromara.business.service.IBusinessAlertStatisticsService; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.system.api.RemoteDeptService; import org.dromara.system.api.RemoteLabelPostService; import org.dromara.system.api.RemotePostService; @@ -19,7 +18,7 @@ import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo; import org.dromara.system.api.domain.vo.RemoteDeptVo; import org.dromara.system.api.domain.vo.RemotePostVo; import org.springframework.stereotype.Service; -import org.dromara.common.redis.utils.RedisUtils; + import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; @@ -55,7 +54,7 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist /** - * 按照月份分类预警数量(包含权限) + * 按照月份分类预警数量 * @param businessAlertBo * @return */ @@ -157,33 +156,43 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist businessAlertBo.setAiLabelEnList(getAiLabel(businessAlertBo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList())); } + //----------------------------------------------获取飞行总架次、总时长---------------------------------------------- //获取飞行总架次、总时长 Map countMap = RedisUtils.getCacheMap(FLY_COUNT); - - - int flyCount = countMap.values().stream() - .filter(Objects::nonNull) - .mapToInt(value -> { - if (value instanceof Number) { - return ((Number) value).intValue(); - } - return 0; - }) - .sum(); - + int flyCount; + + if (ObjectUtil.isNotEmpty(countMap)){ + flyCount = countMap.values().stream() + .filter(Objects::nonNull) + .mapToInt(value -> { + if (value instanceof Number) { + return ((Number) value).intValue(); + } + return 0; + }) + .sum(); + } else { + flyCount = 0; + } Map accTimeMap = RedisUtils.getCacheMap(FLY_ACC_TIME); + double flyAccTime; + + if (ObjectUtil.isNotEmpty(accTimeMap)) { + flyAccTime = accTimeMap.values().stream() + .filter(Objects::nonNull) + .mapToDouble(value -> { + if (value instanceof Number) { + return ((Number) value).doubleValue(); + } + return 0.0; + }) + .sum(); + } else { + flyAccTime = 0.0; + } - double flyAccTime = accTimeMap.values().stream() - .filter(Objects::nonNull) - .mapToDouble(value -> { - if (value instanceof Number) { - return ((Number) value).doubleValue(); - } - return 0.0; - }) - .sum(); - + //----------------------------------------------获取飞行总架次、总时长---------------------------------------------- List> mapList = baseMapper.countPanelAlert(businessAlertBo); diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml index 1b6bf60..dad7d7e 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -510,7 +510,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ba.label_en labelEn, ba.label_cn labelCn, - ba.create_time createTime + ba.create_time createTime, b.flow_status flowStatus, b.business_id businessId, b.id instanceId diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java index 8b4fa47..cb13acb 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/AiLabelController.java @@ -43,6 +43,7 @@ public class AiLabelController extends BaseController { @SaCheckPermission("system:label:list") @GetMapping("/list") public TableDataInfo list(AiLabelBo bo, PageQuery pageQuery) { + pageQuery.setPageSize(30); return aiLabelService.queryPageList(bo, pageQuery); }