diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java index 780f731..1b90a82 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java @@ -79,6 +79,12 @@ public class ProjectViewController extends BaseController { return getDataTable(list); } + /** + * 根据工程id获取大屏首页地图工程信息 + * @param projectTypeCode + * @param areaId + * @return + */ @GetMapping("/getProjectListGroupAreaByTypeCode") public AjaxResult getProjectListGroupAreaByTypeCode(Integer projectTypeCode, Integer areaId) { return success(projectViewService.getProjectListGroupAreaByTypeCode(projectTypeCode, areaId)); diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java index 8322253..c8c04ac 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java @@ -145,46 +145,26 @@ public class ProjectViewTwoController extends BaseController { return getDataTable(list); } -// /** -// * 根据工程id获取大屏首页地图工程信息 -// * @param record -// * @return -// */ -// @GetMapping("/getProjectAndDeviceById") -// public AjaxResult getProjectAndDeviceById(DeviceNumByProjectVo record) { -// return success(projectViewService.getProjectAndDeviceById(record)); -// } - - -// /** -// * 感知设备数量 -// * @return -// */ -// @GetMapping("/getSensingDeviceModelData") -// public AjaxResult getSensingDeviceModelData() { -// return success(projectViewService.getSensingDevice()); -// } - -// /** -// * 感知设备各部分详情页 -// * @param tbDevice -// * @return -// */ -// @GetMapping("/getDeviceModelDetailsPagePart") -// public TableDataInfo getDeviceModelDetailsPagePart(TbDevice tbDevice) { -// startPage(); -// List list = projectViewService.getDeviceModelDetailsPage(tbDevice); -// return getDataTable(list); -// } - -// /** -// * 左侧工程信息数量 -// * @return -// */ -// @GetMapping("/getProjectModelDataAll") -// public AjaxResult getProjectModelDataAll() { -// return success(projectViewService.getProjectView()); -// } + /** + * 根据设备类型编码（环境、基坑、倾角、拉力）查询当天预警信息 + * @param record + * @return + */ + @GetMapping("/getDevTypeCodeDetails") + public AjaxResult getDevTypeCodeDetails(DeviceWarnRecordVo record) { + return success(projectViewService.getDevTypeCodeDetails(record)); + } + /** + * 根据设备类型编码（环境、基坑、倾角、拉力）查询所有预警信息 + * @param record + * @return + */ + @GetMapping("/getDevTypeCodeDetailsAll") + public TableDataInfo getDevTypeCodeDetailsAll(DeviceWarnRecordVo record) { + startPage(); + List list = projectViewService.getDevTypeCodeDetailsAll(record); + return getDataTable(list); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java index 5a90457..1f2f13d 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java @@ -40,6 +40,20 @@ public interface TbDeviceDataRecord { */ List getDeviceWarnRecord(DeviceWarnRecordVo deviceWarnRecordVo); + /** + * 根据设备类型编码（环境、基坑、倾角、拉力）查询当天预警信息 + * @param deviceWarnRecordVo + * @return + */ + List getDevTypeCodeDetails(DeviceWarnRecordVo deviceWarnRecordVo); + + /** + * 根据设备类型编码（环境、基坑、倾角、拉力）查询所有预警信息 + * @param deviceWarnRecordVo + * @return + */ + List getDevTypeCodeDetailsAll(DeviceWarnRecordVo deviceWarnRecordVo); + /** * 查询室外感知设备最新的各项监测数据 * @param devId 设备id diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java index 4a44b49..8f03ecb 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java @@ -112,6 +112,12 @@ public class ProjectViewServiceImpl { } + /** + * 根据工程id获取大屏首页地图工程信息 + * @param projectTypeCode + * @param areaId + * @return + */ public AjaxResult getProjectListGroupAreaByTypeCode(Integer projectTypeCode, Integer areaId) { if (projectTypeCode != null) { if (ProjectTypeEnum.getByCode(projectTypeCode) == null) { @@ -273,11 +279,25 @@ public class ProjectViewServiceImpl { return list; } -// /** -// * 根据工程id获取大屏首页地图工程信息 -// * @return -// */ -// public DeviceNumByProjectVo getProjectAndDeviceById(DeviceNumByProjectVo record) { -// return deviceNumByProjectMapper.getProjectAndDeviceById(record); -// } + /** + * 根据设备类型编码（环境、基坑、倾角、拉力）查询当天预警信息 + * @param record + * @return + */ + public List getDevTypeCodeDetails(DeviceWarnRecordVo record) { + List list = new ArrayList<>(); + list = tbDeviceDataRecord.getDevTypeCodeDetails(record); + return list; + } + + /** + * 根据设备类型编码（环境、基坑、倾角、拉力）查询所有预警信息 + * @param record + * @return + */ + public List getDevTypeCodeDetailsAll(DeviceWarnRecordVo record) { + List list = new ArrayList<>(); + list = tbDeviceDataRecord.getDevTypeCodeDetailsAll(record); + return list; + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceViewVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceViewVo.java index 0aaf843..9092e35 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceViewVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceViewVo.java @@ -14,6 +14,8 @@ import java.io.Serializable; */ @Data public class DeviceViewVo implements Serializable { + @ApiModelProperty(value = "工程id") + private Long proId; @ApiModelProperty(value = "设备总数") private Integer deviceTotal; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceWarnRecordVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceWarnRecordVo.java index 43bec14..e88ccca 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceWarnRecordVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceWarnRecordVo.java @@ -1,6 +1,7 @@ package com.bonus.screen.vo; import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; import lombok.Data; import java.io.Serializable; @@ -17,6 +18,8 @@ public class DeviceWarnRecordVo implements Serializable { private Long id; + @ApiModelProperty(value = "工程id") + private Long proId; @ApiModelProperty(value = "设备编号") private String devCode; @@ -63,4 +66,9 @@ public class DeviceWarnRecordVo implements Serializable { @ApiModelProperty(value = "结束时间") private String endTime; + @ApiModelProperty(value = "是否处置") + private Integer isDispose; + + @ApiModelProperty(value = "是否处置") + private String isDisposeName; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/ProjectViewVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/ProjectViewVo.java index 1c4c231..4cd1f37 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/ProjectViewVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/ProjectViewVo.java @@ -16,6 +16,9 @@ public class ProjectViewVo implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "工程id") + private Long proId; + @ApiModelProperty(value = "工程总数") private Integer projectTotal; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java index ef04ea2..44caf82 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java @@ -18,6 +18,12 @@ public class TeamRecord implements Serializable { */ private Long teamId; + /** + * 工程id + */ + @ApiModelProperty(value="工程id") + private Long proId; + /** * 班组名称 */ diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java index 4244c99..1d0f908 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java @@ -12,6 +12,12 @@ import java.io.Serializable; @Data public class TeamRecordNum implements Serializable { + /** + * 工程id + */ + @ApiModelProperty(value="工程id") + private Long proId; + /** * 施工班组数 */ diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/WarnPredictionRecordVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/WarnPredictionRecordVo.java index 968c698..4a982c8 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/WarnPredictionRecordVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/WarnPredictionRecordVo.java @@ -13,6 +13,8 @@ import java.io.Serializable; @Data public class WarnPredictionRecordVo implements Serializable { + @ApiModelProperty(value = "工程id") + private Long proId; @ApiModelProperty(value = "工程名称") private String proName; diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml index 21a90ca..04ed561 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml @@ -329,6 +329,7 @@ WHEN td.dev_status = 1 THEN '在线' ELSE '未知状态' END devStatusName, tp.pro_name AS proName, + tp.id AS proId, tbdr.dev_name AS bdDeviceName, tbdr.dev_user AS devUserName FROM tb_device td diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml index d2a861c..4e63905 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml @@ -212,7 +212,7 @@ LEFT JOIN tb_area a ON a.id = tp.area_id left join tb_bd_device_record tbdr on tp.id = tbdr.pro_id - left join tb_device td on tbdr.record_id = td.bd_id and td.dev_status = 0 and td.del_flag = 0 + left join tb_device td on tbdr.id = td.bd_id and td.dev_status = 0 and td.del_flag = 0 tp.del_flag = 0 @@ -236,8 +236,8 @@ count(case when td.dev_warn = 0 then 1 end) as successNum, count(case when td.dev_warn = 1 then 1 end) as errorNum from tb_pro_power tpp - left join tb_bd_device_record tbdr on tpp.id = tbdr.power_id - left join tb_device td on tbdr.record_id = td.bd_id and td.dev_status = 0 and td.del_flag = 0 + left join tb_bd_device_record tbdr on tpp.id = tbdr.power_id + left join tb_device td on tbdr.id = td.bd_id and td.dev_status = 0 and td.del_flag = 0 where tpp.pro_id = #{proId} and tpp.del_flag = 0 group by tpp.id diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml index 04b2ab0..4cc6240 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml @@ -24,6 +24,7 @@ + + + + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml index 15d8a54..dea6005 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml @@ -13,7 +13,7 @@ where tt.del_flag = 0 - + - +