新增根据场景码列表，获取视频点位数量

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

@@ -1,12 +1,12 @@
 #应用名
 spring.application.name=4dkankan-scene
 #注册中心
-spring.cloud.nacos.discovery.server-addr=192.168.0.98:8848
+spring.cloud.nacos.discovery.server-addr=10.71.114.232:8848
 
 #DB (new)
-spring.datasource.primary.url=jdbc:mysql://localhost:3306/4dkankan_hd?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.primary.username=root
-spring.datasource.primary.password=123456
+spring.datasource.primary.url=jdbc:mysql://10.71.114.237:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=user_4dhouse_rw
+spring.datasource.primary.password=kaKjbpZi1plmViyDVWhD!a
 spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
 
 spring.servlet.multipart.max-file-size=500MB
@@ -14,9 +14,9 @@ spring.servlet.multipart.max-request-size=1000MB
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.location=/mnt/data/
 #redis
-spring.redis.cluster.nodes=10.1.152.54:6379
+spring.redis.cluster.nodes=10.71.114.132:7000,10.71.114.132:7001,10.71.114.132:7002,10.71.114.132:7003,10.71.114.132:7004,10.71.114.132:7005
 spring.redis.database=0
-spring.redis.password=
+spring.redis.password=BN5Q40JsPHIGfUg5HTkU
 spring.redis.timeout=3000ms
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
@@ -42,9 +42,9 @@ swagger.version=2.0
 #rabbitmq
 #spring.rabbitmq.host=8.135.98.231
 #spring.rabbitmq.port=30672
-spring.rabbitmq.address=8.135.98.231:30672
-spring.rabbitmq.username=root
-spring.rabbitmq.password=root
+spring.rabbitmq.address=10.71.114.232:5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=fcb@admin_4dage
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 #confirm模式
@@ -58,18 +58,18 @@ spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/, classpath:/static/, classpath:/web/, file:${server.file.location}
 
 oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=oss-xiaoan
+oss.key=LTAI4FyDDFpGGjTJZEQH4yaK
+oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
+oss.bucket=fcb-vrkanfang-uat
 oss.type=oss
 
-main.url=https://test.4dkankan.com/
-main.intranet.url=https://test.4dkankan.com/
+main.url=https://vr-mc01-sit.fcb.com.cn/
+main.intranet.url=https://vr-web01-sit.fcb.com.cn/
 scene.url=show.html?m=
 scene.pro.url=showProMobile.html?m=
 scene.pro.new.url=smobile.html?m=
 
-prefix.ali=https://4dkk.4dage.com/
+prefix.ali=https://vr-oss-sit.fcb.com.cn/
 
 #服务器环境，dev为测试环境，formal为正式环境
 environment=dev
@@ -77,11 +77,11 @@ environment=dev
 #mq的任务key
 rabbitmq.queue=QUEUE_MODELING_A
 #mq当排队任务超过这个数量时启用弹性升缩
-mq.base.num=300
+mq.base.num=0
 #弹性伸缩组id
-scaling.group.id=asg-wz92989gdhgek3ktdlsw
+scaling.group.id=asg-wz967ypf42es9lepiixd
 #弹性伸缩规则id
-scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
+scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz9gh8890jbrtn27013k
 
 #服务器类型，aliyun或hqyun
 ecs.type=aliyun
@@ -90,6 +90,11 @@ knife4j.basic.enable=true
 knife4j.basic.username=apiadmin
 knife4j.basic.password=fdkankancui
 
+#log
+logging.path=/4Dkankan/logs/
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug
+
 
 
 

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

@@ -90,6 +90,9 @@ knife4j.basic.enable=true
 knife4j.basic.username=apiadmin
 knife4j.basic.password=fdkankancui
 
-
+#log
+logging.path=/4Dkankan/logs/
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug
 
 

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

@@ -90,6 +90,10 @@ knife4j.basic.enable=true
 knife4j.basic.username=apiadmin
 knife4j.basic.password=fdkankancui
 
+#log
+logging.path=/4Dkankan/logs/
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug
 
 
 

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

@@ -1,4 +1,4 @@
-server.port=8010
+server.port=8020
 server.servlet.context-path=/4dkankan_v2
 server.file.location=/mnt/4Dkankan/
 
@@ -6,10 +6,7 @@ spring.profiles.active=dev
 
 spring.mvc.async.request-timeout=1800000
 
-#log
-logging.path=/4Dkankan/logs/
-logging.config=classpath:logback-spring.xml
-logging.level.com.fdkankan=debug
+
 #mybatis
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.fdkankan.*.mapper

4dkankan-base/src/main/java/com/fdkankan/base/util/ConvertUtils.java

@@ -136,28 +136,29 @@ public class ConvertUtils {
 
     }
 
-    public static void main(String[] args) {
-        List<String> list1 = new ArrayList<String>();
-        list1.add("普通会员");
-        list1.add("专业会员");
-        list1.add("商业会员");
-        List<String> list2 = new ArrayList<String>();
-        list2.add("1G");
-        list2.add("1T");
-        List<List<String>> dimValue = new ArrayList<List<String>>();
-        dimValue.add(list1);
-        dimValue.add(list2);
-
-        // 递归实现笛卡尔积
-        ConvertUtils s = new ConvertUtils();
-        List<List<String>> res = s.descartes(dimValue);
-        System.out.println("递归实现笛卡尔乘积: 共 " + res.size() + " 个结果");
-        for (List<String> list : res) {
-            for (String string : list) {
-                System.out.print(string + " ");
-            }
-            System.out.println();
-        }
+    public static void main(String[] args) throws Exception {
+//        List<String> list1 = new ArrayList<String>();
+//        list1.add("普通会员");
+//        list1.add("专业会员");
+//        list1.add("商业会员");
+//        List<String> list2 = new ArrayList<String>();
+//        list2.add("1G");
+//        list2.add("1T");
+//        List<List<String>> dimValue = new ArrayList<List<String>>();
+//        dimValue.add(list1);
+//        dimValue.add(list2);
+//
+//        // 递归实现笛卡尔积
+//        ConvertUtils s = new ConvertUtils();
+//        List<List<String>> res = s.descartes(dimValue);
+//        System.out.println("递归实现笛卡尔乘积: 共 " + res.size() + " 个结果");
+//        for (List<String> list : res) {
+//            for (String string : list) {
+//                System.out.print(string + " ");
+//            }
+//            System.out.println();
+//        }
+        convertVisionModelDataToTxt("F:\\文档\\下载\\vision (5).modeldata", "F:\\文档\\下载\\vision4.json");
     }
 
     public static void convertTxtToVisionmodeldata(String srcpath,String despath)throws Exception

4dkankan-modeling/src/main/java/com/fdkankan/modeling/message/BuildSceneReceiver.java

@@ -203,8 +203,7 @@ public class BuildSceneReceiver {
                                 FileUtils.deleteFile(deleteFile.getAbsolutePath());
                             }
                         }
-                        else if(!deleteFile.getAbsolutePath().contains("images") &&
-                                !deleteFile.getAbsolutePath().contains("videos")){
+                        else if(!deleteFile.getAbsolutePath().contains("images")){
                             if(deleteFile.isDirectory()){
                                 FileUtils.delAllFile(deleteFile.getAbsolutePath());
                             }else {

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

@@ -1,12 +1,12 @@
 #应用名
 spring.application.name=4dkankan-model
 #注册中心
-spring.cloud.nacos.discovery.server-addr=192.168.0.98:8848
+spring.cloud.nacos.discovery.server-addr=10.71.114.232:8848
 
 #DB (new)
-spring.datasource.primary.url=jdbc:mysql://localhost:3306/4dkankan_hd?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.primary.username=root
-spring.datasource.primary.password=123456
+spring.datasource.primary.url=jdbc:mysql://10.71.114.237:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=user_4dhouse_rw
+spring.datasource.primary.password=kaKjbpZi1plmViyDVWhD
 spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
 
 spring.servlet.multipart.max-file-size=500MB
@@ -14,9 +14,9 @@ spring.servlet.multipart.max-request-size=1000MB
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.location=/mnt/data/
 #redis
-spring.redis.cluster.nodes=10.1.152.54:6379
+spring.redis.cluster.nodes=10.71.114.132:7000,10.71.114.132:7001,10.71.114.132:7002,10.71.114.132:7003,10.71.114.132:7004,10.71.114.132:7005
 spring.redis.database=0
-spring.redis.password=
+spring.redis.password=BN5Q40JsPHIGfUg5HTkU
 spring.redis.timeout=3000ms
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
@@ -42,9 +42,9 @@ swagger.version=2.0
 #rabbitmq
 #spring.rabbitmq.host=8.135.98.231
 #spring.rabbitmq.port=30672
-spring.rabbitmq.address=8.135.107.23:5672,8.135.110.218:5672
-spring.rabbitmq.username=root
-spring.rabbitmq.password=123456
+spring.rabbitmq.address=10.71.114.232:5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=fcb@admin_4dage
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 #confirm模式
@@ -58,18 +58,18 @@ spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/, classpath:/static/, classpath:/web/, file:${server.file.location}
 
 oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=oss-xiaoan
+oss.key=LTAI4FyDDFpGGjTJZEQH4yaK
+oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
+oss.bucket=fcb-vrkanfang-uat
 oss.type=oss
 
-main.url=https://test.4dkankan.com/
-main.intranet.url=https://vr-mc01.fcb.com.cn/
+main.url=https://vr-mc01-sit.fcb.com.cn/
+main.intranet.url=https://vr-web01-sit.fcb.com.cn/
 scene.url=show.html?m=
 scene.pro.url=showProMobile.html?m=
 scene.pro.new.url=smobile.html?m=
 
-prefix.ali=https://4dkk.4dage.com/
+prefix.ali=https://vr-oss-sit.fcb.com.cn/
 
 #服务器环境，dev为测试环境，formal为正式环境
 environment=dev

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

@@ -2478,7 +2478,7 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
 
         JSONArray inputdata =  JSONArray.parseArray(base.getData());
 
-        String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata";
+        String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         FileUtils.downLoadFromUrl(modeldataUrl, "vision.modeldata", dataBuffer.toString());
         File file = new File(dataBuffer.toString() + "vision.modeldata");
         if(!file.exists()) {
@@ -3575,6 +3575,11 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
             }
         }
 
+        //sn查找不到，应该返回空数据
+        if(StringUtils.isNotEmpty(param.getSnCode()) && cameraEntityList.size() == 0){
+            cameraIds.append("'").append(0).append("'");
+        }
+
         Page page = PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
         if(StringUtil.isEmpty(param.getOrderBy())){
             PageHelper.orderBy(" create_time desc");

4dkankan-web/src/main/java/com/fdkankan/web/controller/SceneController.java

@@ -1,5 +1,6 @@
 package com.fdkankan.web.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.base.constant.CameraConstant;
 import com.fdkankan.base.constant.LoginConstant;
@@ -194,7 +195,7 @@ public class SceneController extends BaseController {
             sceneProService.update(sceneProEntity);
 
             uplpadLogo = null;
-            sceneProEditService.findByProId(sceneProEntity.getId());
+            sceneProEditEntity = sceneProEditService.findByProId(sceneProEntity.getId());
             if(sceneProEditEntity != null && StringUtils.isNotEmpty(sceneProEditEntity.getShareLogo())){
                 uplpadLogo = ConstantFilePath.SCENE_PATH + sceneProEditEntity.getShareLogo();
             }
@@ -466,11 +467,11 @@ public class SceneController extends BaseController {
         }
 
         if("true".equals(app)){
-            if(sceneProEntity.getStatus() != 1 && sceneProEntity.getStatus() != 2){
+            if(sceneProEntity.getStatus() < 1 ){
                 throw new BaseRuntimeException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
             }
         }else {
-            if(sceneProEntity.getStatus() == 2){
+            if(sceneProEntity.getStatus() > 1){
                 throw new BaseRuntimeException(SceneConstant.FAILURE_CODE_5026, SceneConstant.FAILURE_MSG_5026);
             }
 
@@ -640,7 +641,33 @@ public class SceneController extends BaseController {
         }
     }
 
+    /**
+     * 删除场景
+     */
+    @ApiOperation("修改场景状态")
+    @RequestMapping(value = "/statisticsPoints", method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sceneNum", value = "场景码", dataType = "String", required = true)
+    })
+    public Result statisticsPoints(@RequestBody RequestScene param) throws Exception{
+        if(StringUtil.isEmpty(param.getSceneNum())){
+            throw new BaseRuntimeException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
+        }
 
+        SceneProEntity sceneProEntity = null;
+        JSONObject object = null;
+
+        int point = 0;
+        for (String num : param.getSceneNum().split(";")) {
+
+            sceneProEntity = sceneProService.findBySceneNum(num);
+            if(sceneProEntity != null && sceneProEntity.getVideos() != null){
+                object = JSON.parseObject(sceneProEntity.getVideos());
+                point += object.getJSONArray("data").size();
+            }
+        }
+        return Result.success(point);
+    }
 
 
 }

4dkankan-web/src/main/java/com/fdkankan/web/controller/SceneFileController.java

@@ -459,9 +459,9 @@ public class SceneFileController extends BaseController {
                 String userName = null;
                 String userId = jsonObject.getString("uploadUserID");
                 String departmentId = jsonObject.getString("uploadDepartmentID");
-                if(StringUtil.isEmpty(userId) || StringUtil.isEmpty(departmentId)){
-                    throw new BaseRuntimeException(LoginConstant.FAILURE_CODE_3004, LoginConstant.FAILURE_MSG_3004);
-                }
+//                if(StringUtil.isEmpty(userId) || StringUtil.isEmpty(departmentId)){
+//                    throw new BaseRuntimeException(LoginConstant.FAILURE_CODE_3004, LoginConstant.FAILURE_MSG_3004);
+//                }
 
 
 //            if(user == null){

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.3.4.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -72,7 +72,7 @@
 
         <druid.version>1.0.28</druid.version>
 
-        <fastjson.version>1.2.67</fastjson.version>
+        <fastjson.version>1.2.75</fastjson.version>
 
         <gson.version>2.8.5</gson.version>