对照协议调整

zhangchao

2024-08-30 0cd7adb27af908b7d0ce0db697f9567d77bcbeb2

 src/main/java/com/zy/system/controller/ResourceController.java

@@ -1,8 +1,8 @@
package com.zy.system.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
    @RequestMapping(value = "/resource/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") Long id) {
        return R.ok(resourceService.selectById(String.valueOf(id)));
        return R.ok(resourceService.getById(String.valueOf(id)));
    }

    @RequestMapping(value = "/resource/list/auth")
@@ -35,13 +35,13 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<Resource> wrapper = new EntityWrapper<>();
        QueryWrapper<Resource> wrapper = new QueryWrapper<>();
        convert(param, wrapper);
        wrapper.orderBy("id", false);
        return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
        wrapper.orderByDesc("id");
        return R.ok(resourceService.page(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
    private void convert(Map<String, Object> map, QueryWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -63,7 +63,7 @@
            if (resource.getSort() == null){
                resource.setSort(999);
            }
            resourceService.insert(resource);
            resourceService.save(resource);
        } else {
            resourceService.updateById(resource);
        }
@@ -73,7 +73,7 @@
    @RequestMapping(value = "/resource/add/auth")
    @ManagerAuth(memo = "菜单添加")
    public R add(Resource resource) {
        resourceService.insert(resource);
        resourceService.save(resource);
        return R.ok();
    }

@@ -93,7 +93,7 @@
        if (Cools.isEmpty(ids)){
            return R.error();
        }
        resourceService.deleteBatchIds(Arrays.asList(ids));
        resourceService.removeByIds(Arrays.asList(ids));
        return R.ok();
    }

@@ -101,19 +101,19 @@
    @ManagerAuth(memo = "菜单导出")
    public R export(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<Resource> wrapper = new EntityWrapper<>();
        QueryWrapper<Resource> wrapper = new QueryWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("resource"));
        convert(map, wrapper);
        List<Resource> list = resourceService.selectList(wrapper);
        List<Resource> list = resourceService.list(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/resourceQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Resource> wrapper = new EntityWrapper<>();
        QueryWrapper<Resource> wrapper = new QueryWrapper<>();
        wrapper.like("name", condition);
        Page<Resource> page = resourceService.selectPage(new Page<>(0, 10), wrapper);
        Page<Resource> page = resourceService.page(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Resource resource : page.getRecords()){
            Map<String, Object> map = new HashMap<>();