From c65ca0929a19933fb6045b3e03ae1e0f2ad5ed1e Mon Sep 17 00:00:00 2001
From: tianwenbo <tianwenbo@syxysoft.com>
Date: Fri, 3 Mar 2023 17:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20SysAnnouncement?=
 =?UTF-8?q?SendController.java=20=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SysAnnouncementSendController.java        | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
index ef074f8b..7cd10494 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
@@ -45,7 +45,8 @@ import lombok.extern.slf4j.Slf4j;
 public class SysAnnouncementSendController {
 	@Autowired
 	private ISysAnnouncementSendService sysAnnouncementSendService;
-	
+	private String ERROE_MSG = "未找到对应实体";
+
 	/**
 	  * 分页列表查询
 	 * @param sysAnnouncementSend
@@ -59,9 +60,9 @@ public class SysAnnouncementSendController {
 									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
-		Result<IPage<SysAnnouncementSend>> result = new Result<IPage<SysAnnouncementSend>>();
-		QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<SysAnnouncementSend>(sysAnnouncementSend);
-		Page<SysAnnouncementSend> page = new Page<SysAnnouncementSend>(pageNo,pageSize);
+		Result<IPage<SysAnnouncementSend>> result = new Result<>();
+		QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<>(sysAnnouncementSend);
+		Page<SysAnnouncementSend> page = new Page<>(pageNo,pageSize);
 		//排序逻辑 处理
 		String column = req.getParameter("column");
 		String order = req.getParameter("order");
@@ -81,7 +82,7 @@ public class SysAnnouncementSendController {
 		result.setResult(pageList);
 		return result;
 	}
-	
+
 	/**
 	  *   添加
 	 * @param sysAnnouncementSend
@@ -97,7 +98,7 @@ public class SysAnnouncementSendController {
 			return Result.error("操作失败");
 		}
 	}
-	
+
 	/**
 	  *  编辑
 	 * @param sysAnnouncementSend
@@ -107,17 +108,17 @@ public class SysAnnouncementSendController {
 	public Result<Object> edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
 		SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
 		if(sysAnnouncementSendEntity==null) {
-			return Result.error("未找到对应实体");
+			return Result.error(ERROE_MSG);
 		}else {
 			boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
 			if(ok) {
 				return Result.OK("操作成功!");
 			}
 		}
-		
+
 		return Result.OK();
 	}
-	
+
 	/**
 	  *   通过id删除
 	 * @param id
@@ -127,7 +128,7 @@ public class SysAnnouncementSendController {
 	public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
 		SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
 		if(sysAnnouncementSend==null) {
-			return Result.error("未找到对应实体");
+			return Result.error(ERROE_MSG);
 		}else {
 			boolean ok = sysAnnouncementSendService.removeById(id);
 			if(ok) {
@@ -137,7 +138,7 @@ public class SysAnnouncementSendController {
 
 		return Result.OK();
 	}
-	
+
 	/**
 	  *  批量删除
 	 * @param ids
@@ -152,7 +153,7 @@ public class SysAnnouncementSendController {
 			return Result.OK("删除成功!");
 		}
 	}
-	
+
 	/**
 	  * 通过id查询
 	 * @param id
@@ -160,15 +161,14 @@ public class SysAnnouncementSendController {
 	 */
 	@GetMapping(value = "/queryById")
 	public Result<SysAnnouncementSend> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
 		SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
 		if(sysAnnouncementSend==null) {
-			return Result.error("未找到对应实体");
+			return Result.error(ERROE_MSG);
 		}else {
 			return Result.OK(sysAnnouncementSend);
 		}
 	}
-	
+
 	/**
 	 * @功能：更新用户系统消息阅读状态
 	 * @param json
@@ -176,7 +176,7 @@ public class SysAnnouncementSendController {
 	 */
 	@PutMapping(value = "/editByAnntIdAndUserId")
 	public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
-		Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+		Result<SysAnnouncementSend> result = new Result<>();
 		String anntId = json.getString("anntId");
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
@@ -189,7 +189,7 @@ public class SysAnnouncementSendController {
 		result.setSuccess(true);
 		return result;
 	}
-	
+
 	/**
 	 * @功能：获取我的消息
 	 * @return
@@ -198,13 +198,13 @@ public class SysAnnouncementSendController {
 	public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
 			@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 			  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-		Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
+		Result<IPage<AnnouncementSendModel>> result = new Result<>();
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
 		announcementSendModel.setUserId(userId);
 		announcementSendModel.setPageNo((pageNo-1)*pageSize);
 		announcementSendModel.setPageSize(pageSize);
-		Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
+		Page<AnnouncementSendModel> pageList = new Page<>(pageNo,pageSize);
 		pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
 		result.setResult(pageList);
 		result.setSuccess(true);