资源保存后设置为已编辑过。设备消息提示bug修改

src/main/java/com/neotel/smfcore/core/language/rest/bean/dto/LanguageMsgDto.java

@@ -30,6 +30,9 @@ public class LanguageMsgDto implements Serializable {
     @ApiModelProperty("存放翻译内容List")
     @ApiModelProperty("存放翻译内容List")
     private List<Content> contentList = Lists.newArrayList();
     private List<Content> contentList = Lists.newArrayList();
 
 
+    @ApiModelProperty("是否编辑过的")
+    private Boolean edited=false;
+
 //    private Map<String,String> contentMap=new HashMap<>();
 //    private Map<String,String> contentMap=new HashMap<>();
 //
 //
 //
 //

src/main/java/com/neotel/smfcore/core/language/service/nanager/impl/LanguageMsgManagerImpl.java

@@ -136,6 +136,7 @@ public class LanguageMsgManagerImpl implements ILanguageMsgManager {
         if (resources.getId() != null) {
         if (resources.getId() != null) {
             logName = "修改资源：";
             logName = "修改资源：";
             c.and("id").ne(resources.getId());
             c.and("id").ne(resources.getId());
+            resources.setEdited(true);
         }   //code不能重复
         }   //code不能重复
         LanguageMsg result = languageMsgDao.findOne(new Query(c));
         LanguageMsg result = languageMsgDao.findOne(new Query(c));
         if (result != null) {
         if (result != null) {

src/main/java/com/neotel/smfcore/core/language/service/po/LanguageMsg.java

@@ -58,6 +58,10 @@ public class LanguageMsg extends BasePo implements Serializable {
      * 存放翻译内容List
      * 存放翻译内容List
      */
      */
     private List<Content> contentList = Lists.newArrayList();
     private List<Content> contentList = Lists.newArrayList();
+    /**
+     * 是否编辑过的
+     */
+    private Boolean edited=false;
 
 
     /**
     /**
      * 查找指定语言的内容
      * 查找指定语言的内容

src/main/java/com/neotel/smfcore/core/system/util/DevicesStatusUtil.java

@@ -66,7 +66,7 @@ public class DevicesStatusUtil {
             //和上个消息是否一样
             //和上个消息是否一样
             StatusBean msgBean=clientMsgs.get(cid);
             StatusBean msgBean=clientMsgs.get(cid);
             if(msgBean!=null){
             if(msgBean!=null){
-                if(msgBean.getMsgCode().equals(msgCode)||msgBean.getMsg().equals(clientMsg)){
+                if(msgBean.getMsgCode().equals(msgCode)&&msgBean.getMsg().equals(clientMsg)){
                     newMsg=false;
                     newMsg=false;
                 }
                 }
             }
             }