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

1.格式化代码

Browse Source 
2.添加录像开始时间和结束时间设置参数downloStartMp4,downloEndMp4
2.彻底实现rfid随行和盘点入库，随行入库数据为次数最多，盘点成功入库
3.盘点历史查询修改
4.定时关闭光源不再查询光源状态
5.盘点失败查询rfidlive的数据库数据值
6.错误或者未盘点无需核对
7.昆船发送信息左右不再交换
8.清空盘点信息
9.websocket实时推送实现
10.增加rfid注解
nanjing-yancao-rfid
LAPTOP-S9HJSOEB\昊天 3 years ago
parent 1e7c3cd274
commit a5af53f601
18 changed files with 473 additions and 264 deletions
Show Stats Download Patch File Download Diff File

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

@ -108,6 +108,8 @@ public class ConfigProperties {
private Integer port;
private Integer reconnectNum = 10;
private Integer reconnectInterval = 10;
private Long downloadStartMp4 = 0L ;
private Long downloadEndMp4 = 0L ;
}
@Data

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

@ -18,12 +18,13 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@Api(value = "Stock", tags = "库存管理")
@RestController
@ -119,6 +120,12 @@ public class StockController {
public Result<Stock> nextOne(@RequestBody Stock stock) {
return Result.success(stockService.nextOne(stock.getId()));
}
@ApiOperation(value = "清空盘点信息")
@RequestMapping(value = "/truncateStock", method = RequestMethod.POST)
public Result truncateStock() {
stockService.truncateStock();
return Result.success();
}
@ApiOperation(value = "获取盘点信息")

7
web/src/main/java/com/zhehekeji/web/entity/RfidLive.java
Unescape Escape View File

@ -1,5 +1,7 @@
package com.zhehekeji.web.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@ -10,13 +12,14 @@ import java.time.LocalDateTime;
@TableName("rfid_live")
public class RfidLive {
@TableId(type = IdType.AUTO)
private String id;
private String wmsTrayCode;
private Integer streetId;
private Integer direction;
private Integer side;
private Integer row;
private Integer column;
private Integer rfidRow;
private Integer rfidColumn;
private String rfidTrayCode;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")

10
web/src/main/java/com/zhehekeji/web/entity/RfidLog.java
Unescape Escape View File

@ -1,5 +1,7 @@
package com.zhehekeji.web.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.models.auth.In;
@ -8,17 +10,19 @@ import lombok.Data;
import java.time.LocalDateTime;
@Data
@TableName("rfid_live")
@TableName("rfid_log")
public class RfidLog {
@TableId(type = IdType.AUTO)
private String id;
private String wmsTrayCode;
private Integer street_id;
private Integer direction;
private Integer side;
private Integer row;
private Integer column;
private Integer rfidRow;
private Integer rfidColumn;
private String rfidTrayCode;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")

9
web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java
Unescape Escape View File

@ -3,7 +3,9 @@ package com.zhehekeji.web.lib.hik;
import com.sun.jna.NativeLong;
import com.sun.jna.ptr.IntByReference;
import com.zhehekeji.common.util.PathUtil;
import com.zhehekeji.common.util.SpringContextUtil;
import com.zhehekeji.core.util.Assert;
import com.zhehekeji.web.config.ConfigProperties;
import com.zhehekeji.web.lib.CameraConnMap;
import com.zhehekeji.web.lib.CameraControlModule;
import com.zhehekeji.web.lib.joyware.NetSDKLib;
@ -257,8 +259,11 @@ public class HikCameraControlModuleImpl implements CameraControlModule {
}
public void downloadMp4(Integer cameraId, String path, LocalDateTime start, LocalDateTime end) {
start = start.minusMinutes(1);
end = end.minusMinutes(1);
ConfigProperties configProperties = SpringContextUtil.getBean(ConfigProperties.class);
start = start.minusNanos(1000000000 * configProperties.getKsec().getDownloadStartMp4());
start = start.minusNanos(1000000000 * configProperties.getKsec().getDownloadEndMp4());
/* start = start.minusMinutes(1);
end = end.minusMinutes(1);*/
PathUtil.checkDirc(path);
HCNetSDK.NET_DVR_TIME startTime = new HCNetSDK.NET_DVR_TIME();
startTime.setTime(start.getYear(), start.getMonthValue(), start.getDayOfMonth(), start.getHour(), start.getMinute(), start.getSecond());

8
web/src/main/java/com/zhehekeji/web/pojo/websocket/WebSocketVo.java
Unescape Escape View File

@ -1,14 +1,20 @@
package com.zhehekeji.web.pojo.websocket;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class WebSocketVo<T> {
private String type;
private Long id;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime time;
private T message;

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

@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
import com.zhehekeji.web.entity.CheckLog;
import com.zhehekeji.web.mapper.CheckLogMapper;
import com.zhehekeji.web.pojo.stock.CheckLogSearch;
import com.zhehekeji.web.util.ToolUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@ -28,18 +29,21 @@ public class CheckLogService {
if(search.getStartTimestamp() != null && search.getEndTimestamp() != null){
wrapper.ge("create_time",search.getStartTimestamp()).le("create_time",search.getEndTimestamp());
}
if(search.getLeftRight() != null &&( search.getLeftRight() != 0 || search.getLeftRight() != -1)){
if(search.getLeftRight() != null &&( search.getLeftRight() != 0 && search.getLeftRight() != -1)){
wrapper.eq("`direction`",search.getLeftRight());
}
if(search.getSide() != null &&( search.getSide() != 0 || search.getSide() != -1)){
if(search.getSide() != null &&( search.getSide() != 0 && search.getSide() != -1)){
wrapper.eq("`side`",search.getSide());
}
if(search.getRow() != null &&( search.getRow() != 0 || search.getRow() != -1)){
if(search.getRow() != null &&( search.getRow() != 0 && search.getRow() != -1)){
wrapper.eq("`row`",search.getRow());
}
if(search.getColumn() != null &&( search.getColumn() != 0 || search.getColumn() != -1)){
if(search.getColumn() != null &&( search.getColumn() != 0 && search.getColumn() != -1)){
wrapper.eq("`column`",search.getColumn());
}
if(ToolUtil.isNotEmpty(search.getStreetId() )){
wrapper.eq("`street_id`",search.getStreetId());
}
wrapper.orderByDesc("create_time");
List<CheckLog>stockChecks = checkLogMapper.selectList(wrapper);

5
web/src/main/java/com/zhehekeji/web/service/CronTab.java
Unescape Escape View File

@ -84,8 +84,9 @@ public class CronTab {
JYDAMEquip equip = JYDamHelper.Connect(lightSource.getIp(),lightSource.getPort());
JYDamHelper.closeDO(equip,configProperties.getLightSource().getIndex());
Integer status = JYDamHelper.ReadStatus(equip,configProperties.getLightSource().getNum(),configProperties.getLightSource().getIndex());
log.info("ip:{},status:{}",lightSource.getIp(),status);
//不再获取灯光状态
//Integer status = JYDamHelper.ReadStatus(equip,configProperties.getLightSource().getNum(),configProperties.getLightSource().getIndex());
//log.info("ip:{},status:{}",lightSource.getIp(),status);
equip.DisConnect();
}else if(configProperties.getLightSource().getType() == 2){
HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),0);

14
web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java
Unescape Escape View File

@ -70,9 +70,23 @@ public class PlcCmdInfo {
private String lotnum;
private String streetName;
private Integer fromSeparation;
private Integer toSeparation;
private Integer fromDirection;
private Integer toDirection;
private Integer fromRow;
private Integer toRow;
private Integer fromColumn;
private Integer toColumn;
private Integer fromSide;
private Integer toSide;
public PlcCmdInfo(String plcId, String taskId, Integer side1, Integer leftRight1, Integer column1, Integer row1, Integer separation1, Integer side2, Integer leftRight2, Integer column2, Integer row2, Integer separation2,String lotnum) {
this.taskId = taskId;
this.side1 = side1;

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

@ -16,8 +16,10 @@ import com.zhehekeji.web.pojo.websocket.WebSocketVo;
import com.zhehekeji.web.service.RFID.RFIDMap;
import com.zhehekeji.web.service.RFID.RFIDSocket;
import com.zhehekeji.web.service.hikLightSource.HikControlSocket;
import com.zhehekeji.web.service.interfaces.RfidLiveService;
import com.zhehekeji.web.service.ksec.KsecNettyClient;
import com.zhehekeji.web.service.sick.SickSocket;
import com.zhehekeji.web.util.ToolUtil;
import com.zhehekeji.web.ws.WebSocketServer;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
@ -33,10 +35,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingDeque;
import java.util.concurrent.ThreadPoolExecutor;
@ -65,6 +64,9 @@ public class PlcService {
private WarnMapper warnMapper;
@Resource
private OrderService orderService;
@Resource
RFIDMapper rfidMapper;
@Resource
private StockLogMapper stockLogMapper;
@ -87,6 +89,8 @@ public class PlcService {
private RFIDService rfidService;
@Resource
private CheckLogMapper checkLogMapper;
@Resource
private RfidLiveService rfidLiveService;
private static ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 8, 200, TimeUnit.MINUTES, new ArrayBlockingQueue<>(100000));
@ -299,6 +303,7 @@ public class PlcService {
gyrateCameraByCodeTimeLater(street.getCamera1Id(), "C5", configProperties.getCameraConfig().getC2OutDelayCaptureTime() + 500);
}
}
rfidLiveService.rfidOrderStock(plcCmdInfo, times, code);
}
public void gyrateCamera(PlcCmdInfo plcCmdInfo, String code) {
@ -548,11 +553,11 @@ public class PlcService {
} else {
if (street.getCamera1Id() != null && street.getCamera2Id() != null && street.getCamera1Id() != 0 && street.getCamera2Id() != 0) {
//双伸 todo 这个因项目而异，看现场的情况
//默认是 左侧返回camera2 右侧返回camera1
//默认是 左侧返回camera1 右侧返回camera2
if (plcCmdInfo.getLeftRight1() == 1) {
return street.getCamera2Id();
}else {
return street.getCamera1Id();
} else {
return street.getCamera2Id();
}
} else {
Integer cameraId = street.getCamera1Id() != null && street.getCamera1Id() != 0 ? street.getCamera1Id() : street.getCamera2Id();
@ -562,17 +567,27 @@ public class PlcService {
}
}
public Integer getCameraByPlcCmdE(PlcCmdInfo plcCmdInfo, Integer leftRight) {
Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
//判断单双伸 type=0 单伸 1为双伸
Integer type;
if (plcCmdInfo.getFromSeparation() == 1) {
return street.getCamera1Id();
} else {
return street.getCamera2Id();
}
}
@Resource
private LightSourceMapper lightSourceMapper;
public void webSocketSendInfo(PlcCmdInfo plcCmdInfo,String cmdCode) throws IOException {
public String webSocketSendInfo(PlcCmdInfo plcCmdInfo, String cmdCode) throws IOException {
WebSocketVo<PlcCmdInfo> webSocketVo = new WebSocketVo<>();
webSocketVo.setMessage(plcCmdInfo);
webSocketVo.setType("wmsCmdCode-" + cmdCode);
webSocketVo.setMessageType("object");
WebSocketServer.sendInfo(JSONObject.toJSONString(webSocketVo), null);
return JSONObject.toJSONString(webSocketVo);
}
public Boolean check(PlcCmdInfo plcCmdInfo, String cmdCode, String wmsCode, String wmsTrayCode) {
@ -580,11 +595,13 @@ public class PlcService {
long startTime = System.currentTimeMillis();
Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
CronTab.putTime(street.getId());
plcCmdInfo.setStreetName(street.getName());
List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id", street.getId()));
lightSources.forEach(lightSource -> {
HikControlSocket.openLight(lightSource.getIp(), lightSource.getPort(), configProperties.getLightSource().getIndex(), 1);
});
Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1());
log.info("盘点摄像头变化参数："+plcCmdInfo.toString());
Integer cameraId = getCameraByPlcCmdE(plcCmdInfo, plcCmdInfo.getLeftRight1());
if (plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2) {
//内测
@ -593,7 +610,7 @@ public class PlcService {
gyrateCameraByCode(cameraId, c);
} else {
String c = cmdCode + "1";
gyrateCameraByCode(cameraId, cmdCode);
gyrateCameraByCode(cameraId, c);
try {
Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
} catch (InterruptedException e) {
@ -644,21 +661,44 @@ public class PlcService {
} else if (configProperties.getScanCodeMode().getTray() == 3) {
// //RFID
// RFID rfid = rfidService.getRFIDByPlc(street.getId(),plcCmdInfo.getLeftRight1());
Set<String> tags = new HashSet<>();
try {
RFIDCheck(plcCmdInfo);
RFIDCheck(plcCmdInfo,true);
Thread.sleep(1000 * configProperties.getRfid().getScanTime());
Set<String> tags = RFIDStop(plcCmdInfo);
} catch (Exception e) {
e.printStackTrace();
} finally {
tags = RFIDStop(plcCmdInfo);
}
if (tags != null && tags.size() > 0 && tags.contains(wmsTrayCode)) {
trayCode = wmsTrayCode;
trayCheck = Boolean.TRUE;
if(! rfidLiveService.getRfidLive(plcCmdInfo,street,wmsTrayCode)){
RFID rfid = rfidMapper.selectOne(new QueryWrapper<RFID>().eq("street_id", street.getId()));
rfidLiveService.rfidRemoveLive(plcCmdInfo,street,rfid);
rfidLiveService.rfidSave(plcCmdInfo,trayCode,street,rfid);
}
} else {
log.warn("sick ocr error:{}", "");
//查看数据库里数据
RfidLive rfidLive = rfidLiveService.getOne(new QueryWrapper<RfidLive>()
.eq("street_Id", street.getId())
.eq("direction", plcCmdInfo.getFromDirection())
.eq("side", plcCmdInfo.getSide1())
.eq("rfid_row", plcCmdInfo.getRow1())
.eq("rfid_column", plcCmdInfo.getRow1()));
if (ToolUtil.isNotEmpty(rfidLive) && ToolUtil.isNotEmpty(rfidLive.getRfidTrayCode()) && rfidLive.getRfidTrayCode().equals(wmsTrayCode)) {
trayCode = wmsTrayCode;
trayCheck = Boolean.TRUE;
log.info("数据库查询rfid", trayCode);
} else {
trayCode = "";
trayCheck = Boolean.FALSE;
log.warn("sick ocr error:{}",trayCode);
}
}catch (Exception e){
e.printStackTrace();
}
}
OrderInfo orderInfo = new OrderInfo(street, plcCmdInfo, 1, cmdCode);
Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(), plcCmdInfo.getFromDirection(), orderInfo.getSeparation(), orderInfo.getRow(), orderInfo.getColumn());
@ -732,26 +772,25 @@ public class PlcService {
checkLog(stock);
// StockCheckRunnable stockCheckRunnable = new StockCheckRunnable(street,plcCmdInfo,cmdCode,stockMapper,path,checkLogMapper,configProperties.getScanCodeMode().getGoods(),wmsCode,wmsTrayCode,trayCode,trayCheck,configProperties,sensorGun);
// threadPoolExecutor.execute(stockCheckRunnable);
//还原相机
gyrateCameraByCode(cameraId, "C5");
long end = System.currentTimeMillis();
long s = end - startTime;
log.info("time:{}millisecond", s);
return true;
}
public Boolean checkRfid(PlcCmdInfo plcCmdInfo,String wmsTrayCode){
RFIDCheck(plcCmdInfo);
WebSocketVo<PlcCmdInfo> webSocketVo = WebSocketVo.<PlcCmdInfo>builder()
.message(plcCmdInfo)
.messageType("object")
.type("InventoryPush")
.build();
try {
Thread.sleep(1000*configProperties.getRfid().getScanTime());
} catch (InterruptedException e) {
WebSocketServer.sendInfo(JSONObject.toJSONString(webSocketVo),"");
} catch (IOException e) {
throw new RuntimeException(e);
}
Set<String> tags = RFIDStop(plcCmdInfo);
if(tags!= null && tags.size()>0 && tags.contains(wmsTrayCode)){
return Boolean.TRUE;
}else {
return Boolean.FALSE;
}
return true;
}
public void checkLog(Stock stock) {
CheckLog checkLog = new CheckLog();
checkLog.setCheckNum(stock.getCheckNum());
@ -770,23 +809,33 @@ public class PlcService {
checkLog.setLotnum(stock.getLotnum());
checkLogMapper.insert(checkLog);
}
public void truncateStock() {
stockMapper.truncate();
}
public void RFIDCheck(PlcCmdInfo plcCmdInfo){
/**
* 根据信息开启rfid链接
* @param plcCmdInfo 相关信息
* @param fromOrTo 确定方向
*/
public void RFIDCheck(PlcCmdInfo plcCmdInfo, boolean fromOrTo) {
Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
if (street != null) {
//rfid不分左右，rfid使用同一ip和端口，依靠传递字符调整方向
RFID rfid = rfidService.getRFIDByPlc(street.getId(), null);
if (rfid != null) {
if (fromOrTo) {
RFIDStart(rfid.getIp(), rfid.getPort(), street.getId(), plcCmdInfo.getFromDirection());
}else
RFIDStart(rfid.getIp(), rfid.getPort(), street.getId(), plcCmdInfo.getToDirection());
}
}
}
public void RFIDStart(String ip, Integer port, Integer streetId, Integer direction) {
RFIDSocket rfidSocket = new RFIDSocket(ip, port);
log.info("rfid调用，ip："+ip+";port:"+port);
rfidSocket.startCheck(direction);
rfidSocket.readData();
RFIDMap.put(streetId, rfidSocket);
@ -805,6 +854,21 @@ public class PlcService {
return tags;
}
public String RFIDStopGetRFID(PlcCmdInfo plcCmdInfo) {
Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
RFIDSocket rfidSocket = RFIDMap.get(street.getId());
String tags = "";
if (rfidSocket != null) {
tags = rfidSocket.getTag();
log.info("tag:{}", tags);
rfidSocket.close();
RFIDMap.remove(street.getId());
}
return tags;
}
public ConfigProperties getConfigProperties() {
return configProperties;
}

40
web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocket.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.zhehekeji.web.service.RFID;
import com.baomidou.mybatisplus.extension.api.R;
import com.zhehekeji.web.util.ToolUtil;
import io.swagger.models.auth.In;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@ -30,6 +31,10 @@ public class RFIDSocket {
private int length;
private String ip;
private int port;
private int index;
private static File file;
@ -41,14 +46,37 @@ public class RFIDSocket {
*/
private Set<String> tags = new HashSet<>();
private Map<String, Integer> countMap = new HashMap();
private List<Byte> byteList = new ArrayList<>(30);
public Set<String> getTags(){
return tags;
}
/**
* 获取rfid扫描最多的tag，不保证准确性
* @return
*/
public String getTag(){
if(ToolUtil.isNotEmpty(countMap)){
int count = 0;
String t = "";
for (String tag : countMap.keySet()){
if(countMap.get(tag)>count){
count = countMap.get(tag);
t = tag;
}
}
return t;
}else return "";
}
public RFIDSocket(String ip,int port){
this.ip = ip;
this.port = port;
socket = new Socket();
os = null;
is = null;
@ -58,7 +86,6 @@ public class RFIDSocket {
is = socket.getInputStream();
} catch (IOException e) {
log.error("RFIDSocket time out,ip:{},info:{}",ip,e);
close();
}
}
@ -113,6 +140,9 @@ public class RFIDSocket {
}*/
System.out.println(code);
tags.add(code);
if(ToolUtil.isEmpty(countMap.get(code))){
countMap.put(code,1);
}else countMap.put(code,countMap.get(code) + 1);
}
}
}
@ -203,10 +233,12 @@ public class RFIDSocket {
antChanges[2] = (byte)0x01;
antChanges[3] = (byte)0x74;
if(1 == direction ){
//切换天线 使用天线0
//切换天线 使用天线
log.info("rfid左 ip:"+ip);
antChanges[4] = (byte)0x00;
antChanges[5] = (byte)0xe7;
}else {
log.info("rfid右 ip:"+ip);
//切换天线 使用天线1
antChanges[4] = (byte)0x01;
antChanges[5] = (byte)0xe6;
@ -237,7 +269,7 @@ public class RFIDSocket {
}
public static void main(String[] args) throws IOException, InterruptedException {
RFIDSocket rfid = new RFIDSocket("10.43.26.124",4001);
RFIDSocket rfid = new RFIDSocket("10.43.26.128",4001);
file = new File("D:\\code.txt");
file.createNewFile();
fw = new FileWriter(file, true);

9
web/src/main/java/com/zhehekeji/web/service/StockService.java
Unescape Escape View File

@ -318,8 +318,7 @@ public class StockService {
* @param stockCheck
* @return
*/
public Stock
stockInfo(StockCheck stockCheck) {
public Stock stockInfo(StockCheck stockCheck) {
Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(stockCheck.getStreetId(),stockCheck.getDirection(),stockCheck.getSide(), stockCheck.getRow(), stockCheck.getColumn());
if(stock == null){
@ -363,7 +362,7 @@ public class StockService {
Stock stock = stockInfo(stockCheck);
Assert.isTrue(stock != null && stock.getId() != null, "该货位暂时没有记录");
Integer oldStatus = stock.getStatus();
Assert.isTrue(StockStatus.ERROR.getStatus().equals(oldStatus), "无需核对");
Assert.isTrue( StockStatus.PENDING.getStatus().equals(oldStatus) || StockStatus.ERROR.getStatus().equals(oldStatus), "无需核对");
log.info("check stock correct, street_id:{},direction:{},side:{},row:{},column:{}", stockCheck.getStreetId(),stockCheck.getDirection(),stockCheck.getSide(), stockCheck.getRow(), stockCheck.getColumn());
stock.setStatus(StockStatus.MANUAL.getStatus());
@ -438,6 +437,10 @@ public class StockService {
return stock;
}
public void truncateStock() {
stockMapper.truncate();
}
// public void init(String shelveId, Integer row, Integer column){
// Map<String,Object> map = new HashMap<>();
// map.put("shelve_id",shelveId);

1
web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDamHelper.java
Unescape Escape View File

@ -33,6 +33,7 @@ public class JYDamHelper {
public static Integer ReadStatus(JYDAMEquip equip,int num, int index){
if(equip.IsConnect()){
BitVector bitVector = equip.readDO(num);
log.error("start li");
return bitVector.getBit(index) ? 1:0;
}else {
return null;

84
web/src/main/java/com/zhehekeji/web/service/impl/RfidLiveServiceImpl.java
Unescape Escape View File

@ -43,66 +43,92 @@ public class RfidLiveServiceImpl extends ServiceImpl<RfidLiveMapper,RfidLive> im
@Override
@Async("threadPoolTaskExecutor")
public void rfidOrderStock(PlcCmdInfo plcCmdInfo, Integer times, String code,String wmsTrayCode) {
public void rfidOrderStock(PlcCmdInfo plcCmdInfo, Integer times, String trayCode) {
Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
RFID rfid = rfidMapper.selectOne(new QueryWrapper<RFID>().eq("street_id", street.getId()));
//wms传递了wmsTrayCode
if(ToolUtil.isNotEmpty(wmsTrayCode)){
//放货到位的时候,去触发rfid拿到值，判断是否相同，是则记录
String tags = "";
if (times == 3) {
plcService.RFIDCheck(plcCmdInfo);
plcService.RFIDCheck(plcCmdInfo, false);
try {
Thread.sleep(1000 * configProperties.getRfid().getScanTime());
} catch (InterruptedException e) {
throw new RuntimeException(e);
} finally {
tags = plcService.RFIDStopGetRFID(plcCmdInfo);
}
rfidRemoveLive(plcCmdInfo,street,rfid);
rfidSave( plcCmdInfo,tags,street,rfid);
}
//取货完成删除live
if (times == 2) {
rfidRemoveLive(plcCmdInfo,street,rfid);
}
}
public void rfidRemoveLive(PlcCmdInfo plcCmdInfo, Street street, RFID rfid) {
RfidLog rfidLog = new RfidLog();
remove(new QueryWrapper<RfidLive>()
.eq("street_Id", street.getId())
.eq("direction", plcCmdInfo.getFromDirection())
.eq("side", plcCmdInfo.getFromSide())
.eq("rfid_row", plcCmdInfo.getFromRow())
.eq("rfid_column", plcCmdInfo.getFromColumn()));
rfidLog.setRfidId(rfid.getId());
rfidLog.setStreet_id(street.getId());
rfidLog.setDirection(plcCmdInfo.getFromDirection());
rfidLog.setSide(plcCmdInfo.getSeparation1());
rfidLog.setRfidRow(plcCmdInfo.getRow1());
rfidLog.setRfidColumn(plcCmdInfo.getColumn1());
rfidLog.setCreateTime(LocalDateTime.now());
rfidLog.setRfidId(rfid.getId());
rfidLog.setTaskId(plcCmdInfo.getTaskId());
rfidLog.setMovement(2);
rfidLogService.save(rfidLog);
}
Set<String> tags = plcService.RFIDStop(plcCmdInfo);
public void rfidSave(PlcCmdInfo plcCmdInfo, String code, Street street, RFID rfid) {
RfidLog rfidLog = new RfidLog();
RfidLive rfidLive = new RfidLive();
if(tags!= null && tags.size()>0 && tags.contains(wmsTrayCode)){
rfidLog.setRfidTrayCode(wmsTrayCode);
if (ToolUtil.isNotEmpty(code)) {
rfidLog.setRfidTrayCode(code);
rfidLive.setRfidId(rfid.getId());
rfidLive.setWmsTrayCode(wmsTrayCode);
rfidLive.setRfidTrayCode(wmsTrayCode);
rfidLive.setRfidTrayCode(code);
rfidLive.setStreetId(street.getId());
rfidLive.setDirection(plcCmdInfo.getToDirection());
rfidLive.setSide(plcCmdInfo.getSide1());
rfidLive.setRow(plcCmdInfo.getRow1());
rfidLive.setColumn(plcCmdInfo.getColumn1());
rfidLive.setRfidTrayCode(null);
rfidLive.setSide(plcCmdInfo.getSeparation2());
rfidLive.setRfidRow(plcCmdInfo.getRow2());
rfidLive.setRfidColumn(plcCmdInfo.getColumn2());
rfidLive.setCreateTime(LocalDateTime.now());
rfidLive.setRfidId(rfid.getId());
rfidLive.setTaskId(plcCmdInfo.getTaskId());
save(rfidLive);
}
rfidLog.setRfidId(rfid.getId());
rfidLog.setWmsTrayCode(wmsTrayCode);
rfidLog.setStreet_id(street.getId());
rfidLog.setDirection(plcCmdInfo.getToDirection());
rfidLog.setSide(plcCmdInfo.getSide1());
rfidLog.setRow(plcCmdInfo.getRow1());
rfidLog.setColumn(plcCmdInfo.getColumn1());
rfidLog.setRfidTrayCode(null);
rfidLog.setSide(plcCmdInfo.getSeparation2());
rfidLog.setRfidRow(plcCmdInfo.getRow2());
rfidLog.setRfidColumn(plcCmdInfo.getColumn2());
rfidLog.setCreateTime(LocalDateTime.now());
rfidLog.setRfidId(rfid.getId());
rfidLog.setTaskId(plcCmdInfo.getTaskId());
rfidLog.setMovement(1);
rfidLogService.save(rfidLog);
}
//取货完成删除live
if(times ==2){
remove(new QueryWrapper<RfidLive>()
public boolean getRfidLive(PlcCmdInfo plcCmdInfo,Street street,String rfidTrayCode){
return count(new QueryWrapper<RfidLive>()
.eq("street_Id", street.getId())
.eq("direction", plcCmdInfo.getFromDirection())
.eq("side" ,plcCmdInfo.getSide1())
.eq("row" ,plcCmdInfo.getRow1())
.eq("column" ,plcCmdInfo.getRow1()));
}
}
.eq("side", plcCmdInfo.getFromSide())
.eq("rfid_row", plcCmdInfo.getFromRow())
.eq("rfid_column", plcCmdInfo.getFromColumn()).eq("rfid_Tray_Code",rfidTrayCode)) == 1;
}
}

18
web/src/main/java/com/zhehekeji/web/service/interfaces/RfidLiveService.java
Unescape Escape View File

@ -1,10 +1,26 @@
package com.zhehekeji.web.service.interfaces;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhehekeji.web.entity.RFID;
import com.zhehekeji.web.entity.RfidLive;
import com.zhehekeji.web.entity.RfidLog;
import com.zhehekeji.web.entity.Street;
import com.zhehekeji.web.service.PlcCmdInfo;
public interface RfidLiveService extends IService<RfidLive> {
void rfidOrderStock(PlcCmdInfo plcCmdInfo, Integer times, String code,String wmsTrayCode);
/**
* 随行时检查rfid 并记录在数据库中，无法保证准确性
* @param plcCmdInfo
* @param times
* @param code
*/
void rfidOrderStock(PlcCmdInfo plcCmdInfo, Integer times, String code);
/**
*
* @param plcCmdInfo
*/
void rfidRemoveLive(PlcCmdInfo plcCmdInfo, Street street, RFID rfid);
void rfidSave(PlcCmdInfo plcCmdInfo, String code, Street street, RFID rfid);
boolean getRfidLive(PlcCmdInfo plcCmdInfo, Street street, String rfidTrayCode);
}

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

@ -87,24 +87,32 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
String srmNumber = null;
String cmdName = null;
if(dataInfo != null){
plcCmdInfo = new PlcCmdInfo(dataInfo.getSRMNumber(), dataInfo.getTaskId(), dataInfo.getFromSide(), dataInfo.getFromDirection(), dataInfo.getFromColumn(), dataInfo.getFromRow(), dataInfo.getFromSeparation(),dataInfo.getToSide(), dataInfo.getToDirection(), dataInfo.getToColumn(), dataInfo.getToRow(),dataInfo.getToSeparation(),lotnum);
plcCmdInfo = new PlcCmdInfo(dataInfo.getSRMNumber(), dataInfo.getTaskId(),
dataInfo.getFromSide(), dataInfo.getFromDirection(), dataInfo.getFromColumn(),
dataInfo.getFromRow(), dataInfo.getFromSeparation(),dataInfo.getToSide(),
dataInfo.getToDirection(), dataInfo.getToColumn(), dataInfo.getToRow(),
dataInfo.getToSeparation(),lotnum);
plcCmdInfo.setFromDirection(dataInfo.getFromDirection());
plcCmdInfo.setToDirection(dataInfo.getToDirection());
//左右换过来
plcCmdInfo.setToColumn(dataInfo.getToColumn());
plcCmdInfo.setToRow(dataInfo.getToRow());
plcCmdInfo.setFromRow(dataInfo.getFromRow());
plcCmdInfo.setFromColumn(dataInfo.getFromColumn());
plcCmdInfo.setFromSide(dataInfo.getFromSide());
plcCmdInfo.setToSide(dataInfo.getToSide());
//左右不换过来
if(dataInfo.getFromDirection() == 1){
dataInfo.setFromDirection(2);
//dataInfo.setFromDirection(2);
plcCmdInfo.setLeftRight1(dataInfo.getFromDirection());
}else {
dataInfo.setFromDirection(1);
//dataInfo.setFromDirection(1);
plcCmdInfo.setLeftRight1(dataInfo.getFromDirection());
}
if(dataInfo.getToDirection() != null && dataInfo.getToDirection() == 1){
dataInfo.setToDirection(2);
//dataInfo.setToDirection(2);
plcCmdInfo.setLeftRight2(dataInfo.getToDirection());
}else {
dataInfo.setToDirection(1);
//dataInfo.setToDirection(1);
plcCmdInfo.setLeftRight2(dataInfo.getToDirection());
}
srmNumber = dataInfo.getSRMNumber();
@ -187,7 +195,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
// }else {
// log.info("other D code :{}",code);
// }
} else if (Cmd.E.name().equals(ksecInfo.getType())) {
} else if (Cmd.E.name().equals(ksecInfo.getType()) && dataInfo.getTrayCode().startsWith("E")) {
//盘点
//转球机到盘点位 然后拍照
@ -211,6 +219,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
String code = dataInfo.getCmdName();
log.info("盘点指令：{}", ksecInfo);
plcService.check(plcCmdInfo,ksecInfo.getType(),dataInfo.getCode(),dataInfo.getTrayCode());
/*
if("E1".equals(code)){
plcService.RFIDCheck(plcCmdInfo);

3
web/src/main/java/com/zhehekeji/web/ws/WebSocketServer.java
Unescape Escape View File

@ -1,4 +1,5 @@
package com.zhehekeji.web.ws;
import com.zhehekeji.web.util.ToolUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -126,7 +127,7 @@ public class WebSocketServer {
for(WebSocketServer server:websocketMap.values()) {
try {
// sid为null时群发，不为null则只发一个
if (sid == null) {
if (ToolUtil.isEmpty(sid)) {
server.sendMessage(message);
} else if (server.sid.equals(sid)) {
server.sendMessage(message);

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

@ -32,6 +32,17 @@ cameraConfig:
cameraUser: admin
cameraPort: 8000
videoServer: 127.0.0.1:8083
#随行模式下的相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的
# 发了C1之后多久拍照
C1DelayCaptureTime: 2500
# 内侧货架 发了C2 之后多久拍照
C2DelayCaptureTime: 1500
# 外侧货架 发了C2 之后多久拍照
C2OutDelayCaptureTime: 4500
# 发了C3之后多久拍照
C3DelayCaptureTime: 2500
C4DelayCaptureTime: 1500
C4OutDelayCaptureTime: 1500
#相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的
delayCaptureTime: 3500
# 下载mp4延迟 海康的下载mp4需要2分钟

Write Preview
Loading…
Cancel
Save