Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit cc9c50f7
由
LN
编写于
2022-02-16 11:18:52 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
提示信息增加国际化处理。获取库位号的提示自动加入警告消息列表
1 个父辈
8c19f16b
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
90 行增加
和
48 行删除
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java
src/main/java/com/neotel/smfcore/core/device/util/DataCache.java
src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java
src/main/java/com/neotel/smfcore/core/language/util/MyMessageSource.java
src/main/java/com/neotel/smfcore/core/message/service/manager/impl/MessageManagerImpl.java
src/main/java/com/neotel/smfcore/core/message/service/po/Message.java
src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java
src/main/resources/messages.properties
src/main/resources/messages_en_US.properties
src/main/resources/messages_ja_JP.properties
src/main/resources/messages_zh_CN.properties
src/main/resources/messages_zh_TW.properties
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
查看文件 @
cc9c50f
...
@@ -2,21 +2,15 @@ package com.neotel.smfcore.common.init;
...
@@ -2,21 +2,15 @@ package com.neotel.smfcore.common.init;
import
com.neotel.smfcore.common.utils.PermissionInitUtil
;
import
com.neotel.smfcore.common.utils.PermissionInitUtil
;
import
com.neotel.smfcore.common.utils.Constants
;
import
com.neotel.smfcore.common.utils.Constants
;
import
com.neotel.smfcore.common.utils.UserCodeUtil
;
import
com.neotel.smfcore.core.inList.util.InListCache
;
import
com.neotel.smfcore.core.inList.util.InListCache
;
import
com.neotel.smfcore.core.message.enums.MessageType
;
import
com.neotel.smfcore.core.message.service.manager.IMessageManager
;
import
com.neotel.smfcore.core.message.service.po.Message
;
import
com.neotel.smfcore.core.message.util.DeviceMessageUtil
;
import
com.neotel.smfcore.core.order.util.OrderFileWatch
;
import
com.neotel.smfcore.core.order.util.OrderFileWatch
;
import
com.neotel.smfcore.core.system.service.manager.IDataLogManager
;
import
com.neotel.smfcore.core.system.service.po.DataLog
;
import
com.neotel.smfcore.core.system.util.TaskService
;
import
com.neotel.smfcore.security.service.manager.IGroupManager
;
import
com.neotel.smfcore.security.service.manager.IMenuManager
;
import
com.neotel.smfcore.security.service.manager.IMenuManager
;
import
com.neotel.smfcore.security.service.manager.IRoleManager
;
import
com.neotel.smfcore.security.service.manager.IRoleManager
;
import
com.neotel.smfcore.security.service.manager.IUserManager
;
import
com.neotel.smfcore.security.service.manager.IUserManager
;
import
com.neotel.smfcore.security.service.manager.impl.GroupManagerImpl
;
import
com.neotel.smfcore.security.service.manager.impl.MenuManagerImpl
;
import
com.neotel.smfcore.security.service.manager.impl.RoleManagerImpl
;
import
com.neotel.smfcore.security.service.manager.impl.UserManagerImpl
;
import
com.neotel.smfcore.security.service.po.Group
;
import
com.neotel.smfcore.security.service.po.Menu
;
import
com.neotel.smfcore.security.service.po.Menu
;
import
com.neotel.smfcore.security.service.po.Role
;
import
com.neotel.smfcore.security.service.po.Role
;
import
com.neotel.smfcore.security.service.po.User
;
import
com.neotel.smfcore.security.service.po.User
;
...
@@ -28,9 +22,7 @@ import org.springframework.data.mongodb.core.query.Query;
...
@@ -28,9 +22,7 @@ import org.springframework.data.mongodb.core.query.Query;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
javax.annotation.PostConstruct
;
import
javax.annotation.PostConstruct
;
import
javax.jws.soap.SOAPBinding
;
import
java.util.*
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
@Slf4j
@Slf4j
@Component
@Component
...
@@ -57,7 +49,8 @@ public class DataInitManager {
...
@@ -57,7 +49,8 @@ public class DataInitManager {
@Autowired
@Autowired
private
InListCache
inListCache
;
private
InListCache
inListCache
;
@Autowired
private
IMessageManager
messageManager
;
/**
/**
* 当前版本
* 当前版本
*/
*/
...
@@ -120,6 +113,9 @@ public class DataInitManager {
...
@@ -120,6 +113,9 @@ public class DataInitManager {
allPermissionSet
=
annotationUtil
.
initPermission
();
allPermissionSet
=
annotationUtil
.
initPermission
();
inListCache
.
loadMap
();
inListCache
.
loadMap
();
Message
message
=
Message
.
newMsg
(
MessageType
.
INFO
,
"server"
,
""
,
""
,
"smfcore.messages.serverStart"
,
"服务器启动"
,
null
);
messageManager
.
save
(
message
);
}
catch
(
Exception
exception
)
{
}
catch
(
Exception
exception
)
{
log
.
error
(
"初始化环境出错..."
+
exception
.
toString
());
log
.
error
(
"初始化环境出错..."
+
exception
.
toString
());
}
}
...
@@ -254,7 +250,8 @@ public class DataInitManager {
...
@@ -254,7 +250,8 @@ public class DataInitManager {
//日志管理:物料日志
//日志管理:物料日志
Menu
pMenuLog
=
Menu
.
CreatePMenu
(
"日志管理"
,
30
,
"log"
,
2
,
"log"
);
Menu
pMenuLog
=
Menu
.
CreatePMenu
(
"日志管理"
,
30
,
"log"
,
2
,
"log"
);
Menu
menuLog
=
new
Menu
(
new
ArrayList
<
Menu
>(),
1
,
"taskLog"
,
"物料日志"
,
1
,
"taskLog"
,
"neolight/taskLog/index"
,
""
,
0
,
"education"
);
Menu
menuLog
=
new
Menu
(
new
ArrayList
<
Menu
>(),
1
,
"taskLog"
,
"物料日志"
,
1
,
"taskLog"
,
"neolight/taskLog/index"
,
""
,
0
,
"education"
);
menus
.
addAll
(
createMenus
(
pMenuLog
,
menuLog
));
Menu
msgLog
=
new
Menu
(
new
ArrayList
<
Menu
>(),
1
,
"message"
,
"消息查询"
,
1
,
"message"
,
"neolight/message/index"
,
""
,
0
,
"messagefind"
);
menus
.
addAll
(
createMenus
(
pMenuLog
,
menuLog
,
msgLog
));
//报表:出入库、库存
//报表:出入库、库存
Menu
pMenuReport
=
Menu
.
CreatePMenu
(
"报表"
,
30
,
"report"
,
2
,
"inOutData"
);
Menu
pMenuReport
=
Menu
.
CreatePMenu
(
"报表"
,
30
,
"report"
,
2
,
"inOutData"
);
...
...
src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java
查看文件 @
cc9c50f
...
@@ -12,12 +12,13 @@ import com.neotel.smfcore.common.utils.Constants;
...
@@ -12,12 +12,13 @@ import com.neotel.smfcore.common.utils.Constants;
import
com.neotel.smfcore.common.utils.ReelLockPosUtil
;
import
com.neotel.smfcore.common.utils.ReelLockPosUtil
;
import
com.neotel.smfcore.core.barcode.service.po.Barcode
;
import
com.neotel.smfcore.core.barcode.service.po.Barcode
;
import
com.neotel.smfcore.core.barcode.utils.CodeResolve
;
import
com.neotel.smfcore.core.barcode.utils.CodeResolve
;
import
com.neotel.smfcore.core.
storage.service.dao.IStoragePosDao
;
import
com.neotel.smfcore.core.
message.util.DeviceMessageUtil
;
import
com.neotel.smfcore.core.storage.service.manager.IStoragePosManager
;
import
com.neotel.smfcore.core.storage.service.manager.IStoragePosManager
;
import
com.neotel.smfcore.core.storage.service.po.StoragePos
;
import
com.neotel.smfcore.core.storage.service.po.StoragePos
;
import
com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao
;
import
com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao
;
import
com.neotel.smfcore.core.system.service.po.AlarmInfo
;
import
com.neotel.smfcore.core.system.service.po.AlarmInfo
;
import
com.neotel.smfcore.core.system.service.po.DataLog
;
import
com.neotel.smfcore.core.system.service.po.DataLog
;
import
com.neotel.smfcore.core.system.util.DevicesStatusUtil
;
import
com.neotel.smfcore.core.system.util.TaskService
;
import
com.neotel.smfcore.core.system.util.TaskService
;
import
com.neotel.smfcore.security.annotation.AnonymousAccess
;
import
com.neotel.smfcore.security.annotation.AnonymousAccess
;
import
com.neotel.smfcore.core.storage.enums.DeviceType
;
import
com.neotel.smfcore.core.storage.enums.DeviceType
;
...
@@ -117,7 +118,7 @@ public class DeviceController {
...
@@ -117,7 +118,7 @@ public class DeviceController {
if
(
dataCahche
.
getCache
(
Constants
.
CACHE_StopOut
))
{
if
(
dataCahche
.
getCache
(
Constants
.
CACHE_StopOut
))
{
lineMsg
=
"系统更新中,暂停出入库"
;
lineMsg
=
"系统更新中,暂停出入库"
;
D
ataCache
.
lineMsg
=
lineMsg
;
D
eviceMessageUtil
.
updateLineMsg
(
lineMsg
,
code
,
cids
,
""
,
"smfcore.linemsg.update"
,
null
)
;
resultMap
.
put
(
"result"
,
"100"
);
resultMap
.
put
(
"result"
,
"100"
);
resultMap
.
put
(
"msg"
,
lineMsg
);
resultMap
.
put
(
"msg"
,
lineMsg
);
return
resultMap
;
return
resultMap
;
...
@@ -250,7 +251,8 @@ public class DeviceController {
...
@@ -250,7 +251,8 @@ public class DeviceController {
if
(
reelLocInfo
==
null
)
{
if
(
reelLocInfo
==
null
)
{
errorMsg
=
"["
+
barcode
.
getBarcode
()
+
"]库位["
+
reelLocInfo
.
getLockPosName
()+
"]已被锁定,暂停入库"
;
errorMsg
=
"["
+
barcode
.
getBarcode
()
+
"]库位["
+
reelLocInfo
.
getLockPosName
()+
"]已被锁定,暂停入库"
;
lineMsg
=
errorMsg
;
lineMsg
=
errorMsg
;
DataCache
.
lineMsg
=
lineMsg
;
DeviceMessageUtil
.
updateLineMsg
(
lineMsg
,
code
,
cids
,
reelLocInfo
.
getLockPosName
(),
"smfcore.linemsg.posLock"
,
new
String
[]{
barcode
.
getBarcode
(),
reelLocInfo
.
getLockPosName
()});
resultMap
.
put
(
"result"
,
"99"
);
resultMap
.
put
(
"result"
,
"99"
);
resultMap
.
put
(
"msg"
,
errorMsg
);
resultMap
.
put
(
"msg"
,
errorMsg
);
return
resultMap
;
return
resultMap
;
...
@@ -295,7 +297,8 @@ public class DeviceController {
...
@@ -295,7 +297,8 @@ public class DeviceController {
alarmInfo
.
setAlarmMsg
(
msg
);
alarmInfo
.
setAlarmMsg
(
msg
);
alarmInfoDao
.
save
(
alarmInfo
);
alarmInfoDao
.
save
(
alarmInfo
);
lineMsg
=
errorMsg
;
lineMsg
=
errorMsg
;
DataCache
.
lineMsg
=
errorMsg
;
DeviceMessageUtil
.
updateLineMsg
(
lineMsg
,
code
,
cids
,
""
,
""
,
null
);
}
else
{
}
else
{
lineMsg
=
okMsg
;
lineMsg
=
okMsg
;
}
}
...
...
src/main/java/com/neotel/smfcore/core/device/util/DataCache.java
查看文件 @
cc9c50f
...
@@ -76,10 +76,7 @@ public class DataCache {
...
@@ -76,10 +76,7 @@ public class DataCache {
* 出库方式
* 出库方式
*/
*/
private
static
Settings
settings
;
private
static
Settings
settings
;
/**
* 流水线提示消息,只保存最后一条
*/
public
static
String
lineMsg
=
""
;
@PostConstruct
@PostConstruct
...
...
src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java
查看文件 @
cc9c50f
...
@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.device.util.DataCache;
...
@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.device.util.DataCache;
import
com.neotel.smfcore.core.kanban.rest.bean.dto.*
;
import
com.neotel.smfcore.core.kanban.rest.bean.dto.*
;
import
com.neotel.smfcore.core.kanban.rest.bean.mapstruct.BoxTaskMapper
;
import
com.neotel.smfcore.core.kanban.rest.bean.mapstruct.BoxTaskMapper
;
import
com.neotel.smfcore.core.kanban.rest.bean.query.BoxTaskQueryCriter
;
import
com.neotel.smfcore.core.kanban.rest.bean.query.BoxTaskQueryCriter
;
import
com.neotel.smfcore.core.message.util.DeviceMessageUtil
;
import
com.neotel.smfcore.core.storage.service.manager.IStoragePosManager
;
import
com.neotel.smfcore.core.storage.service.manager.IStoragePosManager
;
import
com.neotel.smfcore.core.storage.service.po.Storage
;
import
com.neotel.smfcore.core.storage.service.po.Storage
;
import
com.neotel.smfcore.core.storage.service.po.StoragePos
;
import
com.neotel.smfcore.core.storage.service.po.StoragePos
;
...
@@ -79,7 +80,7 @@ public class BoxKanbanController {
...
@@ -79,7 +80,7 @@ public class BoxKanbanController {
public
BoxKanbanDto
info
(
HttpServletRequest
servletRequest
)
{
public
BoxKanbanDto
info
(
HttpServletRequest
servletRequest
)
{
List
<
DataLog
>
allTasks
=
taskService
.
getAllTasks
();
List
<
DataLog
>
allTasks
=
taskService
.
getAllTasks
();
BoxKanbanDto
boxKanbanDto
=
getKanBan
(
allTasks
);
BoxKanbanDto
boxKanbanDto
=
getKanBan
(
allTasks
,
servletRequest
.
getLocale
()
);
String
userId
=
SecurityUtils
.
getCurrentUserId
();
String
userId
=
SecurityUtils
.
getCurrentUserId
();
User
user
=
userManager
.
get
(
userId
);
User
user
=
userManager
.
get
(
userId
);
...
@@ -387,7 +388,7 @@ public class BoxKanbanController {
...
@@ -387,7 +388,7 @@ public class BoxKanbanController {
throw
new
ValidateException
(
"smfcore.posNotExist"
,
"仓位不存在"
);
throw
new
ValidateException
(
"smfcore.posNotExist"
,
"仓位不存在"
);
}
}
private
BoxKanbanDto
getKanBan
(
List
<
DataLog
>
allTasks
)
{
private
BoxKanbanDto
getKanBan
(
List
<
DataLog
>
allTasks
,
Locale
local
)
{
int
allCount
=
allTasks
.
size
();
int
allCount
=
allTasks
.
size
();
int
abnormal
=
0
;
int
abnormal
=
0
;
...
@@ -411,7 +412,11 @@ public class BoxKanbanController {
...
@@ -411,7 +412,11 @@ public class BoxKanbanController {
allcount
++;
allcount
++;
}
}
// DataCache.lineMsg="系统更新中,暂停出入库";
// DataCache.lineMsg="系统更新中,暂停出入库";
BoxKanbanDto
kanbanDto
=
new
BoxKanbanDto
(
allCount
,
normal
,
abnormal
,
waitCount
,
new
ArrayList
<>(),
DataCache
.
lineMsg
);
String
lineMsg
=
null
;
if
(
DeviceMessageUtil
.
lastLineMsg
!=
null
){
lineMsg
=
DeviceMessageUtil
.
lastLineMsg
.
getShowMsg
(
local
);
}
BoxKanbanDto
kanbanDto
=
new
BoxKanbanDto
(
allCount
,
normal
,
abnormal
,
waitCount
,
new
ArrayList
<>(),
lineMsg
);
return
kanbanDto
;
return
kanbanDto
;
}
}
...
@@ -446,7 +451,7 @@ public class BoxKanbanController {
...
@@ -446,7 +451,7 @@ public class BoxKanbanController {
if
(
bean
.
timeOut
())
{
if
(
bean
.
timeOut
())
{
boxDto
.
setOnLine
(
false
);
boxDto
.
setOnLine
(
false
);
for
(
BoxStatusBean
boxStatus
:
bean
.
getBoxStatus
().
values
())
{
for
(
BoxStatusBean
boxStatus
:
bean
.
getBoxStatus
().
values
())
{
boxDto
.
setMsg
(
bean
.
getShowMsg
(
locale
));
//
boxDto.setMsg(bean.getShowMsg(locale));
boxDto
.
setBarcode
(
bean
.
getCode
());
boxDto
.
setBarcode
(
bean
.
getCode
());
boxDto
.
setPosName
(
bean
.
getPosId
());
boxDto
.
setPosName
(
bean
.
getPosId
());
break
;
break
;
...
...
src/main/java/com/neotel/smfcore/core/language/util/MyMessageSource.java
查看文件 @
cc9c50f
package
com
.
neotel
.
smfcore
.
core
.
language
.
util
;
package
com
.
neotel
.
smfcore
.
core
.
language
.
util
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.context.support.ResourceBundleMessageSource
;
import
org.springframework.context.support.ResourceBundleMessageSource
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.lang.reflect.Field
;
import
java.util.*
;
import
java.util.*
;
@Service
@Service
@Slf4j
public
class
MyMessageSource
extends
ResourceBundleMessageSource
{
public
class
MyMessageSource
extends
ResourceBundleMessageSource
{
private
final
String
baseName
=
"messages"
;
private
final
String
baseName
=
"messages"
;
public
Map
<
String
,
String
>
getMessageMap
(
Locale
locale
){
Map
<
String
,
String
>
messageMap
=
new
HashMap
<>();
public
Map
<
String
,
String
>
getMessageMap
(
Locale
locale
)
{
ResourceBundle
resourceBundle
=
getResourceBundle
(
baseName
,
locale
);
Map
<
String
,
String
>
messageMap
=
new
HashMap
<>();
if
(
resourceBundle
!=
null
){
ResourceBundle
resourceBundle
=
getResourceBundle
(
baseName
,
locale
);
Set
<
String
>
keySet
=
resourceBundle
.
keySet
();
if
(
resourceBundle
!=
null
)
{
Set
<
String
>
keySet
=
resourceBundle
.
keySet
();
try
{
//Map<String,Object> lookup
Field
field1
=
resourceBundle
.
getClass
().
getDeclaredField
(
"lookup"
);
field1
.
setAccessible
(
true
);
Map
<
String
,
Object
>
lookup
=
(
Map
<
String
,
Object
>)
field1
.
get
(
resourceBundle
);
keySet
=
lookup
.
keySet
();
}
catch
(
Exception
ex
)
{
log
.
error
(
"MyMessageSource["
+
locale
.
toString
()+
"]出錯:"
+
ex
);
}
for
(
String
key
:
for
(
String
key
:
keySet
)
{
keySet
)
{
String
value
=
resourceBundle
.
getString
(
key
);
String
value
=
resourceBundle
.
getString
(
key
);
if
(!
value
.
isEmpty
())
{
if
(!
value
.
isEmpty
())
{
messageMap
.
put
(
key
,
value
);
messageMap
.
put
(
key
,
value
);
}
}
}
}
}
}
return
messageMap
;
return
messageMap
;
...
...
src/main/java/com/neotel/smfcore/core/message/service/manager/impl/MessageManagerImpl.java
查看文件 @
cc9c50f
...
@@ -93,10 +93,7 @@ public class MessageManagerImpl implements IMessageManager {
...
@@ -93,10 +93,7 @@ public class MessageManagerImpl implements IMessageManager {
map
.
put
(
type
,
typeV
);
map
.
put
(
type
,
typeV
);
map
.
put
(
createDate
,
DateUtil
.
toDateTimeString
(
obj
.
getCreateDate
()));
map
.
put
(
createDate
,
DateUtil
.
toDateTimeString
(
obj
.
getCreateDate
()));
String
msgV
=
obj
.
getMsg
();
String
msgV
=
obj
.
getShowMsg
(
locale
);
if
(
ObjectUtil
.
isNotEmpty
(
obj
.
getMsgCode
())){
msgV
=
MessageUtils
.
getText
(
obj
.
getMsgCode
(),
obj
.
getMsgParams
(),
locale
,
obj
.
getMsg
());
}
map
.
put
(
msg
,
msgV
);
map
.
put
(
msg
,
msgV
);
list
.
add
(
map
);
list
.
add
(
map
);
}
}
...
...
src/main/java/com/neotel/smfcore/core/message/service/po/Message.java
查看文件 @
cc9c50f
package
com
.
neotel
.
smfcore
.
core
.
message
.
service
.
po
;
package
com
.
neotel
.
smfcore
.
core
.
message
.
service
.
po
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.neotel.smfcore.common.base.BasePo
;
import
com.neotel.smfcore.common.base.BasePo
;
import
com.neotel.smfcore.core.language.util.MessageUtils
;
import
com.neotel.smfcore.core.message.enums.MessageType
;
import
com.neotel.smfcore.core.message.enums.MessageType
;
import
com.neotel.smfcore.core.message.service.bean.DataContent
;
import
com.neotel.smfcore.core.message.service.bean.DataContent
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
...
@@ -12,6 +14,7 @@ import java.io.Serializable;
...
@@ -12,6 +14,7 @@ import java.io.Serializable;
import
java.sql.Date
;
import
java.sql.Date
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Locale
;
@Data
@Data
@Document
@Document
...
@@ -70,4 +73,13 @@ public class Message extends BasePo implements Serializable {
...
@@ -70,4 +73,13 @@ public class Message extends BasePo implements Serializable {
dataList
.
add
(
new
DataContent
(
key
,
value
));
dataList
.
add
(
new
DataContent
(
key
,
value
));
}
}
public
String
getShowMsg
(
Locale
locale
){
if
(
ObjectUtil
.
isNotEmpty
(
msgCode
)){
return
MessageUtils
.
getText
(
msgCode
,
msgParams
,
locale
,
msg
);
}
return
msg
;
}
}
}
src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java
查看文件 @
cc9c50f
...
@@ -2,6 +2,7 @@ package com.neotel.smfcore.core.message.util;
...
@@ -2,6 +2,7 @@ package com.neotel.smfcore.core.message.util;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.neotel.smfcore.core.device.util.DataCache
;
import
com.neotel.smfcore.core.device.util.DataCache
;
import
com.neotel.smfcore.core.language.util.MessageUtils
;
import
com.neotel.smfcore.core.message.enums.MessageType
;
import
com.neotel.smfcore.core.message.enums.MessageType
;
import
com.neotel.smfcore.core.message.service.manager.IMessageManager
;
import
com.neotel.smfcore.core.message.service.manager.IMessageManager
;
import
com.neotel.smfcore.core.message.service.po.Message
;
import
com.neotel.smfcore.core.message.service.po.Message
;
...
@@ -31,11 +32,11 @@ public class DeviceMessageUtil {
...
@@ -31,11 +32,11 @@ public class DeviceMessageUtil {
/**
/**
* 流水线提示消息,只保存最后一条
* 流水线提示消息,只保存最后一条
*/
*/
public
static
String
lineMsg
=
""
;
public
static
Message
lastLineMsg
=
null
;
public
static
void
updateLineMsg
(
String
lineMsg
,
String
code
,
String
cids
,
String
posName
)
{
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"
,
""
,
""
,
""
,
lineMsg
,
null
);
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
);
}
}
...
@@ -45,14 +46,21 @@ public class DeviceMessageUtil {
...
@@ -45,14 +46,21 @@ public class DeviceMessageUtil {
if
(
ObjectUtil
.
isNotEmpty
(
posName
))
{
if
(
ObjectUtil
.
isNotEmpty
(
posName
))
{
message
.
addData
(
"posName"
,
posName
);
message
.
addData
(
"posName"
,
posName
);
}
}
messageManager
.
save
(
message
);
message
=
messageManager
.
save
(
message
);
lastLineMsg
=
message
;
}
}
public
static
void
addErrorMessage
(
String
cid
,
String
moudle
,
String
msgCode
,
String
msg
,
String
[]
msgParam
)
{
public
static
void
addErrorMessage
(
String
cid
,
String
moudle
,
String
msgCode
,
String
msg
,
String
[]
msgParam
)
{
Storage
storage
=
dataCache
.
getStorage
(
cid
);
Storage
storage
=
dataCache
.
getStorage
(
cid
);
if
(
storage
!=
null
)
{
if
(
storage
!=
null
)
{
Message
message
=
Message
.
newMsg
(
MessageType
.
ERROR
,
storage
.
getName
(),
storage
.
getId
(),
moudle
,
msgCode
,
msg
,
msgParam
);
String
code
=
msgCode
;
if
(
ObjectUtil
.
isNotEmpty
(
msgCode
)){
if
(!
msgCode
.
startsWith
(
MessageUtils
.
smfcore
)){
code
=
MessageUtils
.
smfcore
+
"."
+
msgCode
;
}
}
Message
message
=
Message
.
newMsg
(
MessageType
.
ERROR
,
storage
.
getName
(),
storage
.
getId
(),
moudle
,
code
,
msg
,
msgParam
);
messageManager
.
save
(
message
);
messageManager
.
save
(
message
);
}
}
}
}
...
...
src/main/resources/messages.properties
查看文件 @
cc9c50f
...
@@ -222,4 +222,6 @@ smfcorre.message.warning=\u8B66\u544A
...
@@ -222,4 +222,6 @@ smfcorre.message.warning=\u8B66\u544A
smfcorre.message.error
=
\u9519\u
8BEF
smfcorre.message.error
=
\u9519\u
8BEF
smfcore.messages.serverStart
=
\u
670D
\u
52A1
\u5668\u
542F
\u
52A8
smfcore.messages.serverStart
=
\u
670D
\u
52A1
\u5668\u
542F
\u
52A8
smfcore.message
=
\u
6D88
\u
606F
\u
67E5
\u
8BE2
smfcore.message
=
\u
6D88
\u
606F
\u
67E5
\u
8BE2
smfcore.inSuddenStop
=
\u6536\u5230\u6025\u
505C
\u
4FE1
\u
53F7
\u
FF0C
\u
62A5
\u
8B66
\u6025\u
505C
\ No newline at end of file
\ No newline at end of file
smfcore.inSuddenStop
=
\u6536\u5230\u6025\u
505C
\u
4FE1
\u
53F7
\u
FF0C
\u
62A5
\u
8B66
\u6025\u
505C
smfcore.linemsg.update
=
\u
7CFB
\u
7EDF
\u
66F4
\u
65B0
\u
4E2D,
\u6682\u
505C
\u
51FA
\u5165\u
5E93
smfcore.linemsg.posLock
=
[{0}]
\u
5E93
\u
4F4D[{1}]
\u
5DF2
\u
88AB
\u9501\u
5B9A,
\u6682\u
505C
\u5165\u
5E93
\ No newline at end of file
\ No newline at end of file
src/main/resources/messages_en_US.properties
查看文件 @
cc9c50f
...
@@ -223,4 +223,6 @@ smfcorre.message.error=Error
...
@@ -223,4 +223,6 @@ smfcorre.message.error=Error
smfcore.messages.serverStart
=
Server start-up
smfcore.messages.serverStart
=
Server start-up
smfcore.message
=
Message Search
smfcore.message
=
Message Search
smfcore.inSuddenStop
=
Emergency stop signal received
\u
FF0Calarm emergency stop
smfcore.inSuddenStop
=
Emergency stop signal received
\u
FF0Calarm emergency stop
smfcore.linemsg.update
=
System update in progress, suspend the inlet and outlet
smfcore.linemsg.posLock
=
The [{0}] storage space [{1}] has been locked, suspend storage
src/main/resources/messages_ja_JP.properties
查看文件 @
cc9c50f
...
@@ -223,4 +223,6 @@ smfcorre.message.error=\u30A8\u30E9\u30FC
...
@@ -223,4 +223,6 @@ smfcorre.message.error=\u30A8\u30E9\u30FC
smfcore.messages.serverStart
=
\u
30B5
\u
30FC
\u
30D0
\u
30FC
\u
306E
\u
8D77
\u
52D5
smfcore.messages.serverStart
=
\u
30B5
\u
30FC
\u
30D0
\u
30FC
\u
306E
\u
8D77
\u
52D5
smfcore.message
=
\u
30E1
\u
30C3
\u
30BB
\u
30FC
\u
30B8
\u
306E
\u
304A
\u
554F
\u3044\u5408\u
308F
\u
305B
smfcore.message
=
\u
30E1
\u
30C3
\u
30BB
\u
30FC
\u
30B8
\u
306E
\u
304A
\u
554F
\u3044\u5408\u
308F
\u
305B
smfcore.inSuddenStop
=
\u
7DCA
\u6025\u
505C
\u
6B62
\u
4FE1
\u
53F7
\u3092\u
53D7
\u
4FE1
\u3057\u3001\u
7DCA
\u6025\u
505C
\u
6B62
\u3092\u
8B66
\u
544A
\u3057\u
307E
\u3059
smfcore.inSuddenStop
=
\u
7DCA
\u6025\u
505C
\u
6B62
\u
4FE1
\u
53F7
\u3092\u
53D7
\u
4FE1
\u3057\u3001\u
7DCA
\u6025\u
505C
\u
6B62
\u3092\u
8B66
\u
544A
\u3057\u
307E
\u3059
smfcore.linemsg.update
=
\u
30B7
\u
30B9
\u
30C6
\u
30E0
\u
66F4
\u
65B0
\u
4E2D
\u3001\u
30A2
\u
30AF
\u
30BB
\u
30B9
\u
505C
\u
6B62
\u
4E2D
smfcore.linemsg.posLock
=
[{0}]
\u
30B9
\u
30C8
\u
30EC
\u
30FC
\u
30B8
\u
30B9
\u
30DA
\u
30FC
\u
30B9[{1}]
\u
304C
\u
30ED
\u
30C3
\u
30AF
\u3055\u
308C
\u3066\u3044\u
308B
\u3001\u
30B9
\u
30C8
\u
30EC
\u
30FC
\u
30B8
\u
304C
\u
505C
\u
6B62
\u3057\u3066\u3044\u
308B
src/main/resources/messages_zh_CN.properties
查看文件 @
cc9c50f
...
@@ -223,3 +223,5 @@ smfcorre.message.error=\u9519\u8BEF
...
@@ -223,3 +223,5 @@ smfcorre.message.error=\u9519\u8BEF
smfcore.messages.serverStart
=
\u
670D
\u
52A1
\u5668\u
542F
\u
52A8
smfcore.messages.serverStart
=
\u
670D
\u
52A1
\u5668\u
542F
\u
52A8
smfcore.message
=
\u
6D88
\u
606F
\u
67E5
\u
8BE2
smfcore.message
=
\u
6D88
\u
606F
\u
67E5
\u
8BE2
smfcore.inSuddenStop
=
\u6536\u5230\u6025\u
505C
\u
4FE1
\u
53F7
\u
FF0C
\u
62A5
\u
8B66
\u6025\u
505C
smfcore.inSuddenStop
=
\u6536\u5230\u6025\u
505C
\u
4FE1
\u
53F7
\u
FF0C
\u
62A5
\u
8B66
\u6025\u
505C
smfcore.linemsg.update
=
\u
7CFB
\u
7EDF
\u
66F4
\u
65B0
\u
4E2D,
\u6682\u
505C
\u
51FA
\u5165\u
5E93
smfcore.linemsg.posLock
=
[{0}]
\u
5E93
\u
4F4D[{1}]
\u
5DF2
\u
88AB
\u9501\u
5B9A,
\u6682\u
505C
\u5165\u
5E93
src/main/resources/messages_zh_TW.properties
查看文件 @
cc9c50f
...
@@ -223,3 +223,5 @@ smfcorre.message.error=\u932F\u8AA4
...
@@ -223,3 +223,5 @@ smfcorre.message.error=\u932F\u8AA4
smfcore.messages.serverStart
=
\u
670D
\u
52D9
\u5668\u
555F
\u
52D5
smfcore.messages.serverStart
=
\u
670D
\u
52D9
\u5668\u
555F
\u
52D5
smfcore.message
=
\u
6D88
\u
606F
\u
67E5
\u
8A62
smfcore.message
=
\u
6D88
\u
606F
\u
67E5
\u
8A62
smfcore.inSuddenStop
=
\u6536\u5230\u6025\u
505C
\u
4FE1
\u
865F
\u
FF0C
\u5831\u
8B66
\u6025\u
505C
smfcore.inSuddenStop
=
\u6536\u5230\u6025\u
505C
\u
4FE1
\u
865F
\u
FF0C
\u5831\u
8B66
\u6025\u
505C
smfcore.linemsg.update
=
\u
7CFB
\u
7D71
\u
66F4
\u
65B0
\u
4E2D
\u
FF0C
\u
66AB
\u
505C
\u
51FA
\u5165\u
5EAB
smfcore.linemsg.posLock
=
[{0}]
\u
5EAB
\u
4F4D[{1}]
\u
5DF2
\u
88AB
\u9396\u
5B9A
\u
FF0C
\u
66AB
\u
505C
\u5165\u
5EAB
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论