diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java index 169c099..5a9380d 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java @@ -23,6 +23,7 @@ public interface EscalateHiddenDangerMapper /** * 查询上报隐患列表 * + * @param id 巡检执法id * @return 上报隐患集合 */ List selectEscalateHiddenDangerList(String id); diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateRiskMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateRiskMapper.java index ea1b1bf..6d97171 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateRiskMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateRiskMapper.java @@ -21,6 +21,7 @@ public interface EscalateRiskMapper /** * 查询上报风险列表 * + * @param id 巡检执法id * @return 上报风险集合 */ List selectEscalateRiskList(String id); diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HazardousOperationMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HazardousOperationMapper.java index 8705a06..01d5044 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HazardousOperationMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HazardousOperationMapper.java @@ -82,6 +82,8 @@ public interface HazardousOperationMapper /** * 按危险作业等级统计 + * + * @return 返回值 */ List> hazardousOperationLevelStatistics(); } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java index 71b1cd2..b49322a 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java @@ -62,6 +62,8 @@ public interface HiddenDangerMapper /** * 隐患信息列表 + * + * @return 返回值 */ List selectHiddenDangers(); @@ -73,5 +75,12 @@ public interface HiddenDangerMapper */ List selectHiddenDangerSubmitDats(Date yearAgo); + /** + * 隐患每周数量统计 + * + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 返回值 + */ List selectHiddenDangerSubmitDat(@Param("startTime") String startTime, @Param("endTime") String endTime); } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/LawEnforcementInspectionMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/LawEnforcementInspectionMapper.java index 9247d12..8329767 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/LawEnforcementInspectionMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/LawEnforcementInspectionMapper.java @@ -60,5 +60,11 @@ public interface LawEnforcementInspectionMapper */ int deleteLawEnforcementInspectionByIds(String[] ids); + /** + * 按月统计巡查信息 + * + * @param yearAgo 当前时间往前推一年得时间 + * @return 结果 + */ List selectLawEnforcementInspections(Date yearAgo); } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java index 04a4e37..8f83236 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java @@ -58,5 +58,10 @@ public interface MajorHazardSourcesMapper */ int deleteMajorHazardSourcesByIds(String[] ids); + /** + * 重大危险源统计 + * + * @return 结果 + */ List majorHazardSourcesStatistics(); } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersonMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersonMapper.java index 61743d7..00212d1 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersonMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersonMapper.java @@ -57,5 +57,10 @@ public interface PersonMapper { */ int deletePersonByIds(String[] ids); + /** + * 在管人员统计 + * + * @return 结果 + */ int getPersonCount(); } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/LawEnforcementInspectionStatics.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/LawEnforcementInspectionStatics.java index a47d63a..cc8877a 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/LawEnforcementInspectionStatics.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/LawEnforcementInspectionStatics.java @@ -9,11 +9,15 @@ import lombok.Data; @Data public class LawEnforcementInspectionStatics { - private String date; // 时间 + /** 时间 */ + private String date; - private int inspectionCount; // 巡查次数 + /** 巡查次数 */ + private int inspectionCount; - private int hiddenTroubleCount; // 发现隐患数 + /** 发现隐患数 */ + private int hiddenTroubleCount; - private int riskCount; // 发现风险数 + /** 发现风险数 */ + private int riskCount; } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/LawEnforcementInspectionVo.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/LawEnforcementInspectionVo.java index ef9b575..ba7a551 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/LawEnforcementInspectionVo.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/LawEnforcementInspectionVo.java @@ -4,9 +4,12 @@ package com.hbt.safety.supervision.pojo.vo; * 执法巡查表vo */ public class LawEnforcementInspectionVo { - private String id; // 主键 - private int inspectionDate; // 月份 + /** 主键id */ + private String id; + + /** 月份 */ + private int inspectionDate; public String getId() { return id; diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/StatisticsVo.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/StatisticsVo.java index 3945b77..6bc75bd 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/StatisticsVo.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/StatisticsVo.java @@ -5,14 +5,18 @@ import lombok.NoArgsConstructor; /** * 统计数据vo + * + * @author 张雨 */ @Data @NoArgsConstructor public class StatisticsVo { - private int classify; // 分类 + /** 分类 */ + private int classify; - private int count; // 数量 + /** 数量 */ + private int count; public StatisticsVo(int classify, int count) { this.classify = classify; diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/WeekDateVo.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/WeekDateVo.java index 7686651..acb026a 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/WeekDateVo.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/WeekDateVo.java @@ -4,11 +4,15 @@ import lombok.Data; /** * 周统计数据实体类 + * + * @author 张雨 */ @Data public class WeekDateVo { - private String date; // 周数 + /** 周数 */ + private String date; - private int count; // 数量 + /** 数量 */ + private int count; } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java index 61472a7..6d21676 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java @@ -23,6 +23,7 @@ public interface IEscalateHiddenDangerService /** * 查询上报隐患列表 * + * @param id 巡检执法id * @return 上报隐患集合 */ List selectEscalateHiddenDangerList(String id); diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHazardousOperationService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHazardousOperationService.java index 01dab44..b0803c7 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHazardousOperationService.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHazardousOperationService.java @@ -67,16 +67,22 @@ public interface IHazardousOperationService /** * 危险作业统计 + * + * @return 返回值 */ String hazardousOperationManagement(); /** * 进行中/已备案作业数量变化趋势图 + * + * @return 返回值 */ String hazardousOperationVariationTendency(); /** * 按危险作业等级统计 + * + * @return 返回值 */ String hazardousOperationLevelStatistics(); } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/ILawEnforcementInspectionService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/ILawEnforcementInspectionService.java index 411a0a8..afaee70 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/ILawEnforcementInspectionService.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/ILawEnforcementInspectionService.java @@ -62,6 +62,8 @@ public interface ILawEnforcementInspectionService /** * 按月统计巡查信息 + * + * @return 结果 */ String monthStatistics(); } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java index 905f233..72141a0 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java @@ -59,6 +59,8 @@ public interface IMajorHazardSourcesService /** * 重大危险源统计 + * + * @return 结果 */ String majorHazardSourcesStatistics(); }