yshop1.7发布,后台升級eladmin2.4(前端,后台权限,代码生成器等重构),修复商品分类等一些问题

yshop-logging/src/main/java/co/yixiang/rest/LogController.java

@@ -1,62 +1,103 @@
 package co.yixiang.rest;
 
-import co.yixiang.utils.SecurityUtils;
+import co.yixiang.aop.log.Log;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import co.yixiang.service.LogService;
 import co.yixiang.service.dto.LogQueryCriteria;
-import org.springframework.beans.factory.annotation.Autowired;
+import co.yixiang.utils.SecurityUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * @author Zheng Jie
  * @date 2018-11-24
  */
 @RestController
-@RequestMapping("api")
+@RequestMapping("/api/logs")
+@Api(tags = "监控：日志管理")
 public class LogController {
 
-    @Autowired
-    private LogService logService;
+    private final LogService logService;
 
-    @GetMapping(value = "/logs")
-    @PreAuthorize("hasAnyRole('ADMIN')")
-    public ResponseEntity getLogs(LogQueryCriteria criteria, Pageable pageable){
-        criteria.setLogType("INFO");
-        criteria.setType(0);
-        return new ResponseEntity(logService.queryAll(criteria,pageable), HttpStatus.OK);
+    public LogController(LogService logService) {
+        this.logService = logService;
     }
 
+    @Log("导出数据")
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check()")
+    public void download(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
+        criteria.setLogType("INFO");
+        logService.download(logService.queryAll(criteria), response);
+    }
+
+    @Log("导出错误数据")
+    @ApiOperation("导出错误数据")
+    @GetMapping(value = "/error/download")
+    @PreAuthorize("@el.check()")
+    public void errorDownload(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
+        criteria.setLogType("ERROR");
+        logService.download(logService.queryAll(criteria), response);
+    }
+    @GetMapping
+    @ApiOperation("日志查询")
+    @PreAuthorize("@el.check()")
+    public ResponseEntity<Object> getLogs(LogQueryCriteria criteria, Pageable pageable){
+        criteria.setLogType("INFO");
+        criteria.setType(0);
+        return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK);
+    }
     @GetMapping(value = "/mlogs")
-    @PreAuthorize("hasAnyRole('ADMIN')")
+    @PreAuthorize("@el.check()")
     public ResponseEntity getApiLogs(LogQueryCriteria criteria, Pageable pageable){
         criteria.setLogType("INFO");
         criteria.setType(1);
         return new ResponseEntity(logService.findAllByPageable(criteria.getBlurry(),pageable), HttpStatus.OK);
     }
-
-    @GetMapping(value = "/logs/user")
-    public ResponseEntity getUserLogs(LogQueryCriteria criteria, Pageable pageable){
+    @GetMapping(value = "/user")
+    @ApiOperation("用户日志查询")
+    public ResponseEntity<Object> getUserLogs(LogQueryCriteria criteria, Pageable pageable){
         criteria.setLogType("INFO");
         criteria.setBlurry(SecurityUtils.getUsername());
-        return new ResponseEntity(logService.queryAllByUser(criteria,pageable), HttpStatus.OK);
+        return new ResponseEntity<>(logService.queryAllByUser(criteria,pageable), HttpStatus.OK);
     }
 
-    @GetMapping(value = "/logs/error")
-    @PreAuthorize("hasAnyRole('ADMIN')")
-    public ResponseEntity getErrorLogs(LogQueryCriteria criteria, Pageable pageable){
+    @GetMapping(value = "/error")
+    @ApiOperation("错误日志查询")
+    @PreAuthorize("@el.check()")
+    public ResponseEntity<Object> getErrorLogs(LogQueryCriteria criteria, Pageable pageable){
         criteria.setLogType("ERROR");
-        return new ResponseEntity(logService.queryAll(criteria,pageable), HttpStatus.OK);
+        return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK);
     }
 
-    @GetMapping(value = "/logs/error/{id}")
-    @PreAuthorize("hasAnyRole('ADMIN')")
-    public ResponseEntity getErrorLogs(@PathVariable Long id){
-        return new ResponseEntity(logService.findByErrDetail(id), HttpStatus.OK);
+    @GetMapping(value = "/error/{id}")
+    @ApiOperation("日志异常详情查询")
+    @PreAuthorize("@el.check()")
+    public ResponseEntity<Object> getErrorLogs(@PathVariable Long id){
+        return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK);
+    }
+    @DeleteMapping(value = "/del/error")
+    @Log("删除所有ERROR日志")
+    @ApiOperation("删除所有ERROR日志")
+    @PreAuthorize("@el.check()")
+    public ResponseEntity<Object> delAllByError(){
+        logService.delAllByError();
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @DeleteMapping(value = "/del/info")
+    @Log("删除所有INFO日志")
+    @ApiOperation("删除所有INFO日志")
+    @PreAuthorize("@el.check()")
+    public ResponseEntity<Object> delAllByInfo(){
+        logService.delAllByInfo();
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 }