yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

闸门监控相关问题#595

master
李一帆 2025-04-09 18:53:26 +08:00
parent 8b61d18427
commit 0bca8090b1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java
View File

@ -115,16 +115,16 @@ public class ReservoirWaterController {
AttResMonitorVo attResMonitorVo = new AttResMonitorVo(); AttResMonitorVo attResMonitorVo = new AttResMonitorVo();
LambdaQueryWrapper<StRsvrR> qw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StRsvrR> qw = new LambdaQueryWrapper<>();
qw.eq(StRsvrR::getStcd,"61610700").orderByDesc(StRsvrR::getTm).last(" limit 1"); qw.eq(StRsvrR::getStcd,dataQueryCommonSo.getStcd()).orderByDesc(StRsvrR::getTm).last(" limit 1");
List<StRsvrR> list1 = stRsvrRService.list(qw); List<StRsvrR> list1 = stRsvrRService.list(qw);
if(CollectionUtils.isNotEmpty(list1)){ if(CollectionUtils.isNotEmpty(list1)){
attResMonitorVo.setRz(new BigDecimal(list1.get(0).getRz())); attResMonitorVo.setRz(new BigDecimal(list1.get(0).getRz()));
attResMonitorVo.setTm(list1.get(0).getTm()); attResMonitorVo.setTm(list1.get(0).getTm());
} }
LambdaQueryWrapper<StPptnR> qw2= new LambdaQueryWrapper<>(); LambdaQueryWrapper<StPptnR> qw2= new LambdaQueryWrapper<>();
qw2.eq(StPptnR::getStcd,"61610700").gt(StPptnR::getDyp,"0").orderByDesc(StPptnR::getTm).last(" limit 1"); qw2.eq(StPptnR::getStcd,dataQueryCommonSo.getStcd()).gt(StPptnR::getDyp,"0").orderByDesc(StPptnR::getTm).last(" limit 1");
List<StPptnR> list3 = stPptnRService.list(qw2); List<StPptnR> list3 = stPptnRService.list(qw2);
if(Objects.nonNull(list3)){ if(CollectionUtils.isNotEmpty(list3)){
attResMonitorVo.setTodayRainNum(new BigDecimal(list3.get(0).getDyp())); attResMonitorVo.setTodayRainNum(new BigDecimal(list3.get(0).getDyp()));
attResMonitorVo.setTodayRainNumTm(list3.get(0).getTm()); attResMonitorVo.setTodayRainNumTm(list3.get(0).getTm());
} }

2
src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java
View File

@ -26,7 +26,7 @@ public interface GateValveRealMapper extends BaseMapper<GateValveReal> {
SELECT t.valve_code,t.valve_name,t.manual_operation,case when s.status = '100%' then '全开' when s.status = '0%' then '关' else s.status end as status,s.tm SELECT t.valve_code,t.valve_name,t.manual_operation,case when s.status = '100%' then '全开' when s.status = '0%' then '关' else s.status end as status,s.tm
FROM public.att_gate_valve t FROM public.att_gate_valve t
LEFT JOIN public.gate_valve_real s ON t.valve_code = s.valve_code LEFT JOIN public.gate_valve_real s ON t.valve_code = s.valve_code
order by s.tm desc nulls last order by t._order asc nulls last
</script> </script>
""") """)
List<GateStautsVo> gateStatusList(); List<GateStautsVo> gateStatusList();