diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
index 102d185e..755aa849 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
-import com.mdp.core.utils.ResponseHelper;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams;
@@ -84,13 +83,13 @@ public class XmRecordVisitController {
public Result addXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit) {
if(!StringUtils.hasText(xmRecordVisit.getBizId())){
- return ResponseHelper.failed("bizId-0","bizId不能为空");
+ return Result.error("bizId-0","bizId不能为空");
}
if(!StringUtils.hasText(xmRecordVisit.getPbizId())){
- return ResponseHelper.failed("pbizId-0","pbizId不能为空");
+ return Result.error("pbizId-0","pbizId不能为空");
}
if(!StringUtils.hasText(xmRecordVisit.getObjType())){
- return ResponseHelper.failed("objType-0","objType不能为空");
+ return Result.error("objType-0","objType不能为空");
}
User user= LoginUtils.getCurrentUserInfo();
xmRecordVisit.setId(this.xmRecordVisitService.createKey("id"));
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmRecordVisit.java b/xm-core/src/main/java/com/xm/core/entity/XmRecordVisit.java
index f6f9b0a0..5036a73b 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmRecordVisit.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmRecordVisit.java
@@ -1,5 +1,7 @@
package com.xm.core.entity;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -7,54 +9,64 @@ import lombok.Data;
import java.util.Date;
/**
- * 组织 com 顶级模块 xm 大模块 core 小模块
- * 实体 XmRecordVisit所有属性名:
- * "id","日志编号","operUserid","操作人id","operUsername","操作人名字","operTime","操作时间","objType","对象类型:项目-1/任务-2/产品-3/需求-4/bug-5/迭代6","action","操作的id","remarks","备注-只描述新旧值之间的变化","gloNo","全局根踪号，用于跟踪日志","branchId","机构编号","ip","ip地址","bizId","业务主键编号","pbizId","对象上级编号,项目时填项目编号，任务时填项目编号，产品时填产品编号，需求时填产品编号，bug时填产品编号，迭代时填产品编号","bizName","对象名称";
- * 当前主键(包括多主键):
- * id;
+ * @author code-gen
+ * @since 2023-11-6
*/
- @Data
+@Data
+@TableName("xm_record_visit")
@ApiModel(description="重要页面访问记录")
public class XmRecordVisit implements java.io.Serializable {
private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(notes="日志编号,主键",allowEmptyValue=true,example="",allowableValues="")
String id;
-
+
@ApiModelProperty(notes="操作人id",allowEmptyValue=true,example="",allowableValues="")
String operUserid;
+
@ApiModelProperty(notes="操作人名字",allowEmptyValue=true,example="",allowableValues="")
String operUsername;
+
@ApiModelProperty(notes="操作时间",allowEmptyValue=true,example="",allowableValues="")
Date operTime;
+
@ApiModelProperty(notes="对象类型:项目-1/任务-2/产品-3/需求-4/bug-5/迭代6",allowEmptyValue=true,example="",allowableValues="")
String objType;
+
@ApiModelProperty(notes="操作的id",allowEmptyValue=true,example="",allowableValues="")
String action;
+
@ApiModelProperty(notes="备注-只描述新旧值之间的变化",allowEmptyValue=true,example="",allowableValues="")
String remarks;
+
@ApiModelProperty(notes="全局根踪号，用于跟踪日志",allowEmptyValue=true,example="",allowableValues="")
String gloNo;
+
@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
String branchId;
+
@ApiModelProperty(notes="ip地址",allowEmptyValue=true,example="",allowableValues="")
String ip;
+
@ApiModelProperty(notes="业务主键编号",allowEmptyValue=true,example="",allowableValues="")
String bizId;
+
@ApiModelProperty(notes="对象上级编号,项目时填项目编号，任务时填项目编号，产品时填产品编号，需求时填产品编号，bug时填产品编号，迭代时填产品编号",allowEmptyValue=true,example="",allowableValues="")
String pbizId;
+
@ApiModelProperty(notes="对象名称",allowEmptyValue=true,example="",allowableValues="")
String bizName;
diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java
index fa75446b..7af32988 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java
@@ -1,7 +1,10 @@
package com.xm.core.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.service.BaseService;
import com.xm.core.entity.XmRecordVisit;
+import com.xm.core.mapper.XmRecordVisitMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -17,6 +20,17 @@ import java.util.*;
public class XmRecordVisitService extends BaseService {
static Logger logger =LoggerFactory.getLogger(XmRecordVisitService.class);
+ /**
+ * 自定义查询，支持多表关联
+ * @param page 分页条件
+ * @param ew 一定要，并且必须加@Param("ew")注解
+ * @param ext 如果xml中需要根据某些值进行特殊处理，可以通过这个进行传递，非必须，注解也可以不加
+ * @return
+ */
+ public List> selectListMapByWhere(IPage page, QueryWrapper ew, Map ext){
+ return baseMapper.selectListMapByWhere(page,ew,ext);
+ }
+
public void batchAddAndCalc(List datas) {
Map timesMap=new HashMap<>();
Map > usersMap=new HashMap<>();
@@ -48,7 +62,7 @@ public class XmRecordVisitService extends BaseService0){
- this.update("updateTaskBrowseTimesAndBrowseUsers",datasToUpdate);
+ super.baseMapper.updateTaskBrowseTimesAndBrowseUsers(datasToUpdate);
}
}
}