Merge branch 'master' into test

sys-api-service/src/main/java/com/xy/service/LogOperateServiceImpl.java

@@ -0,0 +1,42 @@
+package com.xy.service;
+
+import cn.easyes.core.biz.EsPageInfo;
+import cn.easyes.core.conditions.LambdaEsQueryWrapper;
+import com.xy.dto.LogOperateDto;
+import com.xy.entity.LogOperate;
+import com.xy.mapper.LogOperateMapper;
+import com.xy.utils.Emptys;
+import com.xy.utils.EsQueryWrapper;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import static com.xy.utils.EsBeans.toPageBean;
+
+@Service
+@AllArgsConstructor
+@Api(tags = "操作日志")
+public class LogOperateServiceImpl implements LogOperateService {
+
+    private LogOperateMapper logOperateMapper;
+
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    public R<PageBean<LogOperateDto.Vo>> page(@RequestBody LogOperateDto.Page page) {
+        PageBean pageBean = page.getPage();
+        LambdaEsQueryWrapper<LogOperate> lambdaEsQueryWrapper = new EsQueryWrapper().eqWrapper(page, LogOperate.class)
+                .ge(LogOperate::getCreateTime, page.getBeginCreateTime())
+                .le(LogOperate::getCreateTime, page.getEndCreateTime())
+                .like(LogOperate::getLogContent)
+                .build()
+                .orderByDesc(!Emptys.check(pageBean.getOrders()), LogOperate::getCreateTime);
+        EsPageInfo<LogOperate> esPageInfo = logOperateMapper.pageQuery(lambdaEsQueryWrapper, (int) pageBean.getCurrent(), (int) pageBean.getSize());
+        return R.ok(toPageBean(LogOperateDto.Vo.class, esPageInfo));
+    }
+
+}

sys-api-service/src/main/java/com/xy/service/LogSysEnventsServiceImpl.java

@@ -0,0 +1,41 @@
+package com.xy.service;
+
+import cn.easyes.core.biz.EsPageInfo;
+import cn.easyes.core.conditions.LambdaEsQueryWrapper;
+import com.xy.dto.LogSysEnventsDto;
+import com.xy.entity.LogSysEnvents;
+import com.xy.mapper.LogSysEnventsMapper;
+import com.xy.utils.Emptys;
+import com.xy.utils.EsQueryWrapper;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import static com.xy.utils.EsBeans.toPageBean;
+
+@Service
+@AllArgsConstructor
+@Api(tags = "系统事件")
+public class LogSysEnventsServiceImpl implements LogSysEnventsService {
+
+    private LogSysEnventsMapper logSysEnventsMapper;
+
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    public R<PageBean<LogSysEnventsDto.Vo>> page(@RequestBody LogSysEnventsDto.Page page) {
+        PageBean pageBean = page.getPage();
+        LambdaEsQueryWrapper<LogSysEnvents> lambdaEsQueryWrapper = new EsQueryWrapper().eqWrapper(page, LogSysEnvents.class)
+                .ge(LogSysEnvents::getCreateTime, page.getBeginCreateTime())
+                .le(LogSysEnvents::getCreateTime, page.getEndCreateTime())
+                .like(LogSysEnvents::getEventDescript)
+                .build()
+                .orderByDesc(!Emptys.check(pageBean.getOrders()), LogSysEnvents::getCreateTime);
+        EsPageInfo<LogSysEnvents> esPageInfo = logSysEnventsMapper.pageQuery(lambdaEsQueryWrapper, (int) pageBean.getCurrent(), (int) pageBean.getSize());
+        return R.ok(toPageBean(LogSysEnventsDto.Vo.class, esPageInfo));
+    }
+}

sys-api/src/main/java/com/xy/dto/LogOperateDto.java

@@ -0,0 +1,77 @@
+package com.xy.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.PageBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+public class LogOperateDto {
+
+    @Data
+    @Accessors(chain = true)
+    public static class Page extends Vo {
+
+        private PageBean page;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-起")
+        private LocalDate beginCreateTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-始")
+        private LocalDate endCreateTime;
+
+        public LocalDateTime getBeginCreateTime() {
+            return beginCreateTime == null ? null : beginCreateTime.atTime(0, 0, 0);
+        }
+
+        public LocalDateTime getEndCreateTime() {
+            return endCreateTime == null ? null : endCreateTime.atTime(23, 59, 59);
+        }
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Vo {
+
+        @ApiModelProperty("id")
+        private String id;
+
+        @ApiModelProperty("日志类型 1=登录日志 2=操作日志")
+        private Integer logType;
+
+        @ApiModelProperty("日志内容")
+        private String logContent;
+
+        @ApiModelProperty("客户端类型")
+        private String clientType;
+
+        @ApiModelProperty("系统ID")
+        private Long sysId;
+
+        @ApiModelProperty("客户端ip")
+        private String clientIp;
+
+        @ApiModelProperty("操作人")
+        private Long optUserId;
+
+        @ApiModelProperty("操作类型 1=新增 2=修改 3=查询 4=删除 5=导出 6=导入")
+        private Integer optType;
+
+        @ApiModelProperty("操作耗时")
+        private Integer optTime;
+
+        @ApiModelProperty("创建时间")
+        private String createTime;
+
+        @ApiModelProperty("服务名")
+        private String serviceName;
+
+        @ApiModelProperty("日志类别")
+        private String type;
+    }
+}

sys-api/src/main/java/com/xy/dto/LogSysEnventsDto.java

@@ -0,0 +1,65 @@
+package com.xy.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.PageBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+public class LogSysEnventsDto {
+
+    @Data
+    @Accessors(chain = true)
+    public static class Page extends Vo {
+
+        private PageBean page;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-起")
+        private LocalDate beginCreateTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-始")
+        private LocalDate endCreateTime;
+
+        public LocalDateTime getBeginCreateTime() {
+            return beginCreateTime == null ? null : beginCreateTime.atTime(0, 0, 0);
+        }
+
+        public LocalDateTime getEndCreateTime() {
+            return endCreateTime == null ? null : endCreateTime.atTime(23, 59, 59);
+        }
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Vo {
+
+        @ApiModelProperty("id")
+        private String id;
+
+        @ApiModelProperty("事件名称")
+        private String eventName;
+
+        @ApiModelProperty("事件等级")
+        private Integer eventLevel;
+
+        @ApiModelProperty("事件描述")
+        private String eventDescript;
+
+        @ApiModelProperty("服务器IP")
+        private String serverIp;
+
+        @ApiModelProperty("服务名")
+        private String serviceName;
+
+        @ApiModelProperty("创建时间")
+        private String createTime;
+
+        @ApiModelProperty("日志类别")
+        private String type;
+    }
+}

sys-api/src/main/java/com/xy/service/LogOperateService.java

@@ -0,0 +1,10 @@
+package com.xy.service;
+
+import com.xy.annotate.RestMappingController;
+
+/**
+ * 操作日志 接口路由
+ */
+@RestMappingController("log-operate")
+public interface LogOperateService {
+}

sys-api/src/main/java/com/xy/service/LogSysEnventsService.java

@@ -0,0 +1,10 @@
+package com.xy.service;
+
+import com.xy.annotate.RestMappingController;
+
+/**
+ * 系统事件 接口路由
+ */
+@RestMappingController("log-sys-envents")
+public interface LogSysEnventsService {
+}