代码规范

src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerService.java

@@ -17,58 +17,183 @@ import java.util.Map;
  * @version： V1.0
  */
 public interface ITowerService extends IService<Tower> {
-
+    /**
+     *
+     * @param tower
+     */
     void addTower(Tower tower);
 
+    /**
+     *
+     * @param tower
+     */
     void editTower(Tower tower);
 
+    /**
+     *
+     * @param tower
+     */
     void updateTowerInfo(Tower tower);
 
+    /**
+     *
+     * @param list
+     */
     void updateTowerCoordinate(List<Tower> list);
 
+    /**
+     *
+     * @param id
+     */
     void deleteTower(String id);
 
+    /**
+     *
+     * @param id
+     * @return
+     */
     Tower queryById(String id);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     TowerBySnVo selectTowerBySn(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     List<EntityMap> selectTowerList(Map<String, Object> map);
 
+    /**
+     *
+     * @param projectSn
+     */
     void deleteProjectTowerData(String projectSn);
 
+    /**
+     *
+     * @param projectSn
+     */
     void deleteProjectBigDevicesData(String projectSn);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     TowerNumAndAlarmCount selectTowerNumAndAlarmCount(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     List<TowerCurrentCountVo> selectTowerCurrentCount(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     List<Map<String, Object>> selectTowerAlarmRankingList(Map<String, Object> map);
 
+    /**
+     *
+     * @param json
+     */
     void saveTowerInfo(JSONObject json);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     Map<String, Object> selectTowerCount(Map<String, Object> map);
 
+    /**
+     * 查询塔机今日在线环比统计
+     * @param map
+     * @return
+     */
     Map<String, Object> selectTowerRingRatioCount(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     List<Map<String, Object>> selectProjectTowerTotalCountList(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     List<Map<String, Object>> selectProjectTowerVideoCountList(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     List<Map<String, Object>> selectProjectTowerCountList(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     List<Map<String, Object>> selectAllProjectTowerList(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     List<Map<String, Object>> selectAllProjectTowerVideoList(Map<String, Object> map);
 
+    /**
+     *
+     * @param map
+     * @return
+     */
     TowerDevAlarmCountListVo selectTowerDevAlarmCountList(Map<String, Object> map);
 
+    /**
+     *
+     * @return
+     */
     List<Tower> queryOfflineTower();
 
+    /**
+     *
+     * @param offlineTower
+     */
     void offlineAlarm(Tower offlineTower);
 
+    /**
+     *
+     * @param tower
+     * @param towerAlarm
+     * @param typeTitle
+     */
     void sendLifterAlarm(Tower tower, TowerAlarm towerAlarm, String typeTitle);
 
+    /**
+     *
+     * @param record
+     * @param tower
+     */
     void sendMessageToRectification(TowerAlarm record, Tower tower);
 
+    /**
+     *
+     * @param devSn
+     * @return
+     */
     TowerAndDataInfoVO getRelatedInfo(String devSn);
 }

src/main/java/com/zhgd/xmgl/modules/project/mapper/EngineeringScoreMapper.java

@@ -34,7 +34,7 @@ public interface EngineeringScoreMapper extends BaseMapper<EngineeringScore> {
     EntityMap selectEngineeringScoreTotal(Map<String, Object> map);
 
     /**
-     *
+     *查询第三方项目评分列表
      * @param map
      * @return
      */

src/main/java/com/zhgd/xmgl/modules/project/mapper/ManagerialBehaviorScoreMapper.java

@@ -27,14 +27,14 @@ public interface ManagerialBehaviorScoreMapper extends BaseMapper<ManagerialBeha
     List<EntityMap> selectManagerialBehaviorScorePageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
 
     /**
-     *
+     *统计特定项目在当前年份的安全问题和质量问题数量，并区分不同检查类型（公司检查和中心检查）
      * @param map
      * @return
      */
     Map<String, Object> selectThisYearManagerialBehaviorScoreTotal(Map<String, Object> map);
 
     /**
-     *
+     *查询今年管理行为评分列表
      * @param map
      * @return
      */

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressItemFeedbackMapper.java

@@ -17,9 +17,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface ProgressItemFeedbackMapper extends BaseMapper<ProgressItemFeedback> {
 
-    /**
-     * @param map
-     * @return
-     */
-    List<EntityMap> getProjectProgressItemFeedbackList(Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressNodeLibraryMapper.java

@@ -25,11 +25,4 @@ public interface ProgressNodeLibraryMapper extends BaseMapper<ProgressNodeLibrar
      * @return
      */
     List<EntityMap> selectProgressNodeLibraryPageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
-
-    /**
-     *
-     * @param map
-     * @return
-     */
-    Map<String,Object> selectProgressNodeLibraryCount(Map<String,Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java

@@ -30,12 +30,16 @@ public interface ProgressPanoramaNodePlanMapper extends BaseMapper<ProgressPanor
     List<EntityMap> selectProgressPanoramaNodePlanPageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
 
     /**
+     * 列表查询进度-全景节点计划信息
+     *
      * @param map
      * @return
      */
     List<EntityMap> selectPanoramaNodePlanList(Map<String, Object> map);
 
     /**
+     * 统计进度-全景节点计划数量
+     *
      * @param map
      * @return
      */

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskMapper.java

@@ -50,7 +50,7 @@ public interface ProgressTaskMapper extends BaseMapper<ProgressTask> {
      */
     ProgressTask getDetailsById(@Param("id") Long id);
 
-    /**
+    /**更新为逾期状态
      * @param alarmTaskIdList
      * @return
      */
@@ -77,6 +77,7 @@ public interface ProgressTaskMapper extends BaseMapper<ProgressTask> {
      * 通过项目sn和预计完成时间获取末级节点
      *
      * @param projectSn 项目sn
+     * @param startDate
      * @return 最近七天数据
      */
     List<ProgressTask> getLastStageListBySnAndStashDate(@Param("projectSn") String projectSn, @Param("startDate") String startDate);

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectDevStatisticsMapper.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface ProjectDevStatisticsMapper extends BaseMapper<ProjectDevStatistics> {
     /**
-     *
+     *统计指定时间段项目设备在线离线统计
      * @param map
      * @return
      */
@@ -30,7 +30,7 @@ public interface ProjectDevStatisticsMapper extends BaseMapper<ProjectDevStatist
     List<Map<String, Object>> selectDateDevStatistics(Map<String, Object> map);
 
     /**
-     *
+     *查询塔机今日在线环比列表
      * @param map
      * @return
      */

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java

@@ -16,13 +16,14 @@ import java.util.Map;
 /**
  * @Description: 项目劳务公司关联
  * @author： pds
- * @date：   2020-08-13
+ * @date： 2020-08-13
  * @version： V1.0
  */
 @Mapper
 @Repository
 public interface ProjectEnterpriseMapper extends BaseMapper<ProjectEnterprise> {
     /**
+     * 分页列表查询项目关联的劳务公司信息
      *
      * @param page
      * @param map
@@ -31,6 +32,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper<ProjectEnterprise> {
     List<EnterpriseInfo> selectProjectEnterprisePage(Page<EnterpriseInfo> page, @Param("param") Map<String, Object> map);
 
     /**
+     * 列表查询项目关联的劳务公司信息
      *
      * @param map
      * @return
@@ -38,6 +40,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper<ProjectEnterprise> {
     List<EntityMap> selectProjectEnterpriseList(Map<String, Object> map);
 
     /**
+     * 查询企业类型名称列表
      *
      * @param map
      * @return
@@ -45,6 +48,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper<ProjectEnterprise> {
     List<Map<String, Object>> selectProjectEnterpriseTypeList(Map<String, Object> map);
 
     /**
+     * 查询所有企业列表
      *
      * @param map
      * @return
@@ -52,12 +56,14 @@ public interface ProjectEnterpriseMapper extends BaseMapper<ProjectEnterprise> {
     List<Map<String, Object>> selectProjectAllEnterpriseList(Map<String, Object> map);
 
     /**
+     * 修改项目下劳务公司企业类型
      *
      * @param map
      */
     void updateEnterpriseType(Map<String, Object> map);
 
     /**
+     * 获取劳务公司
      *
      * @param map
      * @return
@@ -65,6 +71,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper<ProjectEnterprise> {
     List<Map<String, Object>> selectExternalEnterpriseList(Map<String, Object> map);
 
     /**
+     * 更新祖级列表
      *
      * @param oldAncestor
      * @param newAncestor
@@ -74,6 +81,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper<ProjectEnterprise> {
     void updateAncestors(@Param("oldAncestor") String oldAncestor, @Param("newAncestor") String newAncestor, @Param("projectSn") String projectSn, @Param("id") Long id);
 
     /**
+     * 获取子集列表
      *
      * @param id
      * @return

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExtendMapper.java

@@ -1,22 +1,24 @@
 package com.zhgd.xmgl.modules.project.mapper;
 
-import java.util.Map;
-
-import com.zhgd.jeecg.common.mybatis.EntityMap;
-import org.apache.ibatis.annotations.Mapper;
-import com.zhgd.xmgl.modules.project.entity.ProjectExtend;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhgd.jeecg.common.mybatis.EntityMap;
+import com.zhgd.xmgl.modules.project.entity.ProjectExtend;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Map;
 
 /**
  * @Description: 项目信息扩展表
  * @author： pds
- * @date：   2020-10-10
+ * @date： 2020-10-10
  * @version： V1.0
  */
 @Mapper
 public interface ProjectExtendMapper extends BaseMapper<ProjectExtend> {
 
     /**
+     * 通过项目sn查询项目信息扩展
+     *
      * @param map
      * @return
      */

src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExternalSystemServiceMapper.java

@@ -12,19 +12,21 @@ import java.util.List;
 /**
  * @Description: 项目需要对接外部系统获取数据的配置
  * @author： pds
- * @date：   2021-09-10
+ * @date： 2021-09-10
  * @version： V1.0
  */
 @Mapper
 @Repository
 public interface ProjectExternalSystemServiceMapper extends BaseMapper<ProjectExternalSystemService> {
     /**
+     * 查询项目需要对接外部系统获取数据的配置列表
      *
      * @return
      */
     List<ProjectExternalSystemService> getChangtongCodeSystemList();
 
     /**
+     * 查询项目需要对接外部系统获取数据的配置列表
      *
      * @param projectSn
      * @return

src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressItemFeedbackMapper.xml

@@ -2,9 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.project.mapper.ProgressItemFeedbackMapper">
 
-    <select id="getProjectProgressItemFeedbackList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">
+</mapper>
-        select a.*,b.real_name feedback_person_name
-        from progress_item_feedback a LEFT JOIN system_user b ON a.feedback_person=b.user_id
-        WHERE a.subitem_id=#{itemId}
-    </select>
-</mapper>

src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressNodeLibraryMapper.xml

@@ -13,12 +13,4 @@
 
     </select>
 
-    <select id="selectProgressNodeLibraryCount" resultType="java.util.Map">
+</mapper>
-        SELECT COUNT(1) totalNodeNum,
-               IFNULL(SUM((CASE WHEN `status`=6 THEN 1 ELSE 0 END)),0) completeNodeNum,
-               IFNULL(SUM((CASE WHEN `status`=2 THEN 1 ELSE 0 END)),0) executeNodeNum,
-               IFNULL(SUM((CASE WHEN `status`=4 or `status`=3 THEN 1 ELSE 0 END)),0) notStartNodeNum
-        from progress_node_library
-        where project_sn=#{projectSn}
-    </select>
-</mapper>

src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectDevStatisticsMapper.xml

@@ -4,7 +4,6 @@
 
     <select id="getProjectDevStatisticsCount" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT c.query_time queryTime,SUM(c.dev_num) devNum,SUM(c.dev_online_num) devOnlineNum
-
         FROM project a
                        INNER JOIN company cp ON a.company_sn=cp.company_sn
                        Left JOIN company b ON cp.parent_id=b.company_id

src/main/java/com/zhgd/xmgl/modules/project/service/IProjectUfaceConfigService.java

@@ -27,32 +27,32 @@ public interface IProjectUfaceConfigService extends IService<ProjectUfaceConfig>
     void addUfaceDev(UfaceDev ufaceDev);
 
     /**
-     *
+     *删除人脸设备信息
      * @param ufaceDev
      */
     void deleteUfaceDev(UfaceDev ufaceDev);
 
     /**
-     *
+     *添加人员权限
      * @param workerInfo
      */
     void addWorkerInfo(WorkerInfo workerInfo);
 
     /**
-     *
+     *删除人员权限
      * @param workerInfo
      */
     void deleteWorkerInfo(WorkerInfo workerInfo);
 
     /**
-     *
+     *更新人员权限
      * @param newWorkerInfo
      * @param oldWorkerInfo
      */
     void updateWorkerInfo(WorkerInfo newWorkerInfo, WorkerInfo oldWorkerInfo);
 
     /**
-     *
+     *批量发送人员权限
      * @param workerInfo
      * @param projectUfaceConfig
      * @param list
@@ -60,21 +60,21 @@ public interface IProjectUfaceConfigService extends IService<ProjectUfaceConfig>
     void sendBatchWorkerInfo(WorkerInfo workerInfo, ProjectUfaceConfig projectUfaceConfig, List<UfaceDev> list);
 
     /**
-     *
+     *是否为海康威视设备配置
      * @param projectSn
      * @return
      */
     boolean isHikvisionConfig(String projectSn);
 
     /**
-     *
+     *添加海康同步记录和更新劳务人员总状态
      * @param workerInfo
      * @param devSns
      */
     void addHkSyncRecordsAndUpdateWorkerStatus(WorkerInfo workerInfo, String devSns);
 
     /**
-     *
+     *构建workerAndDevSnList和下发人员
      * @param projectUfaceConfig
      * @param allDevList
      * @param workerList
@@ -83,7 +83,7 @@ public interface IProjectUfaceConfigService extends IService<ProjectUfaceConfig>
     void buildAndSendBatchWorkerForHk(ProjectUfaceConfig projectUfaceConfig, List<UfaceDev> allDevList, List<WorkerInfo> workerList, Long userId);
 
     /**
-     *
+     *构建workerAndDevSnList和下发一个人员
      * @param allDevList
      * @param workerInfo
      * @param model
@@ -93,7 +93,7 @@ public interface IProjectUfaceConfigService extends IService<ProjectUfaceConfig>
     void buildAndSendOneWorkerForHk(List<UfaceDev> allDevList, WorkerInfo workerInfo, int model, String projectSn, boolean sendNotice);
 
     /**
-     *
+     *构建workerAndDevSnList和下发一个人员一个设备
      * @param allDevList
      * @param workerInfo
      * @param operate
@@ -111,7 +111,7 @@ public interface IProjectUfaceConfigService extends IService<ProjectUfaceConfig>
     void addHkSyncRecordAndResetStatusForAddAuth(WorkerInfo workerInfo);
 
     /**
-     *
+     *修改权限的记录
      * @param workerInfo
      */
     void addHkSyncRecordAndResetStatusForEditAuth(WorkerInfo workerInfo);

src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskService.java

@@ -28,7 +28,7 @@ public interface ProgressTaskService extends IService<ProgressTask> {
 
     /**
      * 所有进度甘特图， 以父子节点形式呈现
-     *
+     * @param projectSn
      * @return
      */
     List<ProgressTask> getParentChildList(String projectSn);

src/main/java/com/zhgd/xmgl/modules/project/service/SubdivisionProjectService.java

@@ -26,7 +26,7 @@ public interface SubdivisionProjectService extends IService<SubdivisionProject>
 
     /**
      * 所有分部分项工程， 以父子节点形式呈现
-     *
+     * @param projectSn
      * @return 分部分项工程列表
      */
     List<SubdivisionProject> getParentChildList(String projectSn);

src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java

@@ -377,7 +377,8 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
         String rtDevSns = null;
         String rtDevIds = null;
         if (Objects.equals(workerInfo.getDevType(), WorkerInfoDevTypeEnum.DEV.getCode())) {
-            if ("0".equals(workerInfo.getUfaceDevId())) {
+            String zero = "0";
+            if (zero.equals(workerInfo.getUfaceDevId())) {
                 workerInfo.setUfaceDevId(null);
             }
             StringBuilder devBuilder = new StringBuilder();