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

线路增加杆塔查询

This commit is contained in:
syruan 2024-09-28 14:58:47 +08:00
parent 27b794328e
commit a354de7cb0
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java
View File

@ -30,8 +30,8 @@ public class ProjectDetailsViewController extends BaseController {
* 根据工程id查询相对应类型下的设备信息 * 根据工程id查询相对应类型下的设备信息
*/ */
@GetMapping("/queryDevInfoByProject") @GetMapping("/queryDevInfoByProject")
public AjaxResult queryDevInfoByProject(Integer proId, Integer devType) { public AjaxResult queryDevInfoByProject(Integer proId, Integer powerId, Integer devType) {
return AjaxResult.success(projectDetailsViewService.queryDevInfoByProject(proId, devType)); return AjaxResult.success(projectDetailsViewService.queryDevInfoByProject(proId, powerId, devType));
} }
/** /**

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

@ -20,7 +20,7 @@ import java.util.Map;
@Mapper @Mapper
public interface TbDeviceDataRecord { public interface TbDeviceDataRecord {
List<Map<String,String>> queryDevInfoByProject(@Param("proId") Integer proId, @Param("devType") Integer devType); List<Map<String,String>> queryDevInfoByProject(@Param("proId") Integer proId, @Param("powerId") Integer powerId, @Param("devType") Integer devType);
/** /**
* 安全隐患预测记录信息 * 安全隐患预测记录信息

4
bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java
View File

@ -31,8 +31,8 @@ public class ProjectDetailsViewServiceImpl {
* @param devType * @param devType
* @return * @return
*/ */
public AjaxResult queryDevInfoByProject(Integer proId, Integer devType) { public AjaxResult queryDevInfoByProject(Integer proId, Integer powerId, Integer devType) {
return AjaxResult.success(tbDeviceDataRecordMapper.queryDevInfoByProject(proId, devType)); return AjaxResult.success(tbDeviceDataRecordMapper.queryDevInfoByProject(proId, powerId, devType));
} }
public AjaxResult getDevAttributeLatestInfoById(Integer proId) { public AjaxResult getDevAttributeLatestInfoById(Integer proId) {

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

@ -8,7 +8,12 @@
device.dev_type as devType, device.dev_status as devStatus, device.dev_warn as devWarn device.dev_type as devType, device.dev_status as devStatus, device.dev_warn as devWarn
FROM FROM
tb_device device tb_device device
LEFT JOIN tb_bd_device_record tbdr ON device.bd_id = tbdr.id <if test="powerId != null ">
LEFT JOIN tb_bd_device_record tbdr ON device.bd_id = tbdr.id and tbdr.power_id = #{powerId}
</if>
<if test="powerId == null">
LEFT JOIN tb_bd_device_record tbdr ON device.bd_id = tbdr.id
</if>
LEFT JOIN tb_project project ON project.id = tbdr.pro_id AND project.del_flag = 0 LEFT JOIN tb_project project ON project.id = tbdr.pro_id AND project.del_flag = 0
WHERE project.id = #{proId} and device.dev_type = #{devType} and device.del_flag = 0 WHERE project.id = #{proId} and device.dev_type = #{devType} and device.del_flag = 0
</select> </select>