1

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -60,6 +60,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     ICameraWifiPrefixService cameraWifiPrefixService;
     @Autowired
     ICameraTypeService cameraTypeService;
+    @Autowired
+    IFeedbackOptionService feedbackOptionService;
 
     @Override
     public List<Camera> getListByCameraIdList(List<Long> cameraIdList) {
@@ -106,9 +108,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         for (CameraType cameraType : list) {
             typeHashMap.put(cameraType.getCameraType().toString(),cameraType);
         }
+        List<Integer> fIds = voPage.getRecords().stream().map(CameraDetailVo::getFeedbackOptionId).collect(Collectors.toList());
+        HashMap<Integer, FeedbackOption> mapByIds = feedbackOptionService.getMapByIds(new HashSet<>(fIds));
         for (CameraDetailVo record : voPage.getRecords()) {
             record.setTypeStr(typeHashMap.get(record.getType()).getName());
-            record.setFeedbackOptionName("");
+            FeedbackOption feedbackOption = mapByIds.get(record.getFeedbackOptionId());
+            if(feedbackOption != null){
+                record.setFeedbackOptionName(feedbackOption.getNameCn());
+            }
         }
         return PageInfo.PageInfo(voPage);
     }