Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 6e1a4a95 由 zshaohui
选项

1.消息类型增加errorCode 

2.工单出库，任务取消，清空出料口信息
1 个父辈 7a5b80f0
内嵌 并排
正在显示 8 个修改的文件 包含 31 行增加 和 18 行删除
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
...@@ -109,7 +109,7 @@ public class DataInitManager { ...@@ -109,7 +109,7 @@ public class DataInitManager {
inListCache.loadMap(); inListCache.loadMap();
Message message=Message.newMsg(MessageType.INFO ,"server", "", "", "smfcore.messages.serverStart","服务器启动",null); Message message=Message.newMsg(MessageType.INFO ,"server", "", "", "smfcore.messages.serverStart","服务器启动",null,"");
messageManager.save(message); messageManager.save(message);
dataCache.getAllInventory(null,""); dataCache.getAllInventory(null,"");
......
src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java
...@@ -78,6 +78,8 @@ public class StatusBean { ...@@ -78,6 +78,8 @@ public class StatusBean {
public String msgCode=""; public String msgCode="";
public String errorCode = "";
public String[] msgParam ; public String[] msgParam ;
/// <summary> /// <summary>
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java
...@@ -713,19 +713,20 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -713,19 +713,20 @@ public class BaseDeviceHandler implements IDeviceHandler {
StatusBean bean = DevicesStatusUtil.getStatusBean(statusBean.getCid()); StatusBean bean = DevicesStatusUtil.getStatusBean(statusBean.getCid());
if (bean == null || bean.getBoxStatus() == null) { if (bean == null || bean.getBoxStatus() == null) {
DeviceMessageUtil.addOnlineMessage(statusBean.getCid(), "",statusBean.getClientIp()); DeviceMessageUtil.addOnlineMessage(statusBean.getCid(), "",statusBean.getClientIp());
DevicesStatusUtil.updateClientMsg(statusBean.getCid(), "", "", "", null); DevicesStatusUtil.updateClientMsg(statusBean.getCid(), "", "", "", null,"");
} else if (bean.timeOut() && (bean.getOfflineTime() > -1)) { } else if (bean.timeOut() && (bean.getOfflineTime() > -1)) {
DeviceMessageUtil.addOnlineMessage(statusBean.getCid(), "",statusBean.getClientIp()); DeviceMessageUtil.addOnlineMessage(statusBean.getCid(), "",statusBean.getClientIp());
DevicesStatusUtil.updateClientMsg(statusBean.getCid(), "", "", "", null); DevicesStatusUtil.updateClientMsg(statusBean.getCid(), "", "", "", null,"");
} }
//展示到界面 //展示到界面
String msg = statusBean.getMsg(); String msg = statusBean.getMsg();
String msgEn = statusBean.getMsgEn(); String msgEn = statusBean.getMsgEn();
String msgCode = statusBean.getMsgCode(); String msgCode = statusBean.getMsgCode();
String errorCode = statusBean.getErrorCode();
if(ObjectUtil.isNotEmpty(msg)||ObjectUtil.isNotEmpty(msgCode)) { if(ObjectUtil.isNotEmpty(msg)||ObjectUtil.isNotEmpty(msgCode)) {
DevicesStatusUtil.updateClientMsg(statusBean.getCid(), msgCode, msg, msgEn, statusBean.getMsgParam()); DevicesStatusUtil.updateClientMsg(statusBean.getCid(), msgCode, msg, msgEn, statusBean.getMsgParam(),errorCode);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("客户端故障消息处理出错", e); log.error("客户端故障消息处理出错", e);
......
src/main/java/com/neotel/smfcore/core/equipment/handler/impl/BaseEquipHandler.java
...@@ -58,7 +58,7 @@ public class BaseEquipHandler implements IEquipmentHandler { ...@@ -58,7 +58,7 @@ public class BaseEquipHandler implements IEquipmentHandler {
} }
} }
if (newMsg) { if (newMsg) {
DeviceMessageUtil.addDeviceMessage(statusBean.getCid(), msg.getType(), msg.getModule(), msg.getMsgCode(), msg.getMsg(), msg.getMsgParams()); DeviceMessageUtil.addDeviceMessage(statusBean.getCid(), msg.getType(), msg.getModule(), msg.getMsgCode(), msg.getMsg(), msg.getMsgParams(),"");
} }
} }
} }
......
src/main/java/com/neotel/smfcore/core/message/service/po/Message.java
...@@ -23,12 +23,12 @@ import java.util.Locale; ...@@ -23,12 +23,12 @@ import java.util.Locale;
public class Message extends BasePo implements Serializable { public class Message extends BasePo implements Serializable {
public static Message newMsg(MessageType type,String deviceName,String deviceId,String module,String msgCode,String msg,String[] msgParams){ public static Message newMsg(MessageType type,String deviceName,String deviceId,String module,String msgCode,String msg,String[] msgParams,String errorCode){
Message message=new Message(deviceName,deviceId,module, type.name(),msgCode,msg,msgParams,null,null,""); Message message=new Message(deviceName,deviceId,module, type.name(),msgCode,msg,msgParams,null,null,"",errorCode);
return message; return message;
} }
public static Message newMsg(String type,String deviceName,String deviceId,String module,String msgCode,String msg,String[] msgParams){ public static Message newMsg(String type,String deviceName,String deviceId,String module,String msgCode,String msg,String[] msgParams,String errorCode){
Message message=new Message(deviceName,deviceId,module, type,msgCode,msg,msgParams,null,null,""); Message message=new Message(deviceName,deviceId,module, type,msgCode,msg,msgParams,null,null,"",errorCode);
return message; return message;
} }
/** /**
...@@ -75,6 +75,11 @@ public class Message extends BasePo implements Serializable { ...@@ -75,6 +75,11 @@ public class Message extends BasePo implements Serializable {
*/ */
private String operator; private String operator;
/**
* 类型 code
*/
private String errorCode;
public void addData(String key,String value){ public void addData(String key,String value){
if(dataList==null){ if(dataList==null){
dataList=new ArrayList<>(); dataList=new ArrayList<>();
......
src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java
...@@ -47,7 +47,7 @@ public class DeviceMessageUtil { ...@@ -47,7 +47,7 @@ public class DeviceMessageUtil {
public static void updateLineMsg(String lineMsg, String code, String cids,String posName,String msgCode,String[] msgParams) { public static void updateLineMsg(String lineMsg, String code, String cids,String posName,String msgCode,String[] msgParams) {
// lineMsg = lineMsg; // lineMsg = lineMsg;
Message message = Message.newMsg(MessageType.WARNING, "server", "", "", msgCode, lineMsg, msgParams); Message message = Message.newMsg(MessageType.WARNING, "server", "", "", msgCode, lineMsg, msgParams,"");
if (ObjectUtil.isNotEmpty(code)) { if (ObjectUtil.isNotEmpty(code)) {
message.addData("code", code); message.addData("code", code);
} }
...@@ -74,7 +74,7 @@ public class DeviceMessageUtil { ...@@ -74,7 +74,7 @@ public class DeviceMessageUtil {
} }
public static void addDeviceMessage(String cid,String msgType, String moudle, String msgCode, String msg, String[] msgParam) { public static void addDeviceMessage(String cid,String msgType, String moudle, String msgCode, String msg, String[] msgParam,String errorCode) {
DeviceInfo deviceInfo=getDeviceName(cid); DeviceInfo deviceInfo=getDeviceName(cid);
if (deviceInfo!=null) { if (deviceInfo!=null) {
String code=msgCode; String code=msgCode;
...@@ -83,7 +83,7 @@ public class DeviceMessageUtil { ...@@ -83,7 +83,7 @@ public class DeviceMessageUtil {
code=MessageUtils.smfcore+"."+msgCode; code=MessageUtils.smfcore+"."+msgCode;
} }
} }
Message message=Message.newMsg(msgType ,deviceInfo.getName(), deviceInfo.getId(), moudle, code,msg,msgParam); Message message=Message.newMsg(msgType ,deviceInfo.getName(), deviceInfo.getId(), moudle, code,msg,msgParam,errorCode);
messageManager.save(message); messageManager.save(message);
} }
} }
...@@ -91,7 +91,7 @@ public class DeviceMessageUtil { ...@@ -91,7 +91,7 @@ public class DeviceMessageUtil {
public static void addOnlineMessage(String cid, String moudle,String ip) { public static void addOnlineMessage(String cid, String moudle,String ip) {
DeviceInfo deviceInfo=getDeviceName(cid); DeviceInfo deviceInfo=getDeviceName(cid);
if (deviceInfo != null) { if (deviceInfo != null) {
Message message=Message.newMsg(MessageType.INFO,deviceInfo.getName(), deviceInfo.getId(), moudle ,"smfcore.messages.online","上线",null); Message message=Message.newMsg(MessageType.INFO,deviceInfo.getName(), deviceInfo.getId(), moudle ,"smfcore.messages.online","上线",null,"");
message.addData("ip",ip); message.addData("ip",ip);
messageManager.save(message); messageManager.save(message);
} }
...@@ -101,7 +101,7 @@ public class DeviceMessageUtil { ...@@ -101,7 +101,7 @@ public class DeviceMessageUtil {
DeviceInfo deviceInfo=getDeviceName(cid); DeviceInfo deviceInfo=getDeviceName(cid);
if (deviceInfo != null) { if (deviceInfo != null) {
Message message=Message.newMsg(MessageType.INFO,deviceInfo.getName(), deviceInfo.getId(), moudle, "smfcore.messages.offline","离线",null); Message message=Message.newMsg(MessageType.INFO,deviceInfo.getName(), deviceInfo.getId(), moudle, "smfcore.messages.offline","离线",null,"");
messageManager.save(message); messageManager.save(message);
} }
...@@ -114,10 +114,10 @@ public class DeviceMessageUtil { ...@@ -114,10 +114,10 @@ public class DeviceMessageUtil {
Message message; Message message;
if (pos.isEnabled()) { if (pos.isEnabled()) {
message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.enabledPos", "启用库位：{0}", message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.enabledPos", "启用库位：{0}",
new String[]{posName}); new String[]{posName},"");
} else { } else {
message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.disabledPos", "禁用库位：{0}", message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.disabledPos", "禁用库位：{0}",
new String[]{posName}); new String[]{posName},"");
} }
message.setOperator(operator); message.setOperator(operator);
message.addData("posName", posName); message.addData("posName", posName);
......
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -295,6 +295,11 @@ public class LiteOrderCache { ...@@ -295,6 +295,11 @@ public class LiteOrderCache {
order.setTaskReelCount(order.getTaskReelCount() - 1); order.setTaskReelCount(order.getTaskReelCount() - 1);
//order.setTotalTaskReelCount(order.getTotalTaskReelCount()-1); //order.setTotalTaskReelCount(order.getTotalTaskReelCount()-1);
log.info("工单[" + orderNo + "]的任务" + task.getPartNumber() + "[" + task.getBarcode() + "]已取消,任务数-1=" + order.getFinishedReelCount() + "/" + order.getTaskReelCount()); log.info("工单[" + orderNo + "]的任务" + task.getPartNumber() + "[" + task.getBarcode() + "]已取消,任务数-1=" + order.getFinishedReelCount() + "/" + order.getTaskReelCount());
if (order.getFinishedReelCount() == 0 && order.getTaskReelCount() == 0){
if (StringUtils.isNotBlank(task.getExport())){
StorageExportUtil.clearExport(task.getExport());
}
}
} }
else if (task.isFinished()) { else if (task.isFinished()) {
order.setTotalFinishedReelCount(order.getTotalFinishedReelCount() + 1); order.setTotalFinishedReelCount(order.getTotalFinishedReelCount() + 1);
......
src/main/java/com/neotel/smfcore/core/system/util/DevicesStatusUtil.java
...@@ -58,7 +58,7 @@ public class DevicesStatusUtil { ...@@ -58,7 +58,7 @@ public class DevicesStatusUtil {
/** /**
* 更新客户端发上来的消息(设备故障等消息) * 更新客户端发上来的消息(设备故障等消息)
*/ */
public static StatusBean updateClientMsg(String cid,String msgCode, String clientMsg, String clientMsgEn,String[] msgParam) { public static StatusBean updateClientMsg(String cid,String msgCode, String clientMsg, String clientMsgEn,String[] msgParam,String errorCode) {
if (clientMsg == null) { if (clientMsg == null) {
clientMsg = ""; clientMsg = "";
clientMsgEn = ""; clientMsgEn = "";
...@@ -82,7 +82,7 @@ public class DevicesStatusUtil { ...@@ -82,7 +82,7 @@ public class DevicesStatusUtil {
} }
} }
if(newMsg){ if(newMsg){
DeviceMessageUtil.addDeviceMessage(cid, MessageType.ERROR.name(),"",msgCode,clientMsg,msgParam); DeviceMessageUtil.addDeviceMessage(cid, MessageType.ERROR.name(),"",msgCode,clientMsg,msgParam,errorCode);
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!