|
|
@@ -93,7 +93,7 @@ public class BasicGraphicStatisticsConteoller {
|
|
93
|
93
|
public Map<String, BasicGraphicStatistics> GiveProportionBasicDeviceControlHeat(){
|
|
94
|
94
|
Map<String,BasicGraphicStatistics> map = new HashMap<>();
|
|
95
|
95
|
LambdaQueryWrapper<BasicDeviceControlHeat> heatwrapper = new LambdaQueryWrapper<>();
|
|
96
|
|
- heatwrapper.notBetween(BasicDeviceControlHeat::getEquipmentStatus,0,null);
|
|
|
96
|
+ heatwrapper.eq(BasicDeviceControlHeat::getEquipmentStatus,0);
|
|
97
|
97
|
BasicGraphicStatistics basicGraphicStatistics=new BasicGraphicStatistics();
|
|
98
|
98
|
BasicGraphicStatistics basicelse=new BasicGraphicStatistics();
|
|
99
|
99
|
BasicGraphicStatistics basicDeviceControlIllumination=new BasicGraphicStatistics();
|
|
|
@@ -102,19 +102,19 @@ public class BasicGraphicStatisticsConteoller {
|
|
102
|
102
|
basicGraphicStatistics.setType("控温设备");
|
|
103
|
103
|
basicGraphicStatistics.setCount(basicDeviceControlHeatcount);
|
|
104
|
104
|
LambdaQueryWrapper<BasicDeviceControlElse> elsewrapper = new LambdaQueryWrapper<>();
|
|
105
|
|
- elsewrapper.notBetween(BasicDeviceControlElse::getEquipmentStatus,0,null);
|
|
|
105
|
+ elsewrapper.eq(BasicDeviceControlElse::getEquipmentStatus,0);
|
|
106
|
106
|
int basicDeviceControlElsecount=basicDeviceControlElseService.count(elsewrapper);//其他
|
|
107
|
107
|
basicelse.setType("其他设备");
|
|
108
|
108
|
basicelse.setCount(basicDeviceControlElsecount);
|
|
109
|
109
|
|
|
110
|
110
|
LambdaQueryWrapper<BasicDeviceControlIllumination> illuminationwrapper = new LambdaQueryWrapper<>();
|
|
111
|
|
- illuminationwrapper.notBetween(BasicDeviceControlIllumination::getEquipmentStatus,0,null);
|
|
|
111
|
+ illuminationwrapper.eq(BasicDeviceControlIllumination::getEquipmentStatus,0);
|
|
112
|
112
|
int basicDeviceControlIlluminationcount=basicDeviceControlIlluminationService.count(illuminationwrapper);//照明
|
|
113
|
113
|
basicDeviceControlIllumination.setType("照明设备");
|
|
114
|
114
|
basicDeviceControlIllumination.setCount(basicDeviceControlIlluminationcount);
|
|
115
|
115
|
|
|
116
|
116
|
LambdaQueryWrapper<BasicDeviceControlVentilate> ventilatewrapper = new LambdaQueryWrapper<>();
|
|
117
|
|
- ventilatewrapper.notBetween(BasicDeviceControlVentilate::getEquipmentStatus,0,null);
|
|
|
117
|
+ ventilatewrapper.eq(BasicDeviceControlVentilate::getEquipmentStatus,0);
|
|
118
|
118
|
int basicDeviceControlVentilatecount=basicDeviceControlVentilateService.count(ventilatewrapper);//通风
|
|
119
|
119
|
basicDeviceControlVentilate.setType("通风设备");
|
|
120
|
120
|
basicDeviceControlVentilate.setCount(basicDeviceControlVentilatecount);
|
