dcs před 1 rokem
rodič
revize
d88d96adde

+ 4 - 4
virgo.manager/src/main/java/com/bosshand/virgo/controller/MessageController.java

@@ -72,10 +72,10 @@ public class MessageController {
         return Response.ok(messageService.getMessageByUserId(messageType, userId));
     }
 
-    @ApiOperation(value = "根据type统计未读消息", notes = "根据type统计未读消息")
-    @RequestMapping(value = "/countUnread/messageType/{userId}/{messageType}", method = RequestMethod.GET)
-    public Response countUnread(@PathVariable int messageType, @PathVariable long userId) {
-        return Response.ok(messageService.countUnread(messageType, userId));
+    @ApiOperation(value = "统计未读消息", notes = "统计未读消息")
+    @RequestMapping(value = "/countUnread/messageType/{userId}", method = RequestMethod.GET)
+    public Response countUnread(@PathVariable long userId) {
+        return Response.ok(messageService.countUnread(userId));
     }
 
 }

+ 1 - 1
virgo.manager/src/main/java/com/bosshand/virgo/message/dao/NotificationMessageDao.java

@@ -25,6 +25,6 @@ public interface NotificationMessageDao {
 
 	public List<NotificationMessage> getList();
 
-	List<HashMap<Integer,Long>> countUnread(int messageType, long userId);
+	List<HashMap<Integer,Long>> countUnread(long userId);
 
 }

+ 2 - 2
virgo.manager/src/main/java/com/bosshand/virgo/message/service/MessageService.java

@@ -62,8 +62,8 @@ public class MessageService {
 		return notificationMessageDao.getMessageByMessageType(messageType, userId);
 	}
 
-	public List<HashMap<Integer,Long>> countUnread(int messageType, long userId) {
-		return notificationMessageDao.countUnread(messageType, userId);
+	public List<HashMap<Integer,Long>> countUnread(long userId) {
+		return notificationMessageDao.countUnread(userId);
 	}
 
 	public List<NotificationMessage> getMessageByViewed(long userId, boolean viewed) {

+ 1 - 1
virgo.manager/src/main/resources/mapper/NotificationMessage.xml

@@ -53,7 +53,7 @@
 	</select>
 
 	<select id="countUnread" resultType="java.util.HashMap">
-		SELECT messageType, COUNT(DISTINCT id) as 'count' FROM mgr_user_message where userId = #{userId} and messageType = #{messageType} and viewed = 0 GROUP BY messageType
+		SELECT messageType, COUNT(DISTINCT id) as 'count' FROM mgr_user_message where userId = #{userId} and viewed = 0 GROUP BY messageType
 	</select>
 
 	<update id="updateViewed">