diff --git a/src/main/java/com/letian/modules/sys/controller/SysConfigController.java b/src/main/java/com/letian/modules/sys/controller/SysConfigController.java index 277026f..5d7025a 100644 --- a/src/main/java/com/letian/modules/sys/controller/SysConfigController.java +++ b/src/main/java/com/letian/modules/sys/controller/SysConfigController.java @@ -9,7 +9,6 @@ import com.letian.common.utils.R; import com.letian.common.validator.ValidatorUtils; import com.letian.modules.sys.entity.SysConfigEntity; import com.letian.modules.sys.service.SysConfigService; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,7 +29,6 @@ public class SysConfigController extends AbstractController { * 所有配置列表 */ @GetMapping("/list") - @RequiresPermissions("sys:config:list") public R list(@RequestParam Map params){ PageUtils page = sysConfigService.queryPage(params); @@ -42,7 +40,6 @@ public class SysConfigController extends AbstractController { * 配置信息 */ @GetMapping("/info/{id}") - @RequiresPermissions("sys:config:info") public R info(@PathVariable("id") Long id){ SysConfigEntity config = sysConfigService.getById(id); @@ -54,7 +51,6 @@ public class SysConfigController extends AbstractController { */ @SysLog("保存配置") @PostMapping("/save") - @RequiresPermissions("sys:config:save") public R save(@RequestBody SysConfigEntity config){ ValidatorUtils.validateEntity(config); @@ -68,7 +64,6 @@ public class SysConfigController extends AbstractController { */ @SysLog("修改配置") @PostMapping("/update") - @RequiresPermissions("sys:config:update") public R update(@RequestBody SysConfigEntity config){ ValidatorUtils.validateEntity(config); @@ -82,7 +77,6 @@ public class SysConfigController extends AbstractController { */ @SysLog("删除配置") @PostMapping("/delete") - @RequiresPermissions("sys:config:delete") public R delete(@RequestBody Long[] ids){ sysConfigService.deleteBatch(ids); diff --git a/src/main/java/com/letian/modules/sys/controller/SysLogController.java b/src/main/java/com/letian/modules/sys/controller/SysLogController.java index 3209591..de605f2 100644 --- a/src/main/java/com/letian/modules/sys/controller/SysLogController.java +++ b/src/main/java/com/letian/modules/sys/controller/SysLogController.java @@ -5,7 +5,6 @@ package com.letian.modules.sys.controller; import com.letian.common.utils.PageUtils; import com.letian.common.utils.R; import com.letian.modules.sys.service.SysLogService; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -32,7 +31,6 @@ public class SysLogController { */ @ResponseBody @GetMapping("/list") - @RequiresPermissions("sys:log:list") public R list(@RequestParam Map params){ PageUtils page = sysLogService.queryPage(params); diff --git a/src/main/java/com/letian/modules/sys/controller/SysMenuController.java b/src/main/java/com/letian/modules/sys/controller/SysMenuController.java index 97edc21..a38707c 100644 --- a/src/main/java/com/letian/modules/sys/controller/SysMenuController.java +++ b/src/main/java/com/letian/modules/sys/controller/SysMenuController.java @@ -13,7 +13,6 @@ import com.letian.modules.sys.service.ShiroService; import com.letian.modules.sys.service.SysMenuService; import com.letian.modules.sys.service.SysObjectLanguageMenuService; import org.apache.commons.lang.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -50,7 +49,6 @@ public class SysMenuController extends AbstractController { * 所有菜单列表 */ @GetMapping("/list") - @RequiresPermissions("sys:menu:list") public List list(){ List menuList = sysMenuService.list(); for(SysMenuEntity sysMenuEntity : menuList){ @@ -69,7 +67,6 @@ public class SysMenuController extends AbstractController { * 所有菜单列表 */ @GetMapping("/list/{language}") - @RequiresPermissions("sys:menu:list") public List listLanguage(@PathVariable String language){ List menuList = sysMenuService.listLanguage(language);; for(SysMenuEntity sysMenuEntity : menuList){ @@ -87,7 +84,6 @@ public class SysMenuController extends AbstractController { * 选择菜单(添加、修改菜单) */ @GetMapping("/select") - @RequiresPermissions("sys:menu:select") public R select(){ //查询列表数据 List menuList = sysMenuService.queryNotButtonList(); @@ -107,7 +103,6 @@ public class SysMenuController extends AbstractController { * 菜单信息 */ @GetMapping("/info/{menuId}") - @RequiresPermissions("sys:menu:info") public R info(@PathVariable("menuId") Long menuId){ SysMenuEntity menu = sysMenuService.getById(menuId); return R.ok().put("menu", menu); @@ -118,7 +113,6 @@ public class SysMenuController extends AbstractController { */ @SysLog("保存菜单") @PostMapping("/save") - @RequiresPermissions("sys:menu:save") public R save(@RequestBody SysMenuEntityDto menu){ //数据校验 @@ -140,7 +134,6 @@ public class SysMenuController extends AbstractController { */ @SysLog("修改菜单") @PostMapping("/update") - @RequiresPermissions("sys:menu:update") public R update(@RequestBody SysMenuEntity menu){ //数据校验 verifyForm(menu); @@ -154,7 +147,6 @@ public class SysMenuController extends AbstractController { */ @SysLog("删除菜单") @PostMapping("/delete/{menuId}") - @RequiresPermissions("sys:menu:delete") public R delete(@PathVariable("menuId") long menuId){ if(menuId <= 31){ return R.error("系统菜单,不能删除"); diff --git a/src/main/java/com/letian/modules/sys/controller/SysRoleController.java b/src/main/java/com/letian/modules/sys/controller/SysRoleController.java index e8f88dd..93623e9 100644 --- a/src/main/java/com/letian/modules/sys/controller/SysRoleController.java +++ b/src/main/java/com/letian/modules/sys/controller/SysRoleController.java @@ -10,7 +10,6 @@ import com.letian.common.validator.ValidatorUtils; import com.letian.modules.sys.entity.SysRoleEntity; import com.letian.modules.sys.service.SysRoleMenuService; import com.letian.modules.sys.service.SysRoleService; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -35,7 +34,6 @@ public class SysRoleController extends AbstractController { * 角色列表 */ @GetMapping("/list") - @RequiresPermissions("sys:role:list") public R list(@RequestParam Map params){ //如果不是超级管理员,则只查询自己创建的角色列表 if(getUserId() != Constant.SUPER_ADMIN){ @@ -51,7 +49,6 @@ public class SysRoleController extends AbstractController { * 角色列表 */ @GetMapping("/select") - @RequiresPermissions("sys:role:select") public R select(){ Map map = new HashMap<>(); @@ -68,7 +65,6 @@ public class SysRoleController extends AbstractController { * 角色信息 */ @GetMapping("/info/{roleId}") - @RequiresPermissions("sys:role:info") public R info(@PathVariable("roleId") Long roleId){ SysRoleEntity role = sysRoleService.getById(roleId); @@ -84,7 +80,6 @@ public class SysRoleController extends AbstractController { */ @SysLog("保存角色") @PostMapping("/save") - @RequiresPermissions("sys:role:save") public R save(@RequestBody SysRoleEntity role){ ValidatorUtils.validateEntity(role); @@ -99,7 +94,6 @@ public class SysRoleController extends AbstractController { */ @SysLog("修改角色") @PostMapping("/update") - @RequiresPermissions("sys:role:update") public R update(@RequestBody SysRoleEntity role){ ValidatorUtils.validateEntity(role); @@ -114,7 +108,6 @@ public class SysRoleController extends AbstractController { */ @SysLog("删除角色") @PostMapping("/delete") - @RequiresPermissions("sys:role:delete") public R delete(@RequestBody Long[] roleIds){ sysRoleService.deleteBatch(roleIds); diff --git a/src/main/java/com/letian/modules/sys/controller/SysUserController.java b/src/main/java/com/letian/modules/sys/controller/SysUserController.java index 166dda1..8f162dd 100644 --- a/src/main/java/com/letian/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/letian/modules/sys/controller/SysUserController.java @@ -15,7 +15,6 @@ import com.letian.modules.sys.form.PasswordForm; import com.letian.modules.sys.service.SysUserRoleService; import com.letian.modules.sys.service.SysUserService; import org.apache.commons.lang.ArrayUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.crypto.hash.Sha256Hash; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -41,7 +40,6 @@ public class SysUserController extends AbstractController { * 所有用户列表 */ @GetMapping("/list") - @RequiresPermissions("sys:user:list") public R list(@RequestParam Map params){ //只有超级管理员,才能查看所有管理员列表 if(getUserId() != Constant.SUPER_ADMIN){ @@ -99,7 +97,6 @@ public class SysUserController extends AbstractController { * 用户信息 */ @GetMapping("/info/{userId}") - @RequiresPermissions("sys:user:info") public R info(@PathVariable("userId") Long userId){ SysUserEntity user = sysUserService.getById(userId); @@ -115,7 +112,6 @@ public class SysUserController extends AbstractController { */ @SysLog("保存用户") @PostMapping("/save") - @RequiresPermissions("sys:user:save") public R save(@RequestBody SysUserEntity user){ ValidatorUtils.validateEntity(user, AddGroup.class); @@ -130,7 +126,6 @@ public class SysUserController extends AbstractController { */ @SysLog("修改用户") @PostMapping("/update") - @RequiresPermissions("sys:user:update") public R update(@RequestBody SysUserEntity user){ ValidatorUtils.validateEntity(user, UpdateGroup.class); @@ -145,7 +140,6 @@ public class SysUserController extends AbstractController { */ @SysLog("删除用户") @PostMapping("/delete") - @RequiresPermissions("sys:user:delete") public R delete(@RequestBody Long[] userIds){ if(ArrayUtils.contains(userIds, 1L)){ return R.error("系统管理员不能删除"); diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index 3d408fb..ff5c6bd 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -513,14 +513,14 @@ INSERT INTO WorkCenter (Site,WorkCenterNo,WorkCenterDesc,WorkCenterType_DB,WorkCenterType,AverageCapacity,Efficiency,Utilization,CapacityType_DB, -CapacityType,UMID,Active,Remark,CreatedDate,ProLineNo,CanCreateNewRollFlag,NeedSetupFlag) +CapacityType,UMID,Active,Remark,CreatedDate,ProLineNo) values (#{site},#{workCenterNo},#{workCenterDesc},#{workCenterTypeDb},#{workCenterType},0,100,100,'I','无限能力', - #{umid},#{active},#{remark},#{createdDate},#{proLineNo},#{canCreateNewRollFlag},#{needSetupFlag}) + #{umid},#{active},#{remark},#{createdDate},#{proLineNo}) UPDATE WorkCenter SET WorkCenterDesc=#{workCenterDesc},Active=#{active},WorkCenterType=#{workCenterNo},WorkCenterType_DB=#{workCenterTypeDb}, Remark=#{remark},CreatedDate=#{createdDate},ProLineNo=#{proLineNo}, - CanCreateNewRollFlag=#{canCreateNewRollFlag},NeedSetupFlag=#{needSetupFlag} + where WorkCenterNo=#{workCenterNo} and Site=#{site}