Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -69,7 +69,6 @@ public class SysDictController {
 	@Autowired
 	public RedisTemplate<String, Object> redisTemplate;
 
-	@RequiresPermissions("sys:dict:list")
 	@RequestMapping(value = "/page", method = RequestMethod.GET)
 	@ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询")
 	public Result<IPage<SysDict>> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -95,8 +94,6 @@ public class SysDictController {
 	 * @param req
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
-	@RequiresPermissions("sys:dict:list")
 	@ApiOperation(value = "字典控制器-树形字典数据", notes = "字典控制器-树形字典数据")
 	@RequestMapping(value = "/treeList", method = RequestMethod.GET)
 	public Result<List<SysDictTree>> treeList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -125,7 +122,6 @@ public class SysDictController {
 	 * @param dictCode 表名,文本字段,code字段  | 举例：sys_user,realname,id
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@ApiOperation(value = "字典控制器-根据字典编码获取字典数据", notes = "字典控制器-根据字典编码获取字典数据")
 	@RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET)
 	public Result<List<DictModel>> getDictItems(@PathVariable String dictCode, @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) {
@@ -177,7 +173,6 @@ public class SysDictController {
 	 *
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@ApiOperation(value = "字典控制器-获取全部字典数据", notes = "字典控制器-获取全部字典数据")
 	@RequestMapping(value = "/queryAllDictItems", method = RequestMethod.GET)
 	public Result<?> queryAllDictItems(HttpServletRequest request) {
@@ -191,7 +186,6 @@ public class SysDictController {
 	 * @param dictCode
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@ApiOperation(value = "字典控制器-通过字典code和字典值key获取字典数据", notes = "字典控制器-通过字典code和字典值key获取字典数据")
 	@RequestMapping(value = "/getDictText/{dictCode}/{key}", method = RequestMethod.GET)
 	public Result<String> getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key) {
@@ -215,7 +209,6 @@ public class SysDictController {
 	 * @param dictCode
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@ApiOperation(value = "字典控制器-通过字典code获取字典数据", notes = "字典控制器-通过字典code获取字典数据")
 	@RequestMapping(value = "/loadDict/{dictCode}", method = RequestMethod.GET)
 	public Result<List<DictModel>> loadDict(@PathVariable String dictCode,
@@ -255,7 +248,6 @@ public class SysDictController {
 	/**
 	 * 根据字典code加载字典text 返回
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@ApiOperation(value = "字典控制器-根据字典code加载字典text", notes = "字典控制器-根据字典code加载字典text")
 	@RequestMapping(value = "/loadDictItem/{dictCode}", method = RequestMethod.GET)
 	public Result<List<String>> loadDictItem(@PathVariable String dictCode, @RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) {
@@ -287,7 +279,6 @@ public class SysDictController {
 	/**
 	 * 根据表名——显示字段-存储字段 pid 加载树形数据
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据")
 	@RequestMapping(value = "/loadTreeData", method = RequestMethod.GET)
 	public Result<List<TreeSelectModel>> loadTreeData(@RequestParam(name="pid") String pid, @RequestParam(name="pidField") String pidField,
@@ -310,7 +301,6 @@ public class SysDictController {
 	/**
 	 * 查询后返回树型数据
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 加载树形数据")
 	@RequestMapping(value = "/queryAllTreeData", method = RequestMethod.GET)
 	public Result<List<TreeSelectModel>> queryAllTreeData(@RequestParam(name="pidField") String pidField,
@@ -334,7 +324,6 @@ public class SysDictController {
 	 * @param sysDict
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:add")
 	@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
 	@RequiresRoles({"admin"})
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
@@ -359,7 +348,6 @@ public class SysDictController {
 	 * @param sysDict
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:edit")
 	@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
 	@RequiresRoles({"admin"})
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
@@ -385,7 +373,6 @@ public class SysDictController {
 	 * @param id
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:del")
 	@ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典")
 	@RequiresRoles({"admin"})
 	@DeleteMapping(value = "/delete")
@@ -406,7 +393,6 @@ public class SysDictController {
 	 * @param ids
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:del")
 	@ApiOperation(value = "字典控制器-批量字典", notes = "字典控制器-批量字典")
 	@DeleteMapping(value = "/deleteBatch")
 	@CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true)
@@ -426,7 +412,6 @@ public class SysDictController {
 	 * @date 修改时间 2021.4.8
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@RequestMapping(value = "/refleshCache")
 	public Result<?> refleshCache() {
 		Result<?> result = new Result<SysDict>();
@@ -439,7 +424,6 @@ public class SysDictController {
 	 *
 	 * @param request
 	 */
-	@RequiresPermissions("sys:dict:export")
 	@RequestMapping(value = "/exportXls")
 	public ModelAndView exportXls(SysDict sysDict, HttpServletRequest request) {
 		// Step.1 组装查询条件
@@ -477,7 +461,6 @@ public class SysDictController {
 	 * @param
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:import")
 	@RequiresRoles({"admin"})
 	@PostMapping(value = "/importExcel")
 	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
@@ -538,7 +521,6 @@ public class SysDictController {
 	 * 查询被删除的列表
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@GetMapping(value = "/deleteList")
 	public Result<List<SysDict>> deleteList() {
 		Result<List<SysDict>> result = new Result<List<SysDict>>();
@@ -553,7 +535,6 @@ public class SysDictController {
 	 * @param id
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@DeleteMapping(value = "/deletePhysic/{id}")
 	public Result<?> deletePhysic(@PathVariable String id) {
 		try {
@@ -570,7 +551,6 @@ public class SysDictController {
 	 * @param id
 	 * @return
 	 */
-	@RequiresPermissions("sys:dict:list")
 	@PutMapping(value = "/back/{id}")
 	public Result<?> back(@PathVariable String id) {
 		try {