From cdefd6a50721e2c4ba6df850e1405419f9df3c31 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 13:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java b/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
index ed5f19b..78158f3 100644
--- a/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
+++ b/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
@@ -2,19 +2,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.mapper.InformationNotificationMapper;
import com.yuanchu.mom.pojo.InformationNotification;
-import com.yuanchu.mom.pojo.InformationNotificationDto;
import com.yuanchu.mom.service.InformationNotificationService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -32,14 +28,14 @@
@Autowired
private InformationNotificationService informationNotificationService;
- @ApiOperation(value = "婊氬姩鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "娑堟伅閫氱煡-婊氬姩鍒嗛〉鏌ヨ")
@GetMapping("page")
@ValueAuth
public Result<?> getPage(Long size, Long current, String messageType) {
return Result.success(informationNotificationService.getPage(new Page<>(current, size), messageType));
}
- @ApiOperation(value = "鏇存柊娑堟伅鐘舵�侊紙鎷掔粷銆佹帴鏀讹級")
+ @ApiOperation(value = "娑堟伅閫氱煡-鏇存柊娑堟伅鐘舵�侊紙鎷掔粷銆佹帴鏀讹級")
@PutMapping("updateMessageStatus")
@ValueAuth
public Result<?> updateMessageStatus(@RequestBody InformationNotification informationNotification) {
@@ -47,7 +43,7 @@
return Result.success();
}
- @ApiOperation(value = "鏍囪鎵�鏈変俊鎭负宸茶/鍒犻櫎鎵�鏈夊凡璇绘秷鎭�")
+ @ApiOperation(value = "娑堟伅閫氱煡-鏍囪鎵�鏈変俊鎭负宸茶/鍒犻櫎鎵�鏈夊凡璇绘秷鎭�")
@PutMapping("informationReadOrDelete/{isMarkAllInformationRead}")
@ValueAuth
public Result<?> markAllInformationReadOrDeleteAllReadMessages(@PathVariable("isMarkAllInformationRead") Boolean isMarkAllInformationRead) {
@@ -55,7 +51,7 @@
return Result.success();
}
- @ApiOperation(value = "鏍规嵁Id鍒犻櫎鏁版嵁")
+ @ApiOperation(value = "娑堟伅閫氱煡-鍒犻櫎鏁版嵁")
@DeleteMapping("deleteDataBasedOnId")
@ValueAuth
public Result<?> deleteDataBasedOnId(Integer id) {
@@ -63,18 +59,26 @@
return Result.success();
}
- @ApiOperation(value = "鏌ヨ鏄惁瀛樺湪鏈鏁版嵁")
+ @ApiOperation(value = "娑堟伅閫氱煡-鏌ヨ鏄惁瀛樺湪鏈鏁版嵁")
@GetMapping("checkForUnreadData")
@ValueAuth
public Result<?> checkForUnreadData() {
return Result.success(informationNotificationService.checkForUnreadData());
}
- @ApiOperation(value = "鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶")
+ @ApiOperation(value = "娑堟伅閫氱煡-鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶")
@PutMapping("triggerModificationStatusToRead/{id}")
@ValueAuth
public Result<?> triggerModificationStatusToRead(@PathVariable("id") Integer id) {
informationNotificationService.triggerModificationStatusToRead(id);
return Result.success();
}
+
+ @ApiOperation(value = "娑堟伅閫氱煡-鑾峰彇棣栭〉鍥涚娑堟伅鏁伴噺")
+ @GetMapping("getNumberFourTypesMessagesHomePage")
+ @ValueAuth
+ public Result<?> getNumberFourTypesMessagesHomePage() {
+ Map<String, Object> data = informationNotificationService.getNumberFourTypesMessagesHomePage();
+ return Result.success(data);
+ }
}
--
Gitblit v1.9.3