电子看板-三跨数据接口

This commit is contained in:
cwchen 2025-04-24 16:45:36 +08:00
parent b9a58b24e0
commit 71ac98f1ef
6 changed files with 143 additions and 9 deletions

View File

@ -41,4 +41,11 @@ public class DigitalSignageController {
public ServerResponse getTowerProgressNum(EncryptedReq<QueryParamDto> dto) {
return service.getTowerProgressNum(dto.getData());
}
@ApiOperation("电子看板-三跨数据")
@PostMapping(value = "getThreeSpans")
@DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理
public ServerResponse getThreeSpans(EncryptedReq<QueryParamDto> dto) {
return service.getThreeSpans(dto.getData());
}
}

View File

@ -42,4 +42,13 @@ public interface DigitalSignageDao {
* @date 2025/4/24 13:59
*/
int getRopewayTransNum(QueryParamDto dto);
/**
* 电子看板-三跨数据
* @param dto
* @return List<ThreeSpanVo>
* @author cwchen
* @date 2025/4/24 14:50
*/
List<DigitalSignageVo.ThreeSpanVo> getThreeSpans(QueryParamDto dto);
}

View File

@ -14,23 +14,99 @@ public class DigitalSignageVo {
@Data
public static class TowerProgressNumVo {
/**基础开挖*/
/**
* 基础开挖
*/
private int num1;
/**开挖完成*/
/**
* 开挖完成
*/
private int num2;
/**浇筑完成*/
/**
* 浇筑完成
*/
private int num3;
/**铁塔组立*/
/**
* 铁塔组立
*/
private int num4;
/**组塔完成*/
/**
* 组塔完成
*/
private int num5;
/**架线完成*/
/**
* 架线完成
*/
private int num6;
/**附件安装*/
/**
* 附件安装
*/
private int num7;
/**未开始*/
/**
* 未开始
*/
private int num8;
/**索道运输*/
/**
* 索道运输
*/
private int num9;
}
@Data
public static class ThreeSpanVo {
/**
* 跨越类型 1.跨线路 2.跨公路 3.跨铁路
*/
private String spanType;
/**
* 开始杆塔id
*/
private Long towerId;
/**
* 结束杆塔id
*/
private String towerName;
/**
* 开始杆塔名称
*/
private Long nextTowerId;
/**
* 结束杆塔名称
*/
private String nextTowerName;
/**
* 上层线路
*/
private String upperLine;
/**
* 下层线路
*/
private String lowerLine;
/**
* 交叉角度
*/
private String intersectionAngle;
/**
* 垂直距离m
*/
private String verticalDistance;
/**
* 安全裕度°
*/
private String safetyMargin;
/**
* 垂直净距m
*/
private String verticalClearDistance;
/**
* 杆塔间距m
*/
private String towerSpacing;
/**
* 公路宽度m
*/
private String highwayWidth;
}
}

View File

@ -28,4 +28,13 @@ public interface DigitalSignageService {
* @date 2025/4/24 13:52
*/
ServerResponse getTowerProgressNum(QueryParamDto data);
/**
* 电子看板-三跨数据
* @param data
* @return ServerResponse
* @author cwchen
* @date 2025/4/24 14:48
*/
ServerResponse getThreeSpans(QueryParamDto data);
}

View File

@ -78,4 +78,15 @@ public class DigitalSignageServiceImpl implements DigitalSignageService {
}
return ServerResponse.createSuccess(vo);
}
@Override
public ServerResponse getThreeSpans(QueryParamDto dto) {
List<DigitalSignageVo.ThreeSpanVo> list = new ArrayList<>();
try {
list = Optional.ofNullable(dao.getThreeSpans(dto)).orElseGet(ArrayList::new);
} catch (Exception e) {
log.error(e.toString(), e);
}
return ServerResponse.createSuccess(list);
}
}

View File

@ -60,4 +60,26 @@
FROM tb_cablewa_trans
WHERE pro_id = #{id} AND is_active = '1'
</select>
<!--电子看板-三跨数据-->
<select id="getThreeSpans"
resultType="com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo$ThreeSpanVo">
SELECT tts.id,
tts.tower_id AS towerId,
tt.tower_name AS towerName,
CASE span_type WHEN '1' THEN '跨线路' WHEN '2' THEN '跨公路' WHEN '3' THEN '跨铁路' ELSE '未知' END AS spanType,
tts.next_tower_id AS nextTowerId,
tt2.tower_name AS nextTowerName,
tts.upper_line AS upperLine,
tts.lower_line AS lowerLine,
tts.intersection_angle AS intersectionAngle,
tts.vertical_distance AS verticalDistance,
tts.safety_margin AS safetyMargin,
tts.vertical_clear_distance AS verticalClearDistance,
tts.tower_spacing AS towerSpacing,
tts.highway_width AS highwayWidth
FROM tb_three_span tts
LEFT JOIN tb_tower tt ON tts.tower_id = tt.id
LEFT JOIN tb_tower tt2 ON tts.tower_id = tt2.id
WHERE tts.pro_id = #{id} AND is_active = '1'
</select>
</mapper>