Merge branch 'hhk' into main

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java

@@ -159,60 +159,65 @@ public class RecipeDeviceRecordController {
             @RequestParam("id") Long recipeId) {
 
 
-        RecipePlanDetailDO recipePlanDetailDO = recipePlanDetailService.getRecipePlanDetail(recipeId);
-        //RecipeRespVO recipeRespVO = recipeService.getRecipeWithDeviceId(recipePlanDetailDO.getRecipeId());
+        try {
+            RecipePlanDetailDO recipePlanDetailDO = recipePlanDetailService.getRecipePlanDetail(recipeId);
+            //RecipeRespVO recipeRespVO = recipeService.getRecipeWithDeviceId(recipePlanDetailDO.getRecipeId());
 
-        //RecipeDO recipeDO = recipeService.getRecipe(recipePlanDetailDO.getRecipeId());
-        // ========== 第一步：查询配方关联的点位属性信息 ==========
-        // 1.1 根据recipeId查询iot_recipe_device_attribute表记录
+            //RecipeDO recipeDO = recipeService.getRecipe(recipePlanDetailDO.getRecipeId());
+            // ========== 第一步：查询配方关联的点位属性信息 ==========
+            // 1.1 根据recipeId查询iot_recipe_device_attribute表记录
 
-        recipePlanDetailDO.setRecipeId(recipeId);
-        List<RecipeDeviceAttributeDO> attributeList = recipeDeviceAttributeService.getByRecipeId(recipePlanDetailDO.getRecipeId());
+            recipePlanDetailDO.setRecipeId(recipeId);
+            List<RecipeDeviceAttributeDO> attributeList = recipeDeviceAttributeService.getByRecipeId(recipePlanDetailDO.getRecipeId());
 
-        //先删除在添加
-        List<RecipeDeviceRecordDO> recipeDeviceRecordDOS = recipeDeviceRecordService.getListByRecipeId(recipeId);
-        if (!recipeDeviceRecordDOS.isEmpty()){
-            recipeDeviceRecordService.deleteByIds(recipeDeviceRecordDOS);
-        }
-        RecipeDO recipe = recipeService.getRecipe(recipeId);
-        if (recipe == null){
-            throw exception(RECIPE_NOT_EXISTS);
-        }
+            //先删除在添加
+            List<RecipeDeviceRecordDO> recipeDeviceRecordDOS = recipeDeviceRecordService.getListByRecipeId(recipeId);
+            if (!recipeDeviceRecordDOS.isEmpty()){
+                recipeDeviceRecordService.deleteByIds(recipeDeviceRecordDOS);
+            }
+            RecipeDO recipe = recipeService.getRecipe(recipeId);
+            if (recipe == null){
+                throw exception(RECIPE_NOT_EXISTS);
+            }
 
-        DeviceRespVO device = deviceService.getDevice(recipe.getMachineId());
-        if (device== null ){
-            throw exception(DEVICE_NOT_EXISTS);
-        }
+            DeviceRespVO device = deviceService.getDevice(recipe.getMachineId());
+            if (device== null ){
+                throw exception(DEVICE_NOT_EXISTS);
+            }
 
-        Map<Long, DeviceContactModelDO> deviceContactModelMap = new HashMap<>();
-        List<DeviceContactModelDO>  deviceContactModelDOS = deviceContactModelService.selectListByDeviceId(device.getId());
-       if (!deviceContactModelDOS.isEmpty()){
-           deviceContactModelMap = deviceContactModelDOS.stream()
-                   .collect(Collectors.toMap(
-                           DeviceContactModelDO::getId,
-                           Function.identity()
-                   ));
-       }
-
-        OpcUtils.connect(device.getUrl(),device.getUsername(),device.getPassword(),10);
-
-        for (RecipeDeviceAttributeDO attributeDO : attributeList) {
-            DeviceContactModelDO deviceContactModelDO = deviceContactModelMap.get(attributeDO.getAttributeId());
-            if (deviceContactModelDO == null){
-                continue;
+            Map<Long, DeviceContactModelDO> deviceContactModelMap = new HashMap<>();
+            List<DeviceContactModelDO>  deviceContactModelDOS = deviceContactModelService.selectListByDeviceId(device.getId());
+            if (!deviceContactModelDOS.isEmpty()){
+                deviceContactModelMap = deviceContactModelDOS.stream()
+                        .collect(Collectors.toMap(
+                                DeviceContactModelDO::getId,
+                                Function.identity()
+                        ));
             }
-            // 创建
-            RecipeDeviceRecordDO recipeDeviceRecordDO = new RecipeDeviceRecordDO();
-            recipeDeviceRecordDO.setRecipeId(recipeId);
-            recipeDeviceRecordDO.setAttributeCode(deviceContactModelDO.getAttributeName());
-            recipeDeviceRecordDO.setDataType(deviceContactModelDO.getDataType());
-            recipeDeviceRecordDO.setDataUnit(deviceContactModelDO.getDataUnit());
-            recipeDeviceRecordDO.setValue((String) OpcUtils.readValue(deviceContactModelDO.getAddress()));
 
-            recipeDeviceRecordService.createRecipeDeviceRecord(BeanUtils.toBean(recipeDeviceRecordDO, RecipeDeviceRecordSaveReqVO.class));
+            OpcUtils.connect(device.getUrl(),device.getUsername(),device.getPassword(),10);
+
+            for (RecipeDeviceAttributeDO attributeDO : attributeList) {
+                DeviceContactModelDO deviceContactModelDO = deviceContactModelMap.get(attributeDO.getAttributeId());
+                if (deviceContactModelDO == null){
+                    continue;
+                }
+                // 创建
+                RecipeDeviceRecordDO recipeDeviceRecordDO = new RecipeDeviceRecordDO();
+                recipeDeviceRecordDO.setRecipeId(recipeId);
+                recipeDeviceRecordDO.setAttributeCode(deviceContactModelDO.getAttributeName());
+                recipeDeviceRecordDO.setDataType(deviceContactModelDO.getDataType());
+                recipeDeviceRecordDO.setDataUnit(deviceContactModelDO.getDataUnit());
+                recipeDeviceRecordDO.setValue((String) OpcUtils.readValue(deviceContactModelDO.getAddress()));
+
+                recipeDeviceRecordService.createRecipeDeviceRecord(BeanUtils.toBean(recipeDeviceRecordDO, RecipeDeviceRecordSaveReqVO.class));
 
+            }
+        } finally {
+            OpcUtils.disconnect();
         }
 
+
         return success(true);
     }