diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/MonitoringCoverageController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/MonitoringCoverageController.java index 5690903..b3fa611 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/MonitoringCoverageController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/MonitoringCoverageController.java @@ -8,10 +8,12 @@ import com.sercurityControl.proteam.supplement.service.MonitoringCoverageService import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Map; /** * @className:MonitoringCoverageController @@ -77,4 +79,11 @@ public class MonitoringCoverageController { AjaxResult res = service.getSpeedNum(dto); return res; } + + @ApiOperation(value = "监控活跃度分析-列表") + @PostMapping(value = "getMonitoringHydList") + @SysLog(title = "监控活跃度分析详情", model = "监控覆盖->监控活跃度分析", operaType = OperaType.QUERY, details = "监控活跃度分析详情",logType = 1) + public Map getMonitoringHydList(ParamsDto dto) { + return service.getMonitoringHydList(dto); + } } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java index d10cb5a..62ef6cb 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java @@ -24,6 +24,24 @@ public class ParamsDto { private String startDay; /**结束日期*/ private String endDay; + /**班组长*/ + private String workManager; + /**班组名称*/ + private String teamName; + /**建管单位*/ + private String org; + /**名称*/ + private String name; + + /**1.监控活跃度分析 2.监控覆盖度分析 3.下行观看分析*/ + private int type; + + /**1.速率正常 2.速率异常*/ + private int operType; + + /**1.球机正常 2.异常掉线 3.画面不清晰 4.不流畅 5.信号弱 6.人为遮挡*/ + private String errorType; + private int page; diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/MonitoringDetailVo.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/MonitoringDetailVo.java new file mode 100644 index 0000000..4de5665 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/MonitoringDetailVo.java @@ -0,0 +1,48 @@ +package com.sercurityControl.proteam.supplement.domain.vo; + +import com.securityControl.common.core.annotation.Sensitive; +import com.securityControl.common.core.enums.SensitizedType; +import lombok.Data; + +/** + * @className:MonitoringDetailVo + * @author:cwchen + * @date:2024-12-11-16:42 + * @version:1.0 + * @description:监控覆盖详情-vo + */ +@Data +public class MonitoringDetailVo { + private int num; + /**id*/ + private String id; + /**球机编号*/ + private String name; + /**工程名称*/ + private String proName; + /**班组长*/ + private String workManager; + /**班组长手机号*/ + @Sensitive(SensitizedType.MOBILE_PHONE) + private String workManagerPhone; + /**风险等级*/ + private String riskLevel; + /**建管单位*/ + private String org; + /**班组名称*/ + private String teamName; + /**经度*/ + private String lon; + /**纬度*/ + private String lat; + /**初次运行日期*/ + private String time; + /**运行时长 时分秒*/ + private String timeValue; + /**运行时长 秒*/ + private long timeValue2; + /**观看次数*/ + private int watchTime; + /**异常类型*/ + private String errorName; +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/MonitoringCoverageMapper.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/MonitoringCoverageMapper.java index 21330dd..ed803a7 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/MonitoringCoverageMapper.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/MonitoringCoverageMapper.java @@ -2,6 +2,7 @@ package com.sercurityControl.proteam.supplement.mapper; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; import com.sercurityControl.proteam.supplement.domain.vo.MonitoringCoverageVo; +import com.sercurityControl.proteam.supplement.domain.vo.MonitoringDetailVo; import org.springframework.stereotype.Repository; import java.util.List; @@ -77,4 +78,13 @@ public interface MonitoringCoverageMapper { * @date 2024/12/11 14:53 */ List getSpeedNum(ParamsDto dto); + + /** + * 监控活跃度分析详情 + * @param dto + * @return List + * @author cwchen + * @date 2024/12/11 16:45 + */ + List getMonitoringHydList(ParamsDto dto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/MonitoringCoverageService.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/MonitoringCoverageService.java index 5cc6f6a..a4135e8 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/MonitoringCoverageService.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/MonitoringCoverageService.java @@ -3,6 +3,8 @@ package com.sercurityControl.proteam.supplement.service; import com.securityControl.common.core.web.domain.AjaxResult; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; +import java.util.Map; + /** * @className:MonitoringCoverageService * @author:cwchen @@ -73,4 +75,13 @@ public interface MonitoringCoverageService { * @date 2024/12/11 14:53 */ AjaxResult getSpeedNum(ParamsDto dto); + + /** + * 监控活跃度分析详情 + * @param dto + * @return Map + * @author cwchen + * @date 2024/12/11 16:41 + */ + Map getMonitoringHydList(ParamsDto dto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/MonitoringCoverageServiceImpl.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/MonitoringCoverageServiceImpl.java index 7af6b44..245bab2 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/MonitoringCoverageServiceImpl.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/MonitoringCoverageServiceImpl.java @@ -1,8 +1,13 @@ package com.sercurityControl.proteam.supplement.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.securityControl.common.core.constant.HttpStatus; import com.securityControl.common.core.web.domain.AjaxResult; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; import com.sercurityControl.proteam.supplement.domain.vo.MonitoringCoverageVo; +import com.sercurityControl.proteam.supplement.domain.vo.MonitoringDetailVo; +import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo; import com.sercurityControl.proteam.supplement.mapper.MonitoringCoverageMapper; import com.sercurityControl.proteam.supplement.service.MonitoringCoverageService; import com.sercurityControl.proteam.util.DateTimeHelper; @@ -11,7 +16,9 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @className:MonitoringCoverageServiceImpl @@ -133,4 +140,35 @@ public class MonitoringCoverageServiceImpl implements MonitoringCoverageService } return AjaxResult.success(list); } + + @Override + public Map getMonitoringHydList(ParamsDto dto) { + PageHelper.startPage(dto.getPage(), dto.getLimit()); + Map map = new HashMap<>(16); + List list = null; + try { + list = mapper.getMonitoringHydList(dto); + int num = 0; + Date endDate = new Date(); + for (MonitoringDetailVo vo : list) { + num ++; + vo.setNum(num); + Date runTime = DateTimeHelper.parse(vo.getTime(), "yyyy-MM-dd HH:mm:ss"); + String gapTime = DateTimeHelper.getGapTime(endDate, runTime); + long timeValue = DateTimeHelper.getGapTime2(endDate, runTime); + vo.setTimeValue(gapTime); + vo.setTimeValue2(timeValue); + } + } catch (Exception e) { + log.error(e.toString(),e); + } + PageInfo pageInfo = new PageInfo<>(list); + map.put("code", HttpStatus.SUCCESS); + map.put("msg", "获取数据成功"); + map.put("count", pageInfo.getTotal()); + map.put("curr", dto.getPage()); + map.put("limit", dto.getLimit()); + map.put("data", pageInfo.getList()); + return map; + } } diff --git a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/MonitoringCoverageMapper.xml b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/MonitoringCoverageMapper.xml index fd52ab5..e2f2c5f 100644 --- a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/MonitoringCoverageMapper.xml +++ b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/MonitoringCoverageMapper.xml @@ -4,7 +4,8 @@ SELECT so.city_name AS name, - a.num + a.num, + so.org_id AS id FROM sys_org so LEFT JOIN ( SELECT jjcm.build_unit_code AS org, @@ -47,7 +49,8 @@ + + \ No newline at end of file