bugfix

VisualInspection/fwq/js/task/check.js

@@ -255,7 +255,6 @@ function getAreaCheckCount() {
                     offset: 'c',
                     time: 2000, //20s后自动关闭
                 });
-                callFunc("stop", "");
             }
 
 

VisualInspection/js/config.js

@@ -1,6 +1,7 @@
 // var base_ui_url = "http://10.112.0.236:8088/";
 // var base_server_url = "http://10.112.0.236:8089/";
 var ISCLIENT = false;
+var CLIENTVERSION = 1;
 
 var base_ui_url = getCurrentaddr();
 var base_server_url = getserveraddr();
@@ -25,15 +26,15 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {
-        return "http://10.112.0.199:7001/"
+        return "http://10.112.0.199:8089/"
     }
 }
 
 function getExcelServeraddr() {
     if (base_ui_url.indexOf("file_yanhai.jsxt.jsjtyxt.com") != -1) {
-        return "http://server_yanhai.jsxt.jsjtyxt.com:8283/";
+        return "http://server_fwq_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
-        return "http://server_release_yanhai.jsxt.jsjtyxt.com:8283/";
+        return "http://server_fwq_release_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
         return "http://localhost:9000/"
@@ -42,7 +43,7 @@ function getExcelServeraddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:9000/"
     } else {
-        return "http://10.112.0.199:7010/"
+        return "http://10.112.0.199:9000/"
     }
 }
 
@@ -57,7 +58,7 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
-        return "http://200.200.19.126:7000/"
+        return "http://200.200.19.126/"
     } else {
         return "http://10.112.0.199/"
     }

VisualInspection/js/util/video.js

@@ -43,6 +43,14 @@ function setVideoPos() {
 }
 
 function queryVideoLists(videoIds) {
+    if (CLIENTVERSION == 1 && ISCLIENT) {
+        callFunc("showvideoview", "false");
+        layer.msg('该软件版本太低，请升级！', {
+            offset: 'r',
+            time: 5000, //20s后自动关闭
+        });
+        return;
+    }
     if (videoIds != null) {
         s1 = $.checkTask.start_time.replace(/-/g, "/");
         var startTime = new Date(s1).getTime() / 1000;
@@ -71,6 +79,12 @@ function queryVideoLists(videoIds) {
                 });
 
                 callFunc("findvideolist", JSON.stringify(pp));
+            } else {
+                callFunc("showvideoview", "false");
+                layer.msg('该处暂无视屏！', {
+                    offset: 'c',
+                    time: 2000, //20s后自动关闭
+                });
             }
         }, function(error) {});
     }
@@ -115,7 +129,18 @@ function queryVideoList() {
                         "filetype": data.playtype
                     }]
                 };
-                callFunc("findvideolist", JSON.stringify(pp));
+                if (CLIENTVERSION == 1) {
+                    console.log(str);
+                    callFunc("findvideolist", str);
+                } else {
+                    callFunc("findvideolist", JSON.stringify(pp));
+                }
+            } else {
+                callFunc("showvideoview", "false");
+                layer.msg('该处暂无视屏！', {
+                    offset: 'c',
+                    time: 2000, //20s后自动关闭
+                });
             }
         }, function(error) {
 

VisualInspection_server/src/main/resources/application.properties

@@ -2,9 +2,9 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -12,9 +12,9 @@ master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
-#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -56,13 +56,13 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0  
 # Redis\u670D\u52A1\u5668\u5730\u5740
-#spring.redis.host=10.112.0.199
-spring.redis.host=192.168.45.158
+spring.redis.host=10.112.0.199
+#spring.redis.host=xt.wenhq.top
 #spring.redis.host=127.0.0.1
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-#spring.redis.port=6379
-
 spring.redis.port=6379
+
+#spring.redis.port=8284
 #spring.redis.port=9004
 #spring.redis.port=7003
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
@@ -82,7 +82,7 @@ spring.redis.timeout=0
 log.path=./visual/
 log.file=visual
 log.lever=info
-log.MaxHistory=20
+log.maxHistory=20
 log.pattern=%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) |-%-5level [%thread] %c [%L] -| %msg%n
 #logging.level.root=INFO
 #logging.level.org.springframework.web=DEBUG
@@ -136,7 +136,7 @@ dubbo.protocol.status = server
 
 ## RegistryConfig Bean
 dubbo.registry.id = demoservice
-dubbo.registry.address = zookeeper://127.0.0.1:2181
+dubbo.registry.address = zookeeper://100.0.0.3:2181
 #dubbo.registry.address = zookeeper://192.168.45.158:2181
 dubbo.registry.file = ./output/dubbo.cache
 

Visuallnspection_fjq/visuallnspection_fjq/src/main/resources/application.properties

@@ -18,15 +18,15 @@ dubbo.protocol.status = server
 ## RegistryConfig Bean
 dubbo.registry.id = fjq_service
 #dubbo.registry.address = zookeeper://git.topm.win:9994
-dubbo.registry.address = zookeeper://127.0.0.1:2181
+dubbo.registry.address = zookeeper://100.0.0.3:2181
 dubbo.registry.file = ./output/dubbo1.cache
 dubbo.reference.check=false
 dubbo.consumer.check=false
 
 
 
-#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_2?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection_2?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
@@ -38,5 +38,5 @@ master.mapper-locations=classpath:com/xintong/visualinspection/visuallnspection_
 log.path=./visual/
 log.file=visual
 log.lever=info
-log.MaxHistory=20
+log.maxHistory=20
 log.pattern=%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) |-%-5level [%thread] %c [%L] -| %msg%n