Merge commit '54b0945297be935e13f6da7109729cdbfe8e5905' into suda

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/AlarmRecordController.java

@@ -78,7 +78,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
         List<AlarmRecordVo> recordVos = TransferUtils.transferList(list, AlarmRecordVo.class);
         if (!recordVos.isEmpty()) {
             alarmRecordService.getRecordInfo(recordVos);
-            recordVos.forEach(r -> r.setCurrentPressureValue(r.getCurrentPressure().toPlainString() + "MPa"));
+            recordVos.forEach(r -> r.setCurrentPressureValue(r.getCurrentPressure()==null?"":r.getCurrentPressure()+"MPa"));
         }
 
         util.exportExcel(response, recordVos, "报警记录数据");

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -10,10 +10,7 @@ import com.zd.algorithm.api.alarm.entity.SendTypes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
 import com.zd.algorithm.api.forward.feign.RemoteForwardService;
 import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
-import com.zd.bottle.domain.AlarmRecord;
-import com.zd.bottle.domain.BottleStorage;
-import com.zd.bottle.domain.RfidTag;
-import com.zd.bottle.domain.UsegasApply;
+import com.zd.bottle.domain.*;
 import com.zd.bottle.mapper.AlarmRecordMapper;
 import com.zd.bottle.properties.AlarmProperties;
 import com.zd.bottle.service.AlarmRecordService;
@@ -121,6 +118,15 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
         String endTime = alarmRecord.getEndTime();
         queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(alarm_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')")
                 .apply(StringUtils.hasLength(startTime), "DATE_FORMAT(alarm_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
+        String searchValue = alarmRecord.getSearchValue();
+        if (StringUtils.hasLength(searchValue)) {
+            queryWrapper.like(AlarmRecord::getElectronicTag, searchValue);
+        }
+
+        List<Long> ids = alarmRecord.getIds();
+        if (ids != null && !ids.isEmpty()) {
+            queryWrapper.in(AlarmRecord::getId, ids);
+        }
         return list(queryWrapper);
     }