From b1ae62872b40272c9b5c56b6f5f0baf1d648cf91 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 19 Apr 2021 11:57:42 +0800
Subject: [PATCH] user_log,字典表实体类修改
---
screen-api/src/main/java/com/moral/api/entity/ManageMenu.java | 7 ++++++-
screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java | 7 ++++---
screen-manage/src/main/resources/mapper/UserLogMapper.xml | 1 +
screen-manage/src/main/java/com/moral/api/entity/UserLog.java | 12 +++++++++---
screen-api/src/main/resources/mapper/SysDictDataMapper.xml | 2 --
screen-api/src/main/resources/mapper/SysDictTypeMapper.xml | 1 +
screen-api/src/main/java/com/moral/api/entity/SysDictType.java | 7 ++++++-
screen-api/src/main/java/com/moral/api/entity/SysDictData.java | 12 +-----------
screen-api/src/main/resources/mapper/ManageMenuMapper.xml | 1 +
9 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java b/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
index 492ebaa..7249cfc 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
@@ -15,7 +15,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -69,6 +69,11 @@
*/
private String isDelete;
+ /**
+ * ������
+ */
+ private String desc;
+
@Override
protected Serializable pkVal() {
diff --git a/screen-api/src/main/java/com/moral/api/entity/SysDictData.java b/screen-api/src/main/java/com/moral/api/entity/SysDictData.java
index 11d6903..9866782 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SysDictData.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SysDictData.java
@@ -16,7 +16,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -29,11 +29,6 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
-
- /**
- * ���Id
- */
- private Integer parentId;
/**
* ������������Id
@@ -51,11 +46,6 @@
*/
@TableField("dataValue")
private String dataValue;
-
- /**
- * ������������
- */
- private Integer sort;
/**
* ������������
diff --git a/screen-api/src/main/java/com/moral/api/entity/SysDictType.java b/screen-api/src/main/java/com/moral/api/entity/SysDictType.java
index e0636a0..e479894 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SysDictType.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SysDictType.java
@@ -15,7 +15,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -40,6 +40,11 @@
private String desc;
/**
+ * ������������ ������������
+ */
+ private Integer system;
+
+ /**
* ������������
*/
private Date createTime;
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
index 61e14ef..cb0a8ee 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -41,9 +42,9 @@
Object orgId = orgInfo.get("id");
QueryWrapper<UserLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("organization_id", orgId);
- Object type = parameters.get("type");
- if (type != null) {
- queryWrapper.eq("type", type);
+ List<Object> types = (List<Object>) parameters.get("types");
+ if (!types.isEmpty()) {
+ queryWrapper.in("type", types);
}
queryWrapper.orderByDesc("create_time");
Integer page = (Integer) parameters.get("page");
diff --git a/screen-api/src/main/resources/mapper/ManageMenuMapper.xml b/screen-api/src/main/resources/mapper/ManageMenuMapper.xml
index 8365603..55a9cb3 100644
--- a/screen-api/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-api/src/main/resources/mapper/ManageMenuMapper.xml
@@ -13,6 +13,7 @@
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="is_delete" property="isDelete" />
+ <result column="desc" property="desc" />
</resultMap>
</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/SysDictDataMapper.xml b/screen-api/src/main/resources/mapper/SysDictDataMapper.xml
index f7dd306..a37bc2c 100644
--- a/screen-api/src/main/resources/mapper/SysDictDataMapper.xml
+++ b/screen-api/src/main/resources/mapper/SysDictDataMapper.xml
@@ -5,11 +5,9 @@
<!-- ������������������������ -->
<resultMap id="BaseResultMap" type="com.moral.api.entity.SysDictData">
<id column="id" property="id" />
- <result column="parent_id" property="parentId" />
<result column="dict_type_id" property="dictTypeId" />
<result column="dataKey" property="dataKey" />
<result column="dataValue" property="dataValue" />
- <result column="sort" property="sort" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="is_delete" property="isDelete" />
diff --git a/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml b/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
index 6eaedd4..63a608b 100644
--- a/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
+++ b/screen-api/src/main/resources/mapper/SysDictTypeMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id" />
<result column="name" property="name" />
<result column="desc" property="desc" />
+ <result column="system" property="system" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="is_delete" property="isDelete" />
diff --git a/screen-manage/src/main/java/com/moral/api/entity/UserLog.java b/screen-manage/src/main/java/com/moral/api/entity/UserLog.java
index 3a34664..58f4dca 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/UserLog.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/UserLog.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +15,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-13
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,6 +28,11 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+
+ /**
+ * ������������
+ */
+ private String type;
/**
* ������������
@@ -51,7 +57,7 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
@Override
diff --git a/screen-manage/src/main/resources/mapper/UserLogMapper.xml b/screen-manage/src/main/resources/mapper/UserLogMapper.xml
index 52f730a..5895e92 100644
--- a/screen-manage/src/main/resources/mapper/UserLogMapper.xml
+++ b/screen-manage/src/main/resources/mapper/UserLogMapper.xml
@@ -5,6 +5,7 @@
<!-- ������������������������ -->
<resultMap id="BaseResultMap" type="com.moral.api.entity.UserLog">
<id column="id" property="id" />
+ <result column="type" property="type" />
<result column="content" property="content" />
<result column="organization_id" property="organizationId" />
<result column="operate_id" property="operateId" />
--
Gitblit v1.8.0