haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 数据接口

This commit is contained in:
haozq 2024-06-17 14:45:42 +08:00
parent 0be35324b5
commit 669026e94f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/OperatingQualityDto.java
View File

@ -30,4 +30,6 @@ public class OperatingQualityDto extends ScreenParamDto {
@ApiModelProperty(value = "设备ID")
private String deviceId;
private String deviceType;
}

2
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/OperatingQualityVo.java
View File

@ -46,6 +46,8 @@ public class OperatingQualityVo {
@ApiModelProperty(value = "单位")
private String unit;
private String deviceType;

14
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
View File

@ -44,7 +44,7 @@
LEFT JOIN tb_area ta ON tbd.area_id = ta.area_id
LEFT JOIN tb_device_value thdv ON tdd.id = thdv.attribute_id
LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
WHERE tbd.devic_type = 1908 and tpb.bid_code = #{bidCode} and tbd.del_flag=0
WHERE tbd.devic_type = #{deviceType} and tpb.bid_code = #{bidCode} and tbd.del_flag=0
<if test="deviceId!=null and deviceId!=''">
and tbd.device_id=#{deviceId}
</if>
@ -54,13 +54,12 @@
<!--作业环境-GPS安装检测-->
<select id="getGisInstallation" resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
SELECT
tbd.device_id AS id,
tbd.device_id AS deviceId,
tbd.device_name AS deviceName,
tbd.status AS status
FROM tb_bd_device tbd
LEFT JOIN tb_pro_bd tpb ON tpb.id = tbd.bd_id
WHERE tbd.devic_type = 1910 and tpb.bid_code = #{bidCode}
WHERE tbd.devic_type = #{deviceType} and tpb.bid_code = #{bidCode}
</select>
<!--作业环境-有限空间检测环境-->
@ -74,22 +73,21 @@
LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
LEFT JOIN tb_bd_device tbd on tdd.device_id = tbd.device_id
LEFT JOIN tb_pro_bd tpb on tbd.bd_id = tpb.id
WHERE tbd.devic_type =1909
and tpb.bid_code = #{bidCode}
WHERE tdd.device_id=#{deviceId}
</select>
<!--作业环境-GPS安装检测设备查询-->
<select id="getGisInstallationEnvironment"
resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
SELECT
tdv.val val,
tdv.val val,
tdv.unit,
tdd.mode_name AS modeName
FROM tb_device_detail tdd
LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
LEFT JOIN tb_bd_device tbd on tdd.device_id = tbd.device_id
LEFT JOIN tb_pro_bd tpb on tbd.bd_id = tpb.id
WHERE tbd.devic_type =1910
WHERE tdd.device_id=#{deviceId}
and tpb.bid_code = #{bidCode}
</select>