314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重构架构，抽取 mapper 数据层

Browse Source
master
382696293@qq.com 3 years ago
parent 5da582c425
commit b247bd5e9c
103 changed files with 1537 additions and 1769 deletions
Show Stats Download Patch File Download Diff File

29
flossom-common/flossom-common-hzMapper/pom.xml
Unescape Escape View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.flossom</groupId>
<artifactId>flossom-common</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>flossom-common-hzMapper</artifactId>
<description>
flossom-common-mapper接口
</description>
<dependencies>
<dependency>
<groupId>com.flossom</groupId>
<artifactId>flossom-common-core</artifactId>
</dependency>
<dependency>
<groupId>com.flossom</groupId>
<artifactId>flossom-api-system</artifactId>
</dependency>
</dependencies>
</project>

88
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysConfig.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysConfig.java
Unescape Escape View File

@ -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();
}
}

89
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysFiringInfo.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysFiringInfo.java
Unescape Escape View File

@ -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();
}
}

259
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysMenu.java
Unescape Escape View File

@ -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<SysMenu> children = new ArrayList<SysMenu>();
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<SysMenu> getChildren() {
return children;
}
public void setChildren(List<SysMenu> 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();
}
}

102
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysNotice.java
Unescape Escape View File

@ -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();
}
}

100
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysPost.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysPost.java
Unescape Escape View File

@ -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();
}
}

45
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleDept.java
Unescape Escape View File

@ -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();
}
}

45
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRoleMenu.java
Unescape Escape View File

@ -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();
}
}

99
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserOnline.java
Unescape Escape View File

@ -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;
}
}

45
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserPost.java
Unescape Escape View File

@ -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();
}
}

45
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysUserRole.java
Unescape Escape View File

@ -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();
}
}

407
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java
Unescape Escape View File

@ -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();
}
}

47
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/MetaVo.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/MetaVo.java
Unescape Escape View File

@ -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;
}
}

60
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/RouterVo.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/RouterVo.java
Unescape Escape View File

@ -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<RouterVo> 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<RouterVo> getChildren()
{
public List<RouterVo> getChildren() {
return children;
}
public void setChildren(List<RouterVo> children)
{
public void setChildren(List<RouterVo> children) {
this.children = children;
}
}

51
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/vo/TreeSelect.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/vo/TreeSelect.java
Unescape Escape View File

@ -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<TreeSelect> 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<TreeSelect> getChildren()
{
public List<TreeSelect> getChildren() {
return children;
}
public void setChildren(List<TreeSelect> children)
{
public void setChildren(List<TreeSelect> children) {
this.children = children;
}
}

7
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysConfigMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java
Unescape Escape View File

@ -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;
/**
* 参数配置 数据层

12
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDeptMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java
Unescape Escape View File

@ -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 选中部门列表
*/

12
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDictDataMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java
Unescape Escape View File

@ -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 字典标签
*/

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysDictTypeMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java
Unescape Escape View File

@ -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 {
/**
* 根据条件分页查询字典类型
*

9
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysFiringInfoMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java
Unescape Escape View File

@ -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 {
/**
* 查询登录信息
*

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysLogininforMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java
Unescape Escape View File

@ -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 {
/**
* 新增系统登录日志
*

12
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysMenuMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java
Unescape Escape View File

@ -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 选中菜单列表
*/

9
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysNoticeMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java
Unescape Escape View File

@ -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 {
/**
* 查询公告信息
*

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysOperLogMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java
Unescape Escape View File

@ -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 {
/**
* 新增操作日志
*

9
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysPostMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java
Unescape Escape View File

@ -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 {
/**
* 查询岗位数据集合
*

10
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleDeptMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java
Unescape Escape View File

@ -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删除角色和部门关联
*

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java
Unescape Escape View File

@ -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 {
/**
* 根据条件分页查询角色数据
*

9
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysRoleMenuMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java
Unescape Escape View File

@ -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 {
/**
* 查询菜单使用数量
*

12
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java
Unescape Escape View File

@ -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);

9
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserPostMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java
Unescape Escape View File

@ -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删除用户和岗位关联
*

12
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/SysUserRoleMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java
Unescape Escape View File

@ -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 结果
*/

6
flossom-modules/flossom-system/src/main/java/com/flossom/system/mapper/WxUserMemberMapper.java → flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java
Unescape Escape View File

@ -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接口

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysConfigMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysConfigMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysConfigMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysConfigMapper">
<resultMap type="SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysDeptMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDeptMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysDeptMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysDeptMapper">
<resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysDictDataMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictDataMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysDictDataMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysDictDataMapper">
<resultMap type="SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysDictTypeMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysDictTypeMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysDictTypeMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysDictTypeMapper">
<resultMap type="SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysFiringInfoMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysFiringInfoMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysFiringInfoMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysFiringInfoMapper">
<resultMap type="SysFiringInfo" id="SysFiringInfoResult">
<result property="id" column="id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysLogininforMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysLogininforMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysLogininforMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysLogininforMapper">
<resultMap type="SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysMenuMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysMenuMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysMenuMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysMenuMapper">
<resultMap type="SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysNoticeMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysNoticeMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysNoticeMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysNoticeMapper">
<resultMap type="SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysOperLogMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysOperLogMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysOperLogMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysOperLogMapper">
<resultMap type="SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysPostMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysPostMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysPostMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysPostMapper">
<resultMap type="SysPost" id="SysPostResult">
<id property="postId" column="post_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleDeptMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysRoleDeptMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysRoleDeptMapper">
<resultMap type="SysRoleDept" id="SysRoleDeptResult">
<result property="roleId" column="role_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysRoleMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysRoleMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysRoleMapper">
<resultMap type="SysRole" id="SysRoleResult">
<id property="roleId" column="role_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRoleMenuMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysRoleMenuMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysRoleMenuMapper">
<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysUserMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysUserMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult">
<id property="userId" column="user_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysUserPostMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserPostMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysUserPostMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysUserPostMapper">
<resultMap type="SysUserPost" id="SysUserPostResult">
<result property="userId" column="user_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/SysUserRoleMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysUserRoleMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.SysUserRoleMapper">
<mapper namespace="com.flossom.hzMapper.mapper.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" />

2
flossom-modules/flossom-system/src/main/resources/mapper/system/WxUserMemberMapper.xml → flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.system.mapper.WxUserMemberMapper">
<mapper namespace="com.flossom.hzMapper.mapper.WxUserMemberMapper">
<resultMap type="WxUserMember" id="WxUserMemberResult">
<result property="id" column="id" />

1
flossom-common/pom.xml
Unescape Escape View File

@ -14,6 +14,7 @@
<module>flossom-common-redis</module>
<module>flossom-common-seata</module>
<module>flossom-common-swagger</module>
<module>flossom-common-hzMapper</module>
<module>flossom-common-security</module>
<module>flossom-common-datascope</module>
<module>flossom-common-datasource</module>

6
flossom-modules/flossom-mini-program/pom.xml
Unescape Escape View File

@ -78,6 +78,12 @@
<artifactId>flossom-common-swagger</artifactId>
</dependency>
<dependency>
<groupId>com.flossom</groupId>
<artifactId>flossom-common-hzMapper</artifactId>
<version>3.6.3</version>
</dependency>
<!-- httpClient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>

27
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/LoginController.java → flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java
Unescape Escape View File

@ -4,20 +4,37 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.flossom.common.core.web.controller.BaseController;
import com.flossom.common.core.web.domain.AjaxResult;
import com.flossom.miniProgram.domain.WxCode2SessionRet;
import com.flossom.miniProgram.domain.vo.WxCode2SessionRet;
import com.flossom.miniProgram.service.IWxUserMemberService;
import com.flossom.miniProgram.utils.MiniProgramUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class LoginController extends BaseController {
@RequestMapping("/wx/user")
public class UserMemberController extends BaseController {
@PostMapping("/wx/login")
@Autowired
private IWxUserMemberService wxUserMemberService;
/**
* 根据userNo 获取\注册 游客
* 前端使用 userNo 对应数据库表的 用户id
*/
@PostMapping("/obtainUserMemberInfo")
public AjaxResult obtainUserMemberInfo(@RequestParam(value = "userNo", required = false) Long userNo) {
return AjaxResult.success(wxUserMemberService.obtainUserMemberInfo(userNo));
}
@PostMapping("/login")
public AjaxResult getJwt(@RequestParam(value = "code") String code,
@RequestParam(value = "rawData", required = false) String rawData,
@RequestParam(value = "signature", required = false) String signature) throws Exception {
@RequestParam(value = "rawData", required = false) String rawData,
@RequestParam(value = "signature", required = false) String signature) throws Exception {
// 1. 使用临时凭证code获取 appi + appsecret + code
WxCode2SessionRet wxCode2SessionRet = JSON.parseObject(MiniProgramUtils.getSessionKeyAndOpenId(code), WxCode2SessionRet.class);
if (0 != wxCode2SessionRet.getErrcode()) {

7
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WelcomeController.java
Unescape Escape View File

@ -2,7 +2,6 @@ package com.flossom.miniProgram.controller;
import com.flossom.common.core.web.controller.BaseController;
import com.flossom.common.core.web.domain.AjaxResult;
import com.flossom.miniProgram.service.IWelcomeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -15,8 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/welcome")
public class WelcomeController extends BaseController {
@Autowired
private IWelcomeService welcomeService;
/**
* 获取首页视频
@ -24,12 +21,12 @@ public class WelcomeController extends BaseController {
*/
@GetMapping("/obtain/firstPageVideo")
public AjaxResult obtainFirstPageVideo() {
return AjaxResult.success(welcomeService.obtainFirstPageVideo());
return AjaxResult.success();
}
@GetMapping("/obtain/firstPageIntroduction")
public AjaxResult obtainFirstPageIntroduction() {
return AjaxResult.success(welcomeService.obtainFirstPageIntroduction());
return AjaxResult.success();
}
}

8
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/WxSystemSetting.java
Unescape Escape View File

@ -24,12 +24,12 @@ public class WxSystemSetting extends BaseEntity {
/**
* 状态（0正常 1停用
*/
private String status;
private Integer status;
public WxSystemSetting() {
}
public WxSystemSetting(String id, String key, String value, String instructions, String status) {
public WxSystemSetting(String id, String key, String value, String instructions, Integer status) {
this.id = id;
this.key = key;
this.value = value;
@ -69,11 +69,11 @@ public class WxSystemSetting extends BaseEntity {
this.instructions = instructions;
}
public String getStatus() {
public Integer getStatus() {
return status;
}
public void setStatus(String status) {
public void setStatus(Integer status) {
this.status = status;
}
}

120
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/WxUserMember.java
Unescape Escape View File

@ -1,120 +0,0 @@
package com.flossom.miniProgram.domain;
import com.flossom.common.core.web.domain.BaseEntity;
import java.util.Date;
public class WxUserMember extends BaseEntity {
private Integer id;
/**
* 昵称
*/
private String nickname;
/**
* 头像
*/
private String headimg;
/**
* 姓名
*/
private String username;
/**
* 积分 decimal(10,2)
*/
private Double credit;
/**
* openid
*/
private String openid;
/**
* DEFAULT NULL
*/
private String unionid;
/**
* 微信号
*/
private String wechat;
/**
* 应该是邀请码来的
*/
private String code;
/**
* 默认普通会员
*/
private Integer level;
/**
* 手机
*/
private String mobile;
/**
* 密码
*/
private String password;
/**
* 个人二维码
*/
private String userQr;// 个人二维码
/**
* 省
*/
private String province;
/**
* 市
*/
private String city;
/**
* 区
*/
private String area;
/**
* 生日
*/
private Date birthday;
/**
* 1可以,2不可以
*/
private Integer clock;
/**
* DEFAULT '1' ,'1可以2不可以',
*/
private Integer activity;
/**
* DEFAULT '1' COMMENT '1 未对接到中控 2已经对接 3对接失败'
*/
private Integer isAbutment;
/**
* decimal(15,2) DEFAULT '0.00'
*/
private Double collagenDay;
/**
* decimal(15,2) DEFAULT '0.00'
*/
private Double collagenMount;
/**
* 登陆时间
*/
private Date loginTime;
}

104
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/WxWelcomeSetting.java
Unescape Escape View File

@ -1,104 +0,0 @@
package com.flossom.miniProgram.domain;
import com.flossom.common.core.web.domain.BaseEntity;
public class WxWelcomeSetting extends BaseEntity {
private static final long serialVersionUID = 1L;
private String id;
/**
* 标题
*/
private String title;
/**
* 介绍
*/
private String introduction;
/**
* 类型：1 启动页视频、2 欢迎页、 3 登录页'
*/
private Integer type;
private Integer sort;
/**
* 地址
*/
private String url;
/**
* 状态（0正常 1停用）
*/
private String status;
public WxWelcomeSetting() {
}
public WxWelcomeSetting(String id, String title, String introduction, Integer type, Integer sort, String url, String status) {
this.id = id;
this.title = title;
this.introduction = introduction;
this.type = type;
this.sort = sort;
this.url = url;
this.status = status;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getIntroduction() {
return introduction;
}
public void setIntroduction(String introduction) {
this.introduction = introduction;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public Integer getSort() {
return sort;
}
public void setSort(Integer sort) {
this.sort = sort;
}
}

19
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/mapper/WelcomeMapper.java
Unescape Escape View File

@ -1,19 +0,0 @@
package com.flossom.miniProgram.mapper;
import com.flossom.miniProgram.domain.WxWelcomeSetting;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface WelcomeMapper {
/**
* 根据 typs 获取首页配置项
*
* @param type 类型：1 启动页视频、2 欢迎页、 3 登录页
* @return
*/
public List<WxWelcomeSetting> obtainWxWlComeSetting(@Param("type") Integer type);
}

14
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWelcomeService.java
Unescape Escape View File

@ -1,14 +0,0 @@
package com.flossom.miniProgram.service;
import com.flossom.miniProgram.domain.WxWelcomeSetting;
import java.util.List;
public interface IWelcomeService {
public WxWelcomeSetting obtainFirstPageVideo();
public List<WxWelcomeSetting> obtainFirstPageIntroduction();
}

9
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java
Unescape Escape View File

@ -0,0 +1,9 @@
package com.flossom.miniProgram.service;
import com.flossom.hzMapper.domain.WxUserMember;
public interface IWxUserMemberService {
WxUserMember obtainUserMemberInfo(Long userNo);
}

36
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WelcomeServiceImpl.java
Unescape Escape View File

@ -1,36 +0,0 @@
package com.flossom.miniProgram.service.impl;
import com.flossom.miniProgram.Enums.FirstPageTypeEnum;
import com.flossom.miniProgram.domain.WxWelcomeSetting;
import com.flossom.miniProgram.mapper.WelcomeMapper;
import com.flossom.miniProgram.service.IWelcomeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class WelcomeServiceImpl implements IWelcomeService {
@Autowired
private WelcomeMapper welcomeMapper;
@Override
public WxWelcomeSetting obtainFirstPageVideo() {
List<WxWelcomeSetting> settings = welcomeMapper.obtainWxWlComeSetting(FirstPageTypeEnum.First_PAGE_VIDEO.getType());
if (settings == null || settings.size() == 0) {
return null;
}
// 首页视频只有一个，配置多个只返回第一个
return settings.get(0);
}
@Override
public List<WxWelcomeSetting> obtainFirstPageIntroduction() {
List<WxWelcomeSetting> settings = welcomeMapper.obtainWxWlComeSetting(FirstPageTypeEnum.FIRST_WELCOME_IMAGE.getType());
if (settings == null || settings.size() == 0) {
return null;
}
return settings;
}
}

27
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -0,0 +1,27 @@
package com.flossom.miniProgram.service.impl;
import com.flossom.hzMapper.domain.WxUserMember;
import com.flossom.hzMapper.mapper.WxUserMemberMapper;
import com.flossom.miniProgram.service.IWxUserMemberService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class WxUserMemberServiceImpl implements IWxUserMemberService {
@Autowired
private WxUserMemberMapper wxUserMemberMapper;
@Override
public WxUserMember obtainUserMemberInfo(Long userNo) {
WxUserMember wxUserMember = new WxUserMember();
if (userNo != null) {
wxUserMember = wxUserMemberMapper.selectWxUserMemberById(userNo);
}
if (userNo == null || wxUserMember == null) {
// 未注册用户，就注册游客账户
wxUserMemberMapper.insertWxUserMember(wxUserMember);
}
return wxUserMember;
}
}

4
flossom-modules/flossom-mini-program/src/main/resources/mapper/miniProgram/SystemSettingMapper.xml
Unescape Escape View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.miniProgram.mapper.SystemSettingMapper">
<resultMap type="WxSystemSetting" id="wxSystemSetting">
<resultMap type="WxSystemSetting" id="wxSystemSettingResult">
<id property="id" column="id"/>
<result property="key" column="key"/>
<result property="value" column="value"/>
@ -40,7 +40,7 @@
</where>
</sql>
<select id="getSystemSettingByKey" parameterType="String" resultMap="wxSystemSetting">
<select id="getSystemSettingByKey" parameterType="String" resultMap="wxSystemSettingResult">
<include refid="selectWxSystemSettingVo"/>
<include refid="sqlwhereSearch"/>
order by update_time desc

44
flossom-modules/flossom-mini-program/src/main/resources/mapper/miniProgram/WelcomeMapper.xml
Unescape Escape View File

@ -1,44 +0,0 @@
<?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.flossom.miniProgram.mapper.WelcomeMapper">
<resultMap type="WxWelcomeSetting" id="wxWelcomeSettingResult">
<id property="id" column="id" />
<result property="title" column="title" />
<result property="introduction" column="introduction" />
<result property="type" column="type" />
<result property="sort" column="sort" />
<result property="url" column="url" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectWxWelcomeSettingVo">
select id, title, introduction, type, sort, url, status, create_by, create_time, update_by, update_time, remark
from wx_welcome_setting
</sql>
<!-- 查询条件 -->
<sql id="sqlwhereSearch">
<where>
<if test="type !=null">
and type = #{type}
</if>
</where>
</sql>
<select id="obtainWxWlComeSetting" parameterType="Integer" resultMap="wxWelcomeSettingResult">
<include refid="selectWxWelcomeSettingVo"/>
<include refid="sqlwhereSearch"/>
order by sort asc
</select>
</mapper>

5
flossom-modules/flossom-system/pom.xml
Unescape Escape View File

@ -78,6 +78,11 @@
<artifactId>flossom-common-swagger</artifactId>
</dependency>
<dependency>
<groupId>com.flossom</groupId>
<artifactId>flossom-common-hzMapper</artifactId>
<version>3.6.3</version>
</dependency>
</dependencies>
<build>

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysConfigController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.flossom.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.flossom.hzMapper.domain.SysConfig;
import com.flossom.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -22,7 +23,6 @@ import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.domain.SysConfig;
/**
* 参数配置 信息操作处理

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysFiringInfoController.java
Unescape Escape View File

@ -11,6 +11,7 @@ import com.flossom.common.core.web.page.TableDataInfo;
import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.hzMapper.domain.SysFiringInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.flossom.system.domain.SysFiringInfo;
import com.flossom.system.service.ISysFiringInfoService;
/**

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysMenuController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.flossom.system.controller;
import java.util.List;
import com.flossom.hzMapper.domain.SysMenu;
import com.flossom.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -21,7 +22,6 @@ import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.domain.SysMenu;
/**
* 菜单信息

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysNoticeController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.flossom.system.controller;
import java.util.List;
import com.flossom.hzMapper.domain.SysNotice;
import com.flossom.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -20,7 +21,6 @@ import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.domain.SysNotice;
/**
* 公告 信息操作处理

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysPostController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.flossom.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.flossom.hzMapper.domain.SysPost;
import com.flossom.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -22,7 +23,6 @@ import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.domain.SysPost;
/**
* 岗位信息操作处理

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRoleController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.flossom.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.flossom.hzMapper.domain.SysUserRole;
import com.flossom.system.service.ISysDeptService;
import com.flossom.system.service.ISysRoleService;
import com.flossom.system.service.ISysUserService;
@ -27,7 +28,6 @@ import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.api.domain.SysDept;
import com.flossom.system.api.domain.SysRole;
import com.flossom.system.api.domain.SysUser;
import com.flossom.system.domain.SysUserRole;
/**
* 角色信息

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysUserOnlineController.java
Unescape Escape View File

@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import com.flossom.hzMapper.domain.SysUserOnline;
import com.flossom.system.service.ISysUserOnlineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
@ -22,7 +23,6 @@ import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.redis.service.RedisService;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.system.api.model.LoginUser;
import com.flossom.system.domain.SysUserOnline;
/**
* 在线用户监控

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java
Unescape Escape View File

@ -1,7 +1,5 @@
package com.flossom.system.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import com.flossom.common.core.utils.poi.ExcelUtil;
@ -11,6 +9,8 @@ import com.flossom.common.core.web.page.TableDataInfo;
import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.hzMapper.domain.WxUserMember;
import com.flossom.system.service.IWxUserMemberService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.flossom.system.domain.WxUserMember;
import com.flossom.system.service.IWxUserMemberService;
import java.util.List;
/**
* 用户Controller

259
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysMenu.java
Unescape Escape View File

@ -1,259 +0,0 @@
package com.flossom.system.domain;
import java.util.ArrayList;
import java.util.List;
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.web.domain.BaseEntity;
/**
* 菜单权限表 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<SysMenu> children = new ArrayList<SysMenu>();
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<SysMenu> getChildren()
{
return children;
}
public void setChildren(List<SysMenu> 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();
}
}

102
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysNotice.java
Unescape Escape View File

@ -1,102 +0,0 @@
package com.flossom.system.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.web.domain.BaseEntity;
import com.flossom.common.core.xss.Xss;
/**
* 通知公告表 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();
}
}

46
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysRoleDept.java
Unescape Escape View File

@ -1,46 +0,0 @@
package com.flossom.system.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();
}
}

46
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysRoleMenu.java
Unescape Escape View File

@ -1,46 +0,0 @@
package com.flossom.system.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();
}
}

100
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysUserOnline.java
Unescape Escape View File

@ -1,100 +0,0 @@
package com.flossom.system.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;
}
}

46
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysUserPost.java
Unescape Escape View File

@ -1,46 +0,0 @@
package com.flossom.system.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();
}
}

46
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/SysUserRole.java
Unescape Escape View File

@ -1,46 +0,0 @@
package com.flossom.system.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();
}
}

383
flossom-modules/flossom-system/src/main/java/com/flossom/system/domain/WxUserMember.java
Unescape Escape View File

@ -1,383 +0,0 @@
package com.flossom.system.domain;
import java.math.BigDecimal;
import java.util.Date;
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;
/**
* 用户对象 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();
}
}

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysConfigService.java
Unescape Escape View File

@ -1,7 +1,8 @@
package com.flossom.system.service;
import com.flossom.hzMapper.domain.SysConfig;
import java.util.List;
import com.flossom.system.domain.SysConfig;
/**
* 参数配置 服务层

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysDeptService.java
Unescape Escape View File

@ -1,8 +1,9 @@
package com.flossom.system.service;
import java.util.List;
import com.flossom.hzMapper.domain.vo.TreeSelect;
import com.flossom.system.api.domain.SysDept;
import com.flossom.system.domain.vo.TreeSelect;
/**
* 部门管理 服务层

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysFiringInfoService.java
Unescape Escape View File

@ -1,7 +1,8 @@
package com.flossom.system.service;
import com.flossom.hzMapper.domain.SysFiringInfo;
import java.util.List;
import com.flossom.system.domain.SysFiringInfo;
/**
* 登录信息Service接口

7
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysMenuService.java
Unescape Escape View File

@ -1,10 +1,11 @@
package com.flossom.system.service;
import com.flossom.hzMapper.domain.SysMenu;
import com.flossom.hzMapper.domain.vo.RouterVo;
import com.flossom.hzMapper.domain.vo.TreeSelect;
import java.util.List;
import java.util.Set;
import com.flossom.system.domain.SysMenu;
import com.flossom.system.domain.vo.RouterVo;
import com.flossom.system.domain.vo.TreeSelect;
/**
* 菜单 业务层

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysNoticeService.java
Unescape Escape View File

@ -1,7 +1,8 @@
package com.flossom.system.service;
import com.flossom.hzMapper.domain.SysNotice;
import java.util.List;
import com.flossom.system.domain.SysNotice;
/**
* 公告 服务层

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysPostService.java
Unescape Escape View File

@ -1,7 +1,8 @@
package com.flossom.system.service;
import com.flossom.hzMapper.domain.SysPost;
import java.util.List;
import com.flossom.system.domain.SysPost;
/**
* 岗位信息 服务层

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRoleService.java
Unescape Escape View File

@ -2,8 +2,9 @@ package com.flossom.system.service;
import java.util.List;
import java.util.Set;
import com.flossom.hzMapper.domain.SysUserRole;
import com.flossom.system.api.domain.SysRole;
import com.flossom.system.domain.SysUserRole;
/**
* 角色业务层

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysUserOnlineService.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.flossom.system.service;
import com.flossom.hzMapper.domain.SysUserOnline;
import com.flossom.system.api.model.LoginUser;
import com.flossom.system.domain.SysUserOnline;
/**
* 在线用户 服务层

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java
Unescape Escape View File

@ -1,7 +1,8 @@
package com.flossom.system.service;
import com.flossom.hzMapper.domain.WxUserMember;
import java.util.List;
import com.flossom.system.domain.WxUserMember;
/**
* 用户Service接口

5
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysConfigServiceImpl.java
Unescape Escape View File

@ -3,6 +3,9 @@ package com.flossom.system.service.impl;
import java.util.Collection;
import java.util.List;
import javax.annotation.PostConstruct;
import com.flossom.hzMapper.domain.SysConfig;
import com.flossom.hzMapper.mapper.SysConfigMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.common.core.constant.CacheConstants;
@ -11,8 +14,6 @@ import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.text.Convert;
import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.redis.service.RedisService;
import com.flossom.system.domain.SysConfig;
import com.flossom.system.mapper.SysConfigMapper;
import com.flossom.system.service.ISysConfigService;
/**

7
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDeptServiceImpl.java
Unescape Escape View File

@ -4,6 +4,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
import com.flossom.hzMapper.domain.vo.TreeSelect;
import com.flossom.hzMapper.mapper.SysDeptMapper;
import com.flossom.hzMapper.mapper.SysRoleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.common.core.constant.UserConstants;
@ -16,9 +20,6 @@ import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.api.domain.SysDept;
import com.flossom.system.api.domain.SysRole;
import com.flossom.system.api.domain.SysUser;
import com.flossom.system.domain.vo.TreeSelect;
import com.flossom.system.mapper.SysDeptMapper;
import com.flossom.system.mapper.SysRoleMapper;
import com.flossom.system.service.ISysDeptService;
/**

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictDataServiceImpl.java
Unescape Escape View File

@ -1,11 +1,12 @@
package com.flossom.system.service.impl;
import java.util.List;
import com.flossom.hzMapper.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.common.security.utils.DictUtils;
import com.flossom.system.api.domain.SysDictData;
import com.flossom.system.mapper.SysDictDataMapper;
import com.flossom.system.service.ISysDictDataService;
/**

5
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictTypeServiceImpl.java
Unescape Escape View File

@ -5,6 +5,9 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import com.flossom.hzMapper.mapper.SysDictDataMapper;
import com.flossom.hzMapper.mapper.SysDictTypeMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -14,8 +17,6 @@ import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.security.utils.DictUtils;
import com.flossom.system.api.domain.SysDictData;
import com.flossom.system.api.domain.SysDictType;
import com.flossom.system.mapper.SysDictDataMapper;
import com.flossom.system.mapper.SysDictTypeMapper;
import com.flossom.system.service.ISysDictTypeService;
/**

4
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysFiringInfoServiceImpl.java
Unescape Escape View File

@ -4,11 +4,11 @@ import java.util.List;
import com.flossom.common.core.utils.DateUtils;
import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.hzMapper.domain.SysFiringInfo;
import com.flossom.hzMapper.mapper.SysFiringInfoMapper;
import com.flossom.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.system.mapper.SysFiringInfoMapper;
import com.flossom.system.domain.SysFiringInfo;
import com.flossom.system.service.ISysFiringInfoService;
/**

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysLogininforServiceImpl.java
Unescape Escape View File

@ -1,10 +1,11 @@
package com.flossom.system.service.impl;
import java.util.List;
import com.flossom.hzMapper.mapper.SysLogininforMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.system.api.domain.SysLogininfor;
import com.flossom.system.mapper.SysLogininforMapper;
import com.flossom.system.service.ISysLogininforService;
/**

15
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysMenuServiceImpl.java
Unescape Escape View File

@ -8,6 +8,14 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import com.flossom.hzMapper.domain.SysMenu;
import com.flossom.hzMapper.domain.vo.MetaVo;
import com.flossom.hzMapper.domain.vo.RouterVo;
import com.flossom.hzMapper.domain.vo.TreeSelect;
import com.flossom.hzMapper.mapper.SysMenuMapper;
import com.flossom.hzMapper.mapper.SysRoleMapper;
import com.flossom.hzMapper.mapper.SysRoleMenuMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.common.core.constant.Constants;
@ -16,13 +24,6 @@ import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.api.domain.SysRole;
import com.flossom.system.api.domain.SysUser;
import com.flossom.system.domain.SysMenu;
import com.flossom.system.domain.vo.MetaVo;
import com.flossom.system.domain.vo.RouterVo;
import com.flossom.system.domain.vo.TreeSelect;
import com.flossom.system.mapper.SysMenuMapper;
import com.flossom.system.mapper.SysRoleMapper;
import com.flossom.system.mapper.SysRoleMenuMapper;
import com.flossom.system.service.ISysMenuService;
/**

5
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysNoticeServiceImpl.java
Unescape Escape View File

@ -1,10 +1,11 @@
package com.flossom.system.service.impl;
import java.util.List;
import com.flossom.hzMapper.domain.SysNotice;
import com.flossom.hzMapper.mapper.SysNoticeMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.system.domain.SysNotice;
import com.flossom.system.mapper.SysNoticeMapper;
import com.flossom.system.service.ISysNoticeService;
/**

2
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysOperLogServiceImpl.java
Unescape Escape View File

@ -2,11 +2,11 @@ package com.flossom.system.service.impl;
import java.util.List;
import com.flossom.hzMapper.mapper.SysOperLogMapper;
import com.flossom.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.system.api.domain.SysOperLog;
import com.flossom.system.mapper.SysOperLogMapper;
/**
* 操作日志 服务层处理

7
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPostServiceImpl.java
Unescape Escape View File

@ -1,14 +1,15 @@
package com.flossom.system.service.impl;
import java.util.List;
import com.flossom.hzMapper.domain.SysPost;
import com.flossom.hzMapper.mapper.SysPostMapper;
import com.flossom.hzMapper.mapper.SysUserPostMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.flossom.common.core.constant.UserConstants;
import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.utils.StringUtils;
import com.flossom.system.domain.SysPost;
import com.flossom.system.mapper.SysPostMapper;
import com.flossom.system.mapper.SysUserPostMapper;
import com.flossom.system.service.ISysPostService;
/**

15
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRoleServiceImpl.java
Unescape Escape View File

@ -5,6 +5,14 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.flossom.hzMapper.domain.SysRoleDept;
import com.flossom.hzMapper.domain.SysRoleMenu;
import com.flossom.hzMapper.domain.SysUserRole;
import com.flossom.hzMapper.mapper.SysRoleDeptMapper;
import com.flossom.hzMapper.mapper.SysRoleMapper;
import com.flossom.hzMapper.mapper.SysRoleMenuMapper;
import com.flossom.hzMapper.mapper.SysUserRoleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -16,13 +24,6 @@ import com.flossom.common.datascope.annotation.DataScope;
import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.api.domain.SysRole;
import com.flossom.system.api.domain.SysUser;
import com.flossom.system.domain.SysRoleDept;
import com.flossom.system.domain.SysRoleMenu;
import com.flossom.system.domain.SysUserRole;
import com.flossom.system.mapper.SysRoleDeptMapper;
import com.flossom.system.mapper.SysRoleMapper;
import com.flossom.system.mapper.SysRoleMenuMapper;
import com.flossom.system.mapper.SysUserRoleMapper;
import com.flossom.system.service.ISysRoleService;
/**

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save