bonus
/
SafetyAlertSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

选择工程变换

This commit is contained in:
jjLv 2024-09-28 17:59:49 +08:00
parent 566f3d7d00
commit 7ab22b5320
15 changed files with 173 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java
View File

@ -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));

60
bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java
View File

@ -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<DeviceWarnRecordVo> 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<DeviceWarnRecordVo> list = projectViewService.getDevTypeCodeDetailsAll(record);
return getDataTable(list);
}
}

14
bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java
View File

@ -31,6 +31,20 @@ public interface TbDeviceDataRecord {
List<DeviceWarnRecordVo> getDeviceWarnRecord(DeviceWarnRecordVo deviceWarnRecordVo);
/**
* 根据设备类型编码（环境、基坑、倾角、拉力）查询当天预警信息
* @param deviceWarnRecordVo
* @return
*/
List<DeviceWarnRecordVo> getDevTypeCodeDetails(DeviceWarnRecordVo deviceWarnRecordVo);
/**
* 根据设备类型编码（环境、基坑、倾角、拉力）查询所有预警信息
* @param deviceWarnRecordVo
* @return
*/
List<DeviceWarnRecordVo> getDevTypeCodeDetailsAll(DeviceWarnRecordVo deviceWarnRecordVo);
/**
* 查询室外感知设备最新的各项监测数据
* @param devId 设备id

34
bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
View File

@ -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<DeviceWarnRecordVo> getDevTypeCodeDetails(DeviceWarnRecordVo record) {
List<DeviceWarnRecordVo> list = new ArrayList<>();
list = tbDeviceDataRecord.getDevTypeCodeDetails(record);
return list;
}
/**
* 根据设备类型编码（环境、基坑、倾角、拉力）查询所有预警信息
* @param record
* @return
*/
public List<DeviceWarnRecordVo> getDevTypeCodeDetailsAll(DeviceWarnRecordVo record) {
List<DeviceWarnRecordVo> list = new ArrayList<>();
list = tbDeviceDataRecord.getDevTypeCodeDetailsAll(record);
return list;
}
}

2
bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceViewVo.java
View File

@ -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;

8
bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceWarnRecordVo.java
View File

@ -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;
}

3
bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/ProjectViewVo.java
View File

@ -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;

6
bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java
View File

@ -18,6 +18,12 @@ public class TeamRecord implements Serializable {
*/
private Long teamId;
/**
* 工程id
*/
@ApiModelProperty(value="工程id")
private Long proId;
/**
* 班组名称
*/

6
bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java
View File

@ -12,6 +12,12 @@ import java.io.Serializable;
@Data
public class TeamRecordNum implements Serializable {
/**
* 工程id
*/
@ApiModelProperty(value="工程id")
private Long proId;
/**
* 施工班组数
*/

2
bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/WarnPredictionRecordVo.java
View File

@ -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;

1
bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml
View File

@ -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

6
bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml
View File

@ -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
<where>
tp.del_flag = 0
<if test="projectTypeCode != null">
@ -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

70
bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml
View File

@ -21,6 +21,7 @@
<select id="getDeviceWarnRecord" resultType="com.bonus.screen.vo.DeviceWarnRecordVo">
SELECT
tddr.id,
tp.id as proId,
ANY_VALUE(tddr.dev_name) AS devName,
ANY_VALUE(tddr.create_time) AS warnTime,
ANY_VALUE(tddr.attribute_name) AS warnType,
@ -42,6 +43,75 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[and DATE(tddr.create_time) BETWEEN #{startTime} AND #{endTime} ]]>
</if>
<if test="proId != null">
and tp.id = #{proId}
</if>
GROUP BY tddr.id
</select>
<!-- 根据设备类型编码（环境、基坑、倾角、拉力）查询当天预警信息 -->
<select id="getDevTypeCodeDetails" resultType="com.bonus.screen.vo.DeviceWarnRecordVo">
SELECT
tddr.id,
tp.id as proId,
ANY_VALUE(tddr.dev_name) AS devName,
ANY_VALUE(tddr.create_time) AS warnTime,
ANY_VALUE(tddr.attribute_name) AS warnType,
ANY_VALUE(tddr.attribute_val) AS warnValue,
ANY_VALUE( tddr.dev_json) AS warnContent,
ANY_VALUE( tp.pro_name) AS proName,
ANY_VALUE( td.dev_code) AS devCode,
tddr.is_dispose as isDispose,
case
WHEN tddr.is_dispose=0 then '未处置'
WHEN tddr.is_dispose=1 then '已处置'
END AS isDisposeName
FROM tb_dev_data_record tddr
LEFT JOIN tb_device td ON tddr.dev_id = td.id
LEFT JOIN tb_bd_device_record tbdr ON td.bd_id = tbdr.id
LEFT JOIN tb_project tp ON tbdr.pro_id = tp.id
WHERE tddr.is_warn = 1 and tp.id = #{proId}
and DATE(tddr.create_time) = CURDATE()
<if test="devTypeCode != null and devTypeCode != ''">
and td.dev_type = #{devTypeCode}
</if>
<if test="proId != null">
and tp.id = #{proId}
</if>
GROUP BY tddr.id
</select>
<!-- 根据设备类型编码（环境、基坑、倾角、拉力）查询所有预警信息 -->
<select id="getDevTypeCodeDetailsAll" resultType="com.bonus.screen.vo.DeviceWarnRecordVo">
SELECT
tddr.id,
tp.id as proId,
ANY_VALUE(tddr.dev_name) AS devName,
ANY_VALUE(tddr.create_time) AS warnTime,
ANY_VALUE(tddr.attribute_name) AS warnType,
ANY_VALUE(tddr.attribute_val) AS warnValue,
ANY_VALUE( tddr.dev_json) AS warnContent,
ANY_VALUE( tp.pro_name) AS proName,
ANY_VALUE( td.dev_code) AS devCode,
tddr.is_dispose as isDispose,
case
WHEN tddr.is_dispose=0 then '未处置'
WHEN tddr.is_dispose=1 then '已处置'
END AS isDisposeName
FROM tb_dev_data_record tddr
LEFT JOIN tb_device td ON tddr.dev_id = td.id
LEFT JOIN tb_bd_device_record tbdr ON td.bd_id = tbdr.id
LEFT JOIN tb_project tp ON tbdr.pro_id = tp.id
WHERE tddr.is_warn = 1 and tp.id = #{proId}
<if test="devName != null and devName != ''">
and tddr.dev_name = #{devName}
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[and DATE(tddr.create_time) BETWEEN #{startTime} AND #{endTime} ]]>
</if>
<if test="proId != null">
and tp.id = #{proId}
</if>
GROUP BY tddr.id
</select>

4
bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml
View File

@ -13,7 +13,7 @@
where tt.del_flag = 0
</select>
<!-- 施工人员详情页 -->
<!-- 施工班组详情页 -->
<select id="getTeamDetails" resultType="com.bonus.screen.vo.TeamRecord">
select
tt.id as teamId,
@ -34,7 +34,7 @@
order by tt.team_name
</select>
<!-- 施工班组详情页 -->
<!-- 施工人员详情页 -->
<select id="getTeamPeopleDetails" resultType="com.bonus.screen.vo.TeamRecord">
select
tp.rel_name as peopleName,

3
bonus-modules/bonus-base/src/main/resources/mapper/screen/UserPostMapper.xml
View File

@ -20,6 +20,9 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[and DATE(create_time) BETWEEN #{startTime} AND #{endTime} ]]>
</if>
<if test="proId != null">
and tup.pro_id = #{proId}
</if>
ORDER BY create_time
</select>
</mapper>