From d02c31ba49b3e8794bfa45eadbb372b9ec8cecf1 Mon Sep 17 00:00:00 2001
From: bupengxiang <15022776095@163.com>
Date: Wed, 2 Aug 2023 10:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E5=91=8A=E6=97=A5=E5=BF=97=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/aspect/AutoLogAspect.java    |  1 +
 .../controller/SysAnnouncementController.java    | 16 ++++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
index b9caea84..9a866a26 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
@@ -82,6 +82,7 @@ public class AutoLogAspect {
             }
             //注解上的描述,操作日志内容
             dto.setLogType(syslog.logType());
+            //用户日志 ，根据不同的操作类型 生成不同的日志内容
             if ("user".equals(content)){
                 if (syslog.operateType() == 2){
                     Object result = ((Results) obj).getResult();
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java
index 5ef3f438..6a65eb54 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Results;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.CommonSendStatus;
 import com.jero.common.constant.WebsocketConst;
 import com.jero.common.system.api.ISysBaseAPI;
-import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.util.JwtUtil;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.RedisUtil;
@@ -26,23 +26,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -84,6 +75,7 @@ public class SysAnnouncementController {
 	 * @return
 	 */
 	@GetMapping("/page")
+	@AutoLog(operateType = 1,value = "查询系统通告")
 	public Results<IPage<SysAnnouncement>> queryPageList(SysAnnouncement sysAnnouncement,
 														 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -114,6 +106,7 @@ public class SysAnnouncementController {
 	 * @return
 	 */
 	@PostMapping("/add")
+	@AutoLog(operateType = 2,value = "新增系统通告")
 	public Results<Object> add(@RequestBody SysAnnouncement sysAnnouncement) {
 		try {
 			// update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题
@@ -136,6 +129,7 @@ public class SysAnnouncementController {
 	 * @return
 	 */
 	@PostMapping("/edit")
+	@AutoLog(operateType = 3,value = "修改系统通告")
 	public Results<Object> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
 		SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
 		if(sysAnnouncementEntity==null) {
@@ -160,6 +154,7 @@ public class SysAnnouncementController {
 	 * @return
 	 */
 	@PostMapping("/delete")
+	@AutoLog(operateType = 4,value = "删除系统通告")
 	public Results<Object> delete(@RequestBody Map<String, String> map) {
 		String id = map.get("id");
 		if(StringUtils.isBlank(id)){
@@ -185,6 +180,7 @@ public class SysAnnouncementController {
 	 * @return
 	 */
 	@PostMapping("/deleteBatch")
+	@AutoLog(operateType = 4,value = "批量删除系统通告")
 	public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
 		String ids = map.get("ids");
 		if(ids==null || "".equals(ids.trim())) {