球幕视频修复 开关更新

4dkankan-common/src/main/java/com/fdkankan/common/vo/response/ResponseScene.java

@@ -100,7 +100,7 @@ public class ResponseScene implements Serializable {
     private String num;
 
     @ApiModelProperty(value = "1表示推荐，0表示正常", name = "recommend")
-    private int recommend;
+    private Integer recommend;
 
     @ApiModelProperty(value = "表示缩略图是否存在", name = "thumbStatus")
     private int thumbStatus;

4dkankan-modeling/src/main/resources/application-uat.properties

@@ -4,7 +4,7 @@ spring.application.name=4dkankan-model
 spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
 
 #DB (new)
-spring.datasource.primary.url=jdbc:mysql://10.71.184.146:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.url=jdbc:mysql://10.71.6.50:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.primary.username=user_4dkankan_rw
 spring.datasource.primary.password=y2b9a42wRwGNKkJjCm1o
 spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
@@ -14,7 +14,7 @@ spring.servlet.multipart.max-request-size=1000MB
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.location=/mnt/data/
 #redis
-spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
+spring.redis.cluster.nodes=10.71.6.71:7000,10.71.6.72:7000,10.71.6.73:7000,10.71.6.70:7000,10.71.6.68:7000,10.71.6.69:7000
 spring.redis.database=0
 spring.redis.password=QBzhHTxfcYLTs0n5J5VQ
 spring.redis.timeout=3000ms
@@ -43,7 +43,7 @@ swagger.version=2.0
 #rabbitmq
 #spring.rabbitmq.host=8.135.98.231
 #spring.rabbitmq.port=30672
-spring.rabbitmq.address=10.71.5.163:5379,10.71.5.164:5379
+spring.rabbitmq.address=10.71.5.163:5379
 spring.rabbitmq.username=admin
 spring.rabbitmq.password=fcb@admin_4dage
 spring.rabbitmq.virtual-host=/
@@ -93,5 +93,8 @@ knife4j.basic.username=apiadmin
 knife4j.basic.password=fdkankancui
 
 
+kankan.ffmpeg.env=10.71.5.217
+
+
 
 

4dkankan-modeling/src/main/resources/application.properties

@@ -2,7 +2,7 @@ server.port=8078
 server.servlet.context-path=/4dkankan_v2
 server.file.location=/mnt/4Dkankan/
 
-spring.profiles.active=dev
+spring.profiles.active=uat
 
 
 spring.mvc.async.request-timeout=1800000

4dkankan-scene/src/main/java/com/fdkankan/scene/mapper/ISceneProMapper.java

@@ -35,7 +35,7 @@ public interface ISceneProMapper extends IBaseMapper<SceneProEntity, String> {
     @Update(" UPDATE t_scene_pro SET user_id = #{userId} WHERE camera_id = #{cameraId} ")
     void updateUserIdByCameraId(@Param("userId") String userId, @Param("cameraId") String cameraId);
 
-    @Update("UPDATE t_scene_pro SET create_time = NOW(),status=-2,  videos = #{videos}, compute_time = #{computeTime} WHERE num = #{sceneNum}")
+    @Update("UPDATE t_scene_pro SET create_time = NOW(),status=2,  videos = #{videos}, compute_time = #{computeTime} WHERE num = #{sceneNum}")
     int updateTime2(@Param("sceneNum") String sceneNum, @Param("videos") String videos, @Param("computeTime") long computeTime);
 
     @Select(" SELECT * FROM t_scene_pro WHERE data_source LIKE CONCAT('%',#{fileId},'%') AND is_delete = '0' order by create_time desc LIMIT 1 ")

4dkankan-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -3917,7 +3917,6 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
             }
         }
         vo.put("show", operaVideoDTO.getShow());
-        log.info("vo222 " + vo);
         scenejson.put("videos", vo.toString());
         return vo.toString();
     }
@@ -3941,6 +3940,29 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
 
         ((JSONObject)jsonObj).put("show", operaVideoDTO.getShow());
         vo.put("data", data);
+
+        boolean ischeck = false;
+        JSONArray array = new JSONArray();
+        array = (JSONArray) vo.get("data");
+        log.info("array  " + array);
+        if(array.size()>0){
+            for(int i = 0; i < array.size(); i++) {
+                JSONObject obj = (JSONObject) array.get(i);
+
+                Boolean bool = (Boolean) obj.get("show");
+                log.info("bool"  + bool);
+
+                if(bool!=null){
+                    if(bool){
+                        ischeck = true;
+                    }
+                }else{
+                    ischeck = true;
+                }
+            }
+        }
+        vo.put("show",ischeck);
+
         scenejson.put("videos", vo.toString());
 
         return vo.toString();