Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacility.java

@@ -161,4 +161,10 @@ public class BaseBuildFacility implements Serializable {
      * 建筑设施备注
      */
     private String facilityDesc;
+
+    /**
+     * 模型链接
+     */
+    @TableField(exist = false)
+    private String modelLink;
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -291,6 +291,7 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,id);
         List<BaseBuildFacilityRelate> baseBuildFacilityList = baseBuildFacilityRelateService.list(queryWrapper);
         List<Integer> facilityIdList = new ArrayList<>();
+        List<String> facilityCodeList = new ArrayList<>();
         List<BaseBuildFacility> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(baseBuildFacilityList)) {
             for (int i = 0; i < baseBuildFacilityList.size(); i++) {
@@ -302,6 +303,25 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                     .eq(StringUtils.isNotBlank(floor),BaseBuildFacility::getFloor,floor)
                     .eq(BaseBuildFacility::getDeleteFlag,0);
             list = baseBuildFacilityService.list(queryWrapper1);
+            if (CollectionUtils.isNotEmpty(list)){
+                for (int j = 0; j < list.size(); j++) {
+                    if (!facilityCodeList.contains(list.get(j).getFacilityType())) {
+                        facilityCodeList.add(list.get(j).getFacilityType());
+                    }
+                }
+                LambdaQueryWrapper<BaseBuildFacilityType> queryWrapper2 = Wrappers.lambdaQuery();
+                queryWrapper2.in(BaseBuildFacilityType::getTypeCode,facilityCodeList);
+                List<BaseBuildFacilityType> typeList = baseBuildFacilityTypeService.list(queryWrapper2);
+                if (CollectionUtils.isNotEmpty(typeList)){
+                    for (int k = 0; k < list.size(); k++) {
+                        for (int l = 0; l < typeList.size(); l++) {
+                            if (list.get(k).getFacilityType().equals(typeList.get(l).getTypeCode())){
+                                list.get(k).setModelLink(typeList.get(l).getModelLink());
+                            }
+                        }
+                    }
+                }
+            }
         }
         return list;
     }