融通大屏相关接口开发

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerProject.java

@@ -34,14 +34,33 @@ public class LedgerProject extends BaseEntityClean
     /** 组织机构id */
     private Long deptId;
 
-    /** 所在城市 */
-    @Excel(name = "所在城市",sort = 5)
+    /** 省 */
+    @Excel(name = "省",sort = 5)
+    private String province;
+    /** 市 */
+    @Excel(name = "市",sort = 5)
     private String city;
+    /** 区 */
+    @Excel(name = "区",sort = 5)
+    private String district;
+    /** 街道 */
+    @Excel(name = "街道",sort = 5)
+    private String street;
 
     /** 详细地址 */
     @Excel(name = "详细地址",sort = 6)
     private String address;
 
+    /**
+     * 维度
+     */
+    private String lat;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
     /** 0-关联 1-自建 */
     private String source;
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/AccidentTypeStatisticsDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import lombok.Data;
+
+@Data
+public class AccidentTypeStatisticsDto {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 类型名称
+     */
+    private String  typeName;
+
+    /**
+     * 类型数量
+     */
+    private String  typeNum;
+    
+
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/EvaluationDataDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import lombok.Data;
+
+@Data
+public class EvaluationDataDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目
+     */
+    private Long projectNum;
+    /**
+     * 楼宇
+     */
+    private Long buildingNum;
+    /**
+     * 楼层
+     */
+    private Long floorNum;
+
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/MapLedgerProjectDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import lombok.Data;
+
+import java.util.Random;
+
+@Data
+public class MapLedgerProjectDto {
+    private static final long serialVersionUID = 1L;
+   @Ignore
+    String[] color = new String[]{"red", "green", "yellow", "blue"};
+
+    private Long projectId;
+    private String projectName;
+    private String lat;
+    private String lng;
+    private String riskColor;
+
+    public String getRiskColor() {
+        Random r = new Random();
+        return color[r.nextInt(4)];
+    }
+
+    /**
+     * 风险总数量
+     */
+    private Long riskSumNum;
+    /**
+     * 固有风险数量
+     */
+    private Long inherentNum;
+    /**
+     * 现状风险数量
+     */
+    private Long existingNum;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/MapStatisticsQueryDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+
+import lombok.Data;
+
+@Data
+public class MapStatisticsQueryDto {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 级别 默认传1 点击市级传2  依次类推
+     */
+    private Integer level;
+    /**
+     * 默认不传，点击后传汉字
+     */
+    private String areaName;
+    /**
+     * 0固有 1现状
+     */
+    private String type;
+
+    public String getLevelName() {
+        String levelName = "";
+        if (this.level == null)
+            return levelName;
+        switch (this.level) {
+            case 1:
+                levelName = "province";
+                break;
+            case 2:
+                if (this.getAreaName().contains("北京") || this.getAreaName().contains("重庆") || this.getAreaName().contains("上海") || this.getAreaName().contains("天津"))
+                    levelName = "district";
+                else
+                    levelName = "city";
+                break;
+            case 3:
+                levelName = "district";
+                break;
+            case 4:
+                levelName = "street";
+                break;
+
+        }
+        return levelName;
+    }
+
+    public String getParentLevel() {
+        String levelName = "";
+        if (this.level == null)
+            return levelName;
+        switch (this.level) {
+            case 2:
+                if (this.getAreaName().contains("北京") || this.getAreaName().contains("重庆") || this.getAreaName().contains("上海") || this.getAreaName().contains("天津"))
+                    levelName = "city";
+                else
+                    levelName = "province";
+                break;
+            case 3:
+                levelName = "city";
+                break;
+            case 4:
+                levelName = "district";
+                break;
+        }
+        return levelName;
+    }
+
+
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/NationalRiskStatisticsDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import lombok.Data;
+
+@Data
+public class NationalRiskStatisticsDto {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 全国风险数量
+     */
+    private Long nationalRiskNum;
+    /**
+     * 年度新增风险数量
+     */
+    private Long newRiskNum;
+    /**
+     * 升级风险数量
+     */
+    private Long upRiskNum;
+    /**
+     * 降级风险数量
+     */
+    private Long downRiskNum;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/ProjectRiskInfoDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+
+import lombok.Data;
+
+@Data
+public class ProjectRiskInfoDto {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 风险id
+     */
+    private Long id;
+    /**
+     * 风险名称
+     */
+    private String riskName;
+    /**
+     * 风险类型
+     */
+    private String typeName;
+    /**
+     * 风险等级
+     */
+    private String levelName;
+
+
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/ProjectStatisticsDetailDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProjectStatisticsDetailDto {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 评估时间
+     */
+    private String evaluationTime;
+
+    /**
+     * 评估数据
+     */
+    private EvaluationDataDto evaluationData;
+
+    /**
+     * 风险总数量
+     */
+    private Long riskSumNum;
+    /**
+     * 固有风险数量
+     */
+    private Long inherentNum;
+    /**
+     * 现状风险数量
+     */
+    private Long existingNum;
+    /**
+     * 风险等级（固有）
+     */
+    private List<RiskLevelStatisticsDto> inherentLevelStatics;
+    /**
+     * 风险等级（现状）
+     */
+    private List<RiskLevelStatisticsDto> existingLevelStatics;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/RiskIndexRankingDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import lombok.Data;
+
+@Data
+public class RiskIndexRankingDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 所在区域
+     */
+    private String deptName;
+
+    /**
+     * 所在省
+     */
+    private String province;
+
+    /**
+     * 风险数量
+     */
+    private Long RiskNum;
+
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/RiskLevelStatisticsDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import lombok.Data;
+
+@Data
+public class RiskLevelStatisticsDto {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 风险级别
+     */
+    private String  levelName;
+    /**
+     * 级别数量
+     */
+    private String  levelNum;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/RiskMapStatisticsDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import com.censoft.censoftrongtong.domain.LedgerProject;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Random;
+
+@Data
+public class RiskMapStatisticsDto {
+    @Ignore
+    String[] color = new String[]{"red", "green", "yellow", "blue"};
+    /**
+     * 地区名称
+     */
+    private String areaName;
+
+    /**
+     * 风险数量
+     */
+    private Long riskNum;
+
+    /**
+     * 区域颜色
+     */
+    private String areaColor;
+
+    public String getAreaColor() {
+        Random r = new Random();
+        return color[r.nextInt(4)];
+    }
+
+    private List<MapLedgerProjectDto> projectList;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/statistics/RiskProjectRankingDto.java

+package com.censoft.censoftrongtong.domain.dto.statistics;
+
+import lombok.Data;
+
+@Data
+public class RiskProjectRankingDto {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 所在区域
+     */
+    private String deptName;
+
+    /**
+     * 所在省
+     */
+    private String province;
+
+    /**
+     * 风险分数
+     */
+    private Long RiskScore;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerProjectMapper.java

@@ -2,6 +2,8 @@ package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.LedgerProject;
 import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,6 +30,11 @@ public interface LedgerProjectMapper  extends  MPJBaseMapper<LedgerProject>
      * @return 基础数据-项目集合
      */
     public List<LedgerProject> selectLedgerProjectList(LedgerProject ledgerProject);
+    public List<LedgerProject> getLedgerProjectList(@Param("name")String name,@Param("areaName") String areaName);
+    public Long getProjectCount(@Param("areaName") String areaName);
+    public Long getBuildingCount(@Param("areaName") String areaName,@Param("projectId") Long projectId);
+    public Long getFloorCount(@Param("areaName") String areaName,@Param("projectId") Long projectId);
+
 
     /**
      * 新增基础数据-项目

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanExistingListMapper.java

@@ -2,10 +2,11 @@ package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
+import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * 现有风险清单库Mapper接口
@@ -13,7 +14,42 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanExistingListMapper extends  MPJBaseMapper<RiskPlanExistingList> {
+public interface RiskPlanExistingListMapper extends MPJBaseMapper<RiskPlanExistingList> {
+
+    /**
+     * 风险数量，年度风险数量
+     *
+     * @param areaName
+     * @param beginTime
+     * @return
+     */
+    public Long getNationalRiskNum(@Param("areaName") String areaName, @Param("beginTime") Date beginTime,@Param("projectId")Long projectId);
+
+    /**
+     * 总体风险指数排名
+     *
+     * @param areaName
+     * @return
+     */
+    public List<RiskIndexRankingDto> getRiskIndexRanking(String areaName);
+
+    /**
+     * 年度风险数量统计
+     *
+     * @param areaName
+     * @return
+     */
+    public LinkedHashMap<String, Long> getAnnualRiskStatistics(String areaName);
+
+    public List<RiskLevelStatisticsDto> getRiskLevelStatistics(@Param("areaName") String areaName,@Param("projectId")Long projectId);
+
+    public List<AccidentTypeStatisticsDto> getAccidentTypeStatistics(String areaName);
+
+    public List<RiskProjectRankingDto> getRiskProjectRanking(@Param("areaName") String areaName, @Param("level") String level);
+
+    public List<RiskMapStatisticsDto> getRiskMapStatistics(MapStatisticsQueryDto queryDto);
+
+    public List<ProjectRiskInfoDto> getProjectRiskInfo(@Param("projectId") Long projectId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId,@Param("level")String level);
 
     /**
      * 查询现有风险清单库
@@ -31,6 +67,7 @@ public interface RiskPlanExistingListMapper extends  MPJBaseMapper<RiskPlanExist
      */
     public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList);
 
+
     /**
      * 新增现有风险清单库
      *

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanInherentListMapper.java

@@ -2,20 +2,56 @@ package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.dto.*;
+import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
  * 固有风险清单库Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface RiskPlanInherentListMapper extends  MPJBaseMapper<RiskPlanInherentList>
-{
+public interface RiskPlanInherentListMapper extends MPJBaseMapper<RiskPlanInherentList> {
+    /**
+     * 风险数量，年度风险数量
+     *
+     * @param areaName
+     * @param beginTime
+     * @return
+     */
+    public Long getNationalRiskNum(@Param("areaName") String areaName, @Param("beginTime") Date beginTime, @Param("projectId") Long projectId);
+
+
+    /**
+     * 总体风险指数排名
+     *
+     * @param areaName
+     * @return
+     */
+    public List<RiskIndexRankingDto> getRiskIndexRanking(String areaName);
+
+    /**
+     * 年度风险数量统计
+     *
+     * @param areaName
+     * @return
+     */
+    public LinkedHashMap<String, Long> getAnnualRiskStatistics(String areaName);
+
+    public List<RiskLevelStatisticsDto> getRiskLevelStatistics(@Param("areaName") String areaName, @Param("projectId") Long projectId);
+
+    public List<AccidentTypeStatisticsDto> getAccidentTypeStatistics(String areaName);
+
+    public List<RiskProjectRankingDto> getRiskProjectRanking(@Param("areaName") String areaName, @Param("level") String level);
+
+    public List<ProjectRiskInfoDto> getProjectRiskInfo(@Param("projectId") Long projectId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId,@Param("level")String level);
 
+    public List<RiskMapStatisticsDto> getRiskMapStatistics(MapStatisticsQueryDto queryDto);
     /**
      * 查询固有风险清单库
      *

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerProjectService.java

@@ -29,6 +29,11 @@ public interface ILedgerProjectService extends MPJBaseService<LedgerProject>
      * @return 基础数据-项目集合
      */
     public List<LedgerProject> selectLedgerProjectList(LedgerProject ledgerProject);
+    public List<LedgerProject> getLedgerProjectList(String name,String areaName);
+
+    public Long getProjectCount(String areaName);
+    public Long getBuildingCount(String areaName,Long projectId);
+    public Long getFloorCount(String areaName,Long projectId);
 
     /**
      * 新增基础数据-项目

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanExistingListService.java

@@ -3,18 +3,46 @@ package com.censoft.censoftrongtong.service;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
+import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.github.yulichang.base.MPJBaseService;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * 现有风险清单库Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface IRiskPlanExistingListService  extends MPJBaseService<RiskPlanExistingList>
-{
+public interface IRiskPlanExistingListService extends MPJBaseService<RiskPlanExistingList> {
+
+    /**
+     * 风险数量，年度风险数量
+     *
+     * @param areaName
+     * @param beginTime
+     * @return
+     */
+    public Long getNationalRiskNum(String areaName, Date beginTime,Long peojectId);
+
+    /**
+     * 总体风险指数排名
+     *
+     * @param areaName
+     * @return
+     */
+    public List<RiskIndexRankingDto> getRiskIndexRanking(String areaName);
+
+    public LinkedHashMap<String, Long> getAnnualRiskStatistics(String areaName);
+
+    public List<RiskLevelStatisticsDto> getRiskLevelStatistics(String areaName,Long projectId);
+
+    public List<AccidentTypeStatisticsDto> getAccidentTypeStatistics(String areaName);
+    public List<RiskProjectRankingDto> getRiskProjectRanking(String areaName,String level);
+
+    public List<RiskMapStatisticsDto> getRiskMapStatistics(MapStatisticsQueryDto queryDto);
+
+    public List<ProjectRiskInfoDto> getProjectRiskInfo(Long projectId, Long buildingId, Long floorId,String level);
 
     /**
      * 查询现有风险清单库
@@ -32,6 +60,10 @@ public interface IRiskPlanExistingListService  extends MPJBaseService<RiskPlanEx
      */
     public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList);
 
+
+
+
+
     /**
      * 新增现有风险清单库
      *
@@ -65,5 +97,6 @@ public interface IRiskPlanExistingListService  extends MPJBaseService<RiskPlanEx
     public int deleteRiskPlanExistingListById(Long id);
 
     Boolean saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto);
+
     RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanInherentListService.java

@@ -2,10 +2,13 @@ package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.dto.*;
+import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.github.yulichang.base.MPJBaseService;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
@@ -17,6 +20,34 @@ import java.util.List;
 public interface IRiskPlanInherentListService extends MPJBaseService<RiskPlanInherentList>
 {
 
+    /**
+     * 风险数量，年度风险数量
+     *
+     * @param areaName
+     * @param beginTime
+     * @return
+     */
+    public Long getNationalRiskNum(String areaName, Date beginTime, Long peojectId);
+
+    /**
+     * 总体风险指数排名
+     *
+     * @param areaName
+     * @return
+     */
+    public List<RiskIndexRankingDto> getRiskIndexRanking(String areaName);
+
+    public LinkedHashMap<String, Long> getAnnualRiskStatistics(String areaName);
+
+    public List<RiskLevelStatisticsDto> getRiskLevelStatistics(String areaName,Long projectId);
+
+    public List<AccidentTypeStatisticsDto> getAccidentTypeStatistics(String areaName);
+    public List<RiskProjectRankingDto> getRiskProjectRanking(String areaName, String level);
+
+    public List<ProjectRiskInfoDto> getProjectRiskInfo(Long projectId, Long buildingId, Long floorId,String level);
+
+    public List<RiskMapStatisticsDto> getRiskMapStatistics(MapStatisticsQueryDto queryDto);
+
     /**
      * 查询固有风险清单库
      *

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/InfoLedgerServiceImpl.java

@@ -166,7 +166,9 @@ public class InfoLedgerServiceImpl extends MPJBaseServiceImpl<InfoLedgerMapper,
                     ledgerProject.setInfoAssetsId(infoLedger.getId());
                     ledgerProject.setName(infoLedger.getName());
                     ledgerProject.setType(infoLedger.getBusiness_type());
+                    ledgerProject.setCity(infoLedger.getProvince_name());
                     ledgerProject.setCity(infoLedger.getCity_name());
+                    ledgerProject.setCity(infoLedger.getDistrict_name());
                     ledgerProject.setAddress(infoLedger.getName());
                     ledgerProject.setDelFlag("0");
                     ledgerProject.setStatus("0");

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerProjectServiceImpl.java

@@ -52,6 +52,33 @@ public class LedgerProjectServiceImpl extends MPJBaseServiceImpl<LedgerProjectMa
         return ledgerProjectMapper.selectLedgerProjectList(ledgerProject);
     }
 
+    /**
+     * 查询基础数据-项目列表
+     *
+     * @return 基础数据-项目
+     */
+    @Override
+    public List<LedgerProject> getLedgerProjectList(String name,String areaName)
+    {
+        return ledgerProjectMapper.getLedgerProjectList(name,areaName);
+    }
+
+    @Override
+    public Long getBuildingCount(String areaName,Long projectId)
+    {
+        return ledgerProjectMapper.getBuildingCount(areaName,projectId);
+    }
+    @Override
+    public Long getProjectCount(String areaName)
+    {
+        return ledgerProjectMapper.getProjectCount(areaName);
+    }
+    @Override
+    public Long getFloorCount(String areaName,Long projectId)
+    {
+        return ledgerProjectMapper.getFloorCount(areaName,projectId);
+    }
+
     /**
      * 新增基础数据-项目
      * 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanExistingListServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
+import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.censoft.censoftrongtong.mapper.RiskPlanExistingListMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -14,9 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +35,51 @@ public class RiskPlanExistingListServiceImpl
     private ISysUploadFileService uploadFileService;
 
 
+    @Override
+    public Long getNationalRiskNum(String areaName, Date beginTime,Long peojectId) {
+
+        return riskPlanExistingListMapper.getNationalRiskNum(areaName, beginTime,peojectId);
+    }
+
+    @Override
+    public List<RiskIndexRankingDto> getRiskIndexRanking(String areaName) {
+
+        return riskPlanExistingListMapper.getRiskIndexRanking(areaName);
+    }
+
+    @Override
+    public LinkedHashMap<String, Long> getAnnualRiskStatistics(String areaName) {
+
+        return riskPlanExistingListMapper.getAnnualRiskStatistics(areaName);
+    }
+
+    @Override
+    public List<RiskLevelStatisticsDto> getRiskLevelStatistics(String areaName,Long projectId) {
+        return riskPlanExistingListMapper.getRiskLevelStatistics(areaName,projectId);
+    }
+
+    @Override
+    public List<AccidentTypeStatisticsDto> getAccidentTypeStatistics(String areaName) {
+        return riskPlanExistingListMapper.getAccidentTypeStatistics(areaName);
+    }
+    @Override
+    public List<RiskProjectRankingDto> getRiskProjectRanking(String areaName, String level) {
+        return riskPlanExistingListMapper.getRiskProjectRanking(areaName,level);
+    }
+
+    @Override
+    public List<ProjectRiskInfoDto> getProjectRiskInfo(Long projectId, Long buildingId, Long floorId, String level) {
+        return riskPlanExistingListMapper.getProjectRiskInfo(projectId,buildingId,floorId,level);
+    }
+
+    @Override
+    public List<RiskMapStatisticsDto> getRiskMapStatistics(MapStatisticsQueryDto queryDto) {
+        return riskPlanExistingListMapper.getRiskMapStatistics(queryDto);
+    }
+
+
+
+
     /**
      * 查询现有风险清单库
      *
@@ -43,8 +87,7 @@ public class RiskPlanExistingListServiceImpl
      * @return 现有风险清单库
      */
     @Override
-    public RiskPlanExistingList selectRiskPlanExistingListById(Long id)
-    {
+    public RiskPlanExistingList selectRiskPlanExistingListById(Long id) {
         return riskPlanExistingListMapper.selectRiskPlanExistingListById(id);
     }
 
@@ -55,11 +98,11 @@ public class RiskPlanExistingListServiceImpl
      * @return 现有风险清单库
      */
     @Override
-    public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList)
-    {
+    public List<RiskPlanExistingList> selectRiskPlanExistingListList(RiskPlanExistingList riskPlanExistingList) {
         return riskPlanExistingListMapper.selectRiskPlanExistingListList(riskPlanExistingList);
     }
 
+
     /**
      * 新增现有风险清单库
      *
@@ -67,8 +110,7 @@ public class RiskPlanExistingListServiceImpl
      * @return 结果
      */
     @Override
-    public int insertRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList)
-    {
+    public int insertRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList) {
         riskPlanExistingList.setCreateTime(DateUtils.getNowDate());
         return riskPlanExistingListMapper.insertRiskPlanExistingList(riskPlanExistingList);
     }
@@ -80,8 +122,7 @@ public class RiskPlanExistingListServiceImpl
      * @return 结果
      */
     @Override
-    public int updateRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList)
-    {
+    public int updateRiskPlanExistingList(RiskPlanExistingList riskPlanExistingList) {
         riskPlanExistingList.setUpdateTime(DateUtils.getNowDate());
         return riskPlanExistingListMapper.updateRiskPlanExistingList(riskPlanExistingList);
     }
@@ -93,8 +134,7 @@ public class RiskPlanExistingListServiceImpl
      * @return 结果
      */
     @Override
-    public int deleteRiskPlanExistingListByIds(Long[] ids)
-    {
+    public int deleteRiskPlanExistingListByIds(Long[] ids) {
         return riskPlanExistingListMapper.deleteRiskPlanExistingListByIds(ids);
     }
 
@@ -105,14 +145,13 @@ public class RiskPlanExistingListServiceImpl
      * @return 结果
      */
     @Override
-    public int deleteRiskPlanExistingListById(Long id)
-    {
+    public int deleteRiskPlanExistingListById(Long id) {
         return riskPlanExistingListMapper.deleteRiskPlanExistingListById(id);
     }
 
     @Override
     public RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId) {
-        RiskPlanAppExistingListDetailsDto dto =  riskPlanExistingListMapper.getRiskPlanAppExistingListDetailsDtoByExistingId(existingId);
+        RiskPlanAppExistingListDetailsDto dto = riskPlanExistingListMapper.getRiskPlanAppExistingListDetailsDtoByExistingId(existingId);
 
         //风险源照片
         if (!StrUtil.hasEmpty(dto.getPictureFileIds())) {

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanInherentListServiceImpl.java

@@ -8,6 +8,7 @@ import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
 import com.censoft.censoftrongtong.domain.dto.*;
+import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.mapper.RiskPlanInherentListMapper;
 import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
@@ -18,6 +19,7 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.WordUtil;
 import com.ruoyi.system.service.ISysUploadFileService;
+import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +58,48 @@ public class RiskPlanInherentListServiceImpl
     @Resource
     private IRiskPlanTaskService riskPlanTaskService;
 
+
+    @Override
+    public Long getNationalRiskNum(String areaName, Date beginTime,Long peojectId) {
+
+        return riskPlanInherentListMapper.getNationalRiskNum(areaName, beginTime,peojectId);
+    }
+
+    @Override
+    public List<RiskIndexRankingDto> getRiskIndexRanking(String areaName) {
+
+        return riskPlanInherentListMapper.getRiskIndexRanking(areaName);
+    }
+
+    @Override
+    public LinkedHashMap<String, Long> getAnnualRiskStatistics(String areaName) {
+
+        return riskPlanInherentListMapper.getAnnualRiskStatistics(areaName);
+    }
+
+    @Override
+    public List<RiskLevelStatisticsDto> getRiskLevelStatistics(String areaName,Long projectId) {
+        return riskPlanInherentListMapper.getRiskLevelStatistics(areaName,projectId);
+    }
+
+    @Override
+    public List<AccidentTypeStatisticsDto> getAccidentTypeStatistics(String areaName) {
+        return riskPlanInherentListMapper.getAccidentTypeStatistics(areaName);
+    }
+    @Override
+    public List<RiskProjectRankingDto> getRiskProjectRanking(String areaName, String level) {
+        return riskPlanInherentListMapper.getRiskProjectRanking(areaName,level);
+    }
+    @Override
+    public List<ProjectRiskInfoDto> getProjectRiskInfo( Long projectId, Long buildingId, Long floorId,String level) {
+        return riskPlanInherentListMapper.getProjectRiskInfo(projectId,buildingId,floorId,level);
+    }
+    @Override
+    public List<RiskMapStatisticsDto> getRiskMapStatistics(MapStatisticsQueryDto queryDto) {
+        return riskPlanInherentListMapper.getRiskMapStatistics(queryDto);
+    }
+
+
     /**
      * 新增固有风险清单库
      *

pom.xml

@@ -60,13 +60,6 @@
                 <version>${bitwalker.version}</version>
             </dependency>
 
-            <!-- pagehelper 分页插件 -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-            </dependency>
-
             <!-- 获取系统信息 -->
             <dependency>
                 <groupId>com.github.oshi</groupId>