Junjie
昨天 a4f07b2a0ddb6c210e05afbbb491feeb466203e7
src/main/java/com/zy/asrs/controller/BasDualCrnpController.java
@@ -1,9 +1,9 @@
package com.zy.asrs.controller;
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.BasDualCrnp;
import com.zy.asrs.service.BasDualCrnpService;
@@ -26,7 +26,7 @@
    @RequestMapping(value = "/basDualCrnp/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(basDualCrnpService.selectById(String.valueOf(id)));
        return R.ok(basDualCrnpService.getById(String.valueOf(id)));
    }
    @RequestMapping(value = "/basDualCrnp/list/auth")
@@ -37,15 +37,15 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
        QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasDualCrnp.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(basDualCrnpService.selectPage(new Page<>(curr, limit), wrapper));
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
        return R.ok(basDualCrnpService.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());
            if (val.contains(RANGE_TIME_LINK)){
@@ -61,7 +61,7 @@
    @RequestMapping(value = "/basDualCrnp/add/auth")
    @ManagerAuth
    public R add(BasDualCrnp basDualCrnp) {
        basDualCrnpService.insert(basDualCrnp);
        basDualCrnpService.save(basDualCrnp);
        return R.ok();
    }
@@ -79,7 +79,7 @@
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Integer[] ids){
         for (Integer id : ids){
            basDualCrnpService.deleteById(id);
            basDualCrnpService.removeById(id);
        }
        return R.ok();
    }
@@ -87,20 +87,20 @@
    @RequestMapping(value = "/basDualCrnp/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
        QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnp"));
        convert(map, wrapper);
        List<BasDualCrnp> list = basDualCrnpService.selectList(wrapper);
        List<BasDualCrnp> list = basDualCrnpService.list(wrapper);
        return R.ok(exportSupport(list, fields));
    }
    @RequestMapping(value = "/basDualCrnpQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
        QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<>();
        wrapper.like("crn_no", condition);
        Page<BasDualCrnp> page = basDualCrnpService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasDualCrnp> page = basDualCrnpService.page(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasDualCrnp basDualCrnp : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
@@ -114,8 +114,8 @@
    @RequestMapping(value = "/basDualCrnp/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasDualCrnp> wrapper = new EntityWrapper<BasDualCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basDualCrnpService.selectOne(wrapper)){
        QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<BasDualCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basDualCrnpService.getOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnp.class, String.valueOf(param.get("key"))));
        }
        return R.ok();