Merge branch 'wheng' of wuheng/eas-system into master

controller/src/main/java/com/koobietech/eas/controller/EasEduScheduleController.java

@@ -7,6 +7,7 @@ import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.common.utils.SecurityManager;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.dao.dto.ScheduleDto;
+import com.koobietech.eas.dao.pojo.LessonPojo;
 import com.koobietech.eas.dao.pojo.SchedulePojo;
 import com.koobietech.eas.mbg.model.EasEduSchedule;
 import com.koobietech.eas.service.EasEduScheduleService;
@@ -26,6 +27,14 @@ public class EasEduScheduleController {
     @Resource
     EasEduScheduleService easEduScheduleService;
 
+    @GetMapping("/dashboardWorkbench")
+    @Operation(summary = "工作台", description = "工作台")
+    public JsonResult dashboardWorkbench() {
+        LessonPojo ret = easEduScheduleService.dashboardWorkbench();
+
+        return JsonResult.data(ret);
+    }
+
     @PostMapping("/add")
     @Operation(summary = "添加课程表", description = "根据课程和重复预约次数(接下来连续多少天都预约这节课)录入基本课程信息")
     public JsonResult add(@RequestBody EasEduSchedule schedule, @RequestParam int repeatTime) {

controller/src/main/java/com/koobietech/eas/controller/EasSysPermissionController.java

@@ -1,62 +0,0 @@
-package com.koobietech.eas.controller;
-
-import com.github.pagehelper.PageHelper;
-import com.koobietech.eas.common.result.JsonPageResult;
-import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageDataResult;
-import com.koobietech.eas.mbg.model.EasSysPermission;
-import com.koobietech.eas.service.EasSysPermissionService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-
-@RestController
-@Tag(name = "权限模块")
-@RequestMapping("/permission")
-public class EasSysPermissionController {
-
-    @Resource
-    EasSysPermissionService easSysPermissionService;
-
-    @PostMapping("/query")
-    @Operation(summary = "查询权限", description = "根据参数查询基本权限表信息")
-    public JsonPageResult query(@RequestBody(required = false) EasSysPermission permission,
-                                @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        PageDataResult ret = easSysPermissionService.query(permission);
-        return JsonPageResult.data(ret);
-    }
-
-    @PostMapping("/add")
-    @Operation(summary = "添加权限", description = "录入权限表基本信息")
-    public JsonResult add(@RequestBody EasSysPermission permission) {
-        Boolean ret = easSysPermissionService.add(permission);
-        if (ret) {
-            return JsonResult.ok();
-        }
-        return JsonResult.fail();
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除权限", description = "删除权限表数据根据ID")
-    public JsonResult delete(@RequestParam Integer id) {
-        Boolean ret = easSysPermissionService.delete(id);
-        if (ret) {
-            return JsonResult.ok();
-        }
-        return JsonResult.fail();
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新权限", description = "更新权限表信息")
-    public JsonResult update(@RequestBody EasSysPermission permission) {
-        Boolean ret = easSysPermissionService.update(permission);
-        if (ret) {
-            return JsonResult.ok();
-        }
-        return JsonResult.fail();
-    }
-}

controller/src/main/resources/application-dev.yaml

@@ -29,10 +29,6 @@ knife4j:
 security:
   url:
     ignored:
-      - /swagger-ui/*
-      - /v3/api-docs/**
-      - /doc.html
-      - /webjars/**
       - /login/adminLogin
       - /login/studentLogin
       - /login/verify/get

dao/src/main/resources/com/koobietech/eas/dao/mapper/AttendanceMapper.xml

@@ -40,7 +40,7 @@
         FROM
             eas_edu_clt_relation
             LEFT JOIN eas_edu_class ON eas_edu_class.id = eas_edu_clt_relation.class_id
-            LEFT JOIN eas_edu_schedule ON eas_edu_schedule.class_id = eas_edu_class.id
+            JOIN eas_edu_schedule ON eas_edu_schedule.class_id = eas_edu_class.id
             LEFT JOIN eas_edu_category ON eas_edu_category.id = eas_edu_schedule.category_id
             LEFT JOIN eas_edu_subjects ON eas_edu_subjects.id = eas_edu_schedule.subjects_id
             LEFT JOIN eas_edu_classroom ON eas_edu_classroom.id = eas_edu_schedule.room_id

mbg/src/main/java/com/koobietech/eas/mbg/CommentGenerator.java

@@ -46,7 +46,6 @@ public class CommentGenerator extends DefaultCommentGenerator {
             //给model的字段添加swagger注解
             field.addJavaDocLine("@Schema(description = \""+remarks+"\")");
             //如果字段是时间类型 则加JsonFormat注解
-            System.out.println("字段类型："+field.getType().getFullyQualifiedName());
             if("java.util.Date".equals(field.getType().getFullyQualifiedName())){
                 field.addJavaDocLine("@JsonFormat(pattern = \"yyyy-MM-dd HH:mm\", timezone = \"GMT+8\")");
             }

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcArctypeMapper.java

@@ -1,32 +0,0 @@
-package com.koobietech.eas.mbg.mapper;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.koobietech.eas.mbg.model.EasArcArctype;
-import com.koobietech.eas.mbg.model.EasArcArctypeExample;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface EasArcArctypeMapper {
-    long countByExample(EasArcArctypeExample example);
-
-    int deleteByExample(EasArcArctypeExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(EasArcArctype record);
-
-    int insertSelective(EasArcArctype record);
-
-    List<EasArcArctype> selectByExample(EasArcArctypeExample example);
-
-    EasArcArctype selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") EasArcArctype record, @Param("example") EasArcArctypeExample example);
-
-    int updateByExample(@Param("record") EasArcArctype record, @Param("example") EasArcArctypeExample example);
-
-    int updateByPrimaryKeySelective(EasArcArctype record);
-
-    int updateByPrimaryKey(EasArcArctype record);
-}

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysPermissionMapper.java

@@ -1,32 +0,0 @@
-package com.koobietech.eas.mbg.mapper;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.koobietech.eas.mbg.model.EasSysPermission;
-import com.koobietech.eas.mbg.model.EasSysPermissionExample;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface EasSysPermissionMapper {
-    long countByExample(EasSysPermissionExample example);
-
-    int deleteByExample(EasSysPermissionExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(EasSysPermission record);
-
-    int insertSelective(EasSysPermission record);
-
-    List<EasSysPermission> selectByExample(EasSysPermissionExample example);
-
-    EasSysPermission selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") EasSysPermission record, @Param("example") EasSysPermissionExample example);
-
-    int updateByExample(@Param("record") EasSysPermission record, @Param("example") EasSysPermissionExample example);
-
-    int updateByPrimaryKeySelective(EasSysPermission record);
-
-    int updateByPrimaryKey(EasSysPermission record);
-}

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysPesRelationMapper.java

@@ -1,32 +0,0 @@
-package com.koobietech.eas.mbg.mapper;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.koobietech.eas.mbg.model.EasSysPesRelation;
-import com.koobietech.eas.mbg.model.EasSysPesRelationExample;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface EasSysPesRelationMapper {
-    long countByExample(EasSysPesRelationExample example);
-
-    int deleteByExample(EasSysPesRelationExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(EasSysPesRelation record);
-
-    int insertSelective(EasSysPesRelation record);
-
-    List<EasSysPesRelation> selectByExample(EasSysPesRelationExample example);
-
-    EasSysPesRelation selectByPrimaryKey(Integer id);
-
-    int updateByExampleSelective(@Param("record") EasSysPesRelation record, @Param("example") EasSysPesRelationExample example);
-
-    int updateByExample(@Param("record") EasSysPesRelation record, @Param("example") EasSysPesRelationExample example);
-
-    int updateByPrimaryKeySelective(EasSysPesRelation record);
-
-    int updateByPrimaryKey(EasSysPesRelation record);
-}

mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysRoleusersMapper.java

@@ -0,0 +1,24 @@
+package com.koobietech.eas.mbg.mapper;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.koobietech.eas.mbg.model.EasSysRoleusers;
+import com.koobietech.eas.mbg.model.EasSysRoleusersExample;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface EasSysRoleusersMapper {
+    long countByExample(EasSysRoleusersExample example);
+
+    int deleteByExample(EasSysRoleusersExample example);
+
+    int insert(EasSysRoleusers record);
+
+    int insertSelective(EasSysRoleusers record);
+
+    List<EasSysRoleusers> selectByExample(EasSysRoleusersExample example);
+
+    int updateByExampleSelective(@Param("record") EasSysRoleusers record, @Param("example") EasSysRoleusersExample example);
+
+    int updateByExample(@Param("record") EasSysRoleusers record, @Param("example") EasSysRoleusersExample example);
+}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArctype.java

@@ -1,170 +0,0 @@
-package com.koobietech.eas.mbg.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.Date;
-
-public class EasArcArctype implements Serializable {
-    private Integer id;
-
-    /**
-     * 类别名
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "类别名")
-    private String name;
-
-    /**
-     * 是否可以在线预览
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "是否可以在线预览")
-    private String isViews;
-
-    /**
-     * 模板文件地址
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "模板文件地址")
-    private String template;
-
-    /**
-     * 是否有备份需求, 如果有数据库备份需求,则 展示模板文件, 因为只有按照模板文件创建的档案才能获取数据存储数据库
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "是否有备份需求, 如果有数据库备份需求,则 展示模板文件, 因为只有按照模板文件创建的档案才能获取数据存储数据库")
-    private String backup;
-
-    /**
-     * 限制的文件后缀
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "限制的文件后缀")
-    private String suffix;
-
-    /**
-     * 创建时间
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 修改时间
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date modifyTime;
-
-    /**
-     * 创建用户
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "创建用户")
-    private Integer createUid;
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public String getIsViews() {
-        return isViews;
-    }
-
-    public void setIsViews(String isViews) {
-        this.isViews = isViews == null ? null : isViews.trim();
-    }
-
-    public String getTemplate() {
-        return template;
-    }
-
-    public void setTemplate(String template) {
-        this.template = template == null ? null : template.trim();
-    }
-
-    public String getBackup() {
-        return backup;
-    }
-
-    public void setBackup(String backup) {
-        this.backup = backup == null ? null : backup.trim();
-    }
-
-    public String getSuffix() {
-        return suffix;
-    }
-
-    public void setSuffix(String suffix) {
-        this.suffix = suffix == null ? null : suffix.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-
-    public Integer getCreateUid() {
-        return createUid;
-    }
-
-    public void setCreateUid(Integer createUid) {
-        this.createUid = createUid;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", name=").append(name);
-        sb.append(", isViews=").append(isViews);
-        sb.append(", template=").append(template);
-        sb.append(", backup=").append(backup);
-        sb.append(", suffix=").append(suffix);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", modifyTime=").append(modifyTime);
-        sb.append(", createUid=").append(createUid);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArctypeExample.java

@@ -1,790 +0,0 @@
-package com.koobietech.eas.mbg.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class EasArcArctypeExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public EasArcArctypeExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Integer value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Integer value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Integer value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Integer value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Integer> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Integer> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Integer value1, Integer value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNull() {
-            addCriterion("name is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNotNull() {
-            addCriterion("name is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameEqualTo(String value) {
-            addCriterion("name =", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotEqualTo(String value) {
-            addCriterion("name <>", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThan(String value) {
-            addCriterion("name >", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThanOrEqualTo(String value) {
-            addCriterion("name >=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThan(String value) {
-            addCriterion("name <", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThanOrEqualTo(String value) {
-            addCriterion("name <=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLike(String value) {
-            addCriterion("name like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotLike(String value) {
-            addCriterion("name not like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIn(List<String> values) {
-            addCriterion("name in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotIn(List<String> values) {
-            addCriterion("name not in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameBetween(String value1, String value2) {
-            addCriterion("name between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotBetween(String value1, String value2) {
-            addCriterion("name not between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsIsNull() {
-            addCriterion("is_views is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsIsNotNull() {
-            addCriterion("is_views is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsEqualTo(String value) {
-            addCriterion("is_views =", value, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsNotEqualTo(String value) {
-            addCriterion("is_views <>", value, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsGreaterThan(String value) {
-            addCriterion("is_views >", value, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsGreaterThanOrEqualTo(String value) {
-            addCriterion("is_views >=", value, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsLessThan(String value) {
-            addCriterion("is_views <", value, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsLessThanOrEqualTo(String value) {
-            addCriterion("is_views <=", value, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsLike(String value) {
-            addCriterion("is_views like", value, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsNotLike(String value) {
-            addCriterion("is_views not like", value, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsIn(List<String> values) {
-            addCriterion("is_views in", values, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsNotIn(List<String> values) {
-            addCriterion("is_views not in", values, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsBetween(String value1, String value2) {
-            addCriterion("is_views between", value1, value2, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsViewsNotBetween(String value1, String value2) {
-            addCriterion("is_views not between", value1, value2, "isViews");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateIsNull() {
-            addCriterion("template is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateIsNotNull() {
-            addCriterion("template is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateEqualTo(String value) {
-            addCriterion("template =", value, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateNotEqualTo(String value) {
-            addCriterion("template <>", value, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateGreaterThan(String value) {
-            addCriterion("template >", value, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateGreaterThanOrEqualTo(String value) {
-            addCriterion("template >=", value, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateLessThan(String value) {
-            addCriterion("template <", value, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateLessThanOrEqualTo(String value) {
-            addCriterion("template <=", value, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateLike(String value) {
-            addCriterion("template like", value, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateNotLike(String value) {
-            addCriterion("template not like", value, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateIn(List<String> values) {
-            addCriterion("template in", values, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateNotIn(List<String> values) {
-            addCriterion("template not in", values, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateBetween(String value1, String value2) {
-            addCriterion("template between", value1, value2, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateNotBetween(String value1, String value2) {
-            addCriterion("template not between", value1, value2, "template");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupIsNull() {
-            addCriterion("backup is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupIsNotNull() {
-            addCriterion("backup is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupEqualTo(String value) {
-            addCriterion("backup =", value, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupNotEqualTo(String value) {
-            addCriterion("backup <>", value, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupGreaterThan(String value) {
-            addCriterion("backup >", value, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupGreaterThanOrEqualTo(String value) {
-            addCriterion("backup >=", value, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupLessThan(String value) {
-            addCriterion("backup <", value, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupLessThanOrEqualTo(String value) {
-            addCriterion("backup <=", value, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupLike(String value) {
-            addCriterion("backup like", value, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupNotLike(String value) {
-            addCriterion("backup not like", value, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupIn(List<String> values) {
-            addCriterion("backup in", values, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupNotIn(List<String> values) {
-            addCriterion("backup not in", values, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupBetween(String value1, String value2) {
-            addCriterion("backup between", value1, value2, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andBackupNotBetween(String value1, String value2) {
-            addCriterion("backup not between", value1, value2, "backup");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixIsNull() {
-            addCriterion("suffix is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixIsNotNull() {
-            addCriterion("suffix is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixEqualTo(String value) {
-            addCriterion("suffix =", value, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixNotEqualTo(String value) {
-            addCriterion("suffix <>", value, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixGreaterThan(String value) {
-            addCriterion("suffix >", value, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixGreaterThanOrEqualTo(String value) {
-            addCriterion("suffix >=", value, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixLessThan(String value) {
-            addCriterion("suffix <", value, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixLessThanOrEqualTo(String value) {
-            addCriterion("suffix <=", value, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixLike(String value) {
-            addCriterion("suffix like", value, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixNotLike(String value) {
-            addCriterion("suffix not like", value, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixIn(List<String> values) {
-            addCriterion("suffix in", values, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixNotIn(List<String> values) {
-            addCriterion("suffix not in", values, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixBetween(String value1, String value2) {
-            addCriterion("suffix between", value1, value2, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andSuffixNotBetween(String value1, String value2) {
-            addCriterion("suffix not between", value1, value2, "suffix");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_time =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_time <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_time >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_time >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_time <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_time <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_time not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_time between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_time not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeIsNull() {
-            addCriterion("modify_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeIsNotNull() {
-            addCriterion("modify_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeEqualTo(Date value) {
-            addCriterion("modify_time =", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotEqualTo(Date value) {
-            addCriterion("modify_time <>", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeGreaterThan(Date value) {
-            addCriterion("modify_time >", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("modify_time >=", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeLessThan(Date value) {
-            addCriterion("modify_time <", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeLessThanOrEqualTo(Date value) {
-            addCriterion("modify_time <=", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeIn(List<Date> values) {
-            addCriterion("modify_time in", values, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotIn(List<Date> values) {
-            addCriterion("modify_time not in", values, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeBetween(Date value1, Date value2) {
-            addCriterion("modify_time between", value1, value2, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotBetween(Date value1, Date value2) {
-            addCriterion("modify_time not between", value1, value2, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIsNull() {
-            addCriterion("create_uid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIsNotNull() {
-            addCriterion("create_uid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidEqualTo(Integer value) {
-            addCriterion("create_uid =", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotEqualTo(Integer value) {
-            addCriterion("create_uid <>", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidGreaterThan(Integer value) {
-            addCriterion("create_uid >", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("create_uid >=", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidLessThan(Integer value) {
-            addCriterion("create_uid <", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidLessThanOrEqualTo(Integer value) {
-            addCriterion("create_uid <=", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIn(List<Integer> values) {
-            addCriterion("create_uid in", values, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotIn(List<Integer> values) {
-            addCriterion("create_uid not in", values, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidBetween(Integer value1, Integer value2) {
-            addCriterion("create_uid between", value1, value2, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotBetween(Integer value1, Integer value2) {
-            addCriterion("create_uid not between", value1, value2, "createUid");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPermission.java

@@ -1,159 +0,0 @@
-package com.koobietech.eas.mbg.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.Date;
-
-public class EasSysPermission implements Serializable {
-    /**
-     * ID
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "ID")
-    private Integer id;
-
-    /**
-     * 权限名称
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "权限名称")
-    private String name;
-
-    /**
-     * 权限描述
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "权限描述")
-    private String description;
-
-    /**
-     * 是否激活
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "是否激活")
-    private Byte isActive;
-
-    /**
-     * 创建时间
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 修改时间
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date modifyTime;
-
-    /**
-     * 创建用户ID
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "创建用户ID")
-    private Integer createUid;
-
-    /**
-     * 状态
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "状态")
-    private String disabled;
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description == null ? null : description.trim();
-    }
-
-    public Byte getIsActive() {
-        return isActive;
-    }
-
-    public void setIsActive(Byte isActive) {
-        this.isActive = isActive;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-
-    public Integer getCreateUid() {
-        return createUid;
-    }
-
-    public void setCreateUid(Integer createUid) {
-        this.createUid = createUid;
-    }
-
-    public String getDisabled() {
-        return disabled;
-    }
-
-    public void setDisabled(String disabled) {
-        this.disabled = disabled == null ? null : disabled.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", name=").append(name);
-        sb.append(", description=").append(description);
-        sb.append(", isActive=").append(isActive);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", modifyTime=").append(modifyTime);
-        sb.append(", createUid=").append(createUid);
-        sb.append(", disabled=").append(disabled);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPermissionExample.java

@@ -1,710 +0,0 @@
-package com.koobietech.eas.mbg.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class EasSysPermissionExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public EasSysPermissionExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Integer value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Integer value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Integer value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Integer value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Integer> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Integer> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Integer value1, Integer value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNull() {
-            addCriterion("name is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNotNull() {
-            addCriterion("name is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameEqualTo(String value) {
-            addCriterion("name =", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotEqualTo(String value) {
-            addCriterion("name <>", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThan(String value) {
-            addCriterion("name >", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThanOrEqualTo(String value) {
-            addCriterion("name >=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThan(String value) {
-            addCriterion("name <", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThanOrEqualTo(String value) {
-            addCriterion("name <=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLike(String value) {
-            addCriterion("name like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotLike(String value) {
-            addCriterion("name not like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIn(List<String> values) {
-            addCriterion("name in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotIn(List<String> values) {
-            addCriterion("name not in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameBetween(String value1, String value2) {
-            addCriterion("name between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotBetween(String value1, String value2) {
-            addCriterion("name not between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIsNull() {
-            addCriterion("description is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIsNotNull() {
-            addCriterion("description is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionEqualTo(String value) {
-            addCriterion("description =", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotEqualTo(String value) {
-            addCriterion("description <>", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThan(String value) {
-            addCriterion("description >", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
-            addCriterion("description >=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThan(String value) {
-            addCriterion("description <", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThanOrEqualTo(String value) {
-            addCriterion("description <=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLike(String value) {
-            addCriterion("description like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotLike(String value) {
-            addCriterion("description not like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIn(List<String> values) {
-            addCriterion("description in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotIn(List<String> values) {
-            addCriterion("description not in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionBetween(String value1, String value2) {
-            addCriterion("description between", value1, value2, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotBetween(String value1, String value2) {
-            addCriterion("description not between", value1, value2, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveIsNull() {
-            addCriterion("is_active is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveIsNotNull() {
-            addCriterion("is_active is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveEqualTo(Byte value) {
-            addCriterion("is_active =", value, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveNotEqualTo(Byte value) {
-            addCriterion("is_active <>", value, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveGreaterThan(Byte value) {
-            addCriterion("is_active >", value, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveGreaterThanOrEqualTo(Byte value) {
-            addCriterion("is_active >=", value, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveLessThan(Byte value) {
-            addCriterion("is_active <", value, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveLessThanOrEqualTo(Byte value) {
-            addCriterion("is_active <=", value, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveIn(List<Byte> values) {
-            addCriterion("is_active in", values, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveNotIn(List<Byte> values) {
-            addCriterion("is_active not in", values, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveBetween(Byte value1, Byte value2) {
-            addCriterion("is_active between", value1, value2, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsActiveNotBetween(Byte value1, Byte value2) {
-            addCriterion("is_active not between", value1, value2, "isActive");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_time =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_time <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_time >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_time >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_time <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_time <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_time not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_time between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_time not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeIsNull() {
-            addCriterion("modify_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeIsNotNull() {
-            addCriterion("modify_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeEqualTo(Date value) {
-            addCriterion("modify_time =", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotEqualTo(Date value) {
-            addCriterion("modify_time <>", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeGreaterThan(Date value) {
-            addCriterion("modify_time >", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("modify_time >=", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeLessThan(Date value) {
-            addCriterion("modify_time <", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeLessThanOrEqualTo(Date value) {
-            addCriterion("modify_time <=", value, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeIn(List<Date> values) {
-            addCriterion("modify_time in", values, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotIn(List<Date> values) {
-            addCriterion("modify_time not in", values, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeBetween(Date value1, Date value2) {
-            addCriterion("modify_time between", value1, value2, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifyTimeNotBetween(Date value1, Date value2) {
-            addCriterion("modify_time not between", value1, value2, "modifyTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIsNull() {
-            addCriterion("create_uid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIsNotNull() {
-            addCriterion("create_uid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidEqualTo(Integer value) {
-            addCriterion("create_uid =", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotEqualTo(Integer value) {
-            addCriterion("create_uid <>", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidGreaterThan(Integer value) {
-            addCriterion("create_uid >", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("create_uid >=", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidLessThan(Integer value) {
-            addCriterion("create_uid <", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidLessThanOrEqualTo(Integer value) {
-            addCriterion("create_uid <=", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIn(List<Integer> values) {
-            addCriterion("create_uid in", values, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotIn(List<Integer> values) {
-            addCriterion("create_uid not in", values, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidBetween(Integer value1, Integer value2) {
-            addCriterion("create_uid between", value1, value2, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotBetween(Integer value1, Integer value2) {
-            addCriterion("create_uid not between", value1, value2, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledIsNull() {
-            addCriterion("disabled is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledIsNotNull() {
-            addCriterion("disabled is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledEqualTo(String value) {
-            addCriterion("disabled =", value, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledNotEqualTo(String value) {
-            addCriterion("disabled <>", value, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledGreaterThan(String value) {
-            addCriterion("disabled >", value, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledGreaterThanOrEqualTo(String value) {
-            addCriterion("disabled >=", value, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledLessThan(String value) {
-            addCriterion("disabled <", value, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledLessThanOrEqualTo(String value) {
-            addCriterion("disabled <=", value, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledLike(String value) {
-            addCriterion("disabled like", value, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledNotLike(String value) {
-            addCriterion("disabled not like", value, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledIn(List<String> values) {
-            addCriterion("disabled in", values, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledNotIn(List<String> values) {
-            addCriterion("disabled not in", values, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledBetween(String value1, String value2) {
-            addCriterion("disabled between", value1, value2, "disabled");
-            return (Criteria) this;
-        }
-
-        public Criteria andDisabledNotBetween(String value1, String value2) {
-            addCriterion("disabled not between", value1, value2, "disabled");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPesRelation.java

@@ -1,107 +0,0 @@
-package com.koobietech.eas.mbg.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.util.Date;
-
-public class EasSysPesRelation implements Serializable {
-    /**
-     * ID
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "ID")
-    private Integer id;
-
-    /**
-     * 权限ID
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "权限ID")
-    private Integer permissionId;
-
-    /**
-     * 角色ID
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "角色ID")
-    private Integer departmentId;
-
-    /**
-     * 创建时间
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 创建用户ID
-     *
-     * @mbg.generated
-     */
-    @Schema(description = "创建用户ID")
-    private Integer createUid;
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getPermissionId() {
-        return permissionId;
-    }
-
-    public void setPermissionId(Integer permissionId) {
-        this.permissionId = permissionId;
-    }
-
-    public Integer getDepartmentId() {
-        return departmentId;
-    }
-
-    public void setDepartmentId(Integer departmentId) {
-        this.departmentId = departmentId;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getCreateUid() {
-        return createUid;
-    }
-
-    public void setCreateUid(Integer createUid) {
-        this.createUid = createUid;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", permissionId=").append(permissionId);
-        sb.append(", departmentId=").append(departmentId);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", createUid=").append(createUid);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPesRelationExample.java

@@ -1,500 +0,0 @@
-package com.koobietech.eas.mbg.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class EasSysPesRelationExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public EasSysPesRelationExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Integer value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Integer value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Integer value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Integer value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Integer> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Integer> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Integer value1, Integer value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdIsNull() {
-            addCriterion("permission_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdIsNotNull() {
-            addCriterion("permission_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdEqualTo(Integer value) {
-            addCriterion("permission_id =", value, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdNotEqualTo(Integer value) {
-            addCriterion("permission_id <>", value, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdGreaterThan(Integer value) {
-            addCriterion("permission_id >", value, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("permission_id >=", value, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdLessThan(Integer value) {
-            addCriterion("permission_id <", value, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdLessThanOrEqualTo(Integer value) {
-            addCriterion("permission_id <=", value, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdIn(List<Integer> values) {
-            addCriterion("permission_id in", values, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdNotIn(List<Integer> values) {
-            addCriterion("permission_id not in", values, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdBetween(Integer value1, Integer value2) {
-            addCriterion("permission_id between", value1, value2, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPermissionIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("permission_id not between", value1, value2, "permissionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdIsNull() {
-            addCriterion("department_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdIsNotNull() {
-            addCriterion("department_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdEqualTo(Integer value) {
-            addCriterion("department_id =", value, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdNotEqualTo(Integer value) {
-            addCriterion("department_id <>", value, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdGreaterThan(Integer value) {
-            addCriterion("department_id >", value, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("department_id >=", value, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdLessThan(Integer value) {
-            addCriterion("department_id <", value, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdLessThanOrEqualTo(Integer value) {
-            addCriterion("department_id <=", value, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdIn(List<Integer> values) {
-            addCriterion("department_id in", values, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdNotIn(List<Integer> values) {
-            addCriterion("department_id not in", values, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdBetween(Integer value1, Integer value2) {
-            addCriterion("department_id between", value1, value2, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andDepartmentIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("department_id not between", value1, value2, "departmentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_time =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_time <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_time >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_time >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_time <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_time <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_time not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_time between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_time not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIsNull() {
-            addCriterion("create_uid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIsNotNull() {
-            addCriterion("create_uid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidEqualTo(Integer value) {
-            addCriterion("create_uid =", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotEqualTo(Integer value) {
-            addCriterion("create_uid <>", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidGreaterThan(Integer value) {
-            addCriterion("create_uid >", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("create_uid >=", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidLessThan(Integer value) {
-            addCriterion("create_uid <", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidLessThanOrEqualTo(Integer value) {
-            addCriterion("create_uid <=", value, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidIn(List<Integer> values) {
-            addCriterion("create_uid in", values, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotIn(List<Integer> values) {
-            addCriterion("create_uid not in", values, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidBetween(Integer value1, Integer value2) {
-            addCriterion("create_uid between", value1, value2, "createUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUidNotBetween(Integer value1, Integer value2) {
-            addCriterion("create_uid not between", value1, value2, "createUid");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysRoleusers.java

@@ -0,0 +1,65 @@
+package com.koobietech.eas.mbg.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+
+public class EasSysRoleusers implements Serializable {
+    /**
+     * 用户ID
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "用户ID")
+    private Long id;
+
+    private String type;
+
+    /**
+     * 姓名
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "姓名")
+    private String username;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username == null ? null : username.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", type=").append(type);
+        sb.append(", username=").append(username);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysRoleusersExample.java

@@ -0,0 +1,399 @@
+package com.koobietech.eas.mbg.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EasSysRoleusersExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EasSysRoleusersExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIsNull() {
+            addCriterion("username is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIsNotNull() {
+            addCriterion("username is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameEqualTo(String value) {
+            addCriterion("username =", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotEqualTo(String value) {
+            addCriterion("username <>", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameGreaterThan(String value) {
+            addCriterion("username >", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameGreaterThanOrEqualTo(String value) {
+            addCriterion("username >=", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLessThan(String value) {
+            addCriterion("username <", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLessThanOrEqualTo(String value) {
+            addCriterion("username <=", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLike(String value) {
+            addCriterion("username like", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotLike(String value) {
+            addCriterion("username not like", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIn(List<String> values) {
+            addCriterion("username in", values, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotIn(List<String> values) {
+            addCriterion("username not in", values, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameBetween(String value1, String value2) {
+            addCriterion("username between", value1, value2, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotBetween(String value1, String value2) {
+            addCriterion("username not between", value1, value2, "username");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasArcArctypeMapper.xml

@@ -1,273 +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.koobietech.eas.mbg.mapper.EasArcArctypeMapper">
-  <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasArcArctype">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="is_views" jdbcType="CHAR" property="isViews" />
-    <result column="template" jdbcType="VARCHAR" property="template" />
-    <result column="backup" jdbcType="CHAR" property="backup" />
-    <result column="suffix" jdbcType="VARCHAR" property="suffix" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
-    <result column="create_uid" jdbcType="INTEGER" property="createUid" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, is_views, template, backup, suffix, create_time, modify_time, create_uid
-  </sql>
-  <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasArcArctypeExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from eas_arc_arctype
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from eas_arc_arctype
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from eas_arc_arctype
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.koobietech.eas.mbg.model.EasArcArctypeExample">
-    delete from eas_arc_arctype
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.koobietech.eas.mbg.model.EasArcArctype">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into eas_arc_arctype (name, is_views, template, 
-      backup, suffix, create_time, 
-      modify_time, create_uid)
-    values (#{name,jdbcType=VARCHAR}, #{isViews,jdbcType=CHAR}, #{template,jdbcType=VARCHAR}, 
-      #{backup,jdbcType=CHAR}, #{suffix,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasArcArctype">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into eas_arc_arctype
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="isViews != null">
-        is_views,
-      </if>
-      <if test="template != null">
-        template,
-      </if>
-      <if test="backup != null">
-        backup,
-      </if>
-      <if test="suffix != null">
-        suffix,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="modifyTime != null">
-        modify_time,
-      </if>
-      <if test="createUid != null">
-        create_uid,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="isViews != null">
-        #{isViews,jdbcType=CHAR},
-      </if>
-      <if test="template != null">
-        #{template,jdbcType=VARCHAR},
-      </if>
-      <if test="backup != null">
-        #{backup,jdbcType=CHAR},
-      </if>
-      <if test="suffix != null">
-        #{suffix,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifyTime != null">
-        #{modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createUid != null">
-        #{createUid,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasArcArctypeExample" resultType="java.lang.Long">
-    select count(*) from eas_arc_arctype
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update eas_arc_arctype
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.isViews != null">
-        is_views = #{record.isViews,jdbcType=CHAR},
-      </if>
-      <if test="record.template != null">
-        template = #{record.template,jdbcType=VARCHAR},
-      </if>
-      <if test="record.backup != null">
-        backup = #{record.backup,jdbcType=CHAR},
-      </if>
-      <if test="record.suffix != null">
-        suffix = #{record.suffix,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.modifyTime != null">
-        modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createUid != null">
-        create_uid = #{record.createUid,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update eas_arc_arctype
-    set id = #{record.id,jdbcType=INTEGER},
-      name = #{record.name,jdbcType=VARCHAR},
-      is_views = #{record.isViews,jdbcType=CHAR},
-      template = #{record.template,jdbcType=VARCHAR},
-      backup = #{record.backup,jdbcType=CHAR},
-      suffix = #{record.suffix,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.koobietech.eas.mbg.model.EasArcArctype">
-    update eas_arc_arctype
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="isViews != null">
-        is_views = #{isViews,jdbcType=CHAR},
-      </if>
-      <if test="template != null">
-        template = #{template,jdbcType=VARCHAR},
-      </if>
-      <if test="backup != null">
-        backup = #{backup,jdbcType=CHAR},
-      </if>
-      <if test="suffix != null">
-        suffix = #{suffix,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifyTime != null">
-        modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createUid != null">
-        create_uid = #{createUid,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.koobietech.eas.mbg.model.EasArcArctype">
-    update eas_arc_arctype
-    set name = #{name,jdbcType=VARCHAR},
-      is_views = #{isViews,jdbcType=CHAR},
-      template = #{template,jdbcType=VARCHAR},
-      backup = #{backup,jdbcType=CHAR},
-      suffix = #{suffix,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-</mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysPermissionMapper.xml

@@ -1,258 +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.koobietech.eas.mbg.mapper.EasSysPermissionMapper">
-  <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasSysPermission">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="is_active" jdbcType="TINYINT" property="isActive" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
-    <result column="create_uid" jdbcType="INTEGER" property="createUid" />
-    <result column="disabled" jdbcType="CHAR" property="disabled" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, description, is_active, create_time, modify_time, create_uid, disabled
-  </sql>
-  <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysPermissionExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from eas_sys_permission
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from eas_sys_permission
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from eas_sys_permission
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.koobietech.eas.mbg.model.EasSysPermissionExample">
-    delete from eas_sys_permission
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.koobietech.eas.mbg.model.EasSysPermission">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into eas_sys_permission (name, description, is_active, 
-      create_time, modify_time, create_uid, 
-      disabled)
-    values (#{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{isActive,jdbcType=TINYINT}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, 
-      #{disabled,jdbcType=CHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysPermission">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into eas_sys_permission
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="isActive != null">
-        is_active,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="modifyTime != null">
-        modify_time,
-      </if>
-      <if test="createUid != null">
-        create_uid,
-      </if>
-      <if test="disabled != null">
-        disabled,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="isActive != null">
-        #{isActive,jdbcType=TINYINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifyTime != null">
-        #{modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createUid != null">
-        #{createUid,jdbcType=INTEGER},
-      </if>
-      <if test="disabled != null">
-        #{disabled,jdbcType=CHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSysPermissionExample" resultType="java.lang.Long">
-    select count(*) from eas_sys_permission
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update eas_sys_permission
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.isActive != null">
-        is_active = #{record.isActive,jdbcType=TINYINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.modifyTime != null">
-        modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createUid != null">
-        create_uid = #{record.createUid,jdbcType=INTEGER},
-      </if>
-      <if test="record.disabled != null">
-        disabled = #{record.disabled,jdbcType=CHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update eas_sys_permission
-    set id = #{record.id,jdbcType=INTEGER},
-      name = #{record.name,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      is_active = #{record.isActive,jdbcType=TINYINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER},
-      disabled = #{record.disabled,jdbcType=CHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.koobietech.eas.mbg.model.EasSysPermission">
-    update eas_sys_permission
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="isActive != null">
-        is_active = #{isActive,jdbcType=TINYINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifyTime != null">
-        modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createUid != null">
-        create_uid = #{createUid,jdbcType=INTEGER},
-      </if>
-      <if test="disabled != null">
-        disabled = #{disabled,jdbcType=CHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.koobietech.eas.mbg.model.EasSysPermission">
-    update eas_sys_permission
-    set name = #{name,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      is_active = #{isActive,jdbcType=TINYINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER},
-      disabled = #{disabled,jdbcType=CHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-</mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysPesRelationMapper.xml → mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysRoleusersMapper.xml

@@ -1,12 +1,10 @@
 <?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.koobietech.eas.mbg.mapper.EasSysPesRelationMapper">
-  <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasSysPesRelation">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="permission_id" jdbcType="INTEGER" property="permissionId" />
-    <result column="department_id" jdbcType="INTEGER" property="departmentId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+<mapper namespace="com.koobietech.eas.mbg.mapper.EasSysRoleusersMapper">
+  <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasSysRoleusers">
+    <result column="id" jdbcType="BIGINT" property="id" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="username" jdbcType="VARCHAR" property="username" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -67,15 +65,15 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, permission_id, department_id, create_time, create_uid
+    id, type, username
   </sql>
-  <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelationExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysRoleusersExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from eas_sys_pes_relation
+    from eas_sys_roleusers
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -83,88 +81,58 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from eas_sys_pes_relation
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from eas_sys_pes_relation
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelationExample">
-    delete from eas_sys_pes_relation
+  <delete id="deleteByExample" parameterType="com.koobietech.eas.mbg.model.EasSysRoleusersExample">
+    delete from eas_sys_roleusers
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+  <insert id="insert" parameterType="com.koobietech.eas.mbg.model.EasSysRoleusers">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into eas_sys_pes_relation (permission_id, department_id, create_time, 
-      create_uid)
-    values (#{permissionId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createUid,jdbcType=INTEGER})
+    insert into eas_sys_roleusers (type, username)
+    values (#{type,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+  <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysRoleusers">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into eas_sys_pes_relation
+    insert into eas_sys_roleusers
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="permissionId != null">
-        permission_id,
-      </if>
-      <if test="departmentId != null">
-        department_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
+      <if test="type != null">
+        type,
       </if>
-      <if test="createUid != null">
-        create_uid,
+      <if test="username != null">
+        username,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="permissionId != null">
-        #{permissionId,jdbcType=INTEGER},
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
       </if>
-      <if test="departmentId != null">
-        #{departmentId,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createUid != null">
-        #{createUid,jdbcType=INTEGER},
+      <if test="username != null">
+        #{username,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelationExample" resultType="java.lang.Long">
-    select count(*) from eas_sys_pes_relation
+  <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSysRoleusersExample" resultType="java.lang.Long">
+    select count(*) from eas_sys_roleusers
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update eas_sys_pes_relation
+    update eas_sys_roleusers
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.permissionId != null">
-        permission_id = #{record.permissionId,jdbcType=INTEGER},
-      </if>
-      <if test="record.departmentId != null">
-        department_id = #{record.departmentId,jdbcType=INTEGER},
+        id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=VARCHAR},
       </if>
-      <if test="record.createUid != null">
-        create_uid = #{record.createUid,jdbcType=INTEGER},
+      <if test="record.username != null">
+        username = #{record.username,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -172,40 +140,12 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update eas_sys_pes_relation
-    set id = #{record.id,jdbcType=INTEGER},
-      permission_id = #{record.permissionId,jdbcType=INTEGER},
-      department_id = #{record.departmentId,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+    update eas_sys_roleusers
+    set id = #{record.id,jdbcType=BIGINT},
+      type = #{record.type,jdbcType=VARCHAR},
+      username = #{record.username,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelation">
-    update eas_sys_pes_relation
-    <set>
-      <if test="permissionId != null">
-        permission_id = #{permissionId,jdbcType=INTEGER},
-      </if>
-      <if test="departmentId != null">
-        department_id = #{departmentId,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createUid != null">
-        create_uid = #{createUid,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.koobietech.eas.mbg.model.EasSysPesRelation">
-    update eas_sys_pes_relation
-    set permission_id = #{permissionId,jdbcType=INTEGER},
-      department_id = #{departmentId,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
 </mapper>

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSystemLogsMapper.xml

@@ -1,266 +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.koobietech.eas.mbg.mapper.EasSystemLogsMapper">
-  <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasSystemLogs">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="timestamp" jdbcType="TIMESTAMP" property="timestamp" />
-    <result column="level" jdbcType="VARCHAR" property="level" />
-    <result column="logger" jdbcType="VARCHAR" property="logger" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.koobietech.eas.mbg.model.EasSystemLogs">
-    <result column="message" jdbcType="LONGVARCHAR" property="message" />
-    <result column="exception" jdbcType="LONGVARCHAR" property="exception" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, timestamp, level, logger
-  </sql>
-  <sql id="Blob_Column_List">
-    message, exception
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.koobietech.eas.mbg.model.EasSystemLogsExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from eas_system_logs
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSystemLogsExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from eas_system_logs
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from eas_system_logs
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from eas_system_logs
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.koobietech.eas.mbg.model.EasSystemLogsExample">
-    delete from eas_system_logs
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.koobietech.eas.mbg.model.EasSystemLogs">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into eas_system_logs (timestamp, level, logger, 
-      message, exception)
-    values (#{timestamp,jdbcType=TIMESTAMP}, #{level,jdbcType=VARCHAR}, #{logger,jdbcType=VARCHAR}, 
-      #{message,jdbcType=LONGVARCHAR}, #{exception,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSystemLogs">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into eas_system_logs
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="timestamp != null">
-        timestamp,
-      </if>
-      <if test="level != null">
-        level,
-      </if>
-      <if test="logger != null">
-        logger,
-      </if>
-      <if test="message != null">
-        message,
-      </if>
-      <if test="exception != null">
-        exception,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="timestamp != null">
-        #{timestamp,jdbcType=TIMESTAMP},
-      </if>
-      <if test="level != null">
-        #{level,jdbcType=VARCHAR},
-      </if>
-      <if test="logger != null">
-        #{logger,jdbcType=VARCHAR},
-      </if>
-      <if test="message != null">
-        #{message,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="exception != null">
-        #{exception,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSystemLogsExample" resultType="java.lang.Long">
-    select count(*) from eas_system_logs
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update eas_system_logs
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.timestamp != null">
-        timestamp = #{record.timestamp,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.level != null">
-        level = #{record.level,jdbcType=VARCHAR},
-      </if>
-      <if test="record.logger != null">
-        logger = #{record.logger,jdbcType=VARCHAR},
-      </if>
-      <if test="record.message != null">
-        message = #{record.message,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.exception != null">
-        exception = #{record.exception,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update eas_system_logs
-    set id = #{record.id,jdbcType=INTEGER},
-      timestamp = #{record.timestamp,jdbcType=TIMESTAMP},
-      level = #{record.level,jdbcType=VARCHAR},
-      logger = #{record.logger,jdbcType=VARCHAR},
-      message = #{record.message,jdbcType=LONGVARCHAR},
-      exception = #{record.exception,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update eas_system_logs
-    set id = #{record.id,jdbcType=INTEGER},
-      timestamp = #{record.timestamp,jdbcType=TIMESTAMP},
-      level = #{record.level,jdbcType=VARCHAR},
-      logger = #{record.logger,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.koobietech.eas.mbg.model.EasSystemLogs">
-    update eas_system_logs
-    <set>
-      <if test="timestamp != null">
-        timestamp = #{timestamp,jdbcType=TIMESTAMP},
-      </if>
-      <if test="level != null">
-        level = #{level,jdbcType=VARCHAR},
-      </if>
-      <if test="logger != null">
-        logger = #{logger,jdbcType=VARCHAR},
-      </if>
-      <if test="message != null">
-        message = #{message,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="exception != null">
-        exception = #{exception,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.koobietech.eas.mbg.model.EasSystemLogs">
-    update eas_system_logs
-    set timestamp = #{timestamp,jdbcType=TIMESTAMP},
-      level = #{level,jdbcType=VARCHAR},
-      logger = #{logger,jdbcType=VARCHAR},
-      message = #{message,jdbcType=LONGVARCHAR},
-      exception = #{exception,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.koobietech.eas.mbg.model.EasSystemLogs">
-    update eas_system_logs
-    set timestamp = #{timestamp,jdbcType=TIMESTAMP},
-      level = #{level,jdbcType=VARCHAR},
-      logger = #{logger,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-</mapper>

service/src/main/java/com/koobietech/eas/service/EasEduScheduleService.java

@@ -3,6 +3,7 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.dao.dto.ScheduleDto;
+import com.koobietech.eas.dao.pojo.LessonPojo;
 import com.koobietech.eas.dao.pojo.SchedulePojo;
 import com.koobietech.eas.mbg.model.EasEduSchedule;
 
@@ -20,4 +21,7 @@ public interface EasEduScheduleService {
     List<SchedulePojo> querySchedule(ScheduleDto schedule);
 
     Boolean queryConflict(ConflictDto conflictDto);
+
+    LessonPojo dashboardWorkbench();
+
 }

service/src/main/java/com/koobietech/eas/service/EasSysPermissionService.java

@@ -1,15 +0,0 @@
-package com.koobietech.eas.service;
-
-import com.koobietech.eas.common.result.PageDataResult;
-import com.koobietech.eas.mbg.model.EasSysPermission;
-
-public interface EasSysPermissionService {
-
-    Boolean update(EasSysPermission permisson);
-
-    Boolean add(EasSysPermission permisson);
-
-    Boolean delete(Integer id);
-
-    PageDataResult query(EasSysPermission permission);
-}

service/src/main/java/com/koobietech/eas/service/impl/EasEduScheduleServiceImpl.java

@@ -1,9 +1,13 @@
 package com.koobietech.eas.service.impl;
 
 import com.koobietech.eas.common.result.PageDataResult;
+import com.koobietech.eas.common.utils.SecurityManager;
+import com.koobietech.eas.dao.constant.UserType;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.dao.dto.ScheduleDto;
+import com.koobietech.eas.dao.mapper.LessonMapper;
 import com.koobietech.eas.dao.mapper.ScheduleMapper;
+import com.koobietech.eas.dao.pojo.LessonPojo;
 import com.koobietech.eas.dao.pojo.SchedulePojo;
 import com.koobietech.eas.mbg.mapper.EasEduClassroomMapper;
 import com.koobietech.eas.mbg.mapper.EasEduScheduleMapper;
@@ -32,6 +36,9 @@ public class EasEduScheduleServiceImpl implements EasEduScheduleService {
     @Resource
     ScheduleMapper scheduleMapper;
 
+    @Resource
+    LessonMapper  lessonMapper;
+
     @Override
     public Boolean update(EasEduSchedule schedule) {
         schedule.setModifyTime(new Date());
@@ -185,4 +192,14 @@ public class EasEduScheduleServiceImpl implements EasEduScheduleService {
         return ret;
 
     }
+
+    @Override
+    public LessonPojo  dashboardWorkbench() {
+        if (SecurityManager.isStudentUser()) {
+          return  lessonMapper.getStudentboard( SecurityManager.getLoginSid().intValue() );
+        } else if ( SecurityManager.getUserType().equals(UserType.teacher) ) {
+           return lessonMapper.getTeacherboard( SecurityManager.getLoginUid().intValue() );
+        }
+        return lessonMapper.getAllboard();
+    }
 }

service/src/main/java/com/koobietech/eas/service/impl/EasSysPermissionServiceImpl.java

@@ -1,81 +0,0 @@
-package com.koobietech.eas.service.impl;
-
-import com.koobietech.eas.common.result.PageDataResult;
-import com.koobietech.eas.mbg.mapper.EasSysPermissionMapper;
-import com.koobietech.eas.mbg.model.EasSysPermission;
-import com.koobietech.eas.mbg.model.EasSysPermissionExample;
-import com.koobietech.eas.service.EasSysPermissionService;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-@Service
-public class EasSysPermissionServiceImpl implements EasSysPermissionService {
-
-    @Resource
-    EasSysPermissionMapper easSysPermissionMapper;
-
-    @Override
-    public Boolean update(EasSysPermission permission) {
-        permission.setModifyTime(new Date());
-        return easSysPermissionMapper.updateByPrimaryKeySelective(permission) == 1;
-    }
-
-    @Override
-    public Boolean add(EasSysPermission permission) {
-        permission.setCreateTime(new Date());
-        permission.setModifyTime(new Date());
-        return easSysPermissionMapper.insert(permission) == 1;
-    }
-
-    @Override
-    public Boolean delete(Integer id) {
-        return easSysPermissionMapper.deleteByPrimaryKey(id) == 1;
-    }
-
-    @Override
-    public PageDataResult query(EasSysPermission permission) {
-        EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
-        EasSysPermissionExample.Criteria criteria = easSysPermissionExample.createCriteria();
-        if (Objects.nonNull(permission)) {
-
-            if (Objects.nonNull(permission.getId()) && permission.getId() != 0) {
-                criteria.andIdEqualTo(permission.getId());
-            }
-
-            if (Objects.nonNull(permission.getIsActive()) && permission.getIsActive() != 0) {
-                criteria.andIsActiveEqualTo(permission.getIsActive());
-            }
-
-            if (StringUtils.hasText(permission.getName())) {
-                criteria.andNameLike("%" + permission.getName() + "%");
-            }
-
-            if (Objects.nonNull(permission.getCreateTime())) {
-                criteria.andCreateTimeGreaterThanOrEqualTo(permission.getCreateTime());
-            }
-
-            if (Objects.nonNull(permission.getModifyTime())) {
-                criteria.andModifyTimeGreaterThanOrEqualTo(permission.getModifyTime());
-            }
-
-            if (Objects.nonNull(permission.getCreateUid()) && permission.getCreateUid() != 0) {
-                criteria.andCreateUidEqualTo(permission.getCreateUid());
-            }
-
-            if (StringUtils.hasText(permission.getDisabled())) {
-                criteria.andDisabledEqualTo(permission.getDisabled());
-            }
-        }
-        List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);
-        long l = easSysPermissionMapper.countByExample(easSysPermissionExample);
-        PageDataResult ret = new PageDataResult();
-        ret.setData(easSysPermissions);
-        ret.setTotal(l);
-        return ret;
-    }
-}