1

src/main/java/com/fdkankan/manage/entity/Scene.java

@@ -271,5 +271,6 @@ public class Scene implements Serializable {
     @TableField("screencap_thumb")
     private String screencapThumb;
 
-
+    @TableField("feedback_option_id")
+    private Integer feedbackOptionId;
 }

src/main/java/com/fdkankan/manage/mq/common/MqQueueUtil.java

@@ -12,5 +12,6 @@ public class MqQueueUtil {
     public static String laserMoveWenBaoQueue = "relics-migrate-scene-queue";
     public static String laserMoveWenBaoQueue2 = "pano-migrate-scene-queue";
     public static String RECOVER_SCENE = "recover-scene";
+    public static String PANO_RECOVER_SCENE = "pano-recover-scene";
     public static String laserDeleteScene = "laser-delete-scene";
 }

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

@@ -993,6 +993,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public void reDelScene(List<String> numList) {
 
         List<String> laserNumList = new ArrayList<>();
+        List<String> qjkkNumList = new ArrayList<>();
         List<ScenePro> sceneProList = this.getBaseMapper().selectDelPro(numList);
         if(!sceneProList.isEmpty()){
             List<Long> proIds = sceneProList.stream().map(ScenePro::getId).collect(Collectors.toList());
@@ -1003,6 +1004,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(!lNumList.isEmpty()){
                 laserNumList.addAll(lNumList);
             }
+            List<String> lNumList2 = sceneProList.stream().filter(e -> CameraUtils.isQjkk(e.getSceneSource())).map(ScenePro::getNum).collect(Collectors.toList());
+            if(!lNumList2.isEmpty()){
+                qjkkNumList.addAll(lNumList);
+            }
         }
 
         List<ScenePlus> scenePlusList = scenePlusMapper.selectDelPro(numList);
@@ -1015,6 +1020,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(!lNumList.isEmpty()){
                 laserNumList.addAll(lNumList);
             }
+
+            List<String> lNumList2 = scenePlusList.stream().filter(e -> CameraUtils.isQjkk(e.getSceneSource())).map(ScenePlus::getNum).collect(Collectors.toList());
+            if(!lNumList2.isEmpty()){
+                qjkkNumList.addAll(lNumList);
+            }
         }
 
         if(!laserNumList.isEmpty()){
@@ -1022,6 +1032,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             map.put("numList",laserNumList);
             rabbitMqProducer.sendByWorkQueue(MqQueueUtil.RECOVER_SCENE,map);
         }
+        if(!qjkkNumList.isEmpty()){
+            HashMap<String,Object> map = new HashMap<>();
+            map.put("numList",qjkkNumList);
+            rabbitMqProducer.sendByWorkQueue(MqQueueUtil.PANO_RECOVER_SCENE,map);
+        }
 
     }
 

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

@@ -5,18 +5,23 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.entity.FeedbackOption;
 import com.fdkankan.manage.entity.Scene;
 import com.fdkankan.manage.mapper.ISceneMapper;
+import com.fdkankan.manage.service.IFeedbackOptionService;
 import com.fdkankan.manage.service.ISceneService;
 import com.fdkankan.manage.util.SceneStatusUtil;
 import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.response.GroupByCount;
 import com.fdkankan.manage.vo.response.SceneVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -29,7 +34,8 @@ import java.util.List;
 @Service
 public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implements ISceneService {
 
-
+    @Autowired
+    IFeedbackOptionService feedbackOptionService;
     @Override
     public void unbindCamera(Long cameraId) {
         LambdaUpdateWrapper<Scene> wrapper = new LambdaUpdateWrapper<>();
@@ -57,11 +63,21 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     @Override
     public PageInfo pageList(SceneParam param) {
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
+        List<Integer> feedbackOptionIds = page.getRecords().stream().map(SceneVo::getFeedbackOptionId).collect(Collectors.toList());
+        HashMap<Integer, FeedbackOption> mapByIds = feedbackOptionService.getMapByIds(new HashSet<>(feedbackOptionIds));
+
         for (SceneVo record : page.getRecords()) {
             record.setStatusString(SceneStatusUtil.getStatusString(record));
             if(StringUtils.isNotBlank(record.getCopyTime())){
                 record.setIsCopy(true);
             }
+
+            FeedbackOption feedbackOption = mapByIds.get(record.getFeedbackOptionId());
+            if(feedbackOption != null){
+                record.setFeedbackOptionName(feedbackOption.getNameCn());
+            }else {
+                record.setFeedbackOptionId(null);
+            }
         }
         return PageInfo.PageInfo(page);
     }

src/main/java/com/fdkankan/manage/util/CameraUtils.java

@@ -64,4 +64,8 @@ public class CameraUtils {
         }
         return laserCameraTypeList.contains(cameraType);
     }
+
+    public static boolean isQjkk(Integer sceneSource) {
+        return sceneSource == 6;
+    }
 }

src/main/resources/mapper/manage/SceneMapper.xml

@@ -20,7 +20,7 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SceneVo">
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize,cl.old_num,cl.create_time ,u.user_name,s.view_count,s.status,s.pay_status,
-               s.web_site , s.thumb ,cl.create_time  as copy_time
+               s.web_site , s.thumb ,cl.create_time  as copy_time,s.feedback_option_id
         from t_scene s
         left join t_scene_copy_log cl on s.num = cl.new_num
         left join t_user u on s.user_id = u.id