Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java

@@ -1,6 +1,7 @@
 package com.jero.common.aspect;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.jero.common.api.dto.LogDTO;
 import com.jero.common.api.vo.Results;
@@ -81,6 +82,31 @@ public class AutoLogAspect {
             }
             //注解上的描述,操作日志内容
             dto.setLogType(syslog.logType());
+            //用户日志 ，根据不同的操作类型 生成不同的日志内容
+            if ("user".equals(content)){
+                if (syslog.operateType() == 2){
+                    Object result = ((Results) obj).getResult();
+                    String s = JSONObject.toJSONString(result);
+                    JSONObject jsonObject = JSON.parseObject(s);
+                    String id =(String)jsonObject.get("id");
+                    content = "新增用户，id："+id;
+                }else if (syslog.operateType() == 3){
+                    Object result = ((Results) obj).getResult();
+                    String s = JSONObject.toJSONString(result);
+                    JSONObject jsonObject = JSON.parseObject(s);
+                    String id =(String)jsonObject.get("id");
+                    content = "修改，id："+id;
+                }else if (syslog.operateType() == 4){
+                    String message = ((Results) obj).getMessage();
+                    String result = (String)((Results) obj).getResult();
+                    if ("删除用户成功".equals(message)){
+                        content = "删除用户，id："+result;
+                    }else {
+                        content = "批量删除用户，ids："+result;
+                    }
+
+                }
+            }
             dto.setLogContent(content);
         }
 

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())) {

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.PermissionData;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.oConvertUtils;
@@ -186,6 +187,7 @@ public class SysAnnouncementSendController {
 	 * @功能：获取我的消息
 	 * @return
 	 */
+	@PermissionData(pageComponent = "isps/userAnnouncement")
 	@GetMapping(value = "/getMyAnnouncementSend")
 	public Results<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
 																	   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.aspect.annotation.PermissionData;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.exception.JeroBootException;
@@ -165,10 +166,9 @@ public class SysUserController {
 
     @RequiresPermissions("user:add")
     @PostMapping("/add")
+    @AutoLog(operateType = 2,value = "user")
 	public Results<Object> add(@RequestBody JSONObject jsonObject) {
         try {
-            //开始时间
-            long startTime = System.currentTimeMillis();
             String selectedRoles = jsonObject.getString(SELECTED_ROLES);
             String selectedDeparts = jsonObject.getString("selecteddeparts");
             String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
@@ -181,11 +181,7 @@ public class SysUserController {
             String id = UUID.randomUUID().toString().replace("-", "");
             user.setId(id);
             sysUserService.saveUser(user, selectedRoles, selectedDeparts);
-            long endTime = System.currentTimeMillis();
+            return Results.OK(OPTION_SUCCESS,user);
-            long costTime = endTime - startTime;
-            baseCommonService.addLog("新增用户，id： " +id ,CommonConstant.LOG_TYPE_2, 2,null,
-                    costTime);
-            return Results.OK(OPTION_SUCCESS);
 		} catch (Exception e) {
 			SysUserController.log.error(e.getMessage(), e);
             return Results.error("操作失败");
@@ -225,6 +221,7 @@ public class SysUserController {
 
     @RequiresPermissions("user:edit")
     @PostMapping("/edit")
+    @AutoLog(operateType = 3,value = "user")
 	public Results<SysUser> edit(@RequestBody JSONObject jsonObject) {
         String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
         String roles = jsonObject.getString(SELECTED_ROLES);
@@ -235,17 +232,11 @@ public class SysUserController {
 			if(sysUser==null) {
                 return Results.error(INEXISTENCE);
 			}else {
-                //开始时间
-                long startTime = System.currentTimeMillis();
                 SysUser user = getSysUser(jsonObject, rsaPrivateKey, sysUser);
                 // 修改用户走一个service 保证事务
                 sysUserService.editUser(user, roles, departs);
-                //结束时间
+
-                long endTime = System.currentTimeMillis();
+                return Results.OK(OPTION_SUCCESS,sysUser);
-                long costTime = endTime - startTime;
-                baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 3,null,
-                        costTime);
-                return Results.OK(OPTION_SUCCESS);
 			}
 		} catch (Exception e) {
 			SysUserController.log.error(e.getMessage(), e);
@@ -280,33 +271,29 @@ public class SysUserController {
 
     @PostMapping("/delete")
     @RequiresPermissions("sys:user:sel")
-    public Results<T> delete(@RequestBody Map<String,String> map) {
+    @AutoLog(operateType = 4,value = "user")
+    public Results<String> delete(@RequestBody Map<String,String> map) {
         long startTime = System.currentTimeMillis();
         String id = map.get("id");
         if(StringUtils.isBlank(id)){
             return Results.error("参数不识别！");
         }
 		this.sysUserService.deleteUser(id);
-        long endTime = System.currentTimeMillis();
+
-        long costTime = endTime - startTime;
+        return Results.OK("删除用户成功",id);
-        baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 4,null,costTime);
-		return Results.OK("删除用户成功");
 	}
 
     @PostMapping("/deleteBatch")
     @RequiresPermissions("sys:user:sel")
-    public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
+    @AutoLog(operateType = 4,value = "user")
-        long startTime = System.currentTimeMillis();
+    public Results<String> deleteBatch(@RequestBody Map<String, String> map) {
         String ids = map.get("ids");
         if(StringUtils.isBlank(ids)){
             return Results.error("参数不识别！");
         }
 		this.sysUserService.deleteBatchUsers(ids);
 
-        long endTime = System.currentTimeMillis();
+		return Results.OK("批量删除用户成功",ids);
-        long costTime = endTime - startTime;
-        baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 4,null,costTime);
-		return Results.OK("批量删除用户成功");
 	}