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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
BianLzhaoMin 2025-08-06 13:39:44 +08:00
parent 306cefceb3 468ebd809d
commit 0a9b041fc1
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java
View File

@ -72,11 +72,14 @@ public class DigitalSignageServiceImpl implements DigitalSignageService {
DigitalSignageVo.TowerProgressNumVo vo = new DigitalSignageVo.TowerProgressNumVo();
try {
vo = Optional.ofNullable(dao.getTowerProgressNum(dto)).orElseGet(DigitalSignageVo.TowerProgressNumVo::new);
if (vo.getNum11() > 0) {
vo.setNum11(vo.getNum11() - 1);
}
// 查询索道运输数量
int num = dao.getRopewayTransNum(dto);
vo.setNum12(num);
} catch (Exception e) {
log.error(e.toString(),e);
log.error(e.toString(), e);
}
return ServerResponse.createSuccess(vo);
}
@ -98,7 +101,7 @@ public class DigitalSignageServiceImpl implements DigitalSignageService {
try {
// 查询索道运输信息
List<DigitalSignageVo.CablewaTransVo> cablewaTransVos = Optional.ofNullable(dao.getCablewaTrans(dto)).orElseGet(ArrayList::new);
if(CollectionUtils.isNotEmpty(cablewaTransVos)){
if (CollectionUtils.isNotEmpty(cablewaTransVos)) {
for (DigitalSignageVo.CablewaTransVo vo : cablewaTransVos) {
List<DigitalSignageVo.CablewaTransPointVo> cablewaTransPointVos = Optional.ofNullable(dao.getCablewaTransPointVos(vo.getId())).orElseGet(ArrayList::new);
vo.setCablewaTransPointVoList(cablewaTransPointVos);
@ -130,7 +133,7 @@ public class DigitalSignageServiceImpl implements DigitalSignageService {
map.put("highwayList", highwayList);
map.put("aThousandFieldsList", aThousandFieldsList);
} catch (Exception e) {
log.error(e.toString(),e);
log.error(e.toString(), e);
}
return ServerResponse.createSuccess(map);
}
@ -141,7 +144,7 @@ public class DigitalSignageServiceImpl implements DigitalSignageService {
List<TowersInfo> towersInfos = Optional.ofNullable(dao.getTowersPosition(dto)).orElseGet(ArrayList::new);
return ServerResponse.createSuccess(towersInfos);
} catch (Exception e) {
log.error(e.toString(),e);
log.error(e.toString(), e);
return ServerResponse.createErroe("查询失败");
}
}

1
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
View File

@ -72,6 +72,7 @@ public class TbProjectServiceImpl implements TbProjectService {
tbProjectVo.setTbThreeSpanVoList(tbThreeSpanVoList);
//获取工程下的索道运输
tbCablewaTransVo.setProId(tbProjectVo.getId());
tbCablewaTransVo.setSourceType("1");
List<TbCablewaTransVo> tbCablewaTransVoList = tbCablewaTransService.tbCablewaTransAll(tbCablewaTransVo);
tbProjectVo.setTbCablewaTransVoList(tbCablewaTransVoList);
}

10
src/main/resources/mappers/backstage/DigitalSignageMapper.xml
View File

@ -55,13 +55,13 @@
resultType="com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo$TowerProgressNumVo">
SELECT
COUNT(IF(tower_progress >= 1, 1, NULL)) AS num1,
COUNT(IF(tower_progress >= 2, 1, NULL)) AS num2,
COUNT(IF(tower_progress = 2, 1, NULL)) AS num2,
COUNT(IF(tower_progress >= 3, 1, NULL)) AS num3,
COUNT(IF(tower_progress >= 4, 1, NULL)) AS num4,
COUNT(IF(tower_progress = 4, 1, NULL)) AS num4,
COUNT(IF(tower_progress >= 5, 1, NULL)) AS num5,
COUNT(IF(tower_progress >= 6, 1, NULL)) AS num6,
COUNT(IF(tower_progress = 6, 1, NULL)) AS num6,
COUNT(IF(tower_progress >= 7, 1, NULL)) AS num7,
COUNT(IF(tower_progress >= 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress = 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress >= 9, 1, NULL)) AS num9,
COUNT(IF(tower_progress >= 10, 1, NULL)) AS num10,
COUNT(IF(tower_progress = 0, 1, NULL)) AS num11
@ -73,7 +73,7 @@
<select id="getRopewayTransNum" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM tb_cablewa_trans
WHERE pro_id = #{id} AND is_active = '1'
WHERE pro_id = #{id} AND (source_type IS NULL OR source_type = '1') AND is_active = '1'
</select>
<!--电子看板-三跨数据-->
<select id="getThreeSpans"

18
src/main/resources/mappers/backstage/ProProgressMapper.xml
View File

@ -151,15 +151,15 @@
resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo$ProDetailVo">
SELECT
COUNT(IF(tower_progress >= 1, 1, NULL)) AS num1,
COUNT(IF(tower_progress >= 2, 1, NULL)) AS num2,
COUNT(IF(tower_progress >= 3, 1, NULL)) AS num3,
COUNT(IF(tower_progress >= 4, 1, NULL)) AS num4,
COUNT(IF(tower_progress >= 5, 1, NULL)) AS num5,
COUNT(IF(tower_progress >= 6, 1, NULL)) AS num6,
COUNT(IF(tower_progress >= 7, 1, NULL)) AS num7,
COUNT(IF(tower_progress >= 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress >= 9, 1, NULL)) AS num9,
COUNT(IF(tower_progress >= 10, 1, NULL)) AS num10,
COUNT(IF(tower_progress = 2, 1, NULL)) AS num2,
COUNT(IF(tower_progress = 3, 1, NULL)) AS num3,
COUNT(IF(tower_progress = 4, 1, NULL)) AS num4,
COUNT(IF(tower_progress = 5, 1, NULL)) AS num5,
COUNT(IF(tower_progress = 6, 1, NULL)) AS num6,
COUNT(IF(tower_progress = 7, 1, NULL)) AS num7,
COUNT(IF(tower_progress = 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress = 9, 1, NULL)) AS num9,
COUNT(IF(tower_progress = 10, 1, NULL)) AS num10,
COUNT(*) AS towerNum
FROM tb_tower
WHERE pro_id = #{id}