diff --git a/flossom-common/flossom-common-hzMapper/pom.xml b/flossom-common/flossom-common-hzMapper/pom.xml
new file mode 100644
index 0000000..f3fcff3
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/pom.xml
@@ -0,0 +1,29 @@
+
+
+
+ com.flossom
+ flossom-common
+ 3.6.3
+
+ 4.0.0
+
+ flossom-common-hzMapper
+
+
+ flossom-common-mapper接口
+
+
+
+
+ com.flossom
+ flossom-common-core
+
+
+ com.flossom
+ flossom-api-system
+
+
+
+
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysConfig.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysConfig.java
similarity index 56%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysConfig.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysConfig.java
index c9108d5..d56e7ab 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysConfig.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysConfig.java
@@ -1,111 +1,111 @@
-package com.flossom.system.domain;
+package com.flossom.hzMapper.domain;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.flossom.common.core.annotation.Excel;
import com.flossom.common.core.annotation.Excel.ColumnType;
import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
/**
* 参数配置表 sys_config
*
* @author flossom
*/
-public class SysConfig extends BaseEntity
-{
+public class SysConfig extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 参数主键 */
+ /**
+ * 参数主键
+ */
@Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
private Long configId;
- /** 参数名称 */
+ /**
+ * 参数名称
+ */
@Excel(name = "参数名称")
private String configName;
- /** 参数键名 */
+ /**
+ * 参数键名
+ */
@Excel(name = "参数键名")
private String configKey;
- /** 参数键值 */
+ /**
+ * 参数键值
+ */
@Excel(name = "参数键值")
private String configValue;
- /** 系统内置（Y是 N否） */
+ /**
+ * 系统内置（Y是 N否）
+ */
@Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
private String configType;
- public Long getConfigId()
- {
+ public Long getConfigId() {
return configId;
}
- public void setConfigId(Long configId)
- {
+ public void setConfigId(Long configId) {
this.configId = configId;
}
@NotBlank(message = "参数名称不能为空")
@Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
- public String getConfigName()
- {
+ public String getConfigName() {
return configName;
}
- public void setConfigName(String configName)
- {
+ public void setConfigName(String configName) {
this.configName = configName;
}
@NotBlank(message = "参数键名长度不能为空")
@Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
- public String getConfigKey()
- {
+ public String getConfigKey() {
return configKey;
}
- public void setConfigKey(String configKey)
- {
+ public void setConfigKey(String configKey) {
this.configKey = configKey;
}
@NotBlank(message = "参数键值不能为空")
@Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
- public String getConfigValue()
- {
+ public String getConfigValue() {
return configValue;
}
- public void setConfigValue(String configValue)
- {
+ public void setConfigValue(String configValue) {
this.configValue = configValue;
}
- public String getConfigType()
- {
+ public String getConfigType() {
return configType;
}
- public void setConfigType(String configType)
- {
+ public void setConfigType(String configType) {
this.configType = configType;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("configId", getConfigId())
- .append("configName", getConfigName())
- .append("configKey", getConfigKey())
- .append("configValue", getConfigValue())
- .append("configType", getConfigType())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("configId", getConfigId())
+ .append("configName", getConfigName())
+ .append("configKey", getConfigKey())
+ .append("configValue", getConfigValue())
+ .append("configType", getConfigType())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysFiringInfo.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysFiringInfo.java
similarity index 57%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysFiringInfo.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysFiringInfo.java
index 84a1742..99da04f 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysFiringInfo.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysFiringInfo.java
@@ -1,4 +1,4 @@
-package com.flossom.system.domain;
+package com.flossom.hzMapper.domain;
import com.flossom.common.core.annotation.Excel;
import com.flossom.common.core.web.domain.BaseEntity;
@@ -11,84 +11,93 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author flossom
* @date 2023-11-29
*/
-public class SysFiringInfo extends BaseEntity
-{
+public class SysFiringInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 主键ID */
+ /**
+ * 主键ID
+ */
private Long id;
- /** 标题 */
+ /**
+ * 标题
+ */
@Excel(name = "标题")
private String title;
- /** 内容 */
+ /**
+ * 内容
+ */
@Excel(name = "内容")
private String content;
- /** 文件路径 */
+ /**
+ * 文件路径
+ */
@Excel(name = "文件路径")
private String filePath;
- /** 文件访问路径 */
+ /**
+ * 文件访问路径
+ */
@Excel(name = "文件访问路径")
private String fileUrl;
- /** 文件类型 */
+ /**
+ * 文件类型
+ */
@Excel(name = "文件类型")
private String fileSuffix;
- /** 删除标识（0正常 1停用） */
+ /**
+ * 删除标识（0正常 1停用）
+ */
private String delFlag = "0";
- /** 类型(1-启动页 2-登录页) */
+ /**
+ * 类型(1-启动页 2-登录页)
+ */
@Excel(name = "类型(1-启动页 2-登录页)")
private String type;
- public void setId(Long id)
- {
+ public void setId(Long id) {
this.id = id;
}
- public Long getId()
- {
+ public Long getId() {
return id;
}
- public void setFilePath(String filePath)
- {
+
+ public void setFilePath(String filePath) {
this.filePath = filePath;
}
- public String getFilePath()
- {
+ public String getFilePath() {
return filePath;
}
- public void setFileSuffix(String fileSuffix)
- {
+
+ public void setFileSuffix(String fileSuffix) {
this.fileSuffix = fileSuffix;
}
- public String getFileSuffix()
- {
+ public String getFileSuffix() {
return fileSuffix;
}
- public void setDelFlag(String delFlag)
- {
+
+ public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
- public String getDelFlag()
- {
+ public String getDelFlag() {
return delFlag;
}
- public void setType(String type)
- {
+
+ public void setType(String type) {
this.type = type;
}
- public String getType()
- {
+ public String getType() {
return type;
}
@@ -118,14 +127,14 @@ public class SysFiringInfo extends BaseEntity
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("filePath", getFilePath())
- .append("fileSuffix", getFileSuffix())
- .append("delFlag", getDelFlag())
- .append("type", getType())
- .append("createTime", getCreateTime())
- .append("createBy", getCreateBy())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("filePath", getFilePath())
+ .append("fileSuffix", getFileSuffix())
+ .append("delFlag", getDelFlag())
+ .append("type", getType())
+ .append("createTime", getCreateTime())
+ .append("createBy", getCreateBy())
+ .toString();
}
}
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysMenu.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysMenu.java
new file mode 100644
index 0000000..f4231ad
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysMenu.java
@@ -0,0 +1,259 @@
+package com.flossom.hzMapper.domain;
+
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 菜单权限表 sys_menu
+ *
+ * @author flossom
+ */
+public class SysMenu extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 菜单ID
+ */
+ private Long menuId;
+
+ /**
+ * 菜单名称
+ */
+ private String menuName;
+
+ /**
+ * 父菜单名称
+ */
+ private String parentName;
+
+ /**
+ * 父菜单ID
+ */
+ private Long parentId;
+
+ /**
+ * 显示顺序
+ */
+ private Integer orderNum;
+
+ /**
+ * 路由地址
+ */
+ private String path;
+
+ /**
+ * 组件路径
+ */
+ private String component;
+
+ /**
+ * 路由参数
+ */
+ private String query;
+
+ /**
+ * 是否为外链（0是 1否）
+ */
+ private String isFrame;
+
+ /**
+ * 是否缓存（0缓存 1不缓存）
+ */
+ private String isCache;
+
+ /**
+ * 类型（M目录 C菜单 F按钮）
+ */
+ private String menuType;
+
+ /**
+ * 显示状态（0显示 1隐藏）
+ */
+ private String visible;
+
+ /**
+ * 菜单状态（0正常 1停用）
+ */
+ private String status;
+
+ /**
+ * 权限字符串
+ */
+ private String perms;
+
+ /**
+ * 菜单图标
+ */
+ private String icon;
+
+ /**
+ * 子菜单
+ */
+ private List children = new ArrayList();
+
+ public Long getMenuId() {
+ return menuId;
+ }
+
+ public void setMenuId(Long menuId) {
+ this.menuId = menuId;
+ }
+
+ @NotBlank(message = "菜单名称不能为空")
+ @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
+ public String getMenuName() {
+ return menuName;
+ }
+
+ public void setMenuName(String menuName) {
+ this.menuName = menuName;
+ }
+
+ public String getParentName() {
+ return parentName;
+ }
+
+ public void setParentName(String parentName) {
+ this.parentName = parentName;
+ }
+
+ public Long getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId) {
+ this.parentId = parentId;
+ }
+
+ @NotNull(message = "显示顺序不能为空")
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
+ public String getComponent() {
+ return component;
+ }
+
+ public void setComponent(String component) {
+ this.component = component;
+ }
+
+ public String getQuery() {
+ return query;
+ }
+
+ public void setQuery(String query) {
+ this.query = query;
+ }
+
+ public String getIsFrame() {
+ return isFrame;
+ }
+
+ public void setIsFrame(String isFrame) {
+ this.isFrame = isFrame;
+ }
+
+ public String getIsCache() {
+ return isCache;
+ }
+
+ public void setIsCache(String isCache) {
+ this.isCache = isCache;
+ }
+
+ @NotBlank(message = "菜单类型不能为空")
+ public String getMenuType() {
+ return menuType;
+ }
+
+ public void setMenuType(String menuType) {
+ this.menuType = menuType;
+ }
+
+ public String getVisible() {
+ return visible;
+ }
+
+ public void setVisible(String visible) {
+ this.visible = visible;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
+ public String getPerms() {
+ return perms;
+ }
+
+ public void setPerms(String perms) {
+ this.perms = perms;
+ }
+
+ public String getIcon() {
+ return icon;
+ }
+
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+ public List getChildren() {
+ return children;
+ }
+
+ public void setChildren(List children) {
+ this.children = children;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("menuId", getMenuId())
+ .append("menuName", getMenuName())
+ .append("parentId", getParentId())
+ .append("orderNum", getOrderNum())
+ .append("path", getPath())
+ .append("component", getComponent())
+ .append("isFrame", getIsFrame())
+ .append("IsCache", getIsCache())
+ .append("menuType", getMenuType())
+ .append("visible", getVisible())
+ .append("status ", getStatus())
+ .append("perms", getPerms())
+ .append("icon", getIcon())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysNotice.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysNotice.java
new file mode 100644
index 0000000..26b7032
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysNotice.java
@@ -0,0 +1,102 @@
+package com.flossom.hzMapper.domain;
+
+import com.flossom.common.core.web.domain.BaseEntity;
+import com.flossom.common.core.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 通知公告表 sys_notice
+ *
+ * @author flossom
+ */
+public class SysNotice extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 公告ID
+ */
+ private Long noticeId;
+
+ /**
+ * 公告标题
+ */
+ private String noticeTitle;
+
+ /**
+ * 公告类型（1通知 2公告）
+ */
+ private String noticeType;
+
+ /**
+ * 公告内容
+ */
+ private String noticeContent;
+
+ /**
+ * 公告状态（0正常 1关闭）
+ */
+ private String status;
+
+ public Long getNoticeId() {
+ return noticeId;
+ }
+
+ public void setNoticeId(Long noticeId) {
+ this.noticeId = noticeId;
+ }
+
+ public void setNoticeTitle(String noticeTitle) {
+ this.noticeTitle = noticeTitle;
+ }
+
+ @Xss(message = "公告标题不能包含脚本字符")
+ @NotBlank(message = "公告标题不能为空")
+ @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
+ public String getNoticeTitle() {
+ return noticeTitle;
+ }
+
+ public void setNoticeType(String noticeType) {
+ this.noticeType = noticeType;
+ }
+
+ public String getNoticeType() {
+ return noticeType;
+ }
+
+ public void setNoticeContent(String noticeContent) {
+ this.noticeContent = noticeContent;
+ }
+
+ public String getNoticeContent() {
+ return noticeContent;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("noticeId", getNoticeId())
+ .append("noticeTitle", getNoticeTitle())
+ .append("noticeType", getNoticeType())
+ .append("noticeContent", getNoticeContent())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysPost.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysPost.java
similarity index 54%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysPost.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysPost.java
index 46981a4..dac91ef 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysPost.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysPost.java
@@ -1,124 +1,124 @@
-package com.flossom.system.domain;
+package com.flossom.hzMapper.domain;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.flossom.common.core.annotation.Excel;
import com.flossom.common.core.annotation.Excel.ColumnType;
import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
/**
* 岗位表 sys_post
*
* @author flossom
*/
-public class SysPost extends BaseEntity
-{
+public class SysPost extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 岗位序号 */
+ /**
+ * 岗位序号
+ */
@Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
private Long postId;
- /** 岗位编码 */
+ /**
+ * 岗位编码
+ */
@Excel(name = "岗位编码")
private String postCode;
- /** 岗位名称 */
+ /**
+ * 岗位名称
+ */
@Excel(name = "岗位名称")
private String postName;
- /** 岗位排序 */
+ /**
+ * 岗位排序
+ */
@Excel(name = "岗位排序")
private Integer postSort;
- /** 状态（0正常 1停用） */
+ /**
+ * 状态（0正常 1停用）
+ */
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status;
- /** 用户是否存在此岗位标识 默认不存在 */
+ /**
+ * 用户是否存在此岗位标识 默认不存在
+ */
private boolean flag = false;
- public Long getPostId()
- {
+ public Long getPostId() {
return postId;
}
- public void setPostId(Long postId)
- {
+ public void setPostId(Long postId) {
this.postId = postId;
}
@NotBlank(message = "岗位编码不能为空")
@Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
- public String getPostCode()
- {
+ public String getPostCode() {
return postCode;
}
- public void setPostCode(String postCode)
- {
+ public void setPostCode(String postCode) {
this.postCode = postCode;
}
@NotBlank(message = "岗位名称不能为空")
@Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
- public String getPostName()
- {
+ public String getPostName() {
return postName;
}
- public void setPostName(String postName)
- {
+ public void setPostName(String postName) {
this.postName = postName;
}
@NotNull(message = "显示顺序不能为空")
- public Integer getPostSort()
- {
+ public Integer getPostSort() {
return postSort;
}
- public void setPostSort(Integer postSort)
- {
+ public void setPostSort(Integer postSort) {
this.postSort = postSort;
}
- public String getStatus()
- {
+ public String getStatus() {
return status;
}
- public void setStatus(String status)
- {
+ public void setStatus(String status) {
this.status = status;
}
- public boolean isFlag()
- {
+ public boolean isFlag() {
return flag;
}
- public void setFlag(boolean flag)
- {
+ public void setFlag(boolean flag) {
this.flag = flag;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("postId", getPostId())
- .append("postCode", getPostCode())
- .append("postName", getPostName())
- .append("postSort", getPostSort())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("postId", getPostId())
+ .append("postCode", getPostCode())
+ .append("postName", getPostName())
+ .append("postSort", getPostSort())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
}
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleDept.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleDept.java
new file mode 100644
index 0000000..c512679
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleDept.java
@@ -0,0 +1,45 @@
+package com.flossom.hzMapper.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和部门关联 sys_role_dept
+ *
+ * @author flossom
+ */
+public class SysRoleDept {
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+
+ /**
+ * 部门ID
+ */
+ private Long deptId;
+
+ public Long getRoleId() {
+ return roleId;
+ }
+
+ public void setRoleId(Long roleId) {
+ this.roleId = roleId;
+ }
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("roleId", getRoleId())
+ .append("deptId", getDeptId())
+ .toString();
+ }
+}
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleMenu.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleMenu.java
new file mode 100644
index 0000000..71e8a04
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleMenu.java
@@ -0,0 +1,45 @@
+package com.flossom.hzMapper.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 角色和菜单关联 sys_role_menu
+ *
+ * @author flossom
+ */
+public class SysRoleMenu {
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+
+ /**
+ * 菜单ID
+ */
+ private Long menuId;
+
+ public Long getRoleId() {
+ return roleId;
+ }
+
+ public void setRoleId(Long roleId) {
+ this.roleId = roleId;
+ }
+
+ public Long getMenuId() {
+ return menuId;
+ }
+
+ public void setMenuId(Long menuId) {
+ this.menuId = menuId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("roleId", getRoleId())
+ .append("menuId", getMenuId())
+ .toString();
+ }
+}
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserOnline.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserOnline.java
new file mode 100644
index 0000000..1811458
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserOnline.java
@@ -0,0 +1,99 @@
+package com.flossom.hzMapper.domain;
+
+/**
+ * 当前在线会话
+ *
+ * @author flossom
+ */
+public class SysUserOnline {
+ /**
+ * 会话编号
+ */
+ private String tokenId;
+
+ /**
+ * 用户名称
+ */
+ private String userName;
+
+ /**
+ * 登录IP地址
+ */
+ private String ipaddr;
+
+ /**
+ * 登录地址
+ */
+ private String loginLocation;
+
+ /**
+ * 浏览器类型
+ */
+ private String browser;
+
+ /**
+ * 操作系统
+ */
+ private String os;
+
+ /**
+ * 登录时间
+ */
+ private Long loginTime;
+
+ public String getTokenId() {
+ return tokenId;
+ }
+
+ public void setTokenId(String tokenId) {
+ this.tokenId = tokenId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getIpaddr() {
+ return ipaddr;
+ }
+
+ public void setIpaddr(String ipaddr) {
+ this.ipaddr = ipaddr;
+ }
+
+ public String getLoginLocation() {
+ return loginLocation;
+ }
+
+ public void setLoginLocation(String loginLocation) {
+ this.loginLocation = loginLocation;
+ }
+
+ public String getBrowser() {
+ return browser;
+ }
+
+ public void setBrowser(String browser) {
+ this.browser = browser;
+ }
+
+ public String getOs() {
+ return os;
+ }
+
+ public void setOs(String os) {
+ this.os = os;
+ }
+
+ public Long getLoginTime() {
+ return loginTime;
+ }
+
+ public void setLoginTime(Long loginTime) {
+ this.loginTime = loginTime;
+ }
+}
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserPost.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserPost.java
new file mode 100644
index 0000000..136dca8
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserPost.java
@@ -0,0 +1,45 @@
+package com.flossom.hzMapper.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和岗位关联 sys_user_post
+ *
+ * @author flossom
+ */
+public class SysUserPost {
+ /**
+ * 用户ID
+ */
+ private Long userId;
+
+ /**
+ * 岗位ID
+ */
+ private Long postId;
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public Long getPostId() {
+ return postId;
+ }
+
+ public void setPostId(Long postId) {
+ this.postId = postId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("userId", getUserId())
+ .append("postId", getPostId())
+ .toString();
+ }
+}
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserRole.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserRole.java
new file mode 100644
index 0000000..b74ca35
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserRole.java
@@ -0,0 +1,45 @@
+package com.flossom.hzMapper.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 用户和角色关联 sys_user_role
+ *
+ * @author flossom
+ */
+public class SysUserRole {
+ /**
+ * 用户ID
+ */
+ private Long userId;
+
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public Long getRoleId() {
+ return roleId;
+ }
+
+ public void setRoleId(Long roleId) {
+ this.roleId = roleId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("userId", getUserId())
+ .append("roleId", getRoleId())
+ .toString();
+ }
+}
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java
new file mode 100644
index 0000000..a094aec
--- /dev/null
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java
@@ -0,0 +1,407 @@
+package com.flossom.hzMapper.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.flossom.common.core.annotation.Excel;
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 用户对象 wx_user_member
+ *
+ * @author flossom
+ * @date 2023-12-08
+ */
+public class WxUserMember extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ private Long id;
+
+ /**
+ * 昵称
+ */
+ @Excel(name = "昵称")
+ private String nickname;
+
+ /**
+ * 头像
+ */
+ @Excel(name = "头像")
+ private String headimg;
+
+ /**
+ * 姓名
+ */
+ @Excel(name = "姓名")
+ private String username;
+
+ /**
+ * 积分
+ */
+ @Excel(name = "积分")
+ private BigDecimal credit;
+
+ /**
+ * openid
+ */
+ @Excel(name = "openid")
+ private String openid;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String unionid;
+
+ /**
+ * 用户类型：1游客 2会员
+ */
+ @Excel(name = "用户类型：1游客 2会员")
+ private Integer userType;
+
+ /**
+ * 会员等级：0 不是会员，1以上为会员
+ */
+ @Excel(name = "会员等级：0 不是会员，1以上为会员")
+ private Integer level;
+
+ /**
+ * 手机
+ */
+ @Excel(name = "手机")
+ private String mobile;
+
+ /**
+ * 密码
+ */
+ @Excel(name = "密码")
+ private String password;
+
+ /**
+ * 个人二维码
+ */
+ @Excel(name = "个人二维码")
+ private String userQr;
+
+ /**
+ * 省
+ */
+ @Excel(name = "省")
+ private String province;
+
+ /**
+ * 市
+ */
+ @Excel(name = "市")
+ private String city;
+
+ /**
+ * 区
+ */
+ @Excel(name = "区")
+ private String area;
+
+ /**
+ * 生日
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date birthday;
+
+ /**
+ * 1可以2不可以
+ */
+ @Excel(name = "1可以2不可以")
+ private Integer clock;
+
+ /**
+ * 1可以2不可以
+ */
+ @Excel(name = "1可以2不可以")
+ private Integer activity;
+
+ /**
+ * 微信号
+ */
+ @Excel(name = "微信号")
+ private String wechat;
+
+ /**
+ * 应该是邀请码来的
+ */
+ @Excel(name = "应该是邀请码来的")
+ private String code;
+
+ /**
+ * 1 未对接到中控 2已经对接 3对接失败
+ */
+ @Excel(name = "1 未对接到中控 2已经对接 3对接失败")
+ private Integer isAbutment;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private BigDecimal collagenDay;
+
+ /**
+ * $column.columnComment
+ */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private BigDecimal collagenMount;
+
+ /**
+ * 登陆时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "登陆时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date loginTime;
+
+ /**
+ * 状态（0正常 1停用）
+ */
+ @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+ private Integer status;
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setNickname(String nickname) {
+ this.nickname = nickname;
+ }
+
+ public String getNickname() {
+ return nickname;
+ }
+
+ public void setHeadimg(String headimg) {
+ this.headimg = headimg;
+ }
+
+ public String getHeadimg() {
+ return headimg;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setCredit(BigDecimal credit) {
+ this.credit = credit;
+ }
+
+ public BigDecimal getCredit() {
+ return credit;
+ }
+
+ public void setOpenid(String openid) {
+ this.openid = openid;
+ }
+
+ public String getOpenid() {
+ return openid;
+ }
+
+ public void setUnionid(String unionid) {
+ this.unionid = unionid;
+ }
+
+ public String getUnionid() {
+ return unionid;
+ }
+
+ public void setUserType(Integer userType) {
+ this.userType = userType;
+ }
+
+ public Integer getUserType() {
+ return userType;
+ }
+
+ public void setLevel(Integer level) {
+ this.level = level;
+ }
+
+ public Integer getLevel() {
+ return level;
+ }
+
+ public void setMobile(String mobile) {
+ this.mobile = mobile;
+ }
+
+ public String getMobile() {
+ return mobile;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setUserQr(String userQr) {
+ this.userQr = userQr;
+ }
+
+ public String getUserQr() {
+ return userQr;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setBirthday(Date birthday) {
+ this.birthday = birthday;
+ }
+
+ public Date getBirthday() {
+ return birthday;
+ }
+
+ public void setClock(Integer clock) {
+ this.clock = clock;
+ }
+
+ public Integer getClock() {
+ return clock;
+ }
+
+ public void setActivity(Integer activity) {
+ this.activity = activity;
+ }
+
+ public Integer getActivity() {
+ return activity;
+ }
+
+ public void setWechat(String wechat) {
+ this.wechat = wechat;
+ }
+
+ public String getWechat() {
+ return wechat;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setIsAbutment(Integer isAbutment) {
+ this.isAbutment = isAbutment;
+ }
+
+ public Integer getIsAbutment() {
+ return isAbutment;
+ }
+
+ public void setCollagenDay(BigDecimal collagenDay) {
+ this.collagenDay = collagenDay;
+ }
+
+ public BigDecimal getCollagenDay() {
+ return collagenDay;
+ }
+
+ public void setCollagenMount(BigDecimal collagenMount) {
+ this.collagenMount = collagenMount;
+ }
+
+ public BigDecimal getCollagenMount() {
+ return collagenMount;
+ }
+
+ public void setLoginTime(Date loginTime) {
+ this.loginTime = loginTime;
+ }
+
+ public Date getLoginTime() {
+ return loginTime;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("nickname", getNickname())
+ .append("headimg", getHeadimg())
+ .append("username", getUsername())
+ .append("credit", getCredit())
+ .append("openid", getOpenid())
+ .append("unionid", getUnionid())
+ .append("userType", getUserType())
+ .append("level", getLevel())
+ .append("mobile", getMobile())
+ .append("password", getPassword())
+ .append("userQr", getUserQr())
+ .append("province", getProvince())
+ .append("city", getCity())
+ .append("area", getArea())
+ .append("birthday", getBirthday())
+ .append("clock", getClock())
+ .append("activity", getActivity())
+ .append("wechat", getWechat())
+ .append("code", getCode())
+ .append("isAbutment", getIsAbutment())
+ .append("collagenDay", getCollagenDay())
+ .append("collagenMount", getCollagenMount())
+ .append("loginTime", getLoginTime())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/MetaVo.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/MetaVo.java
similarity index 64%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/MetaVo.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/MetaVo.java
index de9b3d8..747ec9c 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/MetaVo.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/MetaVo.java
@@ -1,4 +1,4 @@
-package com.flossom.system.domain.vo;
+package com.flossom.hzMapper.domain.vo;
import com.flossom.common.core.utils.StringUtils;
@@ -7,8 +7,7 @@ import com.flossom.common.core.utils.StringUtils;
*
* @author flossom
*/
-public class MetaVo
-{
+public class MetaVo {
/**
* 设置该路由在侧边栏和面包屑中展示的名字
*/
@@ -29,78 +28,64 @@ public class MetaVo
*/
private String link;
- public MetaVo()
- {
+ public MetaVo() {
}
- public MetaVo(String title, String icon)
- {
+ public MetaVo(String title, String icon) {
this.title = title;
this.icon = icon;
}
- public MetaVo(String title, String icon, boolean noCache)
- {
+ public MetaVo(String title, String icon, boolean noCache) {
this.title = title;
this.icon = icon;
this.noCache = noCache;
}
- public MetaVo(String title, String icon, String link)
- {
+ public MetaVo(String title, String icon, String link) {
this.title = title;
this.icon = icon;
this.link = link;
}
- public MetaVo(String title, String icon, boolean noCache, String link)
- {
+ public MetaVo(String title, String icon, boolean noCache, String link) {
this.title = title;
this.icon = icon;
this.noCache = noCache;
- if (StringUtils.ishttp(link))
- {
+ if (StringUtils.ishttp(link)) {
this.link = link;
}
}
- public boolean isNoCache()
- {
+ public boolean isNoCache() {
return noCache;
}
- public void setNoCache(boolean noCache)
- {
+ public void setNoCache(boolean noCache) {
this.noCache = noCache;
}
- public String getTitle()
- {
+ public String getTitle() {
return title;
}
- public void setTitle(String title)
- {
+ public void setTitle(String title) {
this.title = title;
}
- public String getIcon()
- {
+ public String getIcon() {
return icon;
}
- public void setIcon(String icon)
- {
+ public void setIcon(String icon) {
this.icon = icon;
}
- public String getLink()
- {
+ public String getLink() {
return link;
}
- public void setLink(String link)
- {
+ public void setLink(String link) {
this.link = link;
}
}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/RouterVo.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/RouterVo.java
similarity index 66%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/RouterVo.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/RouterVo.java
index 500da22..efe0739 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/RouterVo.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/RouterVo.java
@@ -1,6 +1,7 @@
-package com.flossom.system.domain.vo;
+package com.flossom.hzMapper.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
+
import java.util.List;
/**
@@ -9,8 +10,7 @@ import java.util.List;
* @author flossom
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo
-{
+public class RouterVo {
/**
* 路由名字
*/
@@ -56,93 +56,75 @@ public class RouterVo
*/
private List children;
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
- public String getPath()
- {
+ public String getPath() {
return path;
}
- public void setPath(String path)
- {
+ public void setPath(String path) {
this.path = path;
}
- public boolean getHidden()
- {
+ public boolean getHidden() {
return hidden;
}
- public void setHidden(boolean hidden)
- {
+ public void setHidden(boolean hidden) {
this.hidden = hidden;
}
- public String getRedirect()
- {
+ public String getRedirect() {
return redirect;
}
- public void setRedirect(String redirect)
- {
+ public void setRedirect(String redirect) {
this.redirect = redirect;
}
- public String getComponent()
- {
+ public String getComponent() {
return component;
}
- public void setComponent(String component)
- {
+ public void setComponent(String component) {
this.component = component;
}
- public String getQuery()
- {
+ public String getQuery() {
return query;
}
- public void setQuery(String query)
- {
+ public void setQuery(String query) {
this.query = query;
}
- public Boolean getAlwaysShow()
- {
+ public Boolean getAlwaysShow() {
return alwaysShow;
}
- public void setAlwaysShow(Boolean alwaysShow)
- {
+ public void setAlwaysShow(Boolean alwaysShow) {
this.alwaysShow = alwaysShow;
}
- public MetaVo getMeta()
- {
+ public MetaVo getMeta() {
return meta;
}
- public void setMeta(MetaVo meta)
- {
+ public void setMeta(MetaVo meta) {
this.meta = meta;
}
- public List getChildren()
- {
+ public List getChildren() {
return children;
}
- public void setChildren(List children)
- {
+ public void setChildren(List children) {
this.children = children;
}
}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/TreeSelect.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/TreeSelect.java
similarity index 64%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/TreeSelect.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/TreeSelect.java
index ffa6d99..5b63496 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/TreeSelect.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/TreeSelect.java
@@ -1,77 +1,74 @@
-package com.flossom.system.domain.vo;
+package com.flossom.hzMapper.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.flossom.hzMapper.domain.SysMenu;
+import com.flossom.system.api.domain.SysDept;
import java.io.Serializable;
import java.util.List;
import java.util.stream.Collectors;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.flossom.system.api.domain.SysDept;
-import com.flossom.system.domain.SysMenu;
/**
* Treeselect树结构实体类
*
* @author flossom
*/
-public class TreeSelect implements Serializable
-{
+public class TreeSelect implements Serializable {
private static final long serialVersionUID = 1L;
- /** 节点ID */
+ /**
+ * 节点ID
+ */
private Long id;
- /** 节点名称 */
+ /**
+ * 节点名称
+ */
private String label;
- /** 子节点 */
+ /**
+ * 子节点
+ */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List children;
- public TreeSelect()
- {
+ public TreeSelect() {
}
- public TreeSelect(SysDept dept)
- {
+ public TreeSelect(SysDept dept) {
this.id = dept.getDeptId();
this.label = dept.getDeptName();
this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
- public TreeSelect(SysMenu menu)
- {
+ public TreeSelect(SysMenu menu) {
this.id = menu.getMenuId();
this.label = menu.getMenuName();
this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
- public Long getId()
- {
+ public Long getId() {
return id;
}
- public void setId(Long id)
- {
+ public void setId(Long id) {
this.id = id;
}
- public String getLabel()
- {
+ public String getLabel() {
return label;
}
- public void setLabel(String label)
- {
+ public void setLabel(String label) {
this.label = label;
}
- public List getChildren()
- {
+ public List getChildren() {
return children;
}
- public void setChildren(List children)
- {
+ public void setChildren(List children) {
this.children = children;
}
}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysConfigMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java
similarity index 94%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysConfigMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java
index 2f2d1c4..c12f59f 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysConfigMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java
@@ -1,8 +1,9 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
-import com.flossom.system.domain.SysConfig;
+import com.flossom.hzMapper.domain.SysConfig;
+
+import java.util.List;
/**
* 参数配置 数据层
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDeptMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java
similarity index 95%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDeptMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java
index f418167..d21ba81 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDeptMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java
@@ -1,16 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
import com.flossom.system.api.domain.SysDept;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 部门管理 数据层
*
* @author flossom
*/
-public interface SysDeptMapper
-{
+public interface SysDeptMapper {
/**
* 查询部门管理数据
*
@@ -22,7 +22,7 @@ public interface SysDeptMapper
/**
* 根据角色ID查询部门树信息
*
- * @param roleId 角色ID
+ * @param roleId 角色ID
* @param deptCheckStrictly 部门树选择项是否关联显示
* @return 选中部门列表
*/
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDictDataMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java
similarity index 95%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDictDataMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java
index 7d5ceb0..68a81e7 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDictDataMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java
@@ -1,16 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
import com.flossom.system.api.domain.SysDictData;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 字典表 数据层
*
* @author flossom
*/
-public interface SysDictDataMapper
-{
+public interface SysDictDataMapper {
/**
* 根据条件分页查询字典数据
*
@@ -30,7 +30,7 @@ public interface SysDictDataMapper
/**
* 根据字典类型和字典键值查询字典数据信息
*
- * @param dictType 字典类型
+ * @param dictType 字典类型
* @param dictValue 字典键值
* @return 字典标签
*/
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDictTypeMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java
similarity index 95%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDictTypeMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java
index 99cf92b..3a3ba94 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDictTypeMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java
@@ -1,15 +1,15 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
import com.flossom.system.api.domain.SysDictType;
+import java.util.List;
+
/**
* 字典表 数据层
*
* @author flossom
*/
-public interface SysDictTypeMapper
-{
+public interface SysDictTypeMapper {
/**
* 根据条件分页查询字典类型
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysFiringInfoMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java
similarity index 90%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysFiringInfoMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java
index a8a22f0..f1ce290 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysFiringInfoMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java
@@ -1,7 +1,9 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
+
+
+import com.flossom.hzMapper.domain.SysFiringInfo;
import java.util.List;
-import com.flossom.system.domain.SysFiringInfo;
/**
* 登录信息Mapper接口
@@ -9,8 +11,7 @@ import com.flossom.system.domain.SysFiringInfo;
* @author flossom
* @date 2023-11-29
*/
-public interface SysFiringInfoMapper
-{
+public interface SysFiringInfoMapper {
/**
* 查询登录信息
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysLogininforMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java
similarity index 91%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysLogininforMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java
index 73669d0..ae6527d 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysLogininforMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java
@@ -1,15 +1,15 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
import com.flossom.system.api.domain.SysLogininfor;
+import java.util.List;
+
/**
* 系统访问日志情况信息 数据层
*
* @author flossom
*/
-public interface SysLogininforMapper
-{
+public interface SysLogininforMapper {
/**
* 新增系统登录日志
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysMenuMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java
similarity index 94%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysMenuMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java
index 33e502e..32eacdc 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysMenuMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java
@@ -1,16 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
+import com.flossom.hzMapper.domain.SysMenu;
import org.apache.ibatis.annotations.Param;
-import com.flossom.system.domain.SysMenu;
+
+import java.util.List;
/**
* 菜单表 数据层
*
* @author flossom
*/
-public interface SysMenuMapper
-{
+public interface SysMenuMapper {
/**
* 查询系统菜单列表
*
@@ -68,7 +68,7 @@ public interface SysMenuMapper
/**
* 根据角色ID查询菜单树信息
*
- * @param roleId 角色ID
+ * @param roleId 角色ID
* @param menuCheckStrictly 菜单树选择项是否关联显示
* @return 选中菜单列表
*/
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysNoticeMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java
similarity index 89%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysNoticeMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java
index c2a0b5d..416149b 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysNoticeMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java
@@ -1,15 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
+
+
+import com.flossom.hzMapper.domain.SysNotice;
import java.util.List;
-import com.flossom.system.domain.SysNotice;
/**
* 通知公告表 数据层
*
* @author flossom
*/
-public interface SysNoticeMapper
-{
+public interface SysNoticeMapper {
/**
* 查询公告信息
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysOperLogMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java
similarity index 92%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysOperLogMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java
index 231623d..da23a11 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysOperLogMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java
@@ -1,15 +1,15 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
import com.flossom.system.api.domain.SysOperLog;
+import java.util.List;
+
/**
* 操作日志 数据层
*
* @author flossom
*/
-public interface SysOperLogMapper
-{
+public interface SysOperLogMapper {
/**
* 新增操作日志
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysPostMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java
similarity index 94%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysPostMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java
index 4da4547..049aaa2 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysPostMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java
@@ -1,15 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
+
+
+import com.flossom.hzMapper.domain.SysPost;
import java.util.List;
-import com.flossom.system.domain.SysPost;
/**
* 岗位信息 数据层
*
* @author flossom
*/
-public interface SysPostMapper
-{
+public interface SysPostMapper {
/**
* 查询岗位数据集合
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleDeptMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java
similarity index 86%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleDeptMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java
index 15ff0a7..6366fb2 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleDeptMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java
@@ -1,16 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
-import com.flossom.system.domain.SysRoleDept;
+import com.flossom.hzMapper.domain.SysRoleDept;
+
+import java.util.List;
/**
* 角色与部门关联表 数据层
*
* @author flossom
*/
-public interface SysRoleDeptMapper
-{
+public interface SysRoleDeptMapper {
/**
* 通过角色ID删除角色和部门关联
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java
similarity index 96%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java
index 00a5f50..15d03fd 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java
@@ -1,15 +1,15 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
import com.flossom.system.api.domain.SysRole;
+import java.util.List;
+
/**
* 角色表 数据层
*
* @author flossom
*/
-public interface SysRoleMapper
-{
+public interface SysRoleMapper {
/**
* 根据条件分页查询角色数据
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleMenuMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java
similarity index 86%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleMenuMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java
index 5fe0cfb..132bb3b 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleMenuMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java
@@ -1,15 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
+
+
+import com.flossom.hzMapper.domain.SysRoleMenu;
import java.util.List;
-import com.flossom.system.domain.SysRoleMenu;
/**
* 角色与菜单关联表 数据层
*
* @author flossom
*/
-public interface SysRoleMenuMapper
-{
+public interface SysRoleMenuMapper {
/**
* 查询菜单使用数量
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java
similarity index 96%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java
index 1c7f68a..ec8efd1 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java
@@ -1,16 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
import com.flossom.system.api.domain.SysUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 用户表 数据层
*
* @author flossom
*/
-public interface SysUserMapper
-{
+public interface SysUserMapper {
/**
* 根据条件分页查询用户列表
*
@@ -71,7 +71,7 @@ public interface SysUserMapper
* 修改用户头像
*
* @param userName 用户名
- * @param avatar 头像地址
+ * @param avatar 头像地址
* @return 结果
*/
public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserPostMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java
similarity index 86%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserPostMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java
index 0dea516..35fa6f6 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserPostMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java
@@ -1,15 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
+
+
+import com.flossom.hzMapper.domain.SysUserPost;
import java.util.List;
-import com.flossom.system.domain.SysUserPost;
/**
* 用户与岗位关联表 数据层
*
* @author flossom
*/
-public interface SysUserPostMapper
-{
+public interface SysUserPostMapper {
/**
* 通过用户ID删除用户和岗位关联
*
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserRoleMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java
similarity index 89%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserRoleMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java
index 008dd76..34b7844 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserRoleMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java
@@ -1,16 +1,16 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
-import java.util.List;
+import com.flossom.hzMapper.domain.SysUserRole;
import org.apache.ibatis.annotations.Param;
-import com.flossom.system.domain.SysUserRole;
+
+import java.util.List;
/**
* 用户与角色关联表 数据层
*
* @author flossom
*/
-public interface SysUserRoleMapper
-{
+public interface SysUserRoleMapper {
/**
* 通过用户ID删除用户和角色关联
*
@@ -54,7 +54,7 @@ public interface SysUserRoleMapper
/**
* 批量取消授权用户角色
*
- * @param roleId 角色ID
+ * @param roleId 角色ID
* @param userIds 需要删除的用户数据ID
* @return 结果
*/
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java
similarity index 92%
rename from flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/WxUserMemberMapper.java
rename to flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java
index 88ec3fa..92bfee4 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/WxUserMemberMapper.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java
@@ -1,7 +1,9 @@
-package com.flossom.system.mapper;
+package com.flossom.hzMapper.mapper;
+
+
+import com.flossom.hzMapper.domain.WxUserMember;
import java.util.List;
-import com.flossom.system.domain.WxUserMember;
/**
* 用户Mapper接口
diff --git a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysConfigMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysConfigMapper.xml
similarity index 98%
rename from flossom-modules/flossom-system/src/main/resources/mapper/system/SysConfigMapper.xml
rename to flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysConfigMapper.xml
index bf89d5e..4d5bb40 100644
--- a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysConfigMapper.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysDeptMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDeptMapper.xml
similarity index 99%
rename from flossom-modules/flossom-system/src/main/resources/mapper/system/SysDeptMapper.xml
rename to flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDeptMapper.xml
index c4d1c7e..4000670 100644
--- a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDeptMapper.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictDataMapper.xml
similarity index 98%
rename from flossom-modules/flossom-system/src/main/resources/mapper/system/SysDictDataMapper.xml
rename to flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictDataMapper.xml
index 4d2d034..480271a 100644
--- a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictDataMapper.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictTypeMapper.xml
similarity index 98%
rename from flossom-modules/flossom-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
rename to flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictTypeMapper.xml
index 0c17098..54bdaa4 100644
--- a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictTypeMapper.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysFiringInfoMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysFiringInfoMapper.xml
similarity index 98%
rename from flossom-modules/flossom-system/src/main/resources/mapper/system/SysFiringInfoMapper.xml
rename to flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysFiringInfoMapper.xml
index 8111b76..9769969 100644
--- a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysFiringInfoMapper.xml
+++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysFiringInfoMapper.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysLogininforMapper.xml
similarity index 96%
rename from flossom-modules/flossom-system/src/main/resources/mapper/system/SysLogininforMapper.xml
rename to flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysLogininforMapper.xml
index 644d27d..b581088 100644
--- a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysLogininforMapper.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysMenuMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysMenuMapper.xml
similarity index 99%
rename from flossom-modules/flossom-system/src/main/resources/mapper/system/SysMenuMapper.xml
rename to flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysMenuMapper.xml
index 56a9169..d32f235 100644
--- a/flossom-modules/flossom-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysMenuMapper.xml
@@ -2,7 +2,7 @@
-
+