温红权 7 yıl önce
ebeveyn
işleme
291ea3cc20

BIN
.DS_Store


+ 1 - 1
VisualInspection/fwq/js/task/check.js

@@ -248,7 +248,7 @@ function getAreaCheckCount() {
             //查询录像播放列表
             var videos = $.checkTask.areainfo.video_ids;
             if (videos != "") {
-                queryVideoList(videos);
+                queryVideoLists(videos);
             } else {
                 callFunc("showvideoview", "false");
                 layer.msg('该处暂无视屏!', {

+ 3 - 3
VisualInspection/js/config.js

@@ -25,7 +25,7 @@ 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:8089/"
+        return "http://10.112.0.199:7001/"
     }
 }
 
@@ -42,7 +42,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:9000s/"
+        return "http://10.112.0.199:7010/"
     }
 }
 
@@ -57,7 +57,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:8080/"
+        return "http://200.200.19.126:7000/"
     } else {
         return "http://10.112.0.199/"
     }

+ 4 - 13
VisualInspection/js/util/video.js

@@ -42,7 +42,7 @@ function setVideoPos() {
 
 }
 
-function queryVideoList(videoIds) {
+function queryVideoLists(videoIds) {
     if (videoIds != null) {
         s1 = $.checkTask.start_time.replace(/-/g, "/");
         var startTime = new Date(s1).getTime() / 1000;
@@ -54,11 +54,12 @@ function queryVideoList(videoIds) {
                 var pp = {
                     "videoIds": videoIds,
                     "cindex": 10,
-                    starttime: startTime,
+                    "starttime": startTime,
                     "endtime": endTime,
                     "videos": []
                 };
 
+                console.log(data)
                 data.forEach(came => {
 
                     pp.videos.push({
@@ -68,17 +69,7 @@ function queryVideoList(videoIds) {
                     });
 
                 });
-                var pp = {
-                    "videoIds": videoIds,
-                    "cindex": 1,
-                    starttime: startTime,
-                    "endtime": endTime,
-                    "videos": [{
-                        "videoId": curVideo,
-                        "cametype": data.cameratype,
-                        "filetype": data.playtype
-                    }]
-                };
+
                 callFunc("findvideolist", JSON.stringify(pp));
             }
         }, function(error) {});

+ 0 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/WebcamController.java

@@ -81,5 +81,4 @@ public class WebcamController extends BaseController {
             throw new BusinessException(20001);
         }
     }
-
 }

+ 1 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/WebcamDao.java

@@ -15,5 +15,6 @@ public interface WebcamDao {
     public List<Webcam> getAll();
     public Webcam getOne(String deviceid);
     public List<Webcam> getWebcams(Webcam webcam);
+    public void insertWebcame(String deviceid);
 
 }

+ 7 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/WebcamMapper.xml

@@ -60,6 +60,13 @@
 			jdbcType="INTEGER" />
 	
 	</resultMap>
+
+
+
+    <insert id="insertWebcame" parameterType="String">
+        INSERT INTO t_br_layer_webcam (DEVICE_ID) values (#{deviceid,jdbcType=VARCHAR})
+
+    </insert>
 	
 
 	<select id="getAll" resultMap="BaseResultMap">

+ 12 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/WebcamServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.xintong.visualinspection.service.UserService;
@@ -43,5 +44,16 @@ public class WebcamServiceImpl extends BaseService implements WebcamService {
 		return webcamDao.getWebcams(webcam);
 	}
 
+    private void insertcame(){
+        String v ="1161,1165,1192,1169,1198,1164,1181,1173,1183,1162,1163,1168,1171,1159,1191,1170,1195,1190,1175,1189,1193,1194,1177,1160,1196,1166,1167,1182,1174,1172,1176,1184,1244,1201,1229,1233,1243,1200,1209,1210,1214,1230,1232,1216,1217,1228,1238,1247,1255,1203,1207,1225,1140,1241,1211,1215,1246,1248,1199,1220,1245,1218,1236,1224,1227,1234,1250,1252,1253,1202,1205,1213,1219,1223,1226,1235,1237,1206,1208,1221,1243,1254,1104,1222,384,386,467,390,393,473,401,468,469,403,471,385,391,478,476,474,395,407,389,470,394,388,392,472,398,402,460,422,438,446,459,464,466,409,418,430,435,436,465,413,440,461,428,432,444,447,408,426,442,448,424,433,449,427,441,425,439,450,453,457,458,410,415,412,423,431,434,443,445,456,463,462,411,416,419,420,417,400,451,454,414,437,841,847,1059,837,839,858,857,937,840,833,938,903,834,870,1249,842,838,863,844,845,835,859,843,861,836,849,848,930,933,885,906,925,927,888,891,900,904,905,873,874,878,892,907,867,890,932,864,926,886,895,883,897,880,908,876,893,894,901,902,931,936,866,868,869,857,877,882,928,934,865,884,898,872,899,935,871,881,955,960,962,942,944,961,943,956,946,966,945,954,957,948,949,958,941,952,950,951,953,1012,1013,990,988,991,971,992,685,972,1025,1026,1035,1036,1030,1034,970,973,975,977,978,980,981,983,985,1021,1023,1027,1028,1031,974,984,1022,986,1024,987,1029,1038,691,774,697,699,690,698,688,689,693,646,770,768,694,717,771,687,700,701,775,714,715,692,785,695,670,682,711,722,752,681,701,706,653,659,662,665,683,755,731,745,749,750,753,757,655,657,725,733,651,718,761,667,647,660,663,673,652,735,650,705,649,754,654,658,661,664,668,672,720,734,741,742,747,751,759,762,666,669,671,674,675,704,716,723,728,729,730,737,746,868,677,676,1134,1133,1111,1112,1114,1110,1108,1109,1103,1105,1106,1107";
+        List<String> d = new ArrayList<>();
+        for (String id:v.split(",")
+             ) {
+            d.add(id);
+            webcamDao.insertWebcame(id);
+        }
+
+
+    }
 
 }

Dosya farkı çok büyük olduğundan ihmal edildi
+ 70 - 0
VisualInspection_server/visual/visual.log


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor