#

Junjie

2 天以前 13b31b2ca2a5f8600002a042b536c9d5529842e3

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

@@ -1,13 +1,14 @@
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;
import com.core.common.R;
import com.core.controller.AbstractBaseController;
import com.zy.common.i18n.I18nMessageService;
import com.zy.system.entity.Resource;
import com.zy.system.service.ResourceService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,11 +21,13 @@

    @Autowired
    private ResourceService resourceService;
    @Autowired
    private I18nMessageService i18nMessageService;

    @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 +38,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.orderBy(true, false, "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 +66,7 @@
            if (resource.getSort() == null){
                resource.setSort(999);
            }
            resourceService.insert(resource);
            resourceService.save(resource);
        } else {
            resourceService.updateById(resource);
        }
@@ -73,7 +76,7 @@
    @RequestMapping(value = "/resource/add/auth")
    @ManagerAuth(memo = "菜单添加")
    public R add(Resource resource) {
        resourceService.insert(resource);
        resourceService.save(resource);
        return R.ok();
    }

@@ -91,7 +94,7 @@
    @ManagerAuth(memo = "菜单删除")
    public R delete(@RequestParam(value="ids[]") Long[] ids){
        for (Long id : ids){
            resourceService.deleteById(id);
            resourceService.removeById(id);
        }
        return R.ok();
    }
@@ -100,24 +103,29 @@
    @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<>();
            map.put("id", resource.getId());
            map.put("value", resource.getName().concat("(").concat(resource.getLevel$().substring(0, 2).concat(")")));
            String levelText = i18nMessageService.translateLegacy(Cools.isEmpty(resource.getLevel$()) ? "" : resource.getLevel$());
            String localizedName = i18nMessageService.resolveResourceText(resource.getName(), resource.getCode(), resource.getId());
            String shortLevelText = levelText.matches(".*[\\u4E00-\\u9FA5].*")
                    ? levelText.substring(0, Math.min(2, levelText.length()))
                    : levelText;
            map.put("value", localizedName.concat("(").concat(shortLevelText).concat(")"));
            result.add(map);
        }
        return R.ok(result);
@@ -130,14 +138,18 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Resource> wrapper = new EntityWrapper<>();
        QueryWrapper<Resource> wrapper = new QueryWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
        else {
            wrapper.orderBy("sort");
            wrapper.orderBy(true, true, "sort");
        }
        return R.parse("0-操作成功").add(resourceService.selectList(wrapper));
        List<Resource> resources = resourceService.list(wrapper);
        for (Resource resource : resources) {
            resource.setName(i18nMessageService.resolveResourceText(resource.getName(), resource.getCode(), resource.getId()));
        }
        return R.parse("0-操作成功").add(resources);
    }

}