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

中烟RFID协议

Browse Source
nanjing-zhongyan
yiming 3 years ago
parent edd098f114
commit fcdaf09ea3
4 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File

32
web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java
Unescape Escape View File

@ -31,7 +31,7 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
* 向上 * 向上
*/ */
public boolean ptzControlUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { public boolean ptzControlUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
log.info("up start"); log.debug("up start");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL,
lParam1, lParam2, 0, 0); lParam1, lParam2, 0, 0);
@ -39,7 +39,7 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
} }
public boolean ptzControlUpEnd(Integer cameraId, int nChannelID) { public boolean ptzControlUpEnd(Integer cameraId, int nChannelID) {
log.info("up end"); log.debug("up end");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL,
0, 0, 0, 1); 0, 0, 0, 1);
@ -49,14 +49,14 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
* 向下 * 向下
*/ */
public boolean ptzControlDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { public boolean ptzControlDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
log.info("down start"); log.debug("down start");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL,
lParam1, lParam2, 0, 0); lParam1, lParam2, 0, 0);
} }
public boolean ptzControlDownEnd(Integer cameraId, int nChannelID) { public boolean ptzControlDownEnd(Integer cameraId, int nChannelID) {
log.info("down end"); log.debug("down end");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL,
0, 0, 0, 1); 0, 0, 0, 1);
@ -66,14 +66,14 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
* 向左 * 向左
*/ */
public boolean ptzControlLeftStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { public boolean ptzControlLeftStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
log.info("left start"); log.debug("left start");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL,
lParam1, lParam2, 0, 0); lParam1, lParam2, 0, 0);
} }
public boolean ptzControlLeftEnd(Integer cameraId, int nChannelID) { public boolean ptzControlLeftEnd(Integer cameraId, int nChannelID) {
log.info("left end"); log.debug("left end");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL,
0, 0, 0, 1); 0, 0, 0, 1);
@ -83,14 +83,14 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
* 向右 * 向右
*/ */
public boolean ptzControlRightStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { public boolean ptzControlRightStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
log.info("right start"); log.debug("right start");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL,
lParam1, lParam2, 0, 0); lParam1, lParam2, 0, 0);
} }
public boolean ptzControlRightEnd(Integer cameraId, int nChannelID) { public boolean ptzControlRightEnd(Integer cameraId, int nChannelID) {
log.info("right end"); log.debug("right end");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL,
0, 0, 0, 1); 0, 0, 0, 1);
@ -100,14 +100,14 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
* 向左上 * 向左上
*/ */
public boolean ptzControlLeftUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { public boolean ptzControlLeftUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
log.info("up left start"); log.debug("up left start");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP,
lParam1, lParam2, 0, 0); lParam1, lParam2, 0, 0);
} }
public boolean ptzControlLeftUpEnd(Integer cameraId, int nChannelID) { public boolean ptzControlLeftUpEnd(Integer cameraId, int nChannelID) {
log.info("up left end"); log.debug("up left end");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP,
0, 0, 0, 1); 0, 0, 0, 1);
@ -117,14 +117,14 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
* 向右上 * 向右上
*/ */
public boolean ptzControlRightUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { public boolean ptzControlRightUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
log.info("up right start"); log.debug("up right start");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP,
lParam1, lParam2, 0, 0); lParam1, lParam2, 0, 0);
} }
public boolean ptzControlRightUpEnd(Integer cameraId, int nChannelID) { public boolean ptzControlRightUpEnd(Integer cameraId, int nChannelID) {
log.info("up right end"); log.debug("up right end");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP,
0, 0, 0, 1); 0, 0, 0, 1);
@ -134,7 +134,7 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
* 向左下 * 向左下
*/ */
public boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { public boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
log.info(" left down start"); log.debug(" left down start");
Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN,
lParam1, lParam2, 0, 0); lParam1, lParam2, 0, 0);
@ -145,7 +145,7 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
} }
public boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID) { public boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID) {
log.info(" left down end"); log.debug(" left down end");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN,
0, 0, 0, 1); 0, 0, 0, 1);
@ -155,14 +155,14 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
* 向右下 * 向右下
*/ */
public boolean ptzControlRightDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { public boolean ptzControlRightDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
log.info(" right down start"); log.debug(" right down start");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN,
lParam1, lParam2, 0, 0); lParam1, lParam2, 0, 0);
} }
public boolean ptzControlRightDownEnd(Integer cameraId, int nChannelID) { public boolean ptzControlRightDownEnd(Integer cameraId, int nChannelID) {
log.info(" right down end"); log.debug(" right down end");
return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN,
0, 0, 0, 1); 0, 0, 0, 1);

6
web/src/main/java/com/zhehekeji/web/mapper/StockLogMapper.java
Unescape Escape View File

@ -2,6 +2,12 @@ package com.zhehekeji.web.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhehekeji.web.entity.StockLog; import com.zhehekeji.web.entity.StockLog;
import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Select;
public interface StockLogMapper extends BaseMapper<StockLog> { public interface StockLogMapper extends BaseMapper<StockLog> {
@Select("select * from `stock_log` where street_id = #{streetId} and `direction` = #{direction} and `side` = #{side} " +
" and `row` = #{row} and `column` = #{column} and `type` = #{type} limit 1")
StockLog selectOneByLocation(Integer streetId, Integer direction, Integer side, Integer row,Integer column,Integer type);
} }

53
web/src/main/java/com/zhehekeji/web/service/PlcService.java
Unescape Escape View File

@ -459,38 +459,27 @@ public class PlcService {
if (order != null) { if (order != null) {
//update picPath in stock if code is C2/C4 //update picPath in stock if code is C2/C4
if(orderInfo.getCode().startsWith("C2") || orderInfo.getCode().startsWith("C4")){ if(orderInfo.getCode().startsWith("C2") || orderInfo.getCode().startsWith("C4")){
StockLog stockLog = new StockLog(); Integer type = Integer.valueOf(orderInfo.getCode().substring(1,2));
stockLog.setStreetId(orderInfo.getStreetId()); StockLog stockLog = stockLogMapper.selectOneByLocation(orderInfo.getStreetId(),
stockLog.setDirection(orderInfo.getLeftRight()); orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),type);
stockLog.setSide(orderInfo.getSeparation()); if(stockLog == null){
stockLog.setRow(orderInfo.getRow()); stockLog = new StockLog();
stockLog.setColumn(orderInfo.getColumn()); stockLog.setStreetId(orderInfo.getStreetId());
stockLog.setPic(path); stockLog.setDirection(orderInfo.getLeftRight());
String type = orderInfo.getCode().substring(1,2); stockLog.setSide(orderInfo.getSeparation());
stockLog.setType(Integer.valueOf(type)); stockLog.setRow(orderInfo.getRow());
stockLog.setOrderNum(orderInfo.getOrderNum()); stockLog.setColumn(orderInfo.getColumn());
stockLog.setCreateTime(LocalDateTime.now()); stockLog.setPic(path);
stockLogMapper.insert(stockLog); stockLog.setType(type);
// Stock stock = stockMapper.getByShelveIdAndRowColumn(orderInfo.getShelveId(), orderInfo.getRow(), orderInfo.getColumn()); stockLog.setOrderNum(orderInfo.getOrderNum());
// if (stock == null) { stockLog.setCreateTime(LocalDateTime.now());
// stock = new Stock(); stockLogMapper.insert(stockLog);
// stock.setShelveId(orderInfo.getShelveId()); }else {
// stock.setColumn(orderInfo.getColumn()); stockLog.setPic(path);
// stock.setRow(orderInfo.getRow()); stockLog.setOrderNum(orderInfo.getOrderNum());
// //stock.setStatus(0); stockLog.setCreateTime(LocalDateTime.now());
// //if the stock is null,take over path only stockLogMapper.updateById(stockLog);
// stock.setOveroperationPic(path); }
// stock.setOrderNum(order.getOrderNum());
// stockMapper.insert(stock);
// } else {
// //take the previous picture path to the lasted over picture path
// //take the lasted picture path to the new one
// stock.setPreoperationPic(stock.getOveroperationPic());
// stock.setOveroperationPic(path);
// stock.setOrderNum(order.getOrderNum());
// //stock.setStatus(0);
// stockMapper.updateById(stock);
// }
} }
String pics = order.getPicPaths(); String pics = order.getPicPaths();
if (StringUtils.isEmpty(pics)) { if (StringUtils.isEmpty(pics)) {

2
web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
Unescape Escape View File

@ -209,7 +209,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
// ctx.channel().writeAndFlush(ksecInfo); // ctx.channel().writeAndFlush(ksecInfo);
}else if("E3".equals(code)){ }else if("E3".equals(code)){
//跑位结束 //跑位结束
plcService.RFIDStop(plcCmdInfo, dataInfo.getRow());
} }
} }

Write Preview
Loading…
Cancel
Save