优化【空工大】:查询该设备所属分类下所有设备得附件资源

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentDetailMapper.java

@@ -45,4 +45,6 @@ public interface EquipmentDetailMapper extends BaseMapper<EquipmentDetail> {
 	List<DetailssAmountVO> getall();
 
     boolean save(EquipmentDetail equipmentDetail);
+
+	List<EquipmentDetail> queryListByCode(String code);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -124,10 +124,18 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
             manufacturerInfo.setImg(manufacturerInfo.getImg());
         }
         equipmentDetail.setManufacturerInfo(manufacturerInfo);
-        equipmentDetail.setImg(getEquipFileList(id, FileTypeEnum.image.toString()));
-        equipmentDetail.setVideo(getEquipFileList(id, FileTypeEnum.video.toString()));
-        equipmentDetail.setCertification(getEquipFileList(id, FileTypeEnum.certificate.toString()));
-        equipmentDetail.setInstruction(getEquipFileList(id, FileTypeEnum.instruction.toString()));
+
+        // TODO start 查询该设备所属分类下所有设备得附件资源【空工大】
+        List<EquipmentDetail> equipmentDetailList = equipmentDetailMapper.queryListByCode(equipmentDetail.getCode());
+        if(equipmentDetailList.size() > 0){
+            List<Long> ids = equipmentDetailList.stream().map(EquipmentDetail::getId).collect(Collectors.toList());
+            equipmentDetail.setImg(getEquipFileList(ids, FileTypeEnum.image.toString()));
+            equipmentDetail.setVideo(getEquipFileList(ids, FileTypeEnum.video.toString()));
+            equipmentDetail.setCertification(getEquipFileList(ids, FileTypeEnum.certificate.toString()));
+            equipmentDetail.setInstruction(getEquipFileList(ids, FileTypeEnum.instruction.toString()));
+        }
+        // TODO end 查询该设备所属分类下所有设备得附件资源【空工大】
+
         if (equipmentDetail.getCountry() != null) {
             equipmentDetail.setCountryName(
                     iSystemDicService.getOne(new QueryWrapper<SystemDic>().eq("id", equipmentDetail.getCountry())).getName());
@@ -135,8 +143,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         return equipmentDetail;
     }
 
-    private List<UploadFile> getEquipFileList(Long id, String type) {
-        List<UploadFile> list = iUploadFileService.list(new QueryWrapper<UploadFile>().eq("object_id", id)
+    private List<UploadFile> getEquipFileList(List<Long> ids, String type) {
+        List<UploadFile> list = iUploadFileService.list(new QueryWrapper<UploadFile>().in("object_id", ids)
                 .eq("object_type", BillContentEnum.ZB.getKey()).eq("file_type", type));
         list.forEach(item -> {
             item.setUrl(item.getUrl());

amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml

@@ -253,4 +253,8 @@
 		 or parent_id = #{id}
 		 )
 	</select>
+
+    <select id="queryListByCode" resultType="com.yeejoin.equipmanage.common.entity.EquipmentDetail">
+		select * from wl_equipment_detail wled where wled.code = #{code}
+	</select>
 </mapper>