From 6d90d193bdd49e441c1fa23ec010a89973dc3c53 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Thu, 8 May 2025 14:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E7=83=AD=E5=8A=9B=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/encrypt/utils/EncryptUtils.java | 4 ++ .../BusinessAlertStatisticsController.java | 21 ++++++++ .../controller/BusinessTaskController.java | 2 + .../business/domain/bo/BusinessAlertBo.java | 6 +-- .../business/domain/vo/BusinessAlertVo.java | 1 + .../business/mapper/BusinessAlertMapper.java | 1 + .../service/IBusinessAlertService.java | 4 +- .../impl/BusinessAlertServiceImpl.java | 48 +++++++++++++++++++ .../mapper/business/BusinessAlertMapper.xml | 35 +++++++++++++- .../controller/system/SysMenuController.java | 4 +- 10 files changed, 120 insertions(+), 6 deletions(-) diff --git a/dk-common/common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/dk-common/common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java index 8e34843..bc7628e 100644 --- a/dk-common/common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ b/dk-common/common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java @@ -175,6 +175,10 @@ public class EncryptUtils { return keyMap; } + public static void main(String[] args) { + Map map = generateRsaKey(); + System.out.println(map); + } /** * sm2公钥加密 * 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 1bb1ff3..be9c2c6 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 @@ -142,6 +142,27 @@ public class BusinessAlertStatisticsController extends BaseController { return R.ok(businessAlertService.cityListAlert(businessAlertBo)); } + /** + * 预警信息-资规/农水-热力图 + * @param businessAlertBo + * @return + */ + @Operation(summary="预警信息-资规/农水-标签分组", description="预警信息-资规/农水-标签分组") + @GetMapping(value = "/alert/heatList") + public R> heatList(BusinessAlertBo businessAlertBo) { + return R.ok(businessAlertService.heatList(businessAlertBo)); + } + + /** + * 预警信息-城管/环保-热力图 + * @param businessAlertBo + * @return + */ + @Operation(summary="预警信息-城管/环保/住建-标签分组", description="预警信息-城管/环保/住建-标签分组") + @GetMapping(value = "/city/alert/heatList") + public R> cityHeatList(BusinessAlertBo businessAlertBo) { + return R.ok(businessAlertService.cityHeatList(businessAlertBo)); + } //饼图显示每个月根据部门 @Operation(summary="根据月份显示预警个数", description="根据月份显示预警个数") diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java index 946e59a..d1967dd 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.business.domain.bo.BusinessTaskBo; import org.dromara.business.domain.vo.BusinessTaskVo; import org.dromara.business.service.IBusinessTaskService; +import org.dromara.common.encrypt.annotation.ApiEncrypt; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -45,6 +46,7 @@ public class BusinessTaskController extends BaseController { /** * 查询工单预约列表 */ + @ApiEncrypt(response=true) @SaCheckPermission("business:task:list") @GetMapping("/list") public TableDataInfo list(BusinessTaskBo bo, PageQuery pageQuery) { diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessAlertBo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessAlertBo.java index 6f34cbf..db985fa 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessAlertBo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessAlertBo.java @@ -41,6 +41,9 @@ public class BusinessAlertBo { */ private String images; + private String startTime; + + private String endTime; /** * 预警类型 @@ -235,9 +238,6 @@ public class BusinessAlertBo { */ private Integer dateType; - private String startTime; - - private String endTime; private String aiName; private Integer businessType; diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java index ce203d9..e1c332b 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java +++ b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessAlertVo.java @@ -190,6 +190,7 @@ public class BusinessAlertVo implements Serializable { * 忽略原因 */ private String ignoringCause; + private Integer value; /** * 来源：0：平台 1：小程序 diff --git a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java index 74dbd6d..138c33b 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java +++ b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java @@ -96,6 +96,7 @@ public interface BusinessAlertMapper extends BaseMapperPlus listAlert(@Param("param") BusinessAlertBo businessAlertBo,@Param("startTime") String startTime,@Param("endTime") String endTime); + List heatList(@Param("param") BusinessAlertBo businessAlertBo,@Param("startTime") String startTime,@Param("endTime") String endTime); List> countStreetRateAlert(@Param("param") BusinessAlertBo businessAlertBo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("deptIdList") List deptIdList); Map streetRateTopAlert(@Param("param") BusinessAlertBo businessAlertBo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("deptIdList") List deptIdList); diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java index becd098..df8ba7b 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java @@ -74,9 +74,11 @@ public interface IBusinessAlertService { TableDataInfo getInfo(BusinessAlertBo bo, PageQuery pageQuery, String alertCode); Map listAlert(BusinessAlertBo businessAlertBo); - + Map heatList(BusinessAlertBo businessAlertBo); Map cityListAlert(BusinessAlertBo businessAlertBo); + Map cityHeatList(BusinessAlertBo businessAlertBo); + List listVerifyAlert(RemoteBusinessAlertBo businessAlertBo); Boolean deleteAlert(List alertIdList); diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 7a8622a..6afe490 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -537,6 +537,32 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { } + @Override + public Map heatList(BusinessAlertBo businessAlertBo) { + Map result = new HashMap<>(); +/* //生成近一周开始时间、结束时间 + List dayList = getLastSixDays(); + String startTime = dayList.get(dayList.size() - 1); + String endTime = dayList.get(0); + + result.put("date", startTime + "~" + endTime);*/ + + //查看的是总览的预警信息 + if (ObjectUtil.isEmpty(businessAlertBo.getPostCode())) { + + List businessAlerts = this.baseMapper.heatList(businessAlertBo, businessAlertBo.getStartTime(), businessAlertBo.getEndTime()); + Map> listMap = businessAlerts.stream().collect(Collectors.groupingBy(BusinessAlertVo::getLabelCn)); + result.putAll(listMap); + return result; + } + //不是空的话查看是对应各局的 + businessAlertBo.setAiLabelEnList(List.of(businessAlertBo.getLabelEn())); + List alertList = this.baseMapper.heatList(businessAlertBo,businessAlertBo.getStartTime(), businessAlertBo.getEndTime()); + Map> listMap = alertList.stream().collect(Collectors.groupingBy(BusinessAlertVo::getLabelCn)); + result.putAll(listMap); + return result; + } + @Override public Map cityListAlert(BusinessAlertBo businessAlertBo) { if (ObjectUtil.hasEmpty(businessAlertBo.getPostCode(),businessAlertBo.getAiName())) { @@ -603,6 +629,28 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { return infoMap; } + @Override + public Map cityHeatList(BusinessAlertBo businessAlertBo) { + if (ObjectUtil.hasEmpty(businessAlertBo.getPostCode(),businessAlertBo.getAiName())) { + throw new ServiceException("参数为空!"); + } + Map infoMap = new HashMap<>(); + + //不是空的话查看是对应各局的 + List postVoList = remoteLablePostService.selectLabelByList(businessAlertBo.getPostCode(), LoginHelper.getDeptId()); + + Map> aiNameMap = postVoList.stream().collect(Collectors.groupingBy(RemoteAiLabelPostVo::getAiName)); + + if (ObjectUtil.isEmpty(postVoList)){ + return infoMap; + } + businessAlertBo.setAiLabelEnList(aiNameMap.get(businessAlertBo.getAiName()).stream().map(RemoteAiLabelPostVo::getLabelEn).distinct().toList()); + List alertList = this.baseMapper.heatList(businessAlertBo, businessAlertBo.getStartTime(), businessAlertBo.getEndTime()); + Map> listMap = alertList.stream().collect(Collectors.groupingBy(BusinessAlertVo::getLabelCn)); + infoMap.putAll(listMap); + return infoMap; + } + @Override public List listVerifyAlert(RemoteBusinessAlertBo businessAlertBo) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); 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 e28d333..2a106aa 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -16,6 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(ba.create_time,'%Y-%m-%d') = #{param.createTime} + + and = #{param.startTime} ]]> + + + and + and ba.dept_id in @@ -880,7 +886,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY dc.dept_id,dc.dept_name - + diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index bfb4b82..c69e134 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -9,6 +9,7 @@ import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.encrypt.annotation.ApiEncrypt; import org.dromara.common.web.core.BaseController; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; @@ -42,8 +43,9 @@ public class SysMenuController extends BaseController { * * @return 路由信息 */ + @ApiEncrypt(response=true) @GetMapping("/{platformType}/getRouters") - public R> getRouters(@PathVariable String platformType) { + public R> getRouters(@PathVariable String platformType) { List menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId(),platformType); return R.ok(menuService.buildMenus(menus)); }