Skip to content

张雷 / fmboot

转到一个项目
切换导航栏
切换导航栏固定状态
0d27321e 由 张雷
选项

人员定位系统对接开发

1 个父辈 764360e2
内嵌 并排
正在显示 8 个修改的文件 包含 77 行增加 和 44 行删除
fm-product/fm-product.iml
...@@ -25,21 +25,23 @@ ...@@ -25,21 +25,23 @@
25 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" /> 25 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
26 <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> 26 <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
27 <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> 27 <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
28 <orderEntry type="library" name="Maven: org.bytedeco:javacv:1.5.1" level="project" /> 28 <orderEntry type="library" name="Maven: org.bytedeco:javacv:1.5.8" level="project" />
29 <orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.1" level="project" /> 29 <orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.8" level="project" />
30 <orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.6-1.5.1" level="project" /> 30 <orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.21-1.5.8" level="project" />
31 <orderEntry type="library" name="Maven: org.bytedeco:opencv:4.1.0-1.5.1" level="project" /> 31 <orderEntry type="library" name="Maven: org.bytedeco:opencv:4.6.0-1.5.8" level="project" />
32 <orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:4.1.3-1.5.1" level="project" /> 32 <orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:5.1.2-1.5.8" level="project" />
33 <orderEntry type="library" name="Maven: org.bytedeco:flycapture:2.13.3.31-1.5.1" level="project" /> 33 <orderEntry type="library" name="Maven: org.bytedeco:flycapture:2.13.3.31-1.5.8" level="project" />
34 <orderEntry type="library" name="Maven: org.bytedeco:libdc1394:2.2.6-1.5.1" level="project" /> 34 <orderEntry type="library" name="Maven: org.bytedeco:libdc1394:2.2.6-1.5.8" level="project" />
35 <orderEntry type="library" name="Maven: org.bytedeco:libfreenect:0.5.7-1.5.1" level="project" /> 35 <orderEntry type="library" name="Maven: org.bytedeco:libfreenect:0.5.7-1.5.8" level="project" />
36 <orderEntry type="library" name="Maven: org.bytedeco:libfreenect2:0.2.0-1.5.1" level="project" /> 36 <orderEntry type="library" name="Maven: org.bytedeco:libfreenect2:0.2.0-1.5.8" level="project" />
37 <orderEntry type="library" name="Maven: org.bytedeco:librealsense:1.12.1-1.5.1" level="project" /> 37 <orderEntry type="library" name="Maven: org.bytedeco:librealsense:1.12.4-1.5.8" level="project" />
38 <orderEntry type="library" name="Maven: org.bytedeco:videoinput:0.200-1.5.1" level="project" /> 38 <orderEntry type="library" name="Maven: org.bytedeco:librealsense2:2.50.0-1.5.8" level="project" />
39 <orderEntry type="library" name="Maven: org.bytedeco:artoolkitplus:2.3.1-1.5.1" level="project" /> 39 <orderEntry type="library" name="Maven: org.bytedeco:videoinput:0.200-1.5.8" level="project" />
40 <orderEntry type="library" name="Maven: org.bytedeco:flandmark:1.07-1.5.1" level="project" /> 40 <orderEntry type="library" name="Maven: org.bytedeco:artoolkitplus:2.3.1-1.5.8" level="project" />
41 <orderEntry type="library" name="Maven: org.bytedeco:leptonica:1.78.0-1.5.1" level="project" /> 41 <orderEntry type="library" name="Maven: org.bytedeco:flandmark:1.07-1.5.8" level="project" />
42 <orderEntry type="library" name="Maven: org.bytedeco:tesseract:4.1.0-1.5.1" level="project" /> 42 <orderEntry type="library" name="Maven: org.bytedeco:leptonica:1.82.0-1.5.8" level="project" />
43 <orderEntry type="library" name="Maven: org.bytedeco:tesseract:5.2.0-1.5.8" level="project" />
44 <orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:linux-x86_64:5.1.2-1.5.8" level="project" />
43 <orderEntry type="library" name="Maven: com.kingtroldata:core:1.1" level="project" /> 45 <orderEntry type="library" name="Maven: com.kingtroldata:core:1.1" level="project" />
44 <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.1" level="project" /> 46 <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.1" level="project" />
45 <orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" /> 47 <orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" />
......
fm-product/pom.xml
...@@ -26,7 +26,13 @@ ...@@ -26,7 +26,13 @@
26 <dependency> 26 <dependency>
27 <groupId>org.bytedeco</groupId> 27 <groupId>org.bytedeco</groupId>
28 <artifactId>javacv</artifactId> 28 <artifactId>javacv</artifactId>
29 <version>1.5.1</version> 29 <version>1.5.8</version>
30 </dependency>
31 <dependency>
32 <groupId>org.bytedeco</groupId>
33 <artifactId>ffmpeg</artifactId>
34 <version>5.1.2-1.5.8</version>
35 <classifier>linux-x86_64</classifier>
30 </dependency> 36 </dependency>
31 </dependencies> 37 </dependencies>
32 38
......
fm-product/src/main/java/com/skua/modules/location/controller/UserLocationController.java
...@@ -36,7 +36,6 @@ public class UserLocationController { ...@@ -36,7 +36,6 @@ public class UserLocationController {
36 return result; 36 return result;
37 } 37 }
38 38
39 //*****************************************义乌人员定位**********************************************//
40 @AutoLog(value = "义乌人员定位-获取所有人员实时定位数据") 39 @AutoLog(value = "义乌人员定位-获取所有人员实时定位数据")
41 @ApiOperation(value="义乌人员定位-获取所有人员实时定位数据", notes="义乌人员定位-获取所有人员实时定位数据") 40 @ApiOperation(value="义乌人员定位-获取所有人员实时定位数据", notes="义乌人员定位-获取所有人员实时定位数据")
42 @GetMapping(value = "/yw/getAllUserGPS") 41 @GetMapping(value = "/yw/getAllUserGPS")
......
fm-product/src/main/java/com/skua/modules/location/service/impl/YwLocationServiceImpl.java
...@@ -45,8 +45,8 @@ public class YwLocationServiceImpl implements ILocationService { ...@@ -45,8 +45,8 @@ public class YwLocationServiceImpl implements ILocationService {
45 HashMap<String,Object> pMap = new HashMap<>(); 45 HashMap<String,Object> pMap = new HashMap<>();
46 pMap.put("username", username); 46 pMap.put("username", username);
47 pMap.put("password", password); 47 pMap.put("password", password);
48 String get = HttpUtil.get(url+"open/information/getRealGps.do",pMap); 48 // String get = HttpUtil.get(url+"open/information/getRealGps.do",pMap);
49 get = "{\n" + 49 String get = "{\n" +
50 "\"data\":\n" + 50 "\"data\":\n" +
51 "[{\n" + 51 "[{\n" +
52 "\"empName\":\"贾伟峰\",\n" + 52 "\"empName\":\"贾伟峰\",\n" +
...@@ -71,7 +71,7 @@ public class YwLocationServiceImpl implements ILocationService { ...@@ -71,7 +71,7 @@ public class YwLocationServiceImpl implements ILocationService {
71 "\"latitude\":30.630693000000115,\n" + 71 "\"latitude\":30.630693000000115,\n" +
72 "\"dateTime\":\"2022-05-05 11:35:52\",\n" + 72 "\"dateTime\":\"2022-05-05 11:35:52\",\n" +
73 "\"layer\":\"-1\",\n" + 73 "\"layer\":\"-1\",\n" +
74 "\"empNo\":\"108036\",\n" + 74 "\"empNo\":\"108037\",\n" +
75 "\"specifictype\":\"0\"\n" + 75 "\"specifictype\":\"0\"\n" +
76 "},\n" + 76 "},\n" +
77 "{\n" + 77 "{\n" +
...@@ -118,8 +118,8 @@ public class YwLocationServiceImpl implements ILocationService { ...@@ -118,8 +118,8 @@ public class YwLocationServiceImpl implements ILocationService {
118 pMap.put("begintime", startTime); 118 pMap.put("begintime", startTime);
119 pMap.put("endtime", endTime); 119 pMap.put("endtime", endTime);
120 pMap.put("deveuis", deviceCode); 120 pMap.put("deveuis", deviceCode);
121 String get = HttpUtil.get(url+"open/information/getHis.do",pMap); 121 // String get = HttpUtil.get(url+"open/information/getHis.do",pMap);
122 get = "{\n" + 122 String get = "{\n" +
123 "\"data\":[\n" + 123 "\"data\":[\n" +
124 "{\n" + 124 "{\n" +
125 "\"name\":\"贾伟峰\",\n" + 125 "\"name\":\"贾伟峰\",\n" +
...@@ -166,7 +166,30 @@ public class YwLocationServiceImpl implements ILocationService { ...@@ -166,7 +166,30 @@ public class YwLocationServiceImpl implements ILocationService {
166 map.put("page",1); 166 map.put("page",1);
167 map.put("rows",1000); 167 map.put("rows",1000);
168 map.put("emp",""); 168 map.put("emp","");
169 String post = HttpUtil.get(url+"open/information/getEmp.do",map); 169 // String post = HttpUtil.get(url+"open/information/getEmp.do",map);
170 String post = "{\n" +
171 "\t\"data\": {\n" +
172 "\t\t\"total\": 3,\n" +
173 "\t\t\"rows\": [{\n" +
174 "\t\t\t\"id\": 1,\n" +
175 "\t\t\t\"empno\": \"108036\",\n" +
176 "\t\t\t\"empname\": \"贾伟峰\",\n" +
177 "\t\t\t\"deviceno\": \"16a7ebee\"\n" +
178 "\t\t},{\n" +
179 "\t\t\t\"id\": 2,\n" +
180 "\t\t\t\"empno\": \"108037\",\n" +
181 "\t\t\t\"empname\": \"宋锡园\",\n" +
182 "\t\t\t\"deviceno\": \"169c1502\"\n" +
183 "\t\t},{\n" +
184 "\t\t\t\"id\": 3,\n" +
185 "\t\t\t\"empno\": \"147258\",\n" +
186 "\t\t\t\"empname\": \"何成翔\",\n" +
187 "\t\t\t\"deviceno\": \"169c0cba\"\n" +
188 "\t\t}]\n" +
189 "\t},\n" +
190 "\t\"msginfo\": \"成功！\",\n" +
191 "\t\"status\": 0\n" +
192 "} ";
170 JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString()); 193 JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
171 List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class); 194 List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class);
172 for (UserBaseInfoYwResult userBaseInfoYwResult : userList) { 195 for (UserBaseInfoYwResult userBaseInfoYwResult : userList) {
......
fm-product/src/main/java/com/skua/modules/video/controller/VideoIntegrateController.java
...@@ -83,7 +83,7 @@ public class VideoIntegrateController { ...@@ -83,7 +83,7 @@ public class VideoIntegrateController {
83 String rtsp = itVideoService.getRtsp(cameraIndexCode); 83 String rtsp = itVideoService.getRtsp(cameraIndexCode);
84 CameraInfo openCamera = videoSteamService.openCamera(rtsp, cameraIndexCode); 84 CameraInfo openCamera = videoSteamService.openCamera(rtsp, cameraIndexCode);
85 result.setSuccess(true); 85 result.setSuccess(true);
86 result.setResult(openCamera.getFlv()); 86 result.setResult(openCamera.getUri());
87 } catch (Exception e) { 87 } catch (Exception e) {
88 result.error500("获取视频流失败"); 88 result.error500("获取视频流失败");
89 } 89 }
......
fm-system/fm-system.iml
...@@ -42,21 +42,23 @@ ...@@ -42,21 +42,23 @@
42 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" /> 42 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
43 <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" /> 43 <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
44 <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> 44 <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
45 <orderEntry type="library" name="Maven: org.bytedeco:javacv:1.5.1" level="project" /> 45 <orderEntry type="library" name="Maven: org.bytedeco:javacv:1.5.8" level="project" />
46 <orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.1" level="project" /> 46 <orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.8" level="project" />
47 <orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.6-1.5.1" level="project" /> 47 <orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.21-1.5.8" level="project" />
48 <orderEntry type="library" name="Maven: org.bytedeco:opencv:4.1.0-1.5.1" level="project" /> 48 <orderEntry type="library" name="Maven: org.bytedeco:opencv:4.6.0-1.5.8" level="project" />
49 <orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:4.1.3-1.5.1" level="project" /> 49 <orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:5.1.2-1.5.8" level="project" />
50 <orderEntry type="library" name="Maven: org.bytedeco:flycapture:2.13.3.31-1.5.1" level="project" /> 50 <orderEntry type="library" name="Maven: org.bytedeco:flycapture:2.13.3.31-1.5.8" level="project" />
51 <orderEntry type="library" name="Maven: org.bytedeco:libdc1394:2.2.6-1.5.1" level="project" /> 51 <orderEntry type="library" name="Maven: org.bytedeco:libdc1394:2.2.6-1.5.8" level="project" />
52 <orderEntry type="library" name="Maven: org.bytedeco:libfreenect:0.5.7-1.5.1" level="project" /> 52 <orderEntry type="library" name="Maven: org.bytedeco:libfreenect:0.5.7-1.5.8" level="project" />
53 <orderEntry type="library" name="Maven: org.bytedeco:libfreenect2:0.2.0-1.5.1" level="project" /> 53 <orderEntry type="library" name="Maven: org.bytedeco:libfreenect2:0.2.0-1.5.8" level="project" />
54 <orderEntry type="library" name="Maven: org.bytedeco:librealsense:1.12.1-1.5.1" level="project" /> 54 <orderEntry type="library" name="Maven: org.bytedeco:librealsense:1.12.4-1.5.8" level="project" />
55 <orderEntry type="library" name="Maven: org.bytedeco:videoinput:0.200-1.5.1" level="project" /> 55 <orderEntry type="library" name="Maven: org.bytedeco:librealsense2:2.50.0-1.5.8" level="project" />
56 <orderEntry type="library" name="Maven: org.bytedeco:artoolkitplus:2.3.1-1.5.1" level="project" /> 56 <orderEntry type="library" name="Maven: org.bytedeco:videoinput:0.200-1.5.8" level="project" />
57 <orderEntry type="library" name="Maven: org.bytedeco:flandmark:1.07-1.5.1" level="project" /> 57 <orderEntry type="library" name="Maven: org.bytedeco:artoolkitplus:2.3.1-1.5.8" level="project" />
58 <orderEntry type="library" name="Maven: org.bytedeco:leptonica:1.78.0-1.5.1" level="project" /> 58 <orderEntry type="library" name="Maven: org.bytedeco:flandmark:1.07-1.5.8" level="project" />
59 <orderEntry type="library" name="Maven: org.bytedeco:tesseract:4.1.0-1.5.1" level="project" /> 59 <orderEntry type="library" name="Maven: org.bytedeco:leptonica:1.82.0-1.5.8" level="project" />
60 <orderEntry type="library" name="Maven: org.bytedeco:tesseract:5.2.0-1.5.8" level="project" />
61 <orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:linux-x86_64:5.1.2-1.5.8" level="project" />
60 <orderEntry type="library" name="Maven: org.jeecgframework.boot:online-form:1.0.2" level="project" /> 62 <orderEntry type="library" name="Maven: org.jeecgframework.boot:online-form:1.0.2" level="project" />
61 <orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.2.5" level="project" /> 63 <orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.2.5" level="project" />
62 <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" /> 64 <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" />
......
fm-system/src/main/java/com/skua/config/ShiroConfig.java
...@@ -102,6 +102,7 @@ public class ShiroConfig { ...@@ -102,6 +102,7 @@ public class ShiroConfig {
102 filterChainDefinitionMap.put("/v1/sys/video/getVideoIntegrateInfo", "anon"); 102 filterChainDefinitionMap.put("/v1/sys/video/getVideoIntegrateInfo", "anon");
103 filterChainDefinitionMap.put("/sys/video/getRtsp", "anon"); 103 filterChainDefinitionMap.put("/sys/video/getRtsp", "anon");
104 filterChainDefinitionMap.put("/sys/video/getFlv", "anon"); 104 filterChainDefinitionMap.put("/sys/video/getFlv", "anon");
105 filterChainDefinitionMap.put("/videoSteam/**", "anon");
105 //三维系统对接设备台账档案请求权限放行 106 //三维系统对接设备台账档案请求权限放行
106 filterChainDefinitionMap.put("/sys/sysCustomField/listModel", "anon"); 107 filterChainDefinitionMap.put("/sys/sysCustomField/listModel", "anon");
107 filterChainDefinitionMap.put("/sys/sysCustomField/listHead", "anon"); 108 filterChainDefinitionMap.put("/sys/sysCustomField/listHead", "anon");
......
fm-system/src/main/resources/application-dev.yml
...@@ -157,14 +157,14 @@ skua : ...@@ -157,14 +157,14 @@ skua :
157 collectionFrequency: 10 157 collectionFrequency: 10
158 #视频对接相关配置 158 #视频对接相关配置
159 video: 159 video:
160 ip: 120.25.102.53 160 ip: 10.0.210.204
161 port: 8667 161 port: 8667
162 username: admin 162 username: admin
163 password: xrjkauto@123 163 password: jkauto@123yw
164 #海康威视需要填写密钥 164 #海康威视需要填写密钥
165 appkey: 22650577 165 appkey: 21969915
166 secretkey: yKovn09uAsl2NTfebzqA 166 secretkey: lQFFEBvmiMg5qeJbQenw
167 streamMediaIp: 120.25.102.53 167 streamMediaIp: 47.104.179.187
168 #消息推送 168 #消息推送
169 push: 169 push:
170 #是否开启流程消息推送 170 #是否开启流程消息推送
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!