修改日志

webapidemo-api/src/main/java/com/example/controller/HomeController.java

@@ -1,5 +1,6 @@
 package com.example.controller;
 
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import com.example.entity.database.system.User;
@@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,7 +49,7 @@ public class HomeController extends BaseController {
     }
 
     @ApiOperation("导出Excel")
-    @GetMapping("/exportExcel")
+    @GetMapping("/exportexcel")
     public void ExportExcel(HttpServletResponse response) {
         List<User> list = userService.getList();
         ExcelHelper<User> excel = new ExcelHelper<>(User.class);
@@ -54,7 +57,7 @@ public class HomeController extends BaseController {
     }
 
     @ApiOperation("导入Excel")
-    @PostMapping("/importExcel")
+    @PostMapping("/importexcel")
     public AjaxResult importExcel(@RequestPart MultipartFile file) throws Exception {
         ExcelHelper<User> excel = new ExcelHelper<>(User.class);
         List<User> list = excel.importExcel(file.getInputStream());
@@ -152,13 +155,28 @@ public class HomeController extends BaseController {
     }
 
     @ApiOperation("代码生成")
-    @GetMapping("/GetCode")
+    @GetMapping("/getcode")
     public void GetCode(HttpServletResponse response, CodeInput input) {
         Map<String, Object> table = SqlRunner.db().selectOne("select table_name,table_comment from information_schema.tables"
-                + " where table_schema = (select database()) AND table_name ='" + input.getTableName() + "' ");
+                + " where table_schema = (select database()) AND table_name = {0} ",input.getTableName());
+        if (table == null) {
+            Map map = new HashMap();
+            map.put("state", "error");
+            map.put("message", "此表不存在");
+
+            try {
+                PrintWriter out = response.getWriter();
+                out.write(JSON.toJSONString(map));
+                out.flush();
+                out.close();
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+            return;
+        }
         List<Map<String, Object>> columns = SqlRunner.db().selectList("select column_name,data_type,column_type,is_nullable,"
                 + "column_key,column_comment from information_schema.columns where table_schema = (select database()) "
-                + "and table_name = '" + input.getTableName() + "' order by ordinal_position");
+                + "and table_name = {0} order by ordinal_position",input.getTableName());
         CodeHelper.GetCode(response, table, columns, input.getPackageName(), input.getControllerName());
     }
 }

webapidemo-api/src/main/java/com/example/filter/LogAspect.java

@@ -2,6 +2,7 @@ package com.example.filter;
 
 import com.alibaba.fastjson2.JSON;
 import com.example.entity.database.system.OperLog;
+import com.example.entity.view.system.UserView;
 import com.example.service.system.IOperLogService;
 import com.example.util.annotation.Log;
 import com.example.util.helper.*;
@@ -14,6 +15,8 @@ import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.NamedThreadLocal;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
@@ -110,6 +113,15 @@ public class LogAspect {
                 }
                 // 设置消耗时间
                 operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get());
+
+                //设置账号和部门
+                try {
+                    UserView user = (UserView) ServletHelper.getRequestAttributes().getAttribute("CurrentUser", 0);
+                    operLog.setOperName(user.getUserName());
+                    operLog.setDeptName(user.getDept().getDeptName());
+                } catch (Exception ex) {
+                }
+
                 // 保存数据库
                 AsyncHelper.instance().execute(new TimerTask() {
                     @Override

webapidemo-util/src/main/java/com/example/util/helper/ExcelHelper.java

@@ -302,7 +302,7 @@ public class ExcelHelper<T> {
             cellStyle.setBorderLeft(BorderStyle.THIN);
             cellStyle.setBorderRight(BorderStyle.THIN);
 
-            int limit=6000;
+            int limit=60000;
             int rowindex=0;
             int total = list.size();
             for (int i = 0; i < total; i++) {