|
@@ -184,37 +184,23 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
|
|
|
List<BaseAlarm> list = new ArrayList<>();
|
|
|
|
|
|
LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(baseAlarmListVO.getDeviceId()),BaseAlarm::getDeviceId,baseAlarmListVO.getDeviceId())
|
|
|
+ .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
|
|
|
+ .in(CollectionUtils.isNotEmpty(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,
|
|
|
+ baseAlarmListVO.getAlarmType())
|
|
|
+ .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
|
|
|
+ .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
|
|
|
+ .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId());
|
|
|
if (StringUtils.isNotBlank(baseAlarmListVO.getTypeCode())){
|
|
|
if (baseAlarmListVO.getTypeCode().equals("1")){
|
|
|
- queryWrapper.eq(StringUtils.isNotBlank(baseAlarmListVO.getDeviceId()),BaseAlarm::getDeviceId,baseAlarmListVO.getDeviceId())
|
|
|
- .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
|
|
|
- .in(CollectionUtils.isNotEmpty(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,
|
|
|
- baseAlarmListVO.getAlarmType())
|
|
|
- .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
|
|
|
- .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
|
|
|
- .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
|
|
|
- .eq(BaseAlarm::getAlarmGrade,1)
|
|
|
+ queryWrapper.eq(BaseAlarm::getAlarmGrade,1)
|
|
|
.orderByDesc(BaseAlarm::getId);
|
|
|
}else if (baseAlarmListVO.getTypeCode().equals("2")){
|
|
|
- queryWrapper.eq(StringUtils.isNotBlank(baseAlarmListVO.getDeviceId()),BaseAlarm::getDeviceId,baseAlarmListVO.getDeviceId())
|
|
|
- .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
|
|
|
- .in(CollectionUtils.isNotEmpty(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,
|
|
|
- baseAlarmListVO.getAlarmType())
|
|
|
- .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
|
|
|
- .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
|
|
|
- .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
|
|
|
- .ne(BaseAlarm::getAlarmGrade,1)
|
|
|
+ queryWrapper.ne(BaseAlarm::getAlarmGrade,1)
|
|
|
.orderByDesc(BaseAlarm::getId);
|
|
|
}
|
|
|
}else {
|
|
|
- queryWrapper.eq(StringUtils.isNotBlank(baseAlarmListVO.getDeviceId()),BaseAlarm::getDeviceId,baseAlarmListVO.getDeviceId())
|
|
|
- .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
|
|
|
- .in(CollectionUtils.isNotEmpty(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,
|
|
|
- baseAlarmListVO.getAlarmType())
|
|
|
- .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
|
|
|
- .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
|
|
|
- .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
|
|
|
- .orderByDesc(BaseAlarm::getId);
|
|
|
+ queryWrapper.orderByDesc(BaseAlarm::getId);
|
|
|
}
|
|
|
List<BaseAlarm> records = this.list(queryWrapper);
|
|
|
if(records.size()>0){
|
|
@@ -718,16 +704,19 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
|
|
|
queryWrapper.select("COUNT(alarm_grade=1 or null) as alarmCount","COUNT(alarm_grade!=1 or" +
|
|
|
" null) as hiddenCount","COUNT(alarm_grade=1 and handle_status=1 or null) as ahAlarmCount","COUNT" +
|
|
|
"(alarm_grade!=1 and handle_status=1 or null) as ahHiddenCount")
|
|
|
- .between("alarm_time",startOfDay,now);
|
|
|
+ .between("alarm_time",startOfDay,now)
|
|
|
+ .eq("tenant_id",SecurityUtils.getTenantId());
|
|
|
List<Map<String,Object>> alarmStatisticList = this.listMaps(queryWrapper);
|
|
|
QueryWrapper<BaseAlarm> queryWrapper1 = Wrappers.query();
|
|
|
queryWrapper1.select("COUNT(alarm_grade=1 or null) as alarmCount","COUNT(alarm_grade=1 and handle_status=1 or null) as ahAlarmCount")
|
|
|
- .between("alarm_time",startOfYear,now);
|
|
|
+ .between("alarm_time",startOfYear,now)
|
|
|
+ .eq("tenant_id",SecurityUtils.getTenantId());
|
|
|
List<Map<String,Object>> alarmStatisticList1 = this.listMaps(queryWrapper1);
|
|
|
QueryWrapper<BaseAlarm> queryWrapper2 = Wrappers.query();
|
|
|
queryWrapper2.select("COUNT(alarm_grade=1 and handle_status=0 or null) as alarmCount","COUNT(alarm_grade=1 " +
|
|
|
"and alarm_type='111' or null) as fireAlarmCount","COUNT(alarm_grade!=1 and handle_status=0 or null) " +
|
|
|
- "as hiddenCount");
|
|
|
+ "as hiddenCount")
|
|
|
+ .eq("tenant_id",SecurityUtils.getTenantId());
|
|
|
List<Map<String,Object>> alarmStatisticList2 = this.listMaps(queryWrapper2);
|
|
|
BigDecimal ahAlarmCountBig = new BigDecimal(Integer.valueOf(alarmStatisticList.get(0).get("ahAlarmCount").toString()));
|
|
|
BigDecimal temp = new BigDecimal(Integer.valueOf(alarmStatisticList.get(0).get("alarmCount").toString()));
|