Merge remote-tracking branch 'origin/master'

hzims-service/assets/src/main/java/com/hnac/hzims/spare/aspect/LimitRemindAspect.java

@@ -171,9 +171,9 @@ public class LimitRemindAspect {
 
     private void warningPush(String alert, User pusher,Long warehouseId) {
             MessagePushRecordDto message = new MessagePushRecordDto();
-            message.setBusinessClassify("business");
+            message.setBusinessClassify(MessageConstants.BusinessClassifyEnum.ASSETS.getKey());
-            message.setBusinessKey(MessageConstants.BusinessClassifyEnum.ASSETS.getKey());
+            message.setBusinessKey("资产预警");
-            message.setSubject(MessageConstants.BusinessClassifyEnum.ASSETS.getDescription());
+            message.setSubject("资产预警");
             message.setTaskId(warehouseId);
             message.setTenantId("200000");
             message.setTypes(Arrays.asList(MessageConstants.APP_PUSH, MessageConstants.WS_PUSH));
@@ -191,7 +191,7 @@ public class LimitRemindAspect {
             }
             message.setPusher(userId.toString());
             message.setPusherName(pusher.getName());
-            message.setAccount(pusher.getAccount());
+            message.setAccount(pusher.getId().toString());
             message.setCreateUser(userId);
             messageClient.sendMessage(message);