update:操作日志查询、新增接口

adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/controller/SysLogController.java

@@ -1,12 +1,23 @@
 package com.adc.da.slrs.sysLog.controller;
 
 
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarMenu.entity.SarMenu;
+import com.adc.da.slrs.sysLog.service.ISysLogService;
+import com.adc.da.slrs.sysLog.vo.SysLogReqDTO;
+import com.adc.da.util.UUIDUtils;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.adc.da.slrs.sysLog.entity.SysLog;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     *  前端控制器
@@ -20,4 +31,24 @@ import com.adc.da.base.web.BaseController;
 @RequestMapping("/sysLog/sys-log")
 public class SysLogController extends BaseController<SysLog> {
 
+    @Autowired
+    private ISysLogService sysLogService;
+
+
+    @ApiOperation("获取操作日志")
+    @GetMapping("/getAllLog")
+    public ResponseMessage getAllLog(SysLogReqDTO sysLogReqDTO){
+        return Result.success(sysLogService.getAllLog(sysLogReqDTO));
+    }
+
+    @ApiOperation("存储操作日志")
+    @GetMapping("/saveLog")
+    public ResponseMessage getAllLog(SysLog sysLog){
+        sysLog.setId(UUIDUtils.randomUUID(64).replace("-",""));
+        boolean flag = sysLogService.save(sysLog);
+        if(flag){
+            return Result.success();
+        }
+        return Result.error();
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/dao/SysLogDao.java

@@ -1,7 +1,14 @@
 package com.adc.da.slrs.sysLog.dao;
 
 import com.adc.da.slrs.sysLog.entity.SysLog;
+import com.adc.da.slrs.sysLog.vo.SysLogReqDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysLogDao extends BaseMapper<SysLog> {
 
+    IPage<SysLog> queryAllLog(Page page,@Param("sysLogReqDTO") SysLogReqDTO sysLogReqDTO);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sysLog.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -55,5 +56,11 @@ public class SysLog extends BaseEntity {
     @ApiModelProperty(value = "接口耗时")
     private int runTime;
 
+    @TableField(exist = false)
+    private String account;
+
+    @TableField(exist = false)
+    private String dept;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/service/ISysLogService.java

@@ -1,6 +1,9 @@
 package com.adc.da.slrs.sysLog.service;
 
 import com.adc.da.slrs.sysLog.entity.SysLog;
+import com.adc.da.slrs.sysLog.vo.SysLogReqDTO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISysLogService extends IService<SysLog> {
 
+    IPage<SysLog> getAllLog(SysLogReqDTO sysLogReqDTO);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/service/impl/SysLogServiceImpl.java

@@ -3,6 +3,9 @@ package com.adc.da.slrs.sysLog.service.impl;
 import com.adc.da.slrs.sysLog.entity.SysLog;
 import com.adc.da.slrs.sysLog.dao.SysLogDao;
 import com.adc.da.slrs.sysLog.service.ISysLogService;
+import com.adc.da.slrs.sysLog.vo.SysLogReqDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -17,4 +20,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysLogServiceImpl extends ServiceImpl<SysLogDao, SysLog> implements ISysLogService {
 
+    @Override
+    public IPage<SysLog> getAllLog(SysLogReqDTO sysLogReqDTO) {
+        Page<SysLog> page = new Page<>(sysLogReqDTO.getPage(), sysLogReqDTO.getPageSize());
+        IPage<SysLog> result = baseMapper.queryAllLog(page,sysLogReqDTO);
+        return result;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/vo/SysLogReqDTO.java

@@ -0,0 +1,18 @@
+package com.adc.da.slrs.sysLog.vo;
+
+import com.adc.da.base.page.BasePage;
+import lombok.Data;
+
+@Data
+public class SysLogReqDTO extends BasePage {
+
+    private String account;
+
+    private String sTime;
+
+    private String eTime;
+
+    private String oper;
+
+    private String content;
+}

adc-da-slrs/src/main/resources/mybatis/mapper/sysLog/SysLogMapper.xml

@@ -2,4 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sysLog.dao.SysLogDao">
 
+    <select id="queryAllLog" parameterType="com.adc.da.slrs.sysLog.vo.SysLogReqDTO" resultType="com.adc.da.slrs.sysLog.entity.SysLog">
+        select ts_user.account,ts_institution.name dept,sys_log.oper_time,sys_log.oper,sys_log.oper_location from sys_log
+        left join ts_user on sys_log.user_id = ts_user.usid
+        left join ts_institution on ts_user.institution_id = ts_institution.id
+        WHERE 1=1
+        <if test="sysLogReqDTO.account != null and sysLogReqDTO.account != ''">
+            and ts_user.account = #{sysLogReqDTO.account}
+        </if>
+        <if test="sysLogReqDTO.sTime != null and sysLogReqDTO.sTime != ''">
+            and sys_log.oper_time >= #{sysLogReqDTO.sTime}
+        </if>
+        <if test="sysLogReqDTO.eTime != null and sysLogReqDTO.eTime != ''">
+            and sys_log.oper_time &lt;= #{sysLogReqDTO.eTime}
+        </if>
+        <if test="sysLogReqDTO.oper != null and sysLogReqDTO.oper != ''">
+            and sys_log.oper = #{sysLogReqDTO.oper}
+        </if>
+        <if test="sysLogReqDTO.content != null and sysLogReqDTO.content != ''">
+            and sys_log.oper_location like concat(concat('%',#{sysLogReqDTO.content}),'%')
+        </if>
+    </select>
 </mapper>