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

代码规范修改

This commit is contained in:
jjLv 2024-04-03 18:15:03 +08:00
parent 49503d88b4
commit d45e9b7283
5 changed files with 131 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/PersonnelControlVo.java
View File

@ -73,6 +73,13 @@ public class PersonnelControlVo {
@ApiModelProperty("手机号")
private String phone;
@ApiModelProperty("监测名称")
private String modeName;
@ApiModelProperty("采集值")
private String val;
@ApiModelProperty("组织机构")
private String orgName;
}

48
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/OperatingMapper.java
View File

@ -20,15 +20,63 @@ public interface OperatingMapper {
*/
List<OperatingQualityVo> getRealTimeMonitoring(OperatingQualityDto dto);
/**
* 作业环境-有限空间检测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getFiniteSpace(OperatingQualityDto dto);
/**
* 作业环境-边坡位移监测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getSlopeDisplacement(OperatingQualityDto dto);
/**
* 作业环境-GPS安装检测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto);
/**
* 作业环境-有限空间检测环境
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getFiniteSpaceEnvironment(OperatingQualityDto dto);
/**
* 作业环境-GPS安装检测环境查询
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto);
/**
* 作业环境-边坡位移监测列表
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getSlopeDisplacementList(ConstructionQualityDto dto);
}

12
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/OperatingService.java
View File

@ -23,7 +23,7 @@ public interface OperatingService {
List<OperatingQualityVo> getRealTimeMonitoring(OperatingQualityDto dto);
/**
* 作业环境-实时检测
* 作业环境-有限空间检测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
@ -33,7 +33,7 @@ public interface OperatingService {
List<OperatingQualityVo> getFiniteSpace(OperatingQualityDto dto);
/**
* 作业环境-实时检测
* 作业环境-边坡位移监测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
@ -43,7 +43,7 @@ public interface OperatingService {
List<OperatingQualityVo> getSlopeDisplacement(OperatingQualityDto dto);
/**
* 作业环境-实时检测
* 作业环境-GPS安装检测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
@ -53,7 +53,7 @@ public interface OperatingService {
List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto);
/**
* 作业环境-实时检测
* 作业环境-有限空间检测环境
* @param dto
* @return List<OperatingQualityVo>
* @description
@ -63,7 +63,7 @@ public interface OperatingService {
List<OperatingQualityVo> getFiniteSpaceEnvironment(OperatingQualityDto dto);
/**
* 作业环境-实时检测
* 作业环境-GPS安装检测环境查询
* @param dto
* @return List<OperatingQualityVo>
* @description
@ -73,7 +73,7 @@ public interface OperatingService {
List<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto);
/**
* 作业环境-实时检测
* 作业环境-边坡位移监测列表
* @param dto
* @return List<OperatingQualityVo>
* @description

58
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OperatingImpl.java
View File

@ -26,37 +26,93 @@ public class OperatingImpl implements OperatingService {
@Resource(name = "OperatingMapper")
private OperatingMapper mapper;
/**
* 作业环境-实时检测
* @param dto
* @return List<OperatingQualityVo>
* &#064;description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<OperatingQualityVo> getRealTimeMonitoring(OperatingQualityDto dto) {
return mapper.getRealTimeMonitoring(dto);
}
/**
* 作业环境-有限空间检测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<OperatingQualityVo> getFiniteSpace(OperatingQualityDto dto) {
return mapper.getFiniteSpace(dto);
}
/**
* 作业环境-边坡位移监测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<OperatingQualityVo> getSlopeDisplacement(OperatingQualityDto dto) {
return mapper.getSlopeDisplacement(dto);
}
/**
* 作业环境-GPS安装检测设备查询
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<OperatingQualityVo> getGPSInstallation(OperatingQualityDto dto) {
return mapper.getGPSInstallation(dto);
}
/**
* 作业环境-有限空间检测环境
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<OperatingQualityVo> getFiniteSpaceEnvironment(OperatingQualityDto dto) {
return mapper.getFiniteSpaceEnvironment(dto);
}
/**
* 作业环境-GPS安装检测环境查询
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<OperatingQualityVo> getGPSInstallationEnvironment(OperatingQualityDto dto) {
return mapper.getGPSInstallationEnvironment(dto);
}
/**
* 作业环境-边坡位移监测列表
* @param dto
* @return List<OperatingQualityVo>
* @description
* @author jjLv
* @date 2024/3/27 19:54
*/
@Override
public List<ConstructionQualityVo> getSlopeDisplacementList(ConstructionQualityDto dto) {
return mapper.getSlopeDisplacementList(dto);

23
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
View File

@ -110,18 +110,21 @@
</select>
<select id="personnelCoordinatePoint" resultType="com.securitycontrol.entity.screen.vo.PersonnelControlVo">
SELECT
tct.user_id AS userId,
su.user_name AS userName,
su.dept_name AS deptName,
su.phone AS phone,
tct.lat AS latitude,
tct.lon AS longitude
tbd.device_id AS deviceId,
group_concat(tdd.mode_name) AS modeName,
group_concat(tdv.val) AS val,
group_concat(su.phone) AS phone,
group_concat(su.org_name) AS orgName,
group_concat(su.user_name) AS userName
FROM
tb_cap_travel tct
LEFT JOIN tb_bd_device tbd ON tct.device_id = tbd.device_id
tb_bd_device tbd
LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
LEFT JOIN sys_user su ON tct.user_id = su.user_id
LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id
LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
LEFT JOIN sys_user su ON tdv.val = su.user_id and tdd.mode_name = '绑定人'
WHERE
tpb.bid_code = #{bidCode}
tpb.bid_code = #{bidCode} and tbd.devic_type = '1905'
GROUP BY
tbd.device_id
</select>
</mapper>