[装备模块]添加统计详情，使用状态出库门禁不报警

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -51,6 +51,14 @@ public class DeviceLibraryController {
     @Autowired
     private DeviceLogService deviceLogService;
 
+    @ApiOperation(value = "根据装备id查询装备详情", notes = "根据装备id查询装备详情")
+    @PostMapping("/selectByIds")
+    public ResponseEntity selectByIds(@RequestBody List<Integer> ids){
+        List<DeviceLibrary> deviceLibraries = new ArrayList<>();
+        ids.forEach(integer -> deviceLibraries.add(deviceLibraryService.getOne(integer)));
+        return ResponseEntity.ok(deviceLibraries);
+    }
+
     @ApiOperation(value = "模糊查询装备分页", notes = "可以通过这个接口查询装备")
     @PostMapping("/selectDevicePage")
     public ResponseEntity selectDevicePage(@RequestBody DeviceLibrarySelectVo deviceLibrarySelectVo) {

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -139,6 +139,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
             //按型号遍历统计各种状态的装备数量
             for (String model : list) {
                 DeviceStatisticsVo deviceStatisticsVo = new DeviceStatisticsVo();
+                List<Integer> deviceIds = new ArrayList<>();
                 deviceStatisticsVo.setModel(model);
                 int num = 0;
                 int inLibraryNum = 0;
@@ -151,6 +152,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 //遍历核心装备，按照相同型号的装备生命状态统计
                 for (DeviceLibrary d2 : libraryEntities) {
                     if (d2.getModel().equals(model)) {
+                        deviceIds.add(d2.getId());
                         deviceStatisticsVo.setName(d2.getName());
                         num++;
                         switch (d2.getLifeStatus()) {
@@ -191,6 +193,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 }
                 //添加统计vo
                 if (num > 0) {
+                    deviceStatisticsVo.setDeviceIds(deviceIds);
                     deviceStatisticsVo.setDeviceNumber(num);
                     deviceStatisticsVo.setAllotNum(allotNum);
                     deviceStatisticsVo.setInLibraryNum(inLibraryNum);

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceStatisticsVo.java

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author dengdiyi
  */
@@ -43,4 +46,7 @@ public class DeviceStatisticsVo {
 
     @ApiModelProperty(value = "使用数量", example = "10")
     private Integer useNum;
+
+    @ApiModelProperty(value = "该型号所有装备Id列表")
+    private List<Integer> deviceIds = new ArrayList<>();
 }

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/AccessController.java

@@ -137,7 +137,8 @@ public class AccessController {
                         outPutCardIds.forEach(s -> deviceLibraries.addAll(deviceLibraryDao.getAllByRfidCardId(s)));
                         //获取最近1分钟报警的Id
                         List<Integer> ids = getLatestWarningDeviceIds();
-                        List<Integer> idList = deviceLibraries.stream().map(DeviceLibrary::getId).collect(Collectors.toList());
+                        //排除使用状态中的装备，映射成id
+                        List<Integer> idList = deviceLibraries.stream().filter(deviceLibrary -> deviceLibrary.getLifeStatus()!=14).map(DeviceLibrary::getId).collect(Collectors.toList());
                         ids.retainAll(idList);
                         idList.removeAll(ids);
                         if(idList.size()>0) {