upright
/
backend-duoji-monitor
mirror of https://gitlab.hzleaper.com:81/duoji/backend-duoji-monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

利珀光源控制器联调

Browse Source
merge-requests/5/merge
Your Name 4 years ago
parent 5b7fe884c1
commit f6ab3f46d8
9 changed files with 71 additions and 65 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
Unescape Escape View File

@ -77,6 +77,8 @@ public class ConfigProperties {
public static class LightSource{ public static class LightSource{
private Integer type; private Integer type;
private String info; private String info;
private Integer num;
private Integer index;
} }
@Data @Data

8
web/src/main/java/com/zhehekeji/web/controller/StreetController.java
Unescape Escape View File

@ -87,13 +87,13 @@ public class StreetController {
if(configProperties.getLightSource().getType() == 1){ if(configProperties.getLightSource().getType() == 1){
JYDAMEquip equip = JYDamHelper.Connect(lightSource.getIp(),lightSource.getPort()); JYDAMEquip equip = JYDamHelper.Connect(lightSource.getIp(),lightSource.getPort());
JYDamHelper.openDO(equip,obj.getInteger("index")); JYDamHelper.openDO(equip,configProperties.getLightSource().getIndex());
Integer status = JYDamHelper.ReadStatus(equip,obj.getInteger("num"),obj.getInteger("index")); Integer status = JYDamHelper.ReadStatus(equip,configProperties.getLightSource().getNum(),configProperties.getLightSource().getIndex());
log.info("ip:{},status:{}",lightSource.getIp(),status); log.info("ip:{},status:{}",lightSource.getIp(),status);
equip.DisConnect(); equip.DisConnect();
}else if(configProperties.getLightSource().getType() == 2){ }else if(configProperties.getLightSource().getType() == 2){
HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),1,1); HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),1);
} }
}); });
@ -116,7 +116,7 @@ public class StreetController {
Integer status = JYDamHelper.ReadStatus(equip,obj.getInteger("num"),obj.getInteger("index")); Integer status = JYDamHelper.ReadStatus(equip,obj.getInteger("num"),obj.getInteger("index"));
log.info("ip:{},status:{}",lightSource.getIp(),status); log.info("ip:{},status:{}",lightSource.getIp(),status);
}else if(configProperties.getLightSource().getType() == 2){ }else if(configProperties.getLightSource().getType() == 2){
HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),1,0); HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),4,0);
} }
}); });

11
web/src/main/java/com/zhehekeji/web/controller/TestController.java
Unescape Escape View File

@ -16,10 +16,17 @@ public class TestController {
@Resource @Resource
private TestService testService; private TestService testService;
@ApiOperation("新增") @ApiOperation("自动盘点")
@GetMapping("/check/{id}/{leftRight}") @GetMapping("/check/{id}/{leftRight}")
public Result test(@PathVariable Integer id,@PathVariable Integer leftRight){ public Result test(@PathVariable Integer id,@PathVariable Integer leftRight){
testService.CheckTest(id,leftRight); Thread thread = new Thread(new Runnable() {
@Override
public void run() {
testService.CheckTest(id,leftRight);
}
});
thread.start();
return Result.success(); return Result.success();
} }

2
web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareLoginModuleImpl.java
Unescape Escape View File

@ -118,7 +118,7 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule {
if(m_hLoginHandle.longValue()==0){ if(m_hLoginHandle.longValue()==0){
return null; return null;
} }
log.info("hik login success"); log.info("joyware login success");
return m_hLoginHandle; return m_hLoginHandle;
} }

11
web/src/main/java/com/zhehekeji/web/service/TestService.java
Unescape Escape View File

@ -23,8 +23,7 @@ public class TestService {
public void CheckTest(Integer StreetId,Integer leftRight){ public void CheckTest(Integer StreetId,Integer leftRight){
if(!isRunning){
isRunning = Boolean.TRUE;
Street street = streetService.streetById(StreetId); Street street = streetService.streetById(StreetId);
Integer row = street.getLeftRow(); Integer row = street.getLeftRow();
Integer column = street.getLeftColumn(); Integer column = street.getLeftColumn();
@ -45,7 +44,7 @@ public class TestService {
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
plcService.gyrateCameraByCode(street.getCamera1Id(),"C5"); plcService.gyrateCameraByCode(plcService.getCameraByPlcCmd(plcCmdInfo,leftRight),"C5");
try { try {
Thread.sleep(3000); Thread.sleep(3000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -53,11 +52,5 @@ public class TestService {
} }
} }
} }
isRunning = Boolean.FALSE;
return;
}
log.info("test running");
} }
} }

12
web/src/main/java/com/zhehekeji/web/service/hikLightSource/HikControlSocket.java
Unescape Escape View File

@ -30,15 +30,16 @@ public class HikControlSocket {
InputStream is = null; InputStream is = null;
try { try {
socket.connect(new InetSocketAddress(ip,port),3000); socket.connect(new InetSocketAddress(ip,port),3000);
socket.setSoTimeout(10000); //socket.setSoTimeout(10000);
os = socket.getOutputStream(); os = socket.getOutputStream();
Thread.sleep(100); Thread.sleep(100);
controlCmd(os,bool,index); controlCmd(os,bool,index);
is = socket.getInputStream(); //is = socket.getInputStream();
String s = read(socket.getInputStream()); //String s = read(socket.getInputStream());
//log.info("hik receieve:{}",s);
socket.close();
} catch (IOException e) { } catch (IOException e) {
log.error("sick time out,ip:{},info:{}",ip,e); log.error("hik contro time out,ip:{},info:{}",ip,e);
}finally { }finally {
if(os != null){ if(os != null){
try { try {
@ -75,6 +76,7 @@ public class HikControlSocket {
private static void controlCmd(OutputStream os,int bool,int index) throws IOException { private static void controlCmd(OutputStream os,int bool,int index) throws IOException {
String startCmd = "<"+index+","+bool+","+"post>"; String startCmd = "<"+index+","+bool+","+"post>";
byte [] bytes = startCmd.getBytes(StandardCharsets.UTF_8); byte [] bytes = startCmd.getBytes(StandardCharsets.UTF_8);
log.info("hik contro light:{}",startCmd);
os.write(bytes); os.write(bytes);
} }

40
web/src/main/resources/application-dev.yml
Unescape Escape View File

@ -19,56 +19,56 @@ spring:
validationQuery: SELECT 1 FROM DUAL validationQuery: SELECT 1 FROM DUAL
# --------本服务端口号 # --------本服务端口号
server: server:
port: 8099 port: 8100
#-------------- #--------------
# ------用户中心地址 # ------用户中心地址
userUrl: http://115.236.65.98:11001 userUrl: http://115.236.65.98:11001
# ----------- # -----------
# ----默认摄像头的连接信息 # ----默认摄像头的连接信息
cameraConfig: cameraConfig:
# ------------球機選擇--- 0:中威 1：海康 # ------------球機選擇--- 0:利珀 1：海康
cameraType: 1 cameraType: 0
cameraPassword: a1234567 cameraPassword: a1234567
cameraUser: admin cameraUser: admin
# ------海康默认是8000 中威是37777 cameraPort: 8000
cameraPort: 37777 videoServer: 127.0.0.1:8083
#相机抓图延迟 毫秒 #相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的
delayCaptureTime: 2000 delayCaptureTime: 3500
# 下载mp4延迟 海康的下载mp4需要2分钟 # 下载mp4延迟 海康的下载mp4需要2分钟
# 中威延迟10s就可 # 利珀延迟10s就可
# 单位毫秒 # 单位毫秒
delayDownloadMp4: 120000 delayDownloadMp4: 120000
# ------------ # ------------
# -----图片 mp4下载地址 # -----图片 mp4下载地址
savePath: savePath:
mediaPath: d:\\data\media\ mediaPath: d:\\data\media\
mp4Path: d:\\data\mp4\ mp4Path: d://data/mp4/
# ------------服务端类型 0：TCP(罗伯泰克) 1:KSEC(JSON)（昆船） # ------------服务端类型 0：TCP(罗伯泰克) 1:KSEC(JSON)（昆船）
serverMode: 1 serverMode: 1
ksec: ksec:
ip: 127.0.0.1 ip: 127.0.0.1
#ip: 192.168.43.46 port: 3000
port: 9000
# ------------ 实时视频流 全部页面的格式 行列数量 # ------------ 实时视频流 全部页面的格式 行列数量
videoStyleConfig: videoStyleConfig:
videoStyleRow: 3 videoStyleRow: 2
videoStyleColumn: 3 videoStyleColumn: 2
# ------------光源--- # ------------光源---
# -------------type 0:没有光源 1：JYDam # -------------type 0:没有光源 1：利珀光源控制器JYDam 2：利珀视觉控制器
# -----------1:JYDam 配置num和index # ----------- num:总共多少个光源端口 index:需要控制的是哪个
# ------------ 利珀视觉控制器id从1开始，光源控制器从0开始
lightSource: lightSource:
type: 1 type: 2
info: "{'num':2,'index':0}" num: 4
index: 1
# -----------扫码枪 # -----------扫码枪
# ------------type 1: sick # ------------type 1: sick
sensor: sensor:
type: 1 type: 1
# -----tray 托盘 # -----tray 托盘
# -----goods 货物 # -----goods 货物
# 扫码模式 1：球机扫码 2：扫码枪 0:不用扫码 # 扫码模式 1：球机扫码 2：扫码枪
scanCodeMode: scanCodeMode:
tray: 2 tray: 0
goods: 1 goods: 1
goodsCodeTypes: goodsCodeTypes:
- 14 - 14

20
web/src/main/resources/application-prod.yml
Unescape Escape View File

@ -19,15 +19,15 @@ spring:
validationQuery: SELECT 1 FROM DUAL validationQuery: SELECT 1 FROM DUAL
# --------本服务端口号 # --------本服务端口号
server: server:
port: 8099 port: 8100
#-------------- #--------------
# ------用户中心地址 # ------用户中心地址
userUrl: http://115.236.65.98:11001 userUrl: http://115.236.65.98:11001
# ----------- # -----------
# ----默认摄像头的连接信息 # ----默认摄像头的连接信息
cameraConfig: cameraConfig:
# ------------球機選擇--- 0:中威 1：海康 # ------------球機選擇--- 0:利珀 1：海康
cameraType: 1 cameraType: 0
cameraPassword: a1234567 cameraPassword: a1234567
cameraUser: admin cameraUser: admin
cameraPort: 8000 cameraPort: 8000
@ -35,7 +35,7 @@ cameraConfig:
#相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的 #相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的
delayCaptureTime: 3500 delayCaptureTime: 3500
# 下载mp4延迟 海康的下载mp4需要2分钟 # 下载mp4延迟 海康的下载mp4需要2分钟
# 中威延迟10s就可 # 利珀延迟10s就可
# 单位毫秒 # 单位毫秒
delayDownloadMp4: 120000 delayDownloadMp4: 120000
# ------------ # ------------
@ -53,13 +53,13 @@ videoStyleConfig:
videoStyleRow: 2 videoStyleRow: 2
videoStyleColumn: 2 videoStyleColumn: 2
# ------------光源--- # ------------光源---
# -------------type 0:没有光源 1：JYDam 2：视觉控制器 # -------------type 0:没有光源 1：利珀光源控制器JYDam 2：利珀视觉控制器
# -----------1:JYDam 配置num和index num:总共多少个控制口 index:需要控制的是哪个 # ----------- num:总共多少个光源端口 index:需要控制的是哪个
# ------------ 利珀视觉控制器id从1开始，光源控制器从0开始
lightSource: lightSource:
type: 1 type: 2
info: "{'num':2,'index':0}" num: 4
num: 2 index: 1
index: 0
# -----------扫码枪 # -----------扫码枪
# ------------type 1: sick # ------------type 1: sick
sensor: sensor:

28
web/src/main/resources/application-test.yml
Unescape Escape View File

@ -14,35 +14,35 @@ spring:
testWhileIdle: false testWhileIdle: false
timeBetweenEvictionRunsMillis: 60000 timeBetweenEvictionRunsMillis: 60000
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://115.236.65.98:12004/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://127.0.0.1:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
username: root username: root
validationQuery: SELECT 1 FROM DUAL validationQuery: SELECT 1 FROM DUAL
# --------本服务端口号 # --------本服务端口号
server: server:
port: 8099 port: 8100
#-------------- #--------------
# ------用户中心地址 # ------用户中心地址
userUrl: http://115.236.65.98:11001 userUrl: http://115.236.65.98:11001
# ----------- # -----------
# ----默认摄像头的连接信息 # ----默认摄像头的连接信息
cameraConfig: cameraConfig:
# ------------球機選擇--- 0:中威 1：海康 # ------------球機選擇--- 0:利珀 1：海康
cameraType: 0 cameraType: 0
cameraPassword: a1234567 cameraPassword: a1234567
cameraUser: admin cameraUser: admin
cameraPort: 37777 cameraPort: 8000
videoServer: 127.0.0.1:8083 videoServer: 127.0.0.1:8083
#相机抓图延迟 毫秒 #相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的
delayCaptureTime: 2000 delayCaptureTime: 3500
# 下载mp4延迟 海康的下载mp4需要2分钟 # 下载mp4延迟 海康的下载mp4需要2分钟
# 中威延迟10s就可 # 利珀延迟10s就可
# 单位毫秒 # 单位毫秒
delayDownloadMp4: 120000 delayDownloadMp4: 120000
# ------------ # ------------
# -----图片 mp4下载地址 # -----图片 mp4下载地址
savePath: savePath:
mediaPath: d:\\data\media\ mediaPath: d:\\data\media\
mp4Path: d:\\data\mp4\ mp4Path: d://data/mp4/
# ------------服务端类型 0：TCP(罗伯泰克) 1:KSEC(JSON)（昆船） # ------------服务端类型 0：TCP(罗伯泰克) 1:KSEC(JSON)（昆船）
serverMode: 1 serverMode: 1
ksec: ksec:
@ -53,11 +53,13 @@ videoStyleConfig:
videoStyleRow: 2 videoStyleRow: 2
videoStyleColumn: 2 videoStyleColumn: 2
# ------------光源--- # ------------光源---
# -------------type 0:没有光源 1：JYDam # -------------type 0:没有光源 1：利珀光源控制器JYDam 2：利珀视觉控制器
# -----------1:JYDam 配置num和index # ----------- num:总共多少个光源端口 index:需要控制的是哪个
# ------------ 利珀视觉控制器id从1开始，光源控制器从0开始
lightSource: lightSource:
type: 1 type: 2
info: "{'num':2,'index':0}" num: 4
index: 1
# -----------扫码枪 # -----------扫码枪
# ------------type 1: sick # ------------type 1: sick
sensor: sensor:
@ -66,7 +68,7 @@ sensor:
# -----goods 货物 # -----goods 货物
# 扫码模式 1：球机扫码 2：扫码枪 # 扫码模式 1：球机扫码 2：扫码枪
scanCodeMode: scanCodeMode:
tray: 2 tray: 0
goods: 1 goods: 1
goodsCodeTypes: goodsCodeTypes:
- 14 - 14

Write Preview
Loading…
Cancel
Save