#

Junjie

1 天以前 2d2fd991826837d7189cc488aee6f309a6f5e216

 src/main/java/com/zy/asrs/controller/BasRgvErrController.java

@@ -2,9 +2,9 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.service.BasRgvErrService;
@@ -27,7 +27,7 @@
    @RequestMapping(value = "/basRgvErr/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(basRgvErrService.selectById(String.valueOf(id)));
        return R.ok(basRgvErrService.getById(String.valueOf(id)));
    }

    @RequestMapping(value = "/basRgvErr/list/auth")
@@ -38,23 +38,24 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<BasRgvErr> wrapper = new EntityWrapper<>();
        QueryWrapper<BasRgvErr> wrapper = new QueryWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasRgvErr.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(basRgvErrService.selectPage(new Page<>(curr, limit), wrapper));
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
        return R.ok(basRgvErrService.page(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
    private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            String column = humpToLine(entry.getKey());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
                wrapper.ge(column, DateUtils.convert(dates[0]));
                wrapper.le(column, DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                wrapper.like(column, val);
            }
        }
    }
@@ -62,7 +63,7 @@
    @RequestMapping(value = "/basRgvErr/add/auth")
    @ManagerAuth
    public R add(BasRgvErr basRgvErr) {
        basRgvErrService.insert(basRgvErr);
        basRgvErrService.save(basRgvErr);
        return R.ok();
    }

@@ -80,7 +81,7 @@
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Integer[] ids){
         for (Integer id : ids){
            basRgvErrService.deleteById(id);
            basRgvErrService.removeById(id);
        }
        return R.ok();
    }
@@ -88,20 +89,20 @@
    @RequestMapping(value = "/basRgvErr/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<BasRgvErr> wrapper = new EntityWrapper<>();
        QueryWrapper<BasRgvErr> wrapper = new QueryWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("basRgvErr"));
        convert(map, wrapper);
        List<BasRgvErr> list = basRgvErrService.selectList(wrapper);
        List<BasRgvErr> list = basRgvErrService.list(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/basRgvErrQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasRgvErr> wrapper = new EntityWrapper<>();
        QueryWrapper<BasRgvErr> wrapper = new QueryWrapper<>();
        wrapper.like("id", condition);
        Page<BasRgvErr> page = basRgvErrService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasRgvErr> page = basRgvErrService.page(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasRgvErr basRgvErr : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
@@ -115,8 +116,8 @@
    @RequestMapping(value = "/basRgvErr/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasRgvErr> wrapper = new EntityWrapper<BasRgvErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basRgvErrService.selectOne(wrapper)){
        QueryWrapper<BasRgvErr> wrapper = new QueryWrapper<BasRgvErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basRgvErrService.getOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(BasRgvErr.class, String.valueOf(param.get("key"))));
        }
        return R.ok();