修改日志

logging/src/main/java/com/storeroom/annotation/Log.java

@@ -10,6 +10,4 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Log {
     String value() default "";
-
-    //int type();
 }

logging/src/main/java/com/storeroom/controller/LogController.java

@@ -1,11 +1,14 @@
 package com.storeroom.controller;
 
 
+import com.storeroom.annotaion.rest.AnonymousDeleteMapping;
 import com.storeroom.annotaion.rest.AnonymousGetMapping;
 import com.storeroom.annotation.Log;
 import com.storeroom.service.LogService;
 import com.storeroom.service.dto.LogQueryCriteria;
+import com.storeroom.utils.ApiResponse;
 import com.storeroom.utils.SecurityUtils;
+import com.storeroom.utils.enums.ResponseStatus;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -38,7 +41,7 @@ public class LogController {
     @Log("导出错误数据")
     @ApiOperation("导出错误数据")
     @AnonymousGetMapping(value = "/error/download")
-   // @PreAuthorize("@ys.check()")
+    // @PreAuthorize("@ys.check()")
     public void exportErrorLog(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
         criteria.setLogType("ERROR");
         logService.download(logService.queryAll(criteria), response);
@@ -46,46 +49,46 @@ public class LogController {
 
     @AnonymousGetMapping
     @ApiOperation("日志查询")
-    public ResponseEntity<Object> queryLog(LogQueryCriteria criteria, Pageable pageable){
+    public ApiResponse<Object> queryLog(LogQueryCriteria criteria, Pageable pageable) {
         criteria.setLogType("INFO");
-        return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK);
+        return ApiResponse.success(logService.queryAll(criteria, pageable));
     }
 
     @AnonymousGetMapping(value = "/user")
     @ApiOperation("用户日志查询")
-    public ResponseEntity<Object> queryUserLog(LogQueryCriteria criteria, Pageable pageable){
+    public ApiResponse<Object> queryUserLog(LogQueryCriteria criteria, Pageable pageable) {
         criteria.setLogType("INFO");
         criteria.setBlurry(SecurityUtils.getCurrentUsername());
-        return new ResponseEntity<>(logService.queryAllByUser(criteria,pageable), HttpStatus.OK);
+        return ApiResponse.success(logService.queryAllByUser(criteria, pageable));
     }
 
     @AnonymousGetMapping(value = "/error")
     @ApiOperation("错误日志查询")
-    public ResponseEntity<Object> queryErrorLog(LogQueryCriteria criteria, Pageable pageable){
+    public ApiResponse<Object> queryErrorLog(LogQueryCriteria criteria, Pageable pageable) {
         criteria.setLogType("ERROR");
-        return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK);
+        return ApiResponse.success(logService.queryAll(criteria, pageable));
     }
 
     @AnonymousGetMapping(value = "/error/{id}")
     @ApiOperation("日志异常详情查询")
-    public ResponseEntity<Object> queryErrorLogDetail(@PathVariable Long id){
-        return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK);
+    public ApiResponse<Object> queryErrorLogDetail(@PathVariable Long id) {
+        return ApiResponse.success(logService.findByErrDetail(id));
     }
 
-    @DeleteMapping(value = "/del/error")
+    @AnonymousDeleteMapping(value = "/del/error")
     @Log("删除所有ERROR日志")
     @ApiOperation("删除所有ERROR日志")
-    @PreAuthorize("@ys.check()")
-    public ResponseEntity<Object> delAllErrorLog(){
+    //@PreAuthorize("@ys.check()")
+    public ApiResponse<Object> delAllErrorLog() {
         logService.delAllByError();
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ApiResponse.success(ResponseStatus.SUCCESS);
     }
 
     @DeleteMapping(value = "/del/info")
     @Log("删除所有INFO日志")
     @ApiOperation("删除所有INFO日志")
-    public ResponseEntity<Object> delAllInfoLog(){
+    public ApiResponse<Object> delAllInfoLog() {
         logService.delAllByInfo();
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ApiResponse.success(ResponseStatus.SUCCESS);
     }
 }

storeroom/src/main/java/com/storeroom/modules/storeroom3d/domain/AlarmLog.java

@@ -0,0 +1,66 @@
+package com.storeroom.modules.storeroom3d.domain;
+
+import com.storeroom.base.BaseEntity;
+import com.storeroom.modules.device.domain.DeviceInfo;
+import com.storeroom.modules.device.domain.Storeroom;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Objects;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "alarm_log")
+public class AlarmLog extends BaseEntity implements Serializable {
+
+    @Id
+    @Column(name = "id")
+    @NotNull(groups = BaseEntity.Update.class)
+    @ApiModelProperty(value = "id", hidden = true)
+    private String id;
+
+
+    @ManyToOne(targetEntity = Storeroom.class)
+    @ApiModelProperty(value = "库房id")
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "sotreroom_id", referencedColumnName = "id")
+    private Storeroom storeroomId;
+
+    @Column(name = "state")
+    @ApiModelProperty(value = "处理状态")
+    private Boolean state;
+
+
+    @Column(name = "device_name")
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @Column(name = "content")
+    @ApiModelProperty(value = "报警内容")
+    private String content;
+
+
+    @Column(name = "remark")
+    @ApiModelProperty(value = "说明备注")
+    private String remark;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AlarmLog alarmLog = (AlarmLog) o;
+        return Objects.equals(id, alarmLog.id) && Objects.equals(storeroomId, alarmLog.storeroomId) && Objects.equals(state, alarmLog.state) && Objects.equals(deviceName, alarmLog.deviceName) && Objects.equals(content, alarmLog.content);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, storeroomId, state, deviceName, content);
+    }
+}