Skip to content

张雷 / fmboot

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

人员定位系统对接开发

1 个父辈 764360e2
内嵌 并排
正在显示 8 个修改的文件 包含 77 行增加 和 44 行删除
fm-product/fm-product.iml
......@@ -25,21 +25,23 @@
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.6-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:opencv:4.1.0-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:4.1.3-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:flycapture:2.13.3.31-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libdc1394:2.2.6-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libfreenect:0.5.7-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libfreenect2:0.2.0-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:librealsense:1.12.1-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:videoinput:0.200-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:artoolkitplus:2.3.1-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:flandmark:1.07-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:leptonica:1.78.0-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:tesseract:4.1.0-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.21-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:opencv:4.6.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:5.1.2-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:flycapture:2.13.3.31-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libdc1394:2.2.6-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libfreenect:0.5.7-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libfreenect2:0.2.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:librealsense:1.12.4-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:librealsense2:2.50.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:videoinput:0.200-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:artoolkitplus:2.3.1-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:flandmark:1.07-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:leptonica:1.82.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:tesseract:5.2.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:linux-x86_64:5.1.2-1.5.8" level="project" />
<orderEntry type="library" name="Maven: com.kingtroldata:core:1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" />
......
fm-product/pom.xml
......@@ -26,7 +26,13 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>javacv</artifactId>
<version>1.5.1</version>
<version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg</artifactId>
<version>5.1.2-1.5.8</version>
<classifier>linux-x86_64</classifier>
</dependency>
</dependencies>
......
fm-product/src/main/java/com/skua/modules/location/controller/UserLocationController.java
......@@ -36,7 +36,6 @@ public class UserLocationController {
return result;
}
//*****************************************义乌人员定位**********************************************//
@AutoLog(value = "义乌人员定位-获取所有人员实时定位数据")
@ApiOperation(value="义乌人员定位-获取所有人员实时定位数据", notes="义乌人员定位-获取所有人员实时定位数据")
@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 {
HashMap<String,Object> pMap = new HashMap<>();
pMap.put("username", username);
pMap.put("password", password);
String get = HttpUtil.get(url+"open/information/getRealGps.do",pMap);
get = "{\n" +
// String get = HttpUtil.get(url+"open/information/getRealGps.do",pMap);
String get = "{\n" +
"\"data\":\n" +
"[{\n" +
"\"empName\":\"贾伟峰\",\n" +
......@@ -71,7 +71,7 @@ public class YwLocationServiceImpl implements ILocationService {
"\"latitude\":30.630693000000115,\n" +
"\"dateTime\":\"2022-05-05 11:35:52\",\n" +
"\"layer\":\"-1\",\n" +
"\"empNo\":\"108036\",\n" +
"\"empNo\":\"108037\",\n" +
"\"specifictype\":\"0\"\n" +
"},\n" +
"{\n" +
......@@ -118,8 +118,8 @@ public class YwLocationServiceImpl implements ILocationService {
pMap.put("begintime", startTime);
pMap.put("endtime", endTime);
pMap.put("deveuis", deviceCode);
String get = HttpUtil.get(url+"open/information/getHis.do",pMap);
get = "{\n" +
// String get = HttpUtil.get(url+"open/information/getHis.do",pMap);
String get = "{\n" +
"\"data\":[\n" +
"{\n" +
"\"name\":\"贾伟峰\",\n" +
......@@ -166,7 +166,30 @@ public class YwLocationServiceImpl implements ILocationService {
map.put("page",1);
map.put("rows",1000);
map.put("emp","");
String post = HttpUtil.get(url+"open/information/getEmp.do",map);
// String post = HttpUtil.get(url+"open/information/getEmp.do",map);
String post = "{\n" +
"\t\"data\": {\n" +
"\t\t\"total\": 3,\n" +
"\t\t\"rows\": [{\n" +
"\t\t\t\"id\": 1,\n" +
"\t\t\t\"empno\": \"108036\",\n" +
"\t\t\t\"empname\": \"贾伟峰\",\n" +
"\t\t\t\"deviceno\": \"16a7ebee\"\n" +
"\t\t},{\n" +
"\t\t\t\"id\": 2,\n" +
"\t\t\t\"empno\": \"108037\",\n" +
"\t\t\t\"empname\": \"宋锡园\",\n" +
"\t\t\t\"deviceno\": \"169c1502\"\n" +
"\t\t},{\n" +
"\t\t\t\"id\": 3,\n" +
"\t\t\t\"empno\": \"147258\",\n" +
"\t\t\t\"empname\": \"何成翔\",\n" +
"\t\t\t\"deviceno\": \"169c0cba\"\n" +
"\t\t}]\n" +
"\t},\n" +
"\t\"msginfo\": \"成功！\",\n" +
"\t\"status\": 0\n" +
"} ";
JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class);
for (UserBaseInfoYwResult userBaseInfoYwResult : userList) {
......
fm-product/src/main/java/com/skua/modules/video/controller/VideoIntegrateController.java
......@@ -83,7 +83,7 @@ public class VideoIntegrateController {
String rtsp = itVideoService.getRtsp(cameraIndexCode);
CameraInfo openCamera = videoSteamService.openCamera(rtsp, cameraIndexCode);
result.setSuccess(true);
result.setResult(openCamera.getFlv());
result.setResult(openCamera.getUri());
} catch (Exception e) {
result.error500("获取视频流失败");
}
......
fm-system/fm-system.iml
......@@ -42,21 +42,23 @@
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.6-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:opencv:4.1.0-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:4.1.3-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:flycapture:2.13.3.31-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libdc1394:2.2.6-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libfreenect:0.5.7-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libfreenect2:0.2.0-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:librealsense:1.12.1-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:videoinput:0.200-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:artoolkitplus:2.3.1-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:flandmark:1.07-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:leptonica:1.78.0-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:tesseract:4.1.0-1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:openblas:0.3.21-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:opencv:4.6.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:5.1.2-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:flycapture:2.13.3.31-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libdc1394:2.2.6-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libfreenect:0.5.7-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:libfreenect2:0.2.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:librealsense:1.12.4-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:librealsense2:2.50.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:videoinput:0.200-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:artoolkitplus:2.3.1-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:flandmark:1.07-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:leptonica:1.82.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:tesseract:5.2.0-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:ffmpeg:linux-x86_64:5.1.2-1.5.8" level="project" />
<orderEntry type="library" name="Maven: org.jeecgframework.boot:online-form:1.0.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.2.5" level="project" />
<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 {
filterChainDefinitionMap.put("/v1/sys/video/getVideoIntegrateInfo", "anon");
filterChainDefinitionMap.put("/sys/video/getRtsp", "anon");
filterChainDefinitionMap.put("/sys/video/getFlv", "anon");
filterChainDefinitionMap.put("/videoSteam/**", "anon");
//三维系统对接设备台账档案请求权限放行
filterChainDefinitionMap.put("/sys/sysCustomField/listModel", "anon");
filterChainDefinitionMap.put("/sys/sysCustomField/listHead", "anon");
......
fm-system/src/main/resources/application-dev.yml
......@@ -157,14 +157,14 @@ skua :
collectionFrequency: 10
#视频对接相关配置
video:
ip: 120.25.102.53
ip: 10.0.210.204
port: 8667
username: admin
password: xrjkauto@123
password: jkauto@123yw
#海康威视需要填写密钥
appkey: 22650577
secretkey: yKovn09uAsl2NTfebzqA
streamMediaIp: 120.25.102.53
appkey: 21969915
secretkey: lQFFEBvmiMg5qeJbQenw
streamMediaIp: 47.104.179.187
#消息推送
push:
#是否开启流程消息推送
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!