Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgDeviceReadStateServiceImpl.java

@@ -31,7 +31,7 @@
   }



   @Override

   public void addUnreadDeviceMsg(String type, String device, int platform, int msgCount, String msg) {

   public void addUnreadDeviceMsg(String type, String device, int platform, int msgCount, String msg,Date msgTime) {

      MsgDeviceReadState state = msgDeviceReadStateMapper.selectByDeviceAndPlatformAndType(device, platform, type);

      if (state != null) {

         MsgDeviceReadState update = new MsgDeviceReadState();

@@ -39,6 +39,7 @@
         update.setUnReadCount(state.getUnReadCount() + msgCount);

         update.setUpdateTime(new Date());

         update.setLatestContent(msg);

         update.setLatestContentTime(msgTime);

         msgDeviceReadStateMapper.updateByPrimaryKeySelective(update);

      } else {

         state = new MsgDeviceReadState();

@@ -49,6 +50,7 @@
         state.setUnReadCount(msgCount);

         state.setUpdateTime(new Date());

         state.setLatestContent(msg);

         state.setLatestContentTime(msgTime);

         msgDeviceReadStateMapper.insertSelective(state);

      }

   }

@@ -99,4 +101,12 @@
      return totalCount;

   }



   @Override

   public int getUnReadCount(String device, int platform, String type) {

      MsgDeviceReadState state = getByDeviceAndPlatformAndType(type, device, platform);

      if (state == null)

         return 0;

      return state.getUnReadCount() == null ? 0 : state.getUnReadCount();

   }



}