Skip to content

G
guns-vip
Commit 4bec9ba9 by stylefeng
Options

修改部门dao

parent d0ff14fe
Showing with 72 additions and 1308 deletions
guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/Dept.java deleted 100644 → 0
package com.stylefeng.guns.common.persistence.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable;
/**
* <p>
* 部门表
* </p>
*
* @author stylefeng
* @since 2017-07-11
*/
@TableName("sys_dept")
public class Dept extends Model<Dept> {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value="id", type= IdType.AUTO)
private Integer id;
/**
* 排序
*/
private Integer num;
/**
* 父部门id
*/
private Integer pid;
/**
* 父级ids
*/
private String pids;
/**
* 简称
*/
private String simplename;
/**
* 全称
*/
private String fullname;
/**
* 提示
*/
private String tips;
/**
* 版本（乐观锁保留字段）
*/
private Integer version;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getNum() {
return num;
}
public void setNum(Integer num) {
this.num = num;
}
public Integer getPid() {
return pid;
}
public void setPid(Integer pid) {
this.pid = pid;
}
public String getPids() {
return pids;
}
public void setPids(String pids) {
this.pids = pids;
}
public String getSimplename() {
return simplename;
}
public void setSimplename(String simplename) {
this.simplename = simplename;
}
public String getFullname() {
return fullname;
}
public void setFullname(String fullname) {
this.fullname = fullname;
}
public String getTips() {
return tips;
}
public void setTips(String tips) {
this.tips = tips;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
@Override
protected Serializable pkVal() {
return this.id;
}
@Override
public String toString() {
return "Dept{" +
"id=" + id +
", num=" + num +
", pid=" + pid +
", pids=" + pids +
", simplename=" + simplename +
", fullname=" + fullname +
", tips=" + tips +
", version=" + version +
"}";
}
}
guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/Dict.java deleted 100644 → 0
package com.stylefeng.guns.common.persistence.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable;
/**
* <p>
* 字典表
* </p>
*
* @author stylefeng
* @since 2017-07-11
*/
@TableName("sys_dict")
public class Dict extends Model<Dict> {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value="id", type= IdType.AUTO)
private Integer id;
/**
* 排序
*/
private Integer num;
/**
* 父级字典
*/
private Integer pid;
/**
* 名称
*/
private String name;
/**
* 提示
*/
private String tips;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getNum() {
return num;
}
public void setNum(Integer num) {
this.num = num;
}
public Integer getPid() {
return pid;
}
public void setPid(Integer pid) {
this.pid = pid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getTips() {
return tips;
}
public void setTips(String tips) {
this.tips = tips;
}
@Override
protected Serializable pkVal() {
return this.id;
}
@Override
public String toString() {
return "Dict{" +
"id=" + id +
", num=" + num +
", pid=" + pid +
", name=" + name +
", tips=" + tips +
"}";
}
}
guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/Expense.java deleted 100644 → 0
package com.stylefeng.guns.common.persistence.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
* 报销表
* </p>
*
* @author stylefeng
* @since 2017-12-05
*/
@TableName("sys_expense")
public class Expense extends Model<Expense> {
private static final long serialVersionUID = 1L;
@TableId(value="id", type= IdType.AUTO)
private Integer id;
/**
* 报销金额
*/
private BigDecimal money;
/**
* 描述
*/
private String desc;
private Date createtime;
/**
* 状态: 1.待提交 2:待审核 3.审核通过
*/
private Integer state;
/**
* 用户id
*/
private Integer userid;
/**
* 流程定义id
*/
private String processId;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public BigDecimal getMoney() {
return money;
}
public void setMoney(BigDecimal money) {
this.money = money;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public Integer getState() {
return state;
}
public void setState(Integer state) {
this.state = state;
}
public Integer getUserid() {
return userid;
}
public void setUserid(Integer userid) {
this.userid = userid;
}
public String getProcessId() {
return processId;
}
public void setProcessId(String processId) {
this.processId = processId;
}
@Override
protected Serializable pkVal() {
return this.id;
}
@Override
public String toString() {
return "Expense{" +
"id=" + id +
", money=" + money +
", desc=" + desc +
", createtime=" + createtime +
", state=" + state +
", userid=" + userid +
", processId=" + processId +
"}";
}
}
guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/LoginLog.java deleted 100644 → 0
package com.stylefeng.guns.common.persistence.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 登录记录
* </p>
*
* @author stylefeng
* @since 2017-07-11
*/
@TableName("sys_login_log")
public class LoginLog extends Model<LoginLog> {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value="id", type= IdType.AUTO)
private Integer id;
/**
* 日志名称
*/
private String logname;
/**
* 管理员id
*/
private Integer userid;
/**
* 创建时间
*/
private Date createtime;
/**
* 是否执行成功
*/
private String succeed;
/**
* 具体消息
*/
private String message;
/**
* 登录ip
*/
private String ip;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getLogname() {
return logname;
}
public void setLogname(String logname) {
this.logname = logname;
}
public Integer getUserid() {
return userid;
}
public void setUserid(Integer userid) {
this.userid = userid;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public String getSucceed() {
return succeed;
}
public void setSucceed(String succeed) {
this.succeed = succeed;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip;
}
@Override
protected Serializable pkVal() {
return this.id;
}
@Override
public String toString() {
return "LoginLog{" +
"id=" + id +
", logname=" + logname +
", userid=" + userid +
", createtime=" + createtime +
", succeed=" + succeed +
", message=" + message +
", ip=" + ip +
"}";
}
}
guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/Menu.java deleted 100644 → 0
package com.stylefeng.guns.common.persistence.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import org.hibernate.validator.constraints.NotBlank;
import java.io.Serializable;
/**
* <p>
* 菜单表
* </p>
*
* @author stylefeng
* @since 2017-07-11
*/
@TableName("sys_menu")
public class Menu extends Model<Menu> {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 菜单编号
*/
private String code;
/**
* 菜单父编号
*/
private String pcode;
/**
* 当前菜单的所有父菜单编号
*/
private String pcodes;
/**
* 菜单名称
*/
@NotBlank
private String name;
/**
* 菜单图标
*/
private String icon;
/**
* url地址
*/
@NotBlank
private String url;
/**
* 菜单排序号
*/
private Integer num;
/**
* 菜单层级
*/
private Integer levels;
/**
* 是否是菜单（1：是 0：不是）
*/
private Integer ismenu;
/**
* 备注
*/
private String tips;
/**
* 菜单状态 : 1:启用 0:不启用
*/
private Integer status;
/**
* 是否打开: 1:打开 0:不打开
*/
private Integer isopen;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getPcode() {
return pcode;
}
public void setPcode(String pcode) {
this.pcode = pcode;
}
public String getPcodes() {
return pcodes;
}
public void setPcodes(String pcodes) {
this.pcodes = pcodes;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public Integer getNum() {
return num;
}
public void setNum(Integer num) {
this.num = num;
}
public Integer getLevels() {
return levels;
}
public void setLevels(Integer levels) {
this.levels = levels;
}
public Integer getIsmenu() {
return ismenu;
}
public void setIsmenu(Integer ismenu) {
this.ismenu = ismenu;
}
public String getTips() {
return tips;
}
public void setTips(String tips) {
this.tips = tips;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getIsopen() {
return isopen;
}
public void setIsopen(Integer isopen) {
this.isopen = isopen;
}
@Override
protected Serializable pkVal() {
return this.id;
}
@Override
public String toString() {
return "Menu{" +
"id=" + id +
", code=" + code +
", pcode=" + pcode +
", pcodes=" + pcodes +
", name=" + name +
", icon=" + icon +
", url=" + url +
", num=" + num +
", levels=" + levels +
", ismenu=" + ismenu +
", tips=" + tips +
", status=" + status +
", isopen=" + isopen +
"}";
}
}
guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/OperationLog.java deleted 100644 → 0
package com.stylefeng.guns.common.persistence.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 操作日志
* </p>
*
* @author stylefeng
* @since 2017-07-11
*/
@TableName("sys_operation_log")
public class OperationLog extends Model<OperationLog> {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value="id", type= IdType.AUTO)
private Integer id;
/**
* 日志类型
*/
private String logtype;
/**
* 日志名称
*/
private String logname;
/**
* 用户id
*/
private Integer userid;
/**
* 类名称
*/
private String classname;
/**
* 方法名称
*/
private String method;
/**
* 创建时间
*/
private Date createtime;
/**
* 是否成功
*/
private String succeed;
/**
* 备注
*/
private String message;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getLogtype() {
return logtype;
}
public void setLogtype(String logtype) {
this.logtype = logtype;
}
public String getLogname() {
return logname;
}
public void setLogname(String logname) {
this.logname = logname;
}
public Integer getUserid() {
return userid;
}
public void setUserid(Integer userid) {
this.userid = userid;
}
public String getClassname() {
return classname;
}
public void setClassname(String classname) {
this.classname = classname;
}
public String getMethod() {
return method;
}
public void setMethod(String method) {
this.method = method;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public String getSucceed() {
return succeed;
}
public void setSucceed(String succeed) {
this.succeed = succeed;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
@Override
protected Serializable pkVal() {
return this.id;
}
@Override
public String toString() {
return "OperationLog{" +
"id=" + id +
", logtype=" + logtype +
", logname=" + logname +
", userid=" + userid +
", classname=" + classname +
", method=" + method +
", createtime=" + createtime +
", succeed=" + succeed +
", message=" + message +
"}";
}
}
guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/Role.java deleted 100644 → 0
package com.stylefeng.guns.common.persistence.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable;
/**
* <p>
* 角色表
* </p>
*
* @author stylefeng
* @since 2017-07-11
*/
@TableName("sys_role")
public class Role extends Model<Role> {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value="id", type= IdType.AUTO)
private Integer id;
/**
* 序号
*/
private Integer num;
/**
* 父角色id
*/
private Integer pid;
/**
* 角色名称
*/
private String name;
/**
* 部门名称
*/
private Integer deptid;
/**
* 提示
*/
private String tips;
/**
* 保留字段(暂时没用）
*/
private Integer version;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getNum() {
return num;
}
public void setNum(Integer num) {
this.num = num;
}
public Integer getPid() {
return pid;
}
public void setPid(Integer pid) {
this.pid = pid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getDeptid() {
return deptid;
}
public void setDeptid(Integer deptid) {
this.deptid = deptid;
}
public String getTips() {
return tips;
}
public void setTips(String tips) {
this.tips = tips;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
@Override
protected Serializable pkVal() {
return this.id;
}
@Override
public String toString() {
return "Role{" +
"id=" + id +
", num=" + num +
", pid=" + pid +
", name=" + name +
", deptid=" + deptid +
", tips=" + tips +
", version=" + version +
"}";
}
}
guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/User.java deleted 100644 → 0
package com.stylefeng.guns.common.persistence.model;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 管理员表
* </p>
*
* @author stylefeng
* @since 2017-07-11
*/
@TableName("sys_user")
public class User extends Model<User> {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value="id", type= IdType.AUTO)
private Integer id;
/**
* 头像
*/
private String avatar;
/**
* 账号
*/
private String account;
/**
* 密码
*/
private String password;
/**
* md5密码盐
*/
private String salt;
/**
* 名字
*/
private String name;
/**
* 生日
*/
private Date birthday;
/**
* 性别（1：男 2：女）
*/
private Integer sex;
/**
* 电子邮件
*/
private String email;
/**
* 电话
*/
private String phone;
/**
* 角色id
*/
private String roleid;
/**
* 部门id
*/
private Integer deptid;
/**
* 状态(1：启用 2：冻结 3：删除）
*/
private Integer status;
/**
* 创建时间
*/
private Date createtime;
/**
* 保留字段
*/
private Integer version;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getSalt() {
return salt;
}
public void setSalt(String salt) {
this.salt = salt;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Date getBirthday() {
return birthday;
}
public void setBirthday(Date birthday) {
this.birthday = birthday;
}
public Integer getSex() {
return sex;
}
public void setSex(Integer sex) {
this.sex = sex;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getRoleid() {
return roleid;
}
public void setRoleid(String roleid) {
this.roleid = roleid;
}
public Integer getDeptid() {
return deptid;
}
public void setDeptid(Integer deptid) {
this.deptid = deptid;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
@Override
protected Serializable pkVal() {
return this.id;
}
@Override
public String toString() {
return "User{" +
"id=" + id +
", avatar=" + avatar +
", account=" + account +
", password=" + password +
", salt=" + salt +
", name=" + name +
", birthday=" + birthday +
", sex=" + sex +
", email=" + email +
", phone=" + phone +
", roleid=" + roleid +
", deptid=" + deptid +
", status=" + status +
", createtime=" + createtime +
", version=" + version +
"}";
}
}
guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/ConstantFactory.java
...@@ -6,7 +6,7 @@ import com.stylefeng.guns.core.common.constant.cache.Cache; ...@@ -6,7 +6,7 @@ import com.stylefeng.guns.core.common.constant.cache.Cache;
import com.stylefeng.guns.core.common.constant.cache.CacheKey; import com.stylefeng.guns.core.common.constant.cache.CacheKey;
import com.stylefeng.guns.core.common.constant.state.ManagerStatus; import com.stylefeng.guns.core.common.constant.state.ManagerStatus;
import com.stylefeng.guns.core.common.constant.state.MenuStatus; import com.stylefeng.guns.core.common.constant.state.MenuStatus;
import com.stylefeng.guns.core.common.persistence.dao.*; import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.core.log.LogObjectHolder; import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.support.StrKit; import com.stylefeng.guns.core.support.StrKit;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/DeptMapper.xml deleted 100644 → 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.stylefeng.guns.core.common.persistence.dao.DeptMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dept">
<id column="id" property="id" />
<result column="num" property="num" />
<result column="pid" property="pid" />
<result column="pids" property="pids" />
<result column="simplename" property="simplename" />
<result column="fullname" property="fullname" />
<result column="tips" property="tips" />
<result column="version" property="version" />
</resultMap>
</mapper>
guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java
...@@ -2,8 +2,8 @@ package com.stylefeng.guns.core.log.factory; ...@@ -2,8 +2,8 @@ package com.stylefeng.guns.core.log.factory;
import com.stylefeng.guns.core.common.constant.state.LogSucceed; import com.stylefeng.guns.core.common.constant.state.LogSucceed;
import com.stylefeng.guns.core.common.constant.state.LogType; import com.stylefeng.guns.core.common.constant.state.LogType;
import com.stylefeng.guns.core.common.persistence.dao.LoginLogMapper; import com.stylefeng.guns.modular.system.dao.LoginLogMapper;
import com.stylefeng.guns.core.common.persistence.dao.OperationLogMapper; import com.stylefeng.guns.modular.system.dao.OperationLogMapper;
import com.stylefeng.guns.modular.system.model.LoginLog; import com.stylefeng.guns.modular.system.model.LoginLog;
import com.stylefeng.guns.modular.system.model.OperationLog; import com.stylefeng.guns.modular.system.model.OperationLog;
import com.stylefeng.guns.core.db.Db; import com.stylefeng.guns.core.db.Db;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/flowable/service/impl/ExpenseServiceImpl.java
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.common.constant.state.ExpenseState; import com.stylefeng.guns.core.common.constant.state.ExpenseState;
import com.stylefeng.guns.core.common.persistence.dao.ExpenseMapper; import com.stylefeng.guns.modular.system.dao.ExpenseMapper;
import com.stylefeng.guns.modular.system.model.Expense; import com.stylefeng.guns.modular.system.model.Expense;
import com.stylefeng.guns.core.shiro.ShiroKit; import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.support.HttpKit; import com.stylefeng.guns.core.support.HttpKit;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java
...@@ -5,14 +5,13 @@ import com.stylefeng.guns.core.common.annotion.Permission; ...@@ -5,14 +5,13 @@ import com.stylefeng.guns.core.common.annotion.Permission;
import com.stylefeng.guns.core.common.constant.dictmap.DeptDict; import com.stylefeng.guns.core.common.constant.dictmap.DeptDict;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.common.persistence.dao.DeptMapper; import com.stylefeng.guns.modular.system.dao.DeptMapper;
import com.stylefeng.guns.modular.system.model.Dept; import com.stylefeng.guns.modular.system.model.Dept;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.exception.GunsException; import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.log.LogObjectHolder; import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.node.ZTreeNode; import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.DeptDao;
import com.stylefeng.guns.modular.system.service.IDeptService; import com.stylefeng.guns.modular.system.service.IDeptService;
import com.stylefeng.guns.modular.system.warpper.DeptWarpper; import com.stylefeng.guns.modular.system.warpper.DeptWarpper;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -39,9 +38,6 @@ public class DeptController extends BaseController { ...@@ -39,9 +38,6 @@ public class DeptController extends BaseController {
private String PREFIX = "/system/dept/"; private String PREFIX = "/system/dept/";
@Resource @Resource
DeptDao deptDao;
@Resource
DeptMapper deptMapper; DeptMapper deptMapper;
@Resource @Resource
...@@ -82,7 +78,7 @@ public class DeptController extends BaseController { ...@@ -82,7 +78,7 @@ public class DeptController extends BaseController {
@RequestMapping(value = "/tree") @RequestMapping(value = "/tree")
@ResponseBody @ResponseBody
public List<ZTreeNode> tree() { public List<ZTreeNode> tree() {
List<ZTreeNode> tree = this.deptDao.tree(); List<ZTreeNode> tree = this.deptMapper.tree();
tree.add(ZTreeNode.createParent()); tree.add(ZTreeNode.createParent());
return tree; return tree;
} }
...@@ -110,7 +106,7 @@ public class DeptController extends BaseController { ...@@ -110,7 +106,7 @@ public class DeptController extends BaseController {
@Permission @Permission
@ResponseBody @ResponseBody
public Object list(String condition) { public Object list(String condition) {
List<Map<String, Object>> list = this.deptDao.list(condition); List<Map<String, Object>> list = this.deptMapper.list(condition);
return super.warpObject(new DeptWarpper(list)); return super.warpObject(new DeptWarpper(list));
} }
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java
...@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.constant.Const; ...@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.constant.Const;
import com.stylefeng.guns.core.common.constant.dictmap.DictMap; import com.stylefeng.guns.core.common.constant.dictmap.DictMap;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.common.persistence.dao.DictMapper; import com.stylefeng.guns.modular.system.dao.DictMapper;
import com.stylefeng.guns.modular.system.model.Dict; import com.stylefeng.guns.modular.system.model.Dict;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.exception.GunsException; import com.stylefeng.guns.core.exception.GunsException;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java
...@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.annotion.Permission; ...@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.annotion.Permission;
import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.Const;
import com.stylefeng.guns.core.common.constant.factory.PageFactory; import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.common.constant.state.BizLogType; import com.stylefeng.guns.core.common.constant.state.BizLogType;
import com.stylefeng.guns.core.common.persistence.dao.OperationLogMapper; import com.stylefeng.guns.modular.system.dao.OperationLogMapper;
import com.stylefeng.guns.modular.system.model.OperationLog; import com.stylefeng.guns.modular.system.model.OperationLog;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.support.BeanKit; import com.stylefeng.guns.core.support.BeanKit;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java
...@@ -2,7 +2,7 @@ package com.stylefeng.guns.modular.system.controller; ...@@ -2,7 +2,7 @@ package com.stylefeng.guns.modular.system.controller;
import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Constants;
import com.stylefeng.guns.core.common.exception.InvalidKaptchaException; import com.stylefeng.guns.core.common.exception.InvalidKaptchaException;
import com.stylefeng.guns.core.common.persistence.dao.UserMapper; import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.User; import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.log.LogManager; import com.stylefeng.guns.core.log.LogManager;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java
...@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.constant.dictmap.MenuDict; ...@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.constant.dictmap.MenuDict;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import com.stylefeng.guns.core.common.constant.state.MenuStatus; import com.stylefeng.guns.core.common.constant.state.MenuStatus;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.common.persistence.dao.MenuMapper; import com.stylefeng.guns.modular.system.dao.MenuMapper;
import com.stylefeng.guns.modular.system.model.Menu; import com.stylefeng.guns.modular.system.model.Menu;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.Tip; import com.stylefeng.guns.core.base.tips.Tip;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java
...@@ -4,7 +4,7 @@ import com.stylefeng.guns.core.common.annotion.BussinessLog; ...@@ -4,7 +4,7 @@ import com.stylefeng.guns.core.common.annotion.BussinessLog;
import com.stylefeng.guns.core.common.constant.dictmap.NoticeMap; import com.stylefeng.guns.core.common.constant.dictmap.NoticeMap;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.common.persistence.dao.NoticeMapper; import com.stylefeng.guns.modular.system.dao.NoticeMapper;
import com.stylefeng.guns.modular.system.model.Notice; import com.stylefeng.guns.modular.system.model.Notice;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.exception.GunsException; import com.stylefeng.guns.core.exception.GunsException;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
...@@ -7,8 +7,8 @@ import com.stylefeng.guns.core.common.constant.cache.Cache; ...@@ -7,8 +7,8 @@ import com.stylefeng.guns.core.common.constant.cache.Cache;
import com.stylefeng.guns.core.common.constant.dictmap.RoleDict; import com.stylefeng.guns.core.common.constant.dictmap.RoleDict;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.common.persistence.dao.RoleMapper; import com.stylefeng.guns.modular.system.dao.RoleMapper;
import com.stylefeng.guns.core.common.persistence.dao.UserMapper; import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.Role; import com.stylefeng.guns.modular.system.model.Role;
import com.stylefeng.guns.modular.system.model.User; import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java
...@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.constant.dictmap.UserDict; ...@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.common.constant.dictmap.UserDict;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import com.stylefeng.guns.core.common.constant.state.ManagerStatus; import com.stylefeng.guns.core.common.constant.state.ManagerStatus;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.common.persistence.dao.UserMapper; import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.User; import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.config.properties.GunsProperties; import com.stylefeng.guns.config.properties.GunsProperties;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptDao.java deleted 100644 → 0
package com.stylefeng.guns.modular.system.dao;
import com.stylefeng.guns.core.node.ZTreeNode;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 部门dao
*
* @author fengshuonan
* @date 2017年2月17日20:28:58
*/
public interface DeptDao {
/**
* 获取ztree的节点列表
*
* @return
* @date 2017年2月17日 下午8:28:43
*/
List<ZTreeNode> tree();
List<Map<String, Object>> list(@Param("condition") String condition);
}
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/DeptMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.modular.system.model.Dept; import com.stylefeng.guns.modular.system.model.Dept;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
...@@ -13,4 +18,14 @@ import com.stylefeng.guns.modular.system.model.Dept; ...@@ -13,4 +18,14 @@ import com.stylefeng.guns.modular.system.model.Dept;
*/ */
public interface DeptMapper extends BaseMapper<Dept> { public interface DeptMapper extends BaseMapper<Dept> {
/**
* 获取ztree的节点列表
*/
List<ZTreeNode> tree();
/**
* 获取所有部门列表
*/
List<Map<String, Object>> list(@Param("condition") String condition);
} }
\ No newline at end of file
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/DictMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.Dict; import com.stylefeng.guns.modular.system.model.Dict;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/ExpenseMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ExpenseMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.Expense; import com.stylefeng.guns.modular.system.model.Expense;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/LoginLogMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.LoginLog; import com.stylefeng.guns.modular.system.model.LoginLog;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/MenuMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.Menu; import com.stylefeng.guns.modular.system.model.Menu;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/NoticeMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/NoticeMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.Notice; import com.stylefeng.guns.modular.system.model.Notice;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/OperationLogMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OperationLogMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.OperationLog; import com.stylefeng.guns.modular.system.model.OperationLog;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/RelationMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RelationMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.Relation; import com.stylefeng.guns.modular.system.model.Relation;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/RoleMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.Role; import com.stylefeng.guns.modular.system.model.Role;
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/UserMapper.java → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java
package com.stylefeng.guns.core.common.persistence.dao; package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.User; import com.stylefeng.guns.modular.system.model.User;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptDao.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.modular.system.dao.DeptDao"> <mapper namespace="com.stylefeng.guns.modular.system.dao.DeptMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dept">
<id column="id" property="id"/>
<result column="num" property="num"/>
<result column="pid" property="pid"/>
<result column="pids" property="pids"/>
<result column="simplename" property="simplename"/>
<result column="fullname" property="fullname"/>
<result column="tips" property="tips"/>
<result column="version" property="version"/>
</resultMap>
<select id="tree" resultType="com.stylefeng.guns.core.node.ZTreeNode"> <select id="tree" resultType="com.stylefeng.guns.core.node.ZTreeNode">
select id,pid as pId,simplename as name, select id,pid as pId,simplename as name,
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/DictMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.DictMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.DictMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dict"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dict">
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/ExpenseMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ExpenseMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.ExpenseMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.ExpenseMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Expense"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Expense">
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/LoginLogMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.LoginLogMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.LoginLogMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.LoginLog"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.LoginLog">
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/MenuMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.MenuMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.MenuMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Menu"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Menu">
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/NoticeMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.NoticeMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.NoticeMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Notice"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Notice">
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/OperationLogMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.OperationLogMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.OperationLogMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.OperationLog"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.OperationLog">
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/RelationMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.RelationMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.RelationMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Relation"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Relation">
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/RoleMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.RoleMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.RoleMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Role"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Role">
......
guns-admin/src/main/java/com/stylefeng/guns/core/common/persistence/dao/mapping/UserMapper.xml → guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.core.common.persistence.dao.UserMapper"> <mapper namespace="com.stylefeng.guns.modular.system.dao.UserMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.User"> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.User">
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java
...@@ -2,7 +2,7 @@ package com.stylefeng.guns.modular.system.service.impl; ...@@ -2,7 +2,7 @@ package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.core.common.persistence.dao.DeptMapper; import com.stylefeng.guns.modular.system.dao.DeptMapper;
import com.stylefeng.guns.modular.system.model.Dept; import com.stylefeng.guns.modular.system.model.Dept;
import com.stylefeng.guns.modular.system.service.IDeptService; import com.stylefeng.guns.modular.system.service.IDeptService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java
...@@ -3,7 +3,7 @@ package com.stylefeng.guns.modular.system.service.impl; ...@@ -3,7 +3,7 @@ package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.common.persistence.dao.DictMapper; import com.stylefeng.guns.modular.system.dao.DictMapper;
import com.stylefeng.guns.modular.system.model.Dict; import com.stylefeng.guns.modular.system.model.Dict;
import com.stylefeng.guns.core.exception.GunsException; import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.modular.system.dao.DictDao; import com.stylefeng.guns.modular.system.dao.DictDao;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java
...@@ -2,7 +2,7 @@ package com.stylefeng.guns.modular.system.service.impl; ...@@ -2,7 +2,7 @@ package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.core.common.persistence.dao.MenuMapper; import com.stylefeng.guns.modular.system.dao.MenuMapper;
import com.stylefeng.guns.modular.system.model.Menu; import com.stylefeng.guns.modular.system.model.Menu;
import com.stylefeng.guns.modular.system.dao.MenuDao; import com.stylefeng.guns.modular.system.dao.MenuDao;
import com.stylefeng.guns.modular.system.service.IMenuService; import com.stylefeng.guns.modular.system.service.IMenuService;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
package com.stylefeng.guns.modular.system.service.impl; package com.stylefeng.guns.modular.system.service.impl;
import com.stylefeng.guns.core.common.persistence.dao.RelationMapper; import com.stylefeng.guns.modular.system.dao.RelationMapper;
import com.stylefeng.guns.core.common.persistence.dao.RoleMapper; import com.stylefeng.guns.modular.system.dao.RoleMapper;
import com.stylefeng.guns.modular.system.model.Relation; import com.stylefeng.guns.modular.system.model.Relation;
import com.stylefeng.guns.core.util.Convert; import com.stylefeng.guns.core.util.Convert;
import com.stylefeng.guns.modular.system.dao.RoleDao; import com.stylefeng.guns.modular.system.dao.RoleDao;
......
guns-admin/src/test/java/com/stylefeng/guns/system/DeptTest.java
package com.stylefeng.guns.system; package com.stylefeng.guns.system;
import com.stylefeng.guns.base.BaseJunit; import com.stylefeng.guns.base.BaseJunit;
import com.stylefeng.guns.core.common.persistence.dao.DeptMapper; import com.stylefeng.guns.modular.system.dao.DeptMapper;
import com.stylefeng.guns.modular.system.model.Dept; import com.stylefeng.guns.modular.system.model.Dept;
import com.stylefeng.guns.modular.system.dao.DeptDao;
import org.junit.Test; import org.junit.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -22,9 +21,6 @@ import static org.junit.Assert.assertTrue; ...@@ -22,9 +21,6 @@ import static org.junit.Assert.assertTrue;
public class DeptTest extends BaseJunit { public class DeptTest extends BaseJunit {
@Resource @Resource
DeptDao deptDao;
@Resource
DeptMapper deptMapper; DeptMapper deptMapper;
@Test @Test
...@@ -57,7 +53,7 @@ public class DeptTest extends BaseJunit { ...@@ -57,7 +53,7 @@ public class DeptTest extends BaseJunit {
@Test @Test
public void listTest() { public void listTest() {
List<Map<String, Object>> list = this.deptDao.list("总公司"); List<Map<String, Object>> list = this.deptMapper.list("总公司");
assertTrue(list.size() > 0); assertTrue(list.size() > 0);
} }
} }
guns-admin/src/test/java/com/stylefeng/guns/system/MenuTest.java
...@@ -3,7 +3,7 @@ package com.stylefeng.guns.system; ...@@ -3,7 +3,7 @@ package com.stylefeng.guns.system;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.base.BaseJunit; import com.stylefeng.guns.base.BaseJunit;
import com.stylefeng.guns.core.common.persistence.dao.MenuMapper; import com.stylefeng.guns.modular.system.dao.MenuMapper;
import com.stylefeng.guns.modular.system.model.Menu; import com.stylefeng.guns.modular.system.model.Menu;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
guns-admin/src/test/java/com/stylefeng/guns/system/UserTest.java
package com.stylefeng.guns.system; package com.stylefeng.guns.system;
import com.stylefeng.guns.base.BaseJunit; import com.stylefeng.guns.base.BaseJunit;
import com.stylefeng.guns.core.common.persistence.dao.UserMapper; import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.dao.UserMgrDao; import com.stylefeng.guns.modular.system.dao.UserMgrDao;
import org.junit.Test; import org.junit.Test;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment