1

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

@@ -546,7 +546,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     if (vo.getStatus().equals(500)) {      //500状态为数据库中手动修改值，当场景本身异常，算法，算不了
                         vo.setStatus(-1);
                     }
-                    if (vo.getStatus().equals(-1)) {       //计算失败，钉钉通知之后，判定是否重算，还是修改为 500
+                    if (vo.getSceneSource() != null && vo.getSceneSource() != 57 && vo.getStatus().equals(-1)) {       //计算失败，钉钉通知之后，判定是否重算，还是修改为 500
                         vo.setStatus(0);
                     }
                 }).collect(Collectors.toList());

src/main/java/com/fdkankan/ucenter/vo/response/SceneVo.java

@@ -53,6 +53,7 @@ public class SceneVo {
     private String roamingPointUrl;
     private String updateTime;
     private Integer removePortrait;
+    private Integer sceneSource;
 
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);

src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -25,7 +25,7 @@
         <include refid="HasFolder"></include>
         SELECT * FROM (
         SELECT  p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
-        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type, null as removePortrait
+        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type, null as removePortrait,p.scene_source
         FROM t_scene_pro p
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'
@@ -40,7 +40,7 @@
         </if>
         UNION ALL
         SELECT  p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,e.algorithm_time as createTime ,num,title as scene_name,description as scene_dec,
-        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,p.remove_portrait as removePortrait
+        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,p.remove_portrait as removePortrait,p.scene_source
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="sceneJoinCamera"></include>
@@ -69,7 +69,7 @@
             SELECT id,name,1 as isFolder,type,parent_id as parentId,create_time,null as num,null as scene_name,null as
             scene_dec,
             null as status,null as pay_status,null as thumb,null as web_site,null as is_upgrade,null as sn_code,null as
-            view_count, null build_type,null as removePortrait
+            view_count, null build_type,null as removePortrait,null as scene_source
             FROM t_folder WHERE rec_status = 'A' and user_id =#{param.userId}
             <if test="param.folderType!=null and param.folderType == 0">
                 and (type = #{param.folderType} or type = 3)