diff --git a/src/main/java/com/fc/test/common/base/BaseController.java b/src/main/java/com/fc/test/common/base/BaseController.java index 10d6bb01a01a0b80f01e07b6b3fa61ea5cf84ead..dc67d5bb69f2af40bc5b7d69b386869da37eb488 100644 --- a/src/main/java/com/fc/test/common/base/BaseController.java +++ b/src/main/java/com/fc/test/common/base/BaseController.java @@ -2,12 +2,7 @@ package com.fc.test.common.base; import java.text.SimpleDateFormat; import java.util.Date; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; + import com.fc.test.common.domain.AjaxResult; import com.fc.test.model.custom.TitleVo; import com.fc.test.service.SysDatasService; @@ -15,10 +10,16 @@ import com.fc.test.service.SysFileDatasService; import com.fc.test.service.SysFileService; import com.fc.test.service.SysNoticeService; import com.fc.test.service.SysOperLogService; -import com.fc.test.service.SysPremissionService; +import com.fc.test.service.SysPermissionService; import com.fc.test.service.SysRoleService; import com.fc.test.service.SysUserService; import com.fc.test.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.propertyeditors.CustomDateEditor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; /** * web层通用数据处理 @@ -40,7 +41,7 @@ public class BaseController //权限 @Autowired - public SysPremissionService sysPremissionService; + public SysPermissionService sysPermissionService; //文件上传 @Autowired diff --git a/src/main/java/com/fc/test/controller/HomeController.java b/src/main/java/com/fc/test/controller/HomeController.java index fb0a706902ad36b4e6e649df706874cc552d04d6..674de5e5bc8d9249de430948c675d3c2b7fc3bd3 100644 --- a/src/main/java/com/fc/test/controller/HomeController.java +++ b/src/main/java/com/fc/test/controller/HomeController.java @@ -1,12 +1,19 @@ package com.fc.test.controller; -import io.swagger.annotations.ApiOperation; - import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.fc.test.common.base.BaseController; +import com.fc.test.model.auto.SysNotice; +import com.fc.test.model.auto.TsysUser; +import com.fc.test.model.custom.BootstrapTree; +import com.fc.test.model.custom.TitleVo; +import com.fc.test.shiro.util.ShiroUtils; +import com.fc.test.util.StringUtils; +import com.google.code.kaptcha.Constants; +import io.swagger.annotations.ApiOperation; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.ExcessiveAttemptsException; @@ -25,15 +32,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.fc.test.common.base.BaseController; -import com.fc.test.model.auto.SysNotice; -import com.fc.test.model.auto.TsysUser; -import com.fc.test.model.custom.BootstrapTree; -import com.fc.test.model.custom.TitleVo; -import com.fc.test.shiro.util.ShiroUtils; -import com.fc.test.util.StringUtils; -import com.google.code.kaptcha.Constants; - @Controller public class HomeController extends BaseController{ private static Logger logger=LoggerFactory.getLogger(HomeController.class); @@ -42,7 +40,7 @@ public class HomeController extends BaseController{ @GetMapping("/index") public String index(HttpServletRequest request) { //获取菜单栏 - BootstrapTree bootstrapTree=sysPremissionService.getbooBootstrapTreePerm(ShiroUtils.getUserId()); + BootstrapTree bootstrapTree= sysPermissionService.getbooBootstrapTreePerm(ShiroUtils.getUserId()); request.getSession().setAttribute("bootstrapTree", bootstrapTree); request.getSession().setAttribute("sessionUserName",ShiroUtils.getUser().getNickname()); //获取公告信息 diff --git a/src/main/java/com/fc/test/controller/admin/AutoCodeController.java b/src/main/java/com/fc/test/controller/admin/AutoCodeController.java index 74f51b2225c3c51dd2cf5f4413664ef9a518c686..a0b5f8424848b7a7986ca21f863e3b8a481e6e75 100644 --- a/src/main/java/com/fc/test/controller/admin/AutoCodeController.java +++ b/src/main/java/com/fc/test/controller/admin/AutoCodeController.java @@ -1,30 +1,32 @@ package com.fc.test.controller.admin; import java.util.List; + import javax.servlet.http.HttpServletRequest; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; + +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONUtil; import com.fc.test.common.base.BaseController; import com.fc.test.common.domain.AjaxResult; -import com.fc.test.model.auto.TsysPremission; +import com.fc.test.model.auto.TsysPermission; import com.fc.test.model.custom.TitleVo; import com.fc.test.model.custom.TsysTables; import com.fc.test.model.custom.autocode.AutoCodeConfig; import com.fc.test.model.custom.autocode.BeanColumn; import com.fc.test.model.custom.autocode.GlobalConfig; import com.fc.test.service.GeneratorService; -import com.fc.test.service.SysPremissionService; +import com.fc.test.service.SysPermissionService; import com.fc.test.service.SysUtilService; import com.fc.test.util.AutoCode.AutoCodeUtil; -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONUtil; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; /** *代码自动生成 @@ -42,7 +44,7 @@ public class AutoCodeController extends BaseController{ @Autowired private SysUtilService sysUtilService; @Autowired - private SysPremissionService sysPremissionService; + private SysPermissionService sysPermissionService; /** * 代码自动生成展示首页 @@ -58,7 +60,7 @@ public class AutoCodeController extends BaseController{ String str="单表代码生成"; setTitle(model, new TitleVo("生成", str+"管理", true,"欢迎进入"+str+"页面", true, false)); List tables=generatorService.queryList(null); - List premissions=sysPremissionService.list2(null) ; + List premissions= sysPermissionService.list2(null) ; model.addAttribute("tables", tables); model.addAttribute("premissions", premissions); return prefix + "/one"; @@ -185,7 +187,7 @@ public class AutoCodeController extends BaseController{ List list= generatorService.queryList(tableName); if(list.size()>0) { TsysTables tables=list.get(0); - Boolean boolean1= sysPremissionService.queryLikePerms(tables.getTableModel_a()); + Boolean boolean1= sysPermissionService.queryLikePerms(tables.getTableModel_a()); if(boolean1) { return AjaxResult.error("数据库已有权限"); }else { diff --git a/src/main/java/com/fc/test/controller/admin/PremissionController.java b/src/main/java/com/fc/test/controller/admin/PremissionController.java index d0fdb061ef4c69ad12f83a64ea21f877d9063ff0..764d5dc7cbc54f47b8fd764b796b5da4bda8181e 100644 --- a/src/main/java/com/fc/test/controller/admin/PremissionController.java +++ b/src/main/java/com/fc/test/controller/admin/PremissionController.java @@ -1,7 +1,15 @@ package com.fc.test.controller.admin; -import io.swagger.annotations.Api; import java.util.List; + +import com.fc.test.common.base.BaseController; +import com.fc.test.common.domain.AjaxResult; +import com.fc.test.model.auto.TsysPermission; +import com.fc.test.model.custom.TableSplitResult; +import com.fc.test.model.custom.Tablepar; +import com.fc.test.model.custom.TitleVo; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -10,13 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.fc.test.common.base.BaseController; -import com.fc.test.common.domain.AjaxResult; -import com.fc.test.model.auto.TsysPremission; -import com.fc.test.model.custom.TableSplitResult; -import com.fc.test.model.custom.Tablepar; -import com.fc.test.model.custom.TitleVo; -import com.github.pagehelper.PageInfo; /** * 权限Controller @@ -52,8 +53,8 @@ public class PremissionController extends BaseController{ @RequiresPermissions("system:premission:list") @ResponseBody public Object list(Tablepar tablepar,String searchTxt){ - PageInfo page=sysPremissionService.list(tablepar,searchTxt) ; - TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList()); + PageInfo page= sysPermissionService.list(tablepar, searchTxt) ; + TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList()); return result; } /** @@ -65,7 +66,7 @@ public class PremissionController extends BaseController{ @PostMapping("list2") @ResponseBody public Object list2(Tablepar tablepar,String searchTxt){ - List page=sysPremissionService.list2(searchTxt) ; + List page= sysPermissionService.list2(searchTxt) ; return page; } /** @@ -86,8 +87,8 @@ public class PremissionController extends BaseController{ @PostMapping("add") @RequiresPermissions("system:premission:add") @ResponseBody - public AjaxResult add(TsysPremission role){ - int b=sysPremissionService.insertSelective(role); + public AjaxResult add(TsysPermission role){ + int b= sysPermissionService.insertSelective(role); if(b>0){ return success(); }else{ @@ -104,7 +105,7 @@ public class PremissionController extends BaseController{ @RequiresPermissions("system:premission:remove") @ResponseBody public AjaxResult remove(String ids){ - int b=sysPremissionService.deleteByPrimaryKey(ids); + int b= sysPermissionService.deleteByPrimaryKey(ids); if(b==1){ return success(); }else if(b==-1){ @@ -118,13 +119,13 @@ public class PremissionController extends BaseController{ /** * 检查权限 - * @param TsysPremission + * @param TsysPermission * @return */ @PostMapping("checkNameUnique") @ResponseBody - public int checkNameUnique(TsysPremission TsysPremission){ - int b=sysPremissionService.checkNameUnique(TsysPremission); + public int checkNameUnique(TsysPermission TsysPermission){ + int b= sysPermissionService.checkNameUnique(TsysPermission); if(b>0){ return 1; }else{ @@ -139,8 +140,8 @@ public class PremissionController extends BaseController{ */ @PostMapping("checkURLUnique") @ResponseBody - public int checkURLUnique(TsysPremission tsysPremission){ - int b=sysPremissionService.checkURLUnique(tsysPremission); + public int checkURLUnique(TsysPermission tsysPermission){ + int b= sysPermissionService.checkURLUnique(tsysPermission); if(b>0){ return 1; }else{ @@ -155,8 +156,8 @@ public class PremissionController extends BaseController{ */ @PostMapping("checkPermsUnique") @ResponseBody - public int checkPermsUnique(TsysPremission tsysPremission){ - int b=sysPremissionService.checkPermsUnique(tsysPremission); + public int checkPermsUnique(TsysPermission tsysPermission){ + int b= sysPermissionService.checkPermsUnique(tsysPermission); if(b>0){ return 1; }else{ @@ -174,11 +175,11 @@ public class PremissionController extends BaseController{ public String edit(@PathVariable("roleId") String id, ModelMap mmap) { //获取自己的权限信息 - TsysPremission mytsysPremission=sysPremissionService.selectByPrimaryKey(id); + TsysPermission mytsysPermission = sysPermissionService.selectByPrimaryKey(id); //获取父权限信息 - TsysPremission pattsysPremission=sysPremissionService.selectByPrimaryKey(mytsysPremission.getPid()); - mmap.put("TsysPremission", mytsysPremission); - mmap.put("pattsysPremission", pattsysPremission); + TsysPermission pattsysPermission = sysPermissionService.selectByPrimaryKey(mytsysPermission.getPid()); + mmap.put("TsysPremission", mytsysPermission); + mmap.put("pattsysPremission", pattsysPermission); return prefix + "/edit"; } @@ -188,9 +189,9 @@ public class PremissionController extends BaseController{ @RequiresPermissions("system:premission:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(TsysPremission TsysPremission) + public AjaxResult editSave(TsysPermission TsysPermission) { - return toAjax(sysPremissionService.updateByPrimaryKey(TsysPremission)); + return toAjax(sysPermissionService.updateByPrimaryKey(TsysPermission)); } /** @@ -201,7 +202,7 @@ public class PremissionController extends BaseController{ @ResponseBody public AjaxResult getbooBootstrapTreePerm(){ - return retobject(200,sysPremissionService.getbooBootstrapTreePerm(null)); + return retobject(200, sysPermissionService.getbooBootstrapTreePerm(null)); } @@ -214,7 +215,7 @@ public class PremissionController extends BaseController{ @ResponseBody public AjaxResult getCheckPrem(String roleId){ - return retobject(200,sysPremissionService.getCheckPrem(roleId)); + return retobject(200, sysPermissionService.getCheckPrem(roleId)); } @@ -235,7 +236,7 @@ public class PremissionController extends BaseController{ @PostMapping("tree/{pid}") @ResponseBody public AjaxResult Tree(@PathVariable("pid") String pid){ - return retobject(200,sysPremissionService.getbooBootstrapTreePerm(null)); + return retobject(200, sysPermissionService.getbooBootstrapTreePerm(null)); } diff --git a/src/main/java/com/fc/test/controller/admin/RoleController.java b/src/main/java/com/fc/test/controller/admin/RoleController.java index e7df062496c30c2c62bad5629026d718e95cf1ac..18ec755cd5dc0fd3ea53965b4acc24fb51989d67 100644 --- a/src/main/java/com/fc/test/controller/admin/RoleController.java +++ b/src/main/java/com/fc/test/controller/admin/RoleController.java @@ -1,15 +1,7 @@ package com.fc.test.controller.admin; -import io.swagger.annotations.Api; import javax.servlet.http.HttpServletRequest; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; + import com.fc.test.common.base.BaseController; import com.fc.test.common.domain.AjaxResult; import com.fc.test.model.auto.TsysRole; @@ -19,6 +11,15 @@ import com.fc.test.model.custom.Tablepar; import com.fc.test.model.custom.TitleVo; import com.fc.test.shiro.util.ShiroUtils; import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; /** @@ -146,7 +147,7 @@ public class RoleController extends BaseController{ //大于0刷新权限 ShiroUtils.clearCachedAuthorizationInfo(); //获取菜单栏 - BootstrapTree bootstrapTree=sysPremissionService.getbooBootstrapTreePerm(ShiroUtils.getUserId()); + BootstrapTree bootstrapTree= sysPermissionService.getbooBootstrapTreePerm(ShiroUtils.getUserId()); request.getSession().setAttribute("bootstrapTree", bootstrapTree); } diff --git a/src/main/java/com/fc/test/mapper/auto/TsysPermissionMapper.java b/src/main/java/com/fc/test/mapper/auto/TsysPermissionMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ba1943277c8006ad03d9c44bd0a373f41cb836e8 --- /dev/null +++ b/src/main/java/com/fc/test/mapper/auto/TsysPermissionMapper.java @@ -0,0 +1,31 @@ +package com.fc.test.mapper.auto; + +import java.util.List; + +import com.fc.test.model.auto.TsysPermission; +import com.fc.test.model.auto.TsysPermissionExample; +import org.apache.ibatis.annotations.Param; + +public interface TsysPermissionMapper { + long countByExample(TsysPermissionExample example); + + int deleteByExample(TsysPermissionExample example); + + int deleteByPrimaryKey(String id); + + int insert(TsysPermission record); + + int insertSelective(TsysPermission record); + + List selectByExample(TsysPermissionExample example); + + TsysPermission selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") TsysPermission record, @Param("example") TsysPermissionExample example); + + int updateByExample(@Param("record") TsysPermission record, @Param("example") TsysPermissionExample example); + + int updateByPrimaryKeySelective(TsysPermission record); + + int updateByPrimaryKey(TsysPermission record); +} \ No newline at end of file diff --git a/src/main/java/com/fc/test/mapper/auto/TsysPremissionMapper.java b/src/main/java/com/fc/test/mapper/auto/TsysPremissionMapper.java deleted file mode 100644 index 381035114cbfe213e660e2b6c81074f19741e5c1..0000000000000000000000000000000000000000 --- a/src/main/java/com/fc/test/mapper/auto/TsysPremissionMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fc.test.mapper.auto; - -import com.fc.test.model.auto.TsysPremission; -import com.fc.test.model.auto.TsysPremissionExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface TsysPremissionMapper { - long countByExample(TsysPremissionExample example); - - int deleteByExample(TsysPremissionExample example); - - int deleteByPrimaryKey(String id); - - int insert(TsysPremission record); - - int insertSelective(TsysPremission record); - - List selectByExample(TsysPremissionExample example); - - TsysPremission selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") TsysPremission record, @Param("example") TsysPremissionExample example); - - int updateByExample(@Param("record") TsysPremission record, @Param("example") TsysPremissionExample example); - - int updateByPrimaryKeySelective(TsysPremission record); - - int updateByPrimaryKey(TsysPremission record); -} \ No newline at end of file diff --git a/src/main/java/com/fc/test/mapper/custom/PermissionDao.java b/src/main/java/com/fc/test/mapper/custom/PermissionDao.java index 3b3100df2a754cc63ac28ed552fb1edefab251a3..1cb56cdc15366bd40e0bbcb0dd5e03694f86ead2 100644 --- a/src/main/java/com/fc/test/mapper/custom/PermissionDao.java +++ b/src/main/java/com/fc/test/mapper/custom/PermissionDao.java @@ -2,28 +2,28 @@ package com.fc.test.mapper.custom; import java.util.List; -import com.fc.test.model.auto.TsysPremission; +import com.fc.test.model.auto.TsysPermission; public interface PermissionDao { /** * 查询全部权限 * @return */ - public List findAll(); + List findAll(); /** * 根据用户id查询出用户的所有权限 * @param userId * @return */ - public List findByAdminUserId(String userId); + List findByAdminUserId(String userId); /** * 根据角色id查询权限 * @param roleid * @return */ - public List queryRoleId(String roleid); + List queryRoleId(String roleid); diff --git a/src/main/java/com/fc/test/model/auto/TsysPremission.java b/src/main/java/com/fc/test/model/auto/TsysPermission.java similarity index 88% rename from src/main/java/com/fc/test/model/auto/TsysPremission.java rename to src/main/java/com/fc/test/model/auto/TsysPermission.java index 18eea84f39c0c93d68b042ebc3bbcbaf598007bf..72e1e2974eeda9576aa5725abea1d8c1fc5efa6f 100644 --- a/src/main/java/com/fc/test/model/auto/TsysPremission.java +++ b/src/main/java/com/fc/test/model/auto/TsysPermission.java @@ -1,147 +1,147 @@ -package com.fc.test.model.auto; - -import java.io.Serializable; - -public class TsysPremission implements Serializable { - private String id; - - private String name; - - private String descripion; - - private String url; - - private Integer isBlank; - - private String pid; - - private String perms; - - private Integer type; - - private String icon; - - private Integer orderNum; - - private Integer visible; - - private Integer childCount; - - private static final long serialVersionUID = 1L; - - public TsysPremission(String id, String name, String descripion, String url, Integer isBlank, String pid, String perms, Integer type, String icon, Integer orderNum,Integer visible,Integer childCount) { - this.id = id; - this.name = name; - this.descripion = descripion; - this.url = url; - this.isBlank = isBlank; - this.pid = pid; - this.perms = perms; - this.type = type; - this.icon = icon; - this.orderNum = orderNum; - this.visible=visible; - this.childCount = childCount; - } - - public TsysPremission() { - super(); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id == null ? null : id.trim(); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getDescripion() { - return descripion; - } - - public void setDescripion(String descripion) { - this.descripion = descripion == null ? null : descripion.trim(); - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url == null ? null : url.trim(); - } - - public Integer getIsBlank() { - return isBlank; - } - - public void setIsBlank(Integer isBlank) { - this.isBlank = isBlank; - } - - public String getPid() { - return pid; - } - - public void setPid(String pid) { - this.pid = pid == null ? null : pid.trim(); - } - - public String getPerms() { - return perms; - } - - public void setPerms(String perms) { - this.perms = perms == null ? null : perms.trim(); - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon == null ? null : icon.trim(); - } - - public Integer getOrderNum() { - return orderNum; - } - - public void setOrderNum(Integer orderNum) { - this.orderNum = orderNum; - } - - public Integer getChildCount() { - return childCount; - } - - public void setChildCount(Integer childCount) { - this.childCount = childCount; - } - - public Integer getVisible() { - return visible; - } - - public void setVisible(Integer visible) { - this.visible = visible; - } - +package com.fc.test.model.auto; + +import java.io.Serializable; + +public class TsysPermission implements Serializable { + private String id; + + private String name; + + private String descripion; + + private String url; + + private Integer isBlank; + + private String pid; + + private String perms; + + private Integer type; + + private String icon; + + private Integer orderNum; + + private Integer visible; + + private Integer childCount; + + private static final long serialVersionUID = 1L; + + public TsysPermission(String id, String name, String descripion, String url, Integer isBlank, String pid, String perms, Integer type, String icon, Integer orderNum, Integer visible, Integer childCount) { + this.id = id; + this.name = name; + this.descripion = descripion; + this.url = url; + this.isBlank = isBlank; + this.pid = pid; + this.perms = perms; + this.type = type; + this.icon = icon; + this.orderNum = orderNum; + this.visible=visible; + this.childCount = childCount; + } + + public TsysPermission() { + super(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id == null ? null : id.trim(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getDescripion() { + return descripion; + } + + public void setDescripion(String descripion) { + this.descripion = descripion == null ? null : descripion.trim(); + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url == null ? null : url.trim(); + } + + public Integer getIsBlank() { + return isBlank; + } + + public void setIsBlank(Integer isBlank) { + this.isBlank = isBlank; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid == null ? null : pid.trim(); + } + + public String getPerms() { + return perms; + } + + public void setPerms(String perms) { + this.perms = perms == null ? null : perms.trim(); + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon == null ? null : icon.trim(); + } + + public Integer getOrderNum() { + return orderNum; + } + + public void setOrderNum(Integer orderNum) { + this.orderNum = orderNum; + } + + public Integer getChildCount() { + return childCount; + } + + public void setChildCount(Integer childCount) { + this.childCount = childCount; + } + + public Integer getVisible() { + return visible; + } + + public void setVisible(Integer visible) { + this.visible = visible; + } + } \ No newline at end of file diff --git a/src/main/java/com/fc/test/model/auto/TsysPremissionExample.java b/src/main/java/com/fc/test/model/auto/TsysPermissionExample.java similarity index 96% rename from src/main/java/com/fc/test/model/auto/TsysPremissionExample.java rename to src/main/java/com/fc/test/model/auto/TsysPermissionExample.java index 998cac9f4044da201e2ae50bb7b96c9abfa6080b..4b0322681e9eebec41134626dd8fd290b7b5243b 100644 --- a/src/main/java/com/fc/test/model/auto/TsysPremissionExample.java +++ b/src/main/java/com/fc/test/model/auto/TsysPermissionExample.java @@ -1,930 +1,930 @@ -package com.fc.test.model.auto; - -import java.util.ArrayList; -import java.util.List; - -public class TsysPremissionExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TsysPremissionExample() { - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String 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 values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List 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 andDescripionIsNull() { - addCriterion("descripion is null"); - return (Criteria) this; - } - - public Criteria andDescripionIsNotNull() { - addCriterion("descripion is not null"); - return (Criteria) this; - } - - public Criteria andDescripionEqualTo(String value) { - addCriterion("descripion =", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionNotEqualTo(String value) { - addCriterion("descripion <>", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionGreaterThan(String value) { - addCriterion("descripion >", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionGreaterThanOrEqualTo(String value) { - addCriterion("descripion >=", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionLessThan(String value) { - addCriterion("descripion <", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionLessThanOrEqualTo(String value) { - addCriterion("descripion <=", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionLike(String value) { - addCriterion("descripion like", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionNotLike(String value) { - addCriterion("descripion not like", value, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionIn(List values) { - addCriterion("descripion in", values, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionNotIn(List values) { - addCriterion("descripion not in", values, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionBetween(String value1, String value2) { - addCriterion("descripion between", value1, value2, "descripion"); - return (Criteria) this; - } - - public Criteria andDescripionNotBetween(String value1, String value2) { - addCriterion("descripion not between", value1, value2, "descripion"); - return (Criteria) this; - } - - public Criteria andUrlIsNull() { - addCriterion("url is null"); - return (Criteria) this; - } - - public Criteria andUrlIsNotNull() { - addCriterion("url is not null"); - return (Criteria) this; - } - - public Criteria andUrlEqualTo(String value) { - addCriterion("url =", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotEqualTo(String value) { - addCriterion("url <>", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlGreaterThan(String value) { - addCriterion("url >", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlGreaterThanOrEqualTo(String value) { - addCriterion("url >=", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLessThan(String value) { - addCriterion("url <", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLessThanOrEqualTo(String value) { - addCriterion("url <=", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlLike(String value) { - addCriterion("url like", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotLike(String value) { - addCriterion("url not like", value, "url"); - return (Criteria) this; - } - - public Criteria andUrlIn(List values) { - addCriterion("url in", values, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotIn(List values) { - addCriterion("url not in", values, "url"); - return (Criteria) this; - } - - public Criteria andUrlBetween(String value1, String value2) { - addCriterion("url between", value1, value2, "url"); - return (Criteria) this; - } - - public Criteria andUrlNotBetween(String value1, String value2) { - addCriterion("url not between", value1, value2, "url"); - return (Criteria) this; - } - - public Criteria andIsBlankIsNull() { - addCriterion("is_blank is null"); - return (Criteria) this; - } - - public Criteria andIsBlankIsNotNull() { - addCriterion("is_blank is not null"); - return (Criteria) this; - } - - public Criteria andIsBlankEqualTo(Integer value) { - addCriterion("is_blank =", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankNotEqualTo(Integer value) { - addCriterion("is_blank <>", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankGreaterThan(Integer value) { - addCriterion("is_blank >", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankGreaterThanOrEqualTo(Integer value) { - addCriterion("is_blank >=", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankLessThan(Integer value) { - addCriterion("is_blank <", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankLessThanOrEqualTo(Integer value) { - addCriterion("is_blank <=", value, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankIn(List values) { - addCriterion("is_blank in", values, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankNotIn(List values) { - addCriterion("is_blank not in", values, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankBetween(Integer value1, Integer value2) { - addCriterion("is_blank between", value1, value2, "isBlank"); - return (Criteria) this; - } - - public Criteria andIsBlankNotBetween(Integer value1, Integer value2) { - addCriterion("is_blank not between", value1, value2, "isBlank"); - return (Criteria) this; - } - - public Criteria andPidIsNull() { - addCriterion("pid is null"); - return (Criteria) this; - } - - public Criteria andPidIsNotNull() { - addCriterion("pid is not null"); - return (Criteria) this; - } - - public Criteria andPidEqualTo(String value) { - addCriterion("pid =", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotEqualTo(String value) { - addCriterion("pid <>", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidGreaterThan(String value) { - addCriterion("pid >", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidGreaterThanOrEqualTo(String value) { - addCriterion("pid >=", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLessThan(String value) { - addCriterion("pid <", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLessThanOrEqualTo(String value) { - addCriterion("pid <=", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidLike(String value) { - addCriterion("pid like", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotLike(String value) { - addCriterion("pid not like", value, "pid"); - return (Criteria) this; - } - - public Criteria andPidIn(List values) { - addCriterion("pid in", values, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotIn(List values) { - addCriterion("pid not in", values, "pid"); - return (Criteria) this; - } - - public Criteria andPidBetween(String value1, String value2) { - addCriterion("pid between", value1, value2, "pid"); - return (Criteria) this; - } - - public Criteria andPidNotBetween(String value1, String value2) { - addCriterion("pid not between", value1, value2, "pid"); - return (Criteria) this; - } - - public Criteria andPermsIsNull() { - addCriterion("perms is null"); - return (Criteria) this; - } - - public Criteria andPermsIsNotNull() { - addCriterion("perms is not null"); - return (Criteria) this; - } - - public Criteria andPermsEqualTo(String value) { - addCriterion("perms =", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsNotEqualTo(String value) { - addCriterion("perms <>", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsGreaterThan(String value) { - addCriterion("perms >", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsGreaterThanOrEqualTo(String value) { - addCriterion("perms >=", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsLessThan(String value) { - addCriterion("perms <", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsLessThanOrEqualTo(String value) { - addCriterion("perms <=", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsLike(String value) { - addCriterion("perms like", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsNotLike(String value) { - addCriterion("perms not like", value, "perms"); - return (Criteria) this; - } - - public Criteria andPermsIn(List values) { - addCriterion("perms in", values, "perms"); - return (Criteria) this; - } - - public Criteria andPermsNotIn(List values) { - addCriterion("perms not in", values, "perms"); - return (Criteria) this; - } - - public Criteria andPermsBetween(String value1, String value2) { - addCriterion("perms between", value1, value2, "perms"); - return (Criteria) this; - } - - public Criteria andPermsNotBetween(String value1, String value2) { - addCriterion("perms not between", value1, value2, "perms"); - 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(Integer value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Integer value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Integer value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Integer value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Integer value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Integer value1, Integer value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Integer value1, Integer value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andIconIsNull() { - addCriterion("icon is null"); - return (Criteria) this; - } - - public Criteria andIconIsNotNull() { - addCriterion("icon is not null"); - return (Criteria) this; - } - - public Criteria andIconEqualTo(String value) { - addCriterion("icon =", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotEqualTo(String value) { - addCriterion("icon <>", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconGreaterThan(String value) { - addCriterion("icon >", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconGreaterThanOrEqualTo(String value) { - addCriterion("icon >=", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLessThan(String value) { - addCriterion("icon <", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLessThanOrEqualTo(String value) { - addCriterion("icon <=", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconLike(String value) { - addCriterion("icon like", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotLike(String value) { - addCriterion("icon not like", value, "icon"); - return (Criteria) this; - } - - public Criteria andIconIn(List values) { - addCriterion("icon in", values, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotIn(List values) { - addCriterion("icon not in", values, "icon"); - return (Criteria) this; - } - - public Criteria andIconBetween(String value1, String value2) { - addCriterion("icon between", value1, value2, "icon"); - return (Criteria) this; - } - - public Criteria andIconNotBetween(String value1, String value2) { - addCriterion("icon not between", value1, value2, "icon"); - return (Criteria) this; - } - - public Criteria andOrderNumIsNull() { - addCriterion("order_num is null"); - return (Criteria) this; - } - - public Criteria andOrderNumIsNotNull() { - addCriterion("order_num is not null"); - return (Criteria) this; - } - - public Criteria andOrderNumEqualTo(Integer value) { - addCriterion("order_num =", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotEqualTo(Integer value) { - addCriterion("order_num <>", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumGreaterThan(Integer value) { - addCriterion("order_num >", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumGreaterThanOrEqualTo(Integer value) { - addCriterion("order_num >=", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLessThan(Integer value) { - addCriterion("order_num <", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumLessThanOrEqualTo(Integer value) { - addCriterion("order_num <=", value, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumIn(List values) { - addCriterion("order_num in", values, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotIn(List values) { - addCriterion("order_num not in", values, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumBetween(Integer value1, Integer value2) { - addCriterion("order_num between", value1, value2, "orderNum"); - return (Criteria) this; - } - - public Criteria andOrderNumNotBetween(Integer value1, Integer value2) { - addCriterion("order_num not between", value1, value2, "orderNum"); - return (Criteria) this; - } - - public Criteria andVisibleIsNull() { - addCriterion("visible is null"); - return (Criteria) this; - } - - public Criteria andVisibleIsNotNull() { - addCriterion("visible is not null"); - return (Criteria) this; - } - - public Criteria andVisibleEqualTo(Integer value) { - addCriterion("visible =", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleNotEqualTo(Integer value) { - addCriterion("visible <>", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleGreaterThan(Integer value) { - addCriterion("visible >", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleGreaterThanOrEqualTo(Integer value) { - addCriterion("visible >=", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleLessThan(Integer value) { - addCriterion("visible <", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleLessThanOrEqualTo(Integer value) { - addCriterion("visible <=", value, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleIn(List values) { - addCriterion("visible in", values, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleNotIn(List values) { - addCriterion("visible not in", values, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleBetween(Integer value1, Integer value2) { - addCriterion("visible between", value1, value2, "visible"); - return (Criteria) this; - } - - public Criteria andVisibleNotBetween(Integer value1, Integer value2) { - addCriterion("visible not between", value1, value2, "visible"); - 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); - } - } +package com.fc.test.model.auto; + +import java.util.ArrayList; +import java.util.List; + +public class TsysPermissionExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TsysPermissionExample() { + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String 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 values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List 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 andDescripionIsNull() { + addCriterion("descripion is null"); + return (Criteria) this; + } + + public Criteria andDescripionIsNotNull() { + addCriterion("descripion is not null"); + return (Criteria) this; + } + + public Criteria andDescripionEqualTo(String value) { + addCriterion("descripion =", value, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionNotEqualTo(String value) { + addCriterion("descripion <>", value, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionGreaterThan(String value) { + addCriterion("descripion >", value, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionGreaterThanOrEqualTo(String value) { + addCriterion("descripion >=", value, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionLessThan(String value) { + addCriterion("descripion <", value, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionLessThanOrEqualTo(String value) { + addCriterion("descripion <=", value, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionLike(String value) { + addCriterion("descripion like", value, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionNotLike(String value) { + addCriterion("descripion not like", value, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionIn(List values) { + addCriterion("descripion in", values, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionNotIn(List values) { + addCriterion("descripion not in", values, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionBetween(String value1, String value2) { + addCriterion("descripion between", value1, value2, "descripion"); + return (Criteria) this; + } + + public Criteria andDescripionNotBetween(String value1, String value2) { + addCriterion("descripion not between", value1, value2, "descripion"); + return (Criteria) this; + } + + public Criteria andUrlIsNull() { + addCriterion("url is null"); + return (Criteria) this; + } + + public Criteria andUrlIsNotNull() { + addCriterion("url is not null"); + return (Criteria) this; + } + + public Criteria andUrlEqualTo(String value) { + addCriterion("url =", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotEqualTo(String value) { + addCriterion("url <>", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlGreaterThan(String value) { + addCriterion("url >", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlGreaterThanOrEqualTo(String value) { + addCriterion("url >=", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLessThan(String value) { + addCriterion("url <", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLessThanOrEqualTo(String value) { + addCriterion("url <=", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLike(String value) { + addCriterion("url like", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotLike(String value) { + addCriterion("url not like", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlIn(List values) { + addCriterion("url in", values, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotIn(List values) { + addCriterion("url not in", values, "url"); + return (Criteria) this; + } + + public Criteria andUrlBetween(String value1, String value2) { + addCriterion("url between", value1, value2, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotBetween(String value1, String value2) { + addCriterion("url not between", value1, value2, "url"); + return (Criteria) this; + } + + public Criteria andIsBlankIsNull() { + addCriterion("is_blank is null"); + return (Criteria) this; + } + + public Criteria andIsBlankIsNotNull() { + addCriterion("is_blank is not null"); + return (Criteria) this; + } + + public Criteria andIsBlankEqualTo(Integer value) { + addCriterion("is_blank =", value, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankNotEqualTo(Integer value) { + addCriterion("is_blank <>", value, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankGreaterThan(Integer value) { + addCriterion("is_blank >", value, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankGreaterThanOrEqualTo(Integer value) { + addCriterion("is_blank >=", value, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankLessThan(Integer value) { + addCriterion("is_blank <", value, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankLessThanOrEqualTo(Integer value) { + addCriterion("is_blank <=", value, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankIn(List values) { + addCriterion("is_blank in", values, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankNotIn(List values) { + addCriterion("is_blank not in", values, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankBetween(Integer value1, Integer value2) { + addCriterion("is_blank between", value1, value2, "isBlank"); + return (Criteria) this; + } + + public Criteria andIsBlankNotBetween(Integer value1, Integer value2) { + addCriterion("is_blank not between", value1, value2, "isBlank"); + return (Criteria) this; + } + + public Criteria andPidIsNull() { + addCriterion("pid is null"); + return (Criteria) this; + } + + public Criteria andPidIsNotNull() { + addCriterion("pid is not null"); + return (Criteria) this; + } + + public Criteria andPidEqualTo(String value) { + addCriterion("pid =", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotEqualTo(String value) { + addCriterion("pid <>", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidGreaterThan(String value) { + addCriterion("pid >", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidGreaterThanOrEqualTo(String value) { + addCriterion("pid >=", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidLessThan(String value) { + addCriterion("pid <", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidLessThanOrEqualTo(String value) { + addCriterion("pid <=", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidLike(String value) { + addCriterion("pid like", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotLike(String value) { + addCriterion("pid not like", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidIn(List values) { + addCriterion("pid in", values, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotIn(List values) { + addCriterion("pid not in", values, "pid"); + return (Criteria) this; + } + + public Criteria andPidBetween(String value1, String value2) { + addCriterion("pid between", value1, value2, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotBetween(String value1, String value2) { + addCriterion("pid not between", value1, value2, "pid"); + return (Criteria) this; + } + + public Criteria andPermsIsNull() { + addCriterion("perms is null"); + return (Criteria) this; + } + + public Criteria andPermsIsNotNull() { + addCriterion("perms is not null"); + return (Criteria) this; + } + + public Criteria andPermsEqualTo(String value) { + addCriterion("perms =", value, "perms"); + return (Criteria) this; + } + + public Criteria andPermsNotEqualTo(String value) { + addCriterion("perms <>", value, "perms"); + return (Criteria) this; + } + + public Criteria andPermsGreaterThan(String value) { + addCriterion("perms >", value, "perms"); + return (Criteria) this; + } + + public Criteria andPermsGreaterThanOrEqualTo(String value) { + addCriterion("perms >=", value, "perms"); + return (Criteria) this; + } + + public Criteria andPermsLessThan(String value) { + addCriterion("perms <", value, "perms"); + return (Criteria) this; + } + + public Criteria andPermsLessThanOrEqualTo(String value) { + addCriterion("perms <=", value, "perms"); + return (Criteria) this; + } + + public Criteria andPermsLike(String value) { + addCriterion("perms like", value, "perms"); + return (Criteria) this; + } + + public Criteria andPermsNotLike(String value) { + addCriterion("perms not like", value, "perms"); + return (Criteria) this; + } + + public Criteria andPermsIn(List values) { + addCriterion("perms in", values, "perms"); + return (Criteria) this; + } + + public Criteria andPermsNotIn(List values) { + addCriterion("perms not in", values, "perms"); + return (Criteria) this; + } + + public Criteria andPermsBetween(String value1, String value2) { + addCriterion("perms between", value1, value2, "perms"); + return (Criteria) this; + } + + public Criteria andPermsNotBetween(String value1, String value2) { + addCriterion("perms not between", value1, value2, "perms"); + 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(Integer value) { + addCriterion("type =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Integer value) { + addCriterion("type <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Integer value) { + addCriterion("type >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("type >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Integer value) { + addCriterion("type <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Integer value) { + addCriterion("type <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("type not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Integer value1, Integer value2) { + addCriterion("type between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Integer value1, Integer value2) { + addCriterion("type not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andIconIsNull() { + addCriterion("icon is null"); + return (Criteria) this; + } + + public Criteria andIconIsNotNull() { + addCriterion("icon is not null"); + return (Criteria) this; + } + + public Criteria andIconEqualTo(String value) { + addCriterion("icon =", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotEqualTo(String value) { + addCriterion("icon <>", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconGreaterThan(String value) { + addCriterion("icon >", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconGreaterThanOrEqualTo(String value) { + addCriterion("icon >=", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLessThan(String value) { + addCriterion("icon <", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLessThanOrEqualTo(String value) { + addCriterion("icon <=", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLike(String value) { + addCriterion("icon like", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotLike(String value) { + addCriterion("icon not like", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconIn(List values) { + addCriterion("icon in", values, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotIn(List values) { + addCriterion("icon not in", values, "icon"); + return (Criteria) this; + } + + public Criteria andIconBetween(String value1, String value2) { + addCriterion("icon between", value1, value2, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotBetween(String value1, String value2) { + addCriterion("icon not between", value1, value2, "icon"); + return (Criteria) this; + } + + public Criteria andOrderNumIsNull() { + addCriterion("order_num is null"); + return (Criteria) this; + } + + public Criteria andOrderNumIsNotNull() { + addCriterion("order_num is not null"); + return (Criteria) this; + } + + public Criteria andOrderNumEqualTo(Integer value) { + addCriterion("order_num =", value, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumNotEqualTo(Integer value) { + addCriterion("order_num <>", value, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumGreaterThan(Integer value) { + addCriterion("order_num >", value, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumGreaterThanOrEqualTo(Integer value) { + addCriterion("order_num >=", value, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumLessThan(Integer value) { + addCriterion("order_num <", value, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumLessThanOrEqualTo(Integer value) { + addCriterion("order_num <=", value, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumIn(List values) { + addCriterion("order_num in", values, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumNotIn(List values) { + addCriterion("order_num not in", values, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumBetween(Integer value1, Integer value2) { + addCriterion("order_num between", value1, value2, "orderNum"); + return (Criteria) this; + } + + public Criteria andOrderNumNotBetween(Integer value1, Integer value2) { + addCriterion("order_num not between", value1, value2, "orderNum"); + return (Criteria) this; + } + + public Criteria andVisibleIsNull() { + addCriterion("visible is null"); + return (Criteria) this; + } + + public Criteria andVisibleIsNotNull() { + addCriterion("visible is not null"); + return (Criteria) this; + } + + public Criteria andVisibleEqualTo(Integer value) { + addCriterion("visible =", value, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleNotEqualTo(Integer value) { + addCriterion("visible <>", value, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleGreaterThan(Integer value) { + addCriterion("visible >", value, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleGreaterThanOrEqualTo(Integer value) { + addCriterion("visible >=", value, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleLessThan(Integer value) { + addCriterion("visible <", value, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleLessThanOrEqualTo(Integer value) { + addCriterion("visible <=", value, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleIn(List values) { + addCriterion("visible in", values, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleNotIn(List values) { + addCriterion("visible not in", values, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleBetween(Integer value1, Integer value2) { + addCriterion("visible between", value1, value2, "visible"); + return (Criteria) this; + } + + public Criteria andVisibleNotBetween(Integer value1, Integer value2) { + addCriterion("visible not between", value1, value2, "visible"); + 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); + } + } } \ No newline at end of file diff --git a/src/main/java/com/fc/test/model/custom/PremissionTreeModelVo.java b/src/main/java/com/fc/test/model/custom/PermissionTreeModelVo.java similarity index 30% rename from src/main/java/com/fc/test/model/custom/PremissionTreeModelVo.java rename to src/main/java/com/fc/test/model/custom/PermissionTreeModelVo.java index e0ec7d4f428b5ee4732626359f25be33a54d68da..d5b148b283a2a42030af6f5594cf9f21af920931 100644 --- a/src/main/java/com/fc/test/model/custom/PremissionTreeModelVo.java +++ b/src/main/java/com/fc/test/model/custom/PermissionTreeModelVo.java @@ -2,42 +2,42 @@ package com.fc.test.model.custom; import java.util.List; -import com.fc.test.model.auto.TsysPremission; +import com.fc.test.model.auto.TsysPermission; /** * 权限树 * @author fuce * @date: 2018年9月8日 下午6:40:29 */ -public class PremissionTreeModelVo{ - private TsysPremission tsysPremission; +public class PermissionTreeModelVo { + private TsysPermission tsysPermission; - List childList;//子类 + List childList;//子类 - public TsysPremission getTsysPremission() { - return tsysPremission; + public TsysPermission getTsysPermission() { + return tsysPermission; } - public void setTsysPremission(TsysPremission tsysPremission) { - this.tsysPremission = tsysPremission; + public void setTsysPermission(TsysPermission tsysPermission) { + this.tsysPermission = tsysPermission; } - public List getChildList() { + public List getChildList() { return childList; } - public void setChildList(List childList) { + public void setChildList(List childList) { this.childList = childList; } - public PremissionTreeModelVo(TsysPremission tsysPremission, - List childList) { + public PermissionTreeModelVo(TsysPermission tsysPermission, + List childList) { super(); - this.tsysPremission = tsysPremission; + this.tsysPermission = tsysPermission; this.childList = childList; } - public PremissionTreeModelVo() { + public PermissionTreeModelVo() { super(); } diff --git a/src/main/java/com/fc/test/service/SysPremissionService.java b/src/main/java/com/fc/test/service/SysPermissionService.java similarity index 60% rename from src/main/java/com/fc/test/service/SysPremissionService.java rename to src/main/java/com/fc/test/service/SysPermissionService.java index 50fca875815f58bf29391575cea743c755b32849..f9715b7d5c39412041172caf98689aab39846ac1 100644 --- a/src/main/java/com/fc/test/service/SysPremissionService.java +++ b/src/main/java/com/fc/test/service/SysPermissionService.java @@ -4,30 +4,31 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; + import com.fc.test.common.base.BaseService; import com.fc.test.common.support.Convert; +import com.fc.test.mapper.auto.TsysPermissionMapper; import com.fc.test.mapper.auto.TsysPermissionRoleMapper; -import com.fc.test.mapper.auto.TsysPremissionMapper; import com.fc.test.mapper.custom.PermissionDao; +import com.fc.test.model.auto.TsysPermission; +import com.fc.test.model.auto.TsysPermissionExample; import com.fc.test.model.auto.TsysPermissionRole; import com.fc.test.model.auto.TsysPermissionRoleExample; -import com.fc.test.model.auto.TsysPremission; -import com.fc.test.model.auto.TsysPremissionExample; import com.fc.test.model.custom.BootstrapTree; import com.fc.test.model.custom.Tablepar; import com.fc.test.util.SnowflakeIdWorker; import com.fc.test.util.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; @Service -public class SysPremissionService implements BaseService{ +public class SysPermissionService implements BaseService{ //权限mapper @Autowired - private TsysPremissionMapper tsysPremissionMapper; + private TsysPermissionMapper tsysPermissionMapper; //权限自定义dao @Autowired @@ -42,26 +43,26 @@ public class SysPremissionService implements BaseService list(Tablepar tablepar,String searchTxt){ - TsysPremissionExample testExample=new TsysPremissionExample(); + public PageInfo list(Tablepar tablepar, String searchTxt){ + TsysPermissionExample testExample=new TsysPermissionExample(); testExample.setOrderByClause("id+0 DESC"); if(searchTxt!=null&&!"".equals(searchTxt)){ testExample.createCriteria().andNameLike("%"+searchTxt+"%"); } PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize()); - List list= tsysPremissionMapper.selectByExample(testExample); - PageInfo pageInfo = new PageInfo(list); + List list= tsysPermissionMapper.selectByExample(testExample); + PageInfo pageInfo = new PageInfo(list); return pageInfo; } - public List list2(String searchTxt){ - TsysPremissionExample testExample=new TsysPremissionExample(); + public List list2(String searchTxt){ + TsysPermissionExample testExample=new TsysPermissionExample(); testExample.setOrderByClause("id+0 asc"); if(searchTxt!=null&&!"".equals(searchTxt)){ testExample.createCriteria().andNameLike("%"+searchTxt+"%"); } - List list= tsysPremissionMapper.selectByExample(testExample); + List list= tsysPermissionMapper.selectByExample(testExample); return list; } @@ -81,19 +82,19 @@ public class SysPremissionService implements BaseService tsysPremissions= tsysPremissionMapper.selectByExample(example); + List tsysPermissions = tsysPermissionMapper.selectByExample(example); boolean lag=false; - for (TsysPremission tsysPremission : tsysPremissions) { - if(tsysPremission.getChildCount()>0) { + for (TsysPermission tsysPermission : tsysPermissions) { + if(tsysPermission.getChildCount()>0) { lag=true; } } if(lag) {//有子集 无法删除 return -1; }else {//删除操作 - int i=tsysPremissionMapper.deleteByExample(example); + int i=tsysPermissionMapper.deleteByExample(example); if(i>0) {//删除成功 return 1; }else {//删除失败 @@ -106,7 +107,7 @@ public class SysPremissionService implements BaseService selectByExample(TsysPremissionExample example) { + public List selectByExample(TsysPermissionExample example) { - return tsysPremissionMapper.selectByExample(example); + return tsysPermissionMapper.selectByExample(example); } @Override - public long countByExample(TsysPremissionExample example) { + public long countByExample(TsysPermissionExample example) { - return tsysPremissionMapper.countByExample(example); + return tsysPermissionMapper.countByExample(example); } @Override - public int deleteByExample(TsysPremissionExample example) { + public int deleteByExample(TsysPermissionExample example) { - return tsysPremissionMapper.deleteByExample(example); + return tsysPermissionMapper.deleteByExample(example); } /** @@ -189,10 +190,10 @@ public class SysPremissionService implements BaseService list=tsysPremissionMapper.selectByExample(example); + public int checkNameUnique(TsysPermission tsysPermission){ + TsysPermissionExample example=new TsysPermissionExample(); + example.createCriteria().andNameEqualTo(tsysPermission.getName()); + List list=tsysPermissionMapper.selectByExample(example); return list.size(); } @@ -201,10 +202,10 @@ public class SysPremissionService implements BaseService list=tsysPremissionMapper.selectByExample(example); + public int checkURLUnique(TsysPermission tsysPermission){ + TsysPermissionExample example=new TsysPermissionExample(); + example.createCriteria().andUrlEqualTo(tsysPermission.getUrl()); + List list=tsysPermissionMapper.selectByExample(example); return list.size(); } @@ -213,10 +214,10 @@ public class SysPremissionService implements BaseService list=tsysPremissionMapper.selectByExample(example); + public int checkPermsUnique(TsysPermission tsysPermission){ + TsysPermissionExample example=new TsysPermissionExample(); + example.createCriteria().andPermsEqualTo(tsysPermission.getPerms()); + List list=tsysPermissionMapper.selectByExample(example); return list.size(); } @@ -226,10 +227,10 @@ public class SysPremissionService implements BaseService queryPid(String pid,int type){ - TsysPremissionExample example=new TsysPremissionExample(); + public List queryPid(String pid, int type){ + TsysPermissionExample example=new TsysPermissionExample(); example.createCriteria().andPidEqualTo(pid).andTypeEqualTo(type); - return tsysPremissionMapper.selectByExample(example); + return tsysPermissionMapper.selectByExample(example); } /** @@ -238,7 +239,7 @@ public class SysPremissionService implements BaseService treeList = new ArrayList(); - List menuList = getall(userid); + List menuList = getall(userid); treeList = getbooBootstrapTreePerm(menuList,"0"); if(treeList!=null&&treeList.size()==1) { return treeList.get(0); @@ -254,12 +255,12 @@ public class SysPremissionService implements BaseService getbooBootstrapTreePerm(List menuList,String parentId){ + private static List getbooBootstrapTreePerm(List menuList, String parentId){ List treeList = new ArrayList<>(); List childList = null; - for(TsysPremission p : menuList) { + for(TsysPermission p : menuList) { p.setPid(p.getPid()==null||p.getPid().trim().equals("")?"0":p.getPid()); - if(p.getPid().toString().trim().equals(parentId)) { + if(p.getPid().trim().equals(parentId)) { if(p.getChildCount()!=null&&p.getChildCount()>0) { childList = getbooBootstrapTreePerm(menuList, String.valueOf(p.getId())); } @@ -275,11 +276,11 @@ public class SysPremissionService implements BaseService getall(String userid){ + public List getall(String userid){ if(StringUtils.isEmpty(userid)) { - TsysPremissionExample example = new TsysPremissionExample(); + TsysPermissionExample example = new TsysPermissionExample(); example.setOrderByClause("order_num asc"); - return tsysPremissionMapper.selectByExample(example); + return tsysPermissionMapper.selectByExample(example); } return permissionDao.findByAdminUserId(userid); } @@ -290,12 +291,12 @@ public class SysPremissionService implements BaseService myTsysPremissions,BootstrapTree sysPremission){ - for (TsysPremission mytsysPremission : myTsysPremissions) { - if(sysPremission.getId().equals(mytsysPremission.getId())){ + public Boolean ifpermissions(List myTsysPermissions, BootstrapTree sysPremission){ + for (TsysPermission mytsysPermission : myTsysPermissions) { + if(sysPremission.getId().equals(mytsysPermission.getId())){ return true; } } @@ -314,10 +315,10 @@ public class SysPremissionService implements BaseService myTsysPremissions = permissionDao.queryRoleId(roleid); + List myTsysPermissions = permissionDao.queryRoleId(roleid); // 获取所有的权限 BootstrapTree sysPremissions = getbooBootstrapTreePerm(null); - iterationCheckPre(sysPremissions, myTsysPremissions, map); + iterationCheckPre(sysPremissions, myTsysPermissions, map); return sysPremissions; } @@ -325,22 +326,22 @@ public class SysPremissionService implements BaseService myTsysPremissions,Map map) { + public void iterationCheckPre(BootstrapTree pboostrapTree, List myTsysPermissions, Map map) { if(null!=pboostrapTree) { - if (ifpermissions(myTsysPremissions, pboostrapTree)) { + if (ifpermissions(myTsysPermissions, pboostrapTree)) { pboostrapTree.setState(map); } List bootstrapTreeList = pboostrapTree.getNodes(); if(null!=bootstrapTreeList&&!bootstrapTreeList.isEmpty()) { for(BootstrapTree bootstrapTree : bootstrapTreeList) { - if (ifpermissions(myTsysPremissions, bootstrapTree)) {// 菜单栏设置 + if (ifpermissions(myTsysPermissions, bootstrapTree)) {// 菜单栏设置 bootstrapTree.setState(map); } //检查子节点 - iterationCheckPre(bootstrapTree, myTsysPremissions, map); + iterationCheckPre(bootstrapTree, myTsysPermissions, map); } } } @@ -354,14 +355,11 @@ public class SysPremissionService implements BaseService list= tsysPremissionMapper.selectByExample(example); - if(list.size()>0) { - return true; - } - return false; - } + List list= tsysPermissionMapper.selectByExample(example); + return list.size() > 0; + } } diff --git a/src/main/java/com/fc/test/shiro/service/MyShiroRealm.java b/src/main/java/com/fc/test/shiro/service/MyShiroRealm.java index c058bbbb615d2548518bf3143c106cc8b018a86d..e35e851354c37e20e2acdccd62acda9faf9f0762 100644 --- a/src/main/java/com/fc/test/shiro/service/MyShiroRealm.java +++ b/src/main/java/com/fc/test/shiro/service/MyShiroRealm.java @@ -2,6 +2,13 @@ package com.fc.test.shiro.service; import java.util.List; +import com.fc.test.mapper.custom.PermissionDao; +import com.fc.test.mapper.custom.RoleDao; +import com.fc.test.mapper.custom.TsysUserDao; +import com.fc.test.model.auto.TsysPermission; +import com.fc.test.model.auto.TsysRole; +import com.fc.test.model.auto.TsysUser; +import com.fc.test.util.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; @@ -14,13 +21,6 @@ import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.fc.test.mapper.custom.PermissionDao; -import com.fc.test.mapper.custom.RoleDao; -import com.fc.test.mapper.custom.TsysUserDao; -import com.fc.test.model.auto.TsysPremission; -import com.fc.test.model.auto.TsysRole; -import com.fc.test.model.auto.TsysUser; -import com.fc.test.util.StringUtils; /** * 身份校验核心类 @@ -98,8 +98,8 @@ public class MyShiroRealm extends AuthorizingRealm { //System.out.println("角色名字:"+gson.toJson(userrole)); String rolid=userrole.getId();//角色id authorizationInfo.addRole(userrole.getName());//添加角色名字 - List premissions=permissionDao.queryRoleId(rolid); - for(TsysPremission p:premissions){ + List premissions=permissionDao.queryRoleId(rolid); + for(TsysPermission p:premissions){ //System.out.println("角色下面的权限:"+gson.toJson(p)); if(StringUtils.isNotEmpty(p.getPerms())){ authorizationInfo.addStringPermission(p.getPerms()); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 13e6e4377485052aee45fd36a60026e58c3e4550..2028076a0353f727540dc74b2d1b48961bd966c7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring : driverClassName : com.mysql.jdbc.Driver url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false username: root - password: root + password: admin hikari: maxLifetime: 1765000 maximumPoolSize: 15 diff --git a/src/main/resources/generator/MyBatisGenerator/generator.xml b/src/main/resources/generator/MyBatisGenerator/generator.xml index e9b3fb5fa7d2cc09d3cef3f23ab9612552eb4483..f214638f8fd3f38e7174f274b4fa3180b22bd19a 100644 --- a/src/main/resources/generator/MyBatisGenerator/generator.xml +++ b/src/main/resources/generator/MyBatisGenerator/generator.xml @@ -62,7 +62,7 @@ - +
diff --git a/src/main/resources/mybatis-generator.xml b/src/main/resources/mybatis-generator.xml index 401f2a9705eed1608d7be9e2340fe9eddacc4f0c..b3061cead62e6efec3691dded90582fcda1814ac 100644 --- a/src/main/resources/mybatis-generator.xml +++ b/src/main/resources/mybatis-generator.xml @@ -73,7 +73,7 @@
- +
@@ -83,6 +83,6 @@
--> - +
\ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TsysPremissionMapper.xml b/src/main/resources/mybatis/auto/TsysPremissionMapper.xml index f929c47d121bb7aab948cb3ed78481233d1857f8..0b8b72dee2293ba6f0e81050046d3ab1211036ac 100644 --- a/src/main/resources/mybatis/auto/TsysPremissionMapper.xml +++ b/src/main/resources/mybatis/auto/TsysPremissionMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -78,7 +78,7 @@ id, name, descripion, url, is_blank, pid, perms, type, icon, order_num, visible, (select count(1) from t_sys_premission where pid=a.id) childcount - select distinct @@ -102,13 +102,13 @@ delete from t_sys_premission where id = #{id,jdbcType=VARCHAR} - + delete from t_sys_premission - + insert into t_sys_premission (id, name, descripion, url, is_blank, pid, perms, type, icon, @@ -118,7 +118,7 @@ #{perms,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{icon,jdbcType=VARCHAR}, #{orderNum,jdbcType=INTEGER}, #{visible,jdbcType=INTEGER}) - + insert into t_sys_premission @@ -191,7 +191,7 @@ - select count(*) from t_sys_premission a @@ -255,7 +255,7 @@ - + update t_sys_premission @@ -291,7 +291,7 @@ where id = #{id,jdbcType=VARCHAR} - + update t_sys_premission set name = #{name,jdbcType=VARCHAR}, descripion = #{descripion,jdbcType=VARCHAR}, diff --git a/src/main/resources/mybatis/custom/TsysPremissionMapper.xml b/src/main/resources/mybatis/custom/TsysPremissionMapper.xml index 4421711b4c63f642bdf0e4d292b3cea49167bd9c..eef65c9bec7314e1642695436e22c5e02a8cbfc1 100644 --- a/src/main/resources/mybatis/custom/TsysPremissionMapper.xml +++ b/src/main/resources/mybatis/custom/TsysPremissionMapper.xml @@ -1,7 +1,7 @@ - + @@ -16,12 +16,12 @@ id, `name`, descripion, url, pid, perms, type, icon, order_num - select *,(select count(1) from t_sys_premission where pid=a.id) childcount from t_sys_premission a - select p.*,(select count(1) from t_sys_premission where pid=p.id) childcount from t_sys_user u LEFT JOIN t_sys_role_user sru on u.id= sru.Sys_User_id @@ -31,7 +31,7 @@ where u.id=#{userId} ORDER BY p.order_num ASC - select p.* from t_sys_premission p left join t_sys_permission_role pr on p.id=pr.permission_id where pr.role_id=#{roleid} diff --git a/src/main/resources/templates/admin/premission/edit.html b/src/main/resources/templates/admin/premission/edit.html index bf199e937497d17d61f1ab9500db6ed8b3594f1c..15e5a109b6770efab59d7f6ff2e5df5b64dfa6b9 100644 --- a/src/main/resources/templates/admin/premission/edit.html +++ b/src/main/resources/templates/admin/premission/edit.html @@ -1,52 +1,55 @@ - + - - - - - - + + + + + + - + body { + color: #9ea7b3; + font-family: "Open Sans", Arial, sans-serif !important; + font-size: 13px !important; + line-height: 20px; + overflow-x: hidden !important; + min-height: 100%; + z-index: -2; + margin: 0px !important; + background-image: none; + -moz-background-size: cover; + -webkit-background-size: cover; + -o-background-size: cover; + background-size: cover; + } + + label.error { + position: absolute; + right: 18px; + top: 5px; + color: #ef392b; + font-size: 12px; + } + + .ico-list .fa { + margin: 5px; + padding: 5px; + cursor: pointer; + font-size: 18px; + width: 28px; + border-radius: 3px; + } + + .ico-list .fa:hover { + background-color: #1d9d74; + color: #ffffff; + } + @@ -60,13 +63,13 @@ label.error {
-
+
- - + +
@@ -82,11 +85,11 @@ label.error {
- - + +
-
+
@@ -94,13 +97,13 @@ label.error {
-
+
- +
@@ -125,10 +128,10 @@ label.error { 获取图标：https://fontawesome.com/v4.7.0/icons/ -->
- -
+ +
@@ -140,10 +143,10 @@ label.error {
- +
@@ -162,7 +165,7 @@ label.error {
- +
@@ -177,147 +180,148 @@ label.error {