From d379b76f14c04dfe13e2a81490e62baaf484f5eb Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 11 Jul 2024 11:56:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigdevice/service/ITowerService.java | 127 +++++++++++++++++- .../mapper/EngineeringScoreMapper.java | 2 +- .../mapper/ManagerialBehaviorScoreMapper.java | 4 +- .../mapper/ProgressItemFeedbackMapper.java | 5 - .../mapper/ProgressNodeLibraryMapper.java | 7 - .../ProgressPanoramaNodePlanMapper.java | 4 + .../project/mapper/ProgressTaskMapper.java | 3 +- .../mapper/ProjectDevStatisticsMapper.java | 4 +- .../mapper/ProjectEnterpriseMapper.java | 10 +- .../project/mapper/ProjectExtendMapper.java | 14 +- .../ProjectExternalSystemServiceMapper.java | 4 +- .../mapper/xml/ProgressItemFeedbackMapper.xml | 7 +- .../mapper/xml/ProgressNodeLibraryMapper.xml | 10 +- .../mapper/xml/ProjectDevStatisticsMapper.xml | 1 - .../service/IProjectUfaceConfigService.java | 22 +-- .../project/service/ProgressTaskService.java | 2 +- .../service/SubdivisionProjectService.java | 2 +- .../impl/ProjectUfaceConfigServiceImpl.java | 3 +- 18 files changed, 174 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerService.java index 7bc20294e..8d02ca086 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerService.java +++ b/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 { - + /** + * + * @param tower + */ void addTower(Tower tower); + /** + * + * @param tower + */ void editTower(Tower tower); + /** + * + * @param tower + */ void updateTowerInfo(Tower tower); + /** + * + * @param list + */ void updateTowerCoordinate(List list); + /** + * + * @param id + */ void deleteTower(String id); + /** + * + * @param id + * @return + */ Tower queryById(String id); + /** + * + * @param map + * @return + */ TowerBySnVo selectTowerBySn(Map map); + /** + * + * @param map + * @return + */ List selectTowerList(Map map); + /** + * + * @param projectSn + */ void deleteProjectTowerData(String projectSn); + /** + * + * @param projectSn + */ void deleteProjectBigDevicesData(String projectSn); + /** + * + * @param map + * @return + */ TowerNumAndAlarmCount selectTowerNumAndAlarmCount(Map map); + /** + * + * @param map + * @return + */ List selectTowerCurrentCount(Map map); + /** + * + * @param map + * @return + */ List> selectTowerAlarmRankingList(Map map); + /** + * + * @param json + */ void saveTowerInfo(JSONObject json); + /** + * + * @param map + * @return + */ Map selectTowerCount(Map map); + /** + * 查询塔机今日在线环比统计 + * @param map + * @return + */ Map selectTowerRingRatioCount(Map map); + /** + * + * @param map + * @return + */ List> selectProjectTowerTotalCountList(Map map); + /** + * + * @param map + * @return + */ List> selectProjectTowerVideoCountList(Map map); + /** + * + * @param map + * @return + */ List> selectProjectTowerCountList(Map map); + /** + * + * @param map + * @return + */ List> selectAllProjectTowerList(Map map); + /** + * + * @param map + * @return + */ List> selectAllProjectTowerVideoList(Map map); + /** + * + * @param map + * @return + */ TowerDevAlarmCountListVo selectTowerDevAlarmCountList(Map map); + /** + * + * @return + */ List 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); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/EngineeringScoreMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/EngineeringScoreMapper.java index 7a122201e..71a83f9e7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/EngineeringScoreMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/EngineeringScoreMapper.java @@ -34,7 +34,7 @@ public interface EngineeringScoreMapper extends BaseMapper { EntityMap selectEngineeringScoreTotal(Map map); /** - * + *查询第三方项目评分列表 * @param map * @return */ diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ManagerialBehaviorScoreMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ManagerialBehaviorScoreMapper.java index b838a57db..c11968c6b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ManagerialBehaviorScoreMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ManagerialBehaviorScoreMapper.java @@ -27,14 +27,14 @@ public interface ManagerialBehaviorScoreMapper extends BaseMapper selectManagerialBehaviorScorePageList(Page page, @Param("param") Map map); /** - * + *统计特定项目在当前年份的安全问题和质量问题数量，并区分不同检查类型（公司检查和中心检查） * @param map * @return */ Map selectThisYearManagerialBehaviorScoreTotal(Map map); /** - * + *查询今年管理行为评分列表 * @param map * @return */ diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressItemFeedbackMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressItemFeedbackMapper.java index af6a41e7e..f7c01a6fa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressItemFeedbackMapper.java +++ b/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 { - /** - * @param map - * @return - */ - List getProjectProgressItemFeedbackList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressNodeLibraryMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressNodeLibraryMapper.java index 669acef90..62c4d233e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressNodeLibraryMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressNodeLibraryMapper.java @@ -25,11 +25,4 @@ public interface ProgressNodeLibraryMapper extends BaseMapper selectProgressNodeLibraryPageList(Page page, @Param("param") Map map); - - /** - * - * @param map - * @return - */ - Map selectProgressNodeLibraryCount(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java index 53de6bafc..566f9d55a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressPanoramaNodePlanMapper.java @@ -30,12 +30,16 @@ public interface ProgressPanoramaNodePlanMapper extends BaseMapper selectProgressPanoramaNodePlanPageList(Page page, @Param("param") Map map); /** + * 列表查询进度-全景节点计划信息 + * * @param map * @return */ List selectPanoramaNodePlanList(Map map); /** + * 统计进度-全景节点计划数量 + * * @param map * @return */ diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskMapper.java index e7ce02bcc..8f71e7c7b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProgressTaskMapper.java @@ -50,7 +50,7 @@ public interface ProgressTaskMapper extends BaseMapper { */ ProgressTask getDetailsById(@Param("id") Long id); - /** + /**更新为逾期状态 * @param alarmTaskIdList * @return */ @@ -77,6 +77,7 @@ public interface ProgressTaskMapper extends BaseMapper { * 通过项目sn和预计完成时间获取末级节点 * * @param projectSn 项目sn + * @param startDate * @return 最近七天数据 */ List getLastStageListBySnAndStashDate(@Param("projectSn") String projectSn, @Param("startDate") String startDate); diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectDevStatisticsMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectDevStatisticsMapper.java index 47a26e118..b6617c117 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectDevStatisticsMapper.java +++ b/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 { /** - * + *统计指定时间段项目设备在线离线统计 * @param map * @return */ @@ -30,7 +30,7 @@ public interface ProjectDevStatisticsMapper extends BaseMapper> selectDateDevStatistics(Map map); /** - * + *查询塔机今日在线环比列表 * @param map * @return */ diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java index bf0afc3ef..32c890ef8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectEnterpriseMapper.java +++ b/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 { /** + * 分页列表查询项目关联的劳务公司信息 * * @param page * @param map @@ -31,6 +32,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper { List selectProjectEnterprisePage(Page page, @Param("param") Map map); /** + * 列表查询项目关联的劳务公司信息 * * @param map * @return @@ -38,6 +40,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper { List selectProjectEnterpriseList(Map map); /** + * 查询企业类型名称列表 * * @param map * @return @@ -45,6 +48,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper { List> selectProjectEnterpriseTypeList(Map map); /** + * 查询所有企业列表 * * @param map * @return @@ -52,12 +56,14 @@ public interface ProjectEnterpriseMapper extends BaseMapper { List> selectProjectAllEnterpriseList(Map map); /** + * 修改项目下劳务公司企业类型 * * @param map */ void updateEnterpriseType(Map map); /** + * 获取劳务公司 * * @param map * @return @@ -65,6 +71,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper { List> selectExternalEnterpriseList(Map map); /** + * 更新祖级列表 * * @param oldAncestor * @param newAncestor @@ -74,6 +81,7 @@ public interface ProjectEnterpriseMapper extends BaseMapper { void updateAncestors(@Param("oldAncestor") String oldAncestor, @Param("newAncestor") String newAncestor, @Param("projectSn") String projectSn, @Param("id") Long id); /** + * 获取子集列表 * * @param id * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExtendMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExtendMapper.java index 6581e12d6..6343f42c8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExtendMapper.java +++ b/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 { /** + * 通过项目sn查询项目信息扩展 + * * @param map * @return */ diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExternalSystemServiceMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExternalSystemServiceMapper.java index 7aa04cfd9..e4236d40d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectExternalSystemServiceMapper.java +++ b/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 { /** + * 查询项目需要对接外部系统获取数据的配置列表 * * @return */ List getChangtongCodeSystemList(); /** + * 查询项目需要对接外部系统获取数据的配置列表 * * @param projectSn * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressItemFeedbackMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressItemFeedbackMapper.xml index ec4dd73d5..0b678bad1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressItemFeedbackMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressItemFeedbackMapper.xml @@ -2,9 +2,4 @@ - - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressNodeLibraryMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressNodeLibraryMapper.xml index 4bcf8f2b6..2bc7c11c4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressNodeLibraryMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProgressNodeLibraryMapper.xml @@ -13,12 +13,4 @@ - - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectDevStatisticsMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectDevStatisticsMapper.xml index 4a44af0ed..2d5a47811 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectDevStatisticsMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectDevStatisticsMapper.xml @@ -4,7 +4,6 @@