去掉modb

pom.xml

@@ -41,12 +41,10 @@
     </dependency>
 
     <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-mongodb</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
     </dependency>
 
-
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>

src/main/java/com/fdkankan/manage/aop/VisitLogInterceptor.java

@@ -10,8 +10,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.manage.config.SaTokenConfigure;
-import com.fdkankan.manage.entity.OperLog;
+import com.fdkankan.manage.entity.SysLog;
 import com.fdkankan.manage.entity.SysUser;
+import com.fdkankan.manage.service.ISysLogService;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +24,6 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -39,11 +39,9 @@ import java.util.*;
 @Slf4j
 public class VisitLogInterceptor {
 
-	@Autowired
-	private RedisUtil redisUtil;
 
 	@Autowired
-	private MongoTemplate mongoTemplate;
+    ISysLogService sysLogService;
 
 	@Autowired
 	private ISysUserService userService;
@@ -110,7 +108,7 @@ public class VisitLogInterceptor {
 			}
 		}
 		//写入mongodb
-		OperLog operLog = new OperLog();
+		SysLog operLog = new SysLog();
 		operLog.setUserId(userId);
 		operLog.setUserName(userName);
 		operLog.setNickName(nickName);
@@ -123,7 +121,7 @@ public class VisitLogInterceptor {
 		operLog.setCreateTime(Calendar.getInstance().getTime());
 		operLog.setResult(msg);
 		operLog.setOperationType("manage");
-		mongoTemplate.insert(operLog);
+		sysLogService.save(operLog);
 
 		return result;
 	}

src/main/java/com/fdkankan/manage/controller/OperLogController.java

@@ -1,12 +1,15 @@
 package com.fdkankan.manage.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultData;
-import com.fdkankan.manage.service.OperLogService;
+import com.fdkankan.manage.entity.SysLog;
+import com.fdkankan.manage.service.ISysLogService;
 import com.fdkankan.manage.vo.OperLogPageParamVO;
-import com.fdkankan.mongodb.base.MongoPageResult;
 import com.fdkankan.redis.util.RedisUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,14 +22,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/service/manage/operLog")
 public class OperLogController {
 
-    @Autowired
-    MongoTemplate mongoTemplate;
 
     @Autowired
     RedisUtil redisUtil;
 
     @Autowired
-    private OperLogService operLogService;
+    private ISysLogService sysLogService;
 
     /**
      * 操作日志列表
@@ -36,9 +37,20 @@ public class OperLogController {
     @PostMapping("/pageOperLog")
     public ResultData pageOperLog(@RequestBody OperLogPageParamVO param){
 
-        MongoPageResult mongoPageResult = operLogService.pageOperLog(param);
-
-        return ResultData.ok(mongoPageResult);
+        LambdaQueryWrapper<SysLog> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getNickName())){
+            wrapper.like(SysLog::getNickName,param.getNickName());
+        }
+        if(StringUtils.isNotBlank(param.getUserName())){
+            wrapper.like(SysLog::getUserName,param.getUserName());
+        }
+        if(StringUtils.isNotBlank(param.getStartTime())){
+            wrapper.between(SysLog::getCreateTime,param.getStartTime(),param.getEndTime());
+        }
+        wrapper.orderByDesc(SysLog::getCreateTime);
+        Page<SysLog> page  = sysLogService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+
+        return ResultData.ok(PageInfo.PageInfo(page));
 
     }
 

src/main/java/com/fdkankan/manage/controller/SysLogController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.manage.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@RestController
+@RequestMapping("/manage/sysLog")
+public class SysLogController {
+
+}
+

src/main/java/com/fdkankan/manage/entity/OperLog.java

@@ -1,62 +0,0 @@
-package com.fdkankan.manage.entity;
-
-import com.fdkankan.mongodb.base.BaseMongoEntity;
-import lombok.Data;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
-
-/**
- * 操作日志
- */
-@Data
-@Document("OperLog")
-public class OperLog extends BaseMongoEntity{
-
-
-    /**
-     * 用户id
-     */
-    @Field("userId")
-    private Long userId;
-
-    /**
-     * 账号
-     */
-    @Field("userName")
-    private String userName;
-
-    /**
-     * 姓名
-     */
-    @Field("nickName")
-    private String nickName;
-
-    /**请求路径*/
-    @Field("requestPath")
-    private String requestPath;
-
-    /**请求url*/
-    @Field("uri")
-    private String uri;
-
-    /**请求方式*/
-    @Field("method")
-    private String method;
-
-    /**请求方式*/
-    @Field("params")
-    private String params;
-
-    /**请求ip*/
-    @Field("ip")
-    private String ip;
-
-    @Field("browser")
-    private String browser;
-
-    @Field("result")
-    private String result;
-
-    @Field("operationType")
-    private String operationType;
-}

src/main/java/com/fdkankan/manage/entity/SysLog.java

@@ -0,0 +1,75 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+@TableName("sys_log")
+public class SysLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("user_id")
+    private Long userId;
+
+    @TableField("user_name")
+    private String userName;
+
+    @TableField("nick_name")
+    private String nickName;
+
+    @TableField("request_path")
+    private String requestPath;
+
+    @TableField("uri")
+    private String uri;
+
+    @TableField("method")
+    private String method;
+
+    @TableField("params")
+    private String params;
+
+    @TableField("ip")
+    private String ip;
+
+    @TableField("browser")
+    private String browser;
+
+    @TableField("result")
+    private String result;
+
+    @TableField("operation_type")
+    private String operationType;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_folder_scene",
+                "sys_log",
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -46,8 +46,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://rm-wz90w10465iiwwv098o.mysql.rds.aliyuncs.com:3306/4dkankan_v4_prod",
-                "root","D2719bd0cae1a005")
+        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/4dkankan_v4",
+                "root","4dkk2023cuikuan%")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

src/main/java/com/fdkankan/manage/mapper/ISysLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.SysLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Mapper
+public interface ISysLogMapper extends BaseMapper<SysLog> {
+
+}

src/main/java/com/fdkankan/manage/service/ISysLogService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.SysLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+public interface ISysLogService extends IService<SysLog> {
+
+}

src/main/java/com/fdkankan/manage/service/OperLogService.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.service;
-
-import com.fdkankan.manage.entity.OperLog;
-import com.fdkankan.manage.vo.OperLogPageParamVO;
-import com.fdkankan.mongodb.base.MongoPageResult;
-import com.fdkankan.mongodb.service.MongodbBaseService;
-import java.util.List;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/30
- **/
-public interface OperLogService extends MongodbBaseService<OperLog> {
-
-    MongoPageResult pageOperLog(OperLogPageParamVO param);
-
-}

src/main/java/com/fdkankan/manage/service/impl/OperLogServiceImpl.java

@@ -1,48 +0,0 @@
-package com.fdkankan.manage.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.fdkankan.manage.entity.OperLog;
-import com.fdkankan.manage.service.OperLogService;
-import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.manage.vo.OperLogPageParamVO;
-import com.fdkankan.mongodb.base.MongoPageResult;
-import com.fdkankan.mongodb.service.impl.MongodbBaseServiceImpl;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/30
- **/
-@Service
-public class OperLogServiceImpl extends MongodbBaseServiceImpl<OperLog> implements OperLogService {
-
-    @Override
-    public MongoPageResult pageOperLog(OperLogPageParamVO param) {
-
-        Query query = new Query();
-        if(StrUtil.isNotEmpty(param.getNickName())){
-            query.addCriteria(Criteria.where("nickName").regex(param.getNickName()));
-        }
-        if(StrUtil.isNotEmpty(param.getUserName())){
-            query.addCriteria(Criteria.where("userName").regex(param.getUserName()));
-        }
-        if(Objects.nonNull(param.getStartTime()) || Objects.nonNull(param.getEndTime())){
-            query.addCriteria (Criteria.where("createTime").gte(Dateutils.getDate(param.getStartTime())).lte(Dateutils.getDate(param.getEndTime())));
-        }
-        //默认按操作时间降序排序
-        param.setOrderBy("createTime");
-
-        MongoPageResult<OperLog> operLogMongoPageResult = this.pageQuery(param, query);
-        return operLogMongoPageResult;
-    }
-}

src/main/java/com/fdkankan/manage/service/impl/SysLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.SysLog;
+import com.fdkankan.manage.mapper.ISysLogMapper;
+import com.fdkankan.manage.service.ISysLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Service
+public class SysLogServiceImpl extends ServiceImpl<ISysLogMapper, SysLog> implements ISysLogService {
+
+}

src/main/java/com/fdkankan/manage/vo/InvoicePageParamVO.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.manage.vo.request.RequestBase;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.mongodb.base.BaseRequestMongo;
 import java.util.Date;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/fdkankan/manage/vo/OperLogPageParamVO.java

@@ -2,11 +2,12 @@ package com.fdkankan.manage.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.mongodb.base.BaseRequestMongo;
+import com.fdkankan.manage.vo.request.RequestBase;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -17,25 +18,40 @@ import java.util.Date;
  * @since 2022/5/31
  **/
 @Data
-public class OperLogPageParamVO extends BaseRequestMongo {
+public class OperLogPageParamVO  extends RequestBase {
 
     private String nickName;
 
     private String userName;
 
+    private String operationType = "sale";
+
     private String startTime;
 
     private String endTime;
 
-    private String operationType = "manage";
+    private List<String> timeList;
 
     public String getStartTime() {
-        return Dateutils.getStartTime(startTime);
+        if(StringUtils.isBlank(startTime) && timeList != null && timeList.size() >0){
+            return Dateutils.getStartTime(timeList.get(0));
+        }
+        if(StringUtils.isNotBlank(startTime)){
+
+            return startTime +" 00:00:00";
+        }
+        return startTime;
     }
 
-
     public String getEndTime() {
-        return Dateutils.getEndTime(endTime);
+        if(StringUtils.isBlank(endTime) && timeList != null && timeList.size() >1){
+            return Dateutils.getEndTime(timeList.get(1));
+        }
+        if(StringUtils.isNotBlank(endTime)){
+
+            return endTime +" 00:00:00";
+        }
+        return endTime;
     }
 
 }

src/main/resources/mapper/manage/SysLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.ISysLogMapper">
+
+</mapper>