Merge remote-tracking branch 'origin/devlop' into devlop

zjj

2 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java

@@ -1,6 +1,8 @@
package com.vincent.rsf.server.manager.controller;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -38,6 +40,24 @@
        return R.ok().add(deviceSiteService.page(pageParam, pageParam.buildWrapper(true)));
    }


    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
    @PostMapping("/selectStaList/page")
    public R selectStaList(@RequestBody Map<String, Object> map) {
        List<String> longs = null;
        if (map.get("type") != null) {
            longs = JSONArray.parseArray(map.get("type").toString(), String.class);
            map.entrySet().removeIf(next -> next.getKey().equals("type"));
        }
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<DeviceSite, BaseParam> pageParam = new PageParam<>(baseParam, DeviceSite.class);

        QueryWrapper<DeviceSite> queryWrapper = pageParam.buildWrapper(true);
        queryWrapper.lambda().in(DeviceSite::getType, longs);
        PageParam<DeviceSite, BaseParam> page = deviceSiteService.page(pageParam, queryWrapper);
        return R.ok().add(page );
    }

    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
    @PostMapping("/deviceSite/list")
    public R list(@RequestBody Map<String, Object> map) {