2023-10-24 优化初始化信标数据接口，添加通知的时候，增加入库人。

zd-api/zd-airbottle-api/src/main/java/com/zd/airbottle/api/feign/RemoteAirBottleService.java

@@ -57,6 +57,13 @@ public interface RemoteAirBottleService {
 
 
     /**
+     * 根据实验室id设置信标载入数据
+     */
+    @GetMapping(value = "/stock/setBeaconBySubId")
+    ResultData<List <Map<String,Object>>> setBeaconBySubId(@RequestParam("subId") Long subId);
+
+
+    /**
      * 根据实验室id查询信标列表
      */
     @PostMapping(value = "/alarm/record/beacon/add")

zd-api/zd-airbottle-api/src/main/java/com/zd/airbottle/api/feign/fallback/RemoteAirBottleFallbackFactory.java

@@ -54,6 +54,11 @@ public class RemoteAirBottleFallbackFactory implements FallbackFactory<RemoteAir
             }
 
             @Override
+            public ResultData <List <Map <String, Object>>> setBeaconBySubId(Long subId) {
+                return ResultData.fail("信标载入列表失败"+throwable.getMessage());
+            }
+
+            @Override
             public ResultData <Integer> beaconAdd(Map <String, String> tagMap) {
                 return ResultData.fail("蓝牙网关通知插入失败"+throwable.getMessage());
             }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStockController.java

@@ -305,14 +305,29 @@ public class DbStockController extends AbstractController {
         LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(DbStock::getSubjectId, subId);
         List<DbStock> list = dbStockService.list(queryWrapper);
+        return ResultData.success(list);
+    }
+
+
+
+    /**
+     * 通过subId载入库存列表
+     *
+     * @param subId
+     * @return
+     */
+    @ApiOperation(value = "通过subId载入库存列表", notes = "参数说明：subId 必填")
+    @GetMapping(value = "/setBeaconBySubId")
+    public ResultData setBeaconBySubId(@RequestParam("subId") Long subId) {
+        paramCheck.notNull(subId);
+        LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(DbStock::getSubjectId, subId);
+        List<DbStock> list = dbStockService.list(queryWrapper);
         redisService.setCacheObject(BaseConstants.BEACON_MATE_INFO + "~" + subId, list, 7L, TimeUnit.DAYS);
         for(DbStock stock : list){
             redisService.setCacheObject(BaseConstants.BEACON_MATE_DET + "~" + stock.getBeaconTag() + "~" + stock.getSubjectId() + "~" + stock.getGasName(), stock.getBeaconTag(), 120L, TimeUnit.SECONDS);
         }
-//        LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper();
-//        queryWrapper.eq(DbStock::getSubjectId, subId);
-//        List<DbStock> list = dbStockService.list(queryWrapper);
-        return ResultData.success(new ArrayList<>());
+        return ResultData.success(list);
     }
 
 

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

@@ -468,7 +468,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         warningNoticeLogDto.setWarningContent("气瓶违规带离");
         warningNoticeLogDto.setWarningTime(LocalDateTime.now());
         warningNoticeLogDto.setWarningWay(illegalRemoval);
-//        warningNoticeLogDto.setHolder(storageRVo.getOwner());
+        warningNoticeLogDto.setHolder(dbStock.getCreateName());
 //        warningNoticeLogDto.setDeposit(storageRVo.getLocation());
         warningNoticeLogDto.setMargin(new BigDecimal(dbStock.getGasPressure()));
         warningNoticeLogDto.setSpecification(dbStock.getSize()+"");

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/service/impl/BeaconMateImpl.java

@@ -61,7 +61,7 @@ public class BeaconMateImpl implements BeaconMate {
                 List <Map<String,Object>> beaconList = redisService.getCacheObject(BaseConstants.BEACON_MATE_INFO+"~"+subId);
                 if(beaconList==null || initFlag){
                     //todo 根据实验室id获取蓝牙信标列表
-                    remoteAirBottleService.findBySubId(subId);
+                    remoteAirBottleService.setBeaconBySubId(subId);
 //                    ResultData<List <Map<String,Object>>> beaconData = remoteAirBottleService.findBySubId(subId);
 //                    log.info("2.1=====================================》如果信标列表为空，查询信标列表：");
 //                    if(beaconData.getCode()==200){