add 用户访问来源

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserWxFollow;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.service.IUserVisitLogService;
 import com.zhongzheng.modules.user.service.IUserWxFollowService;
 import com.zhongzheng.modules.user.vo.RanKingUser;
 import com.zhongzheng.modules.user.vo.UserVo;
@@ -41,6 +42,8 @@ public class UserController extends BaseController {
 
     private final IUserWxFollowService iUserWxFollowService;
 
+    private final IUserVisitLogService iUserVisitLogService;
+
 
     /**
      * 修改客户端用户
@@ -95,7 +98,7 @@ public class UserController extends BaseController {
      */
     @ApiOperation("登录用户信息")
     @GetMapping("getInfo")
-    public AjaxResult<UserVo> getInfo()
+    public AjaxResult<UserVo> getInfo(UserVisitLogAddBo bo)
     {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         UserVo vo = iUserService.queryById(loginUser.getUser().getUserId());
@@ -104,6 +107,8 @@ public class UserController extends BaseController {
             vo.setUserFollowWx(1);
         }
         vo.setNull();
+        bo.setUserId(loginUser.getUser().getUserId());
+        iUserVisitLogService.insertByAddBo(bo);
         return AjaxResult.success(vo);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserVisitLogAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户访问日志添加对象 user_visit_log
+ *
+ * @author hjl
+ * @date 2022-08-17
+ */
+@Data
+@ApiModel("用户访问日志添加对象")
+public class UserVisitLogAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 来源平台 1小程序 2PC网站 */
+    @ApiModelProperty("来源平台 1小程序 2PC网站")
+    private String fromPlat;
+    /** 访问IP */
+    @ApiModelProperty("访问IP")
+    private String ip;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserVisitLogEditBo.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 用户访问日志编辑对象 user_visit_log
+ *
+ * @author hjl
+ * @date 2022-08-17
+ */
+@Data
+@ApiModel("用户访问日志编辑对象")
+public class UserVisitLogEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+
+    /** 来源平台 1小程序 2PC网站 */
+    @ApiModelProperty("来源平台 1小程序 2PC网站")
+    private String fromPlat;
+
+    /** 访问IP */
+    @ApiModelProperty("访问IP")
+    private String ip;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserVisitLogQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 用户访问日志分页查询对象 user_visit_log
+ *
+ * @author hjl
+ * @date 2022-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户访问日志分页查询对象")
+public class UserVisitLogQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** 来源平台 1小程序 2PC网站 */
+	@ApiModelProperty("来源平台 1小程序 2PC网站")
+	private String fromPlat;
+	/** 访问IP */
+	@ApiModelProperty("访问IP")
+	private String ip;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserVisitLog.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 用户访问日志对象 user_visit_log
+ *
+ * @author hjl
+ * @date 2022-08-17
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_visit_log")
+public class UserVisitLog implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** $column.columnComment */
+    private Long userId;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 来源平台 1小程序 2PC网站 */
+    private String fromPlat;
+    /** 访问IP */
+    private String ip;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserVisitLogMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.UserVisitLog;
+
+/**
+ * 用户访问日志Mapper接口
+ *
+ * @author hjl
+ * @date 2022-08-17
+ */
+public interface UserVisitLogMapper extends BaseMapper<UserVisitLog> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserVisitLogService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.UserVisitLogAddBo;
+import com.zhongzheng.modules.user.bo.UserVisitLogEditBo;
+import com.zhongzheng.modules.user.bo.UserVisitLogQueryBo;
+import com.zhongzheng.modules.user.domain.UserVisitLog;
+import com.zhongzheng.modules.user.vo.UserVisitLogVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户访问日志Service接口
+ *
+ * @author hjl
+ * @date 2022-08-17
+ */
+public interface IUserVisitLogService extends IService<UserVisitLog> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserVisitLogVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserVisitLogVo> queryList(UserVisitLogQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户访问日志
+	 * @param bo 用户访问日志新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserVisitLogAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户访问日志
+	 * @param bo 用户访问日志编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserVisitLogEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserVisitLogServiceImpl.java

@@ -0,0 +1,104 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.ip.IpUtils;
+import com.zhongzheng.modules.user.bo.UserVisitLogAddBo;
+import com.zhongzheng.modules.user.bo.UserVisitLogEditBo;
+import com.zhongzheng.modules.user.bo.UserVisitLogQueryBo;
+import com.zhongzheng.modules.user.domain.UserVisitLog;
+import com.zhongzheng.modules.user.mapper.UserVisitLogMapper;
+import com.zhongzheng.modules.user.service.IUserVisitLogService;
+import com.zhongzheng.modules.user.vo.UserVisitLogVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户访问日志Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-08-17
+ */
+@Service
+public class UserVisitLogServiceImpl extends ServiceImpl<UserVisitLogMapper, UserVisitLog> implements IUserVisitLogService {
+
+    @Override
+    public UserVisitLogVo queryById(Long id){
+        UserVisitLog db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, UserVisitLogVo.class);
+    }
+
+    @Override
+    public List<UserVisitLogVo> queryList(UserVisitLogQueryBo bo) {
+        LambdaQueryWrapper<UserVisitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, UserVisitLog::getUserId, bo.getUserId());
+        lqw.eq(StrUtil.isNotBlank(bo.getFromPlat()), UserVisitLog::getFromPlat, bo.getFromPlat());
+        lqw.eq(StrUtil.isNotBlank(bo.getIp()), UserVisitLog::getIp, bo.getIp());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserVisitLogVo> entity2Vo(Collection<UserVisitLog> collection) {
+        List<UserVisitLogVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserVisitLogVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserVisitLog> page = (Page<UserVisitLog>)collection;
+            Page<UserVisitLogVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserVisitLogAddBo bo) {
+        UserVisitLog add = BeanUtil.toBean(bo, UserVisitLog.class);
+        validEntityBeforeSave(add);
+        add.setIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserVisitLogEditBo bo) {
+        UserVisitLog update = BeanUtil.toBean(bo, UserVisitLog.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserVisitLog entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVisitLogVo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户访问日志视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-08-17
+ */
+@Data
+@ApiModel("用户访问日志视图对象")
+public class UserVisitLogVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** 来源平台 1小程序 2PC网站 */
+	@Excel(name = "来源平台 1小程序 2PC网站")
+	@ApiModelProperty("来源平台 1小程序 2PC网站")
+	private String fromPlat;
+	/** 访问IP */
+	@Excel(name = "访问IP")
+	@ApiModelProperty("访问IP")
+	private String ip;
+}

zhongzheng-system/src/main/resources/mapper/modules/user/UserVisitLogMapper.xml

@@ -0,0 +1,17 @@
+<?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.zhongzheng.modules.user.mapper.UserVisitLogMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserVisitLog" id="UserVisitLogResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="fromPlat" column="from_plat"/>
+        <result property="ip" column="ip"/>
+    </resultMap>
+
+
+</mapper>