fix

zhanzhiqin

2022-05-27 bb36a9a264d971c0a1832e66d4feaf8f6b96dd58

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java

@@ -50,8 +50,8 @@
            wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
        }
        if (!StringUtil.isEmpty(keyword)) {
            wrapper.eq(Client::getId, keyword).or(w -> {
                w.eq(Client::getClientName, keyword);
            wrapper.like(Client::getId, keyword).or(w -> {
                w.like(Client::getClientName, keyword);
            });
        }
        List<Client> list = SpringContextHolder.getBean(ClientService.class).list(wrapper);
@@ -74,12 +74,12 @@
    private final PoleMapper poleMapper;

    @GetMapping("/getPoleList")
    public ResponseVO<Object> getPoleList() {
    public ResponseVO<Object> getPoleList(@RequestParam(required = false, value = "keyword") String keyword) {
        List<Pole> poleList;
        if (SecurityUtils.getClientId() == null) {
            poleList = poleMapper.queryPoleOnLineStatesList(null, null, null, null, null, null);
            poleList = poleMapper.getPoleListOnBinding(null, keyword);
        } else {
            poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(), null, null, null, null, null);
            poleList = poleMapper.getPoleListOnBinding(SecurityUtils.getUserId(), keyword);
        }

        List<Map> mapList = new ArrayList<>();
@@ -99,8 +99,8 @@
    private final LightMapper lightMapper;

    @GetMapping("/getLightList")
    public ResponseVO<Object> getLightList() {
        List<LightBo> listLight = lightMapper.listLight(SecurityUtils.getClientId(), null);
    public ResponseVO<Object> getLightList(@RequestParam(required = false, value = "keyword") String keyword) {
        List<LightBo> listLight = lightMapper.listLightOnBinding(SecurityUtils.getClientId(), keyword);


        List<Map> mapList = new ArrayList<>();
@@ -120,9 +120,9 @@
     * NLED列表(诺瓦设备)
     */
    @GetMapping("/getLedPlayerEntityList")
    public ResponseVO<Object> getLedPlayerEntityList() {
    public ResponseVO<Object> getLedPlayerEntityList(@RequestParam(required = false, value = "keyword") String keyword) {
        List<LedPlayerEntity> list = SpringContextHolder.getBean(LedPlayerEntityService.class).
                ledPlayerEntityList(null, null, null, null);
                ledPlayerEntityListOnBinding(keyword);

        List<Map> mapList = new ArrayList<>();
        Map map;
@@ -145,7 +145,13 @@
     */
    @GetMapping("/getLedFilesList")
    public ResponseVO<Object> getLedFilesList() {
        List<LedSFile> list = SpringContextHolder.getBean(LedSFileService.class).list();
        LambdaQueryWrapper<LedSFile> wrapper = Wrappers.lambdaQuery(LedSFile.class);
        if (SecurityUtils.getClientId() != null) {
            wrapper.eq(LedSFile::getCilentId, SecurityUtils.getUserId()).or(w -> {
                w.eq(LedSFile::getUserId, SecurityUtils.getUserId());
            });
        }
        List<LedSFile> list = SpringContextHolder.getBean(LedSFileService.class).list(wrapper);

        List<Map> mapList = new ArrayList<>();
        Map map;
@@ -168,8 +174,8 @@
    private final LEDProgramService ledProgramService;

    @GetMapping("/getNledProgeamList")
    public ResponseVO<Object> getNledProgeamList() {
        List<LEDProgram> ledPrograms = ledProgramService.listProgram(null, null, null, null);
    public ResponseVO<Object> getNledProgeamList(@RequestParam(required = false, value = "keyword") String keyword) {
        List<LEDProgram> ledPrograms = ledProgramService.listProgramOnBinding(keyword);
        List<Map> mapList = new ArrayList<>();
        Map map;
        for (LEDProgram bean : ledPrograms) {
@@ -190,8 +196,8 @@
    private final PoleLightemitService sLedService;

    @GetMapping("/getSledList")
    public ResponseVO<Object> getSledList() {
        List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLed(null, null, null, false);
    public ResponseVO<Object> getSledList(@RequestParam(required = false, value = "keyword") String keyword) {
        List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLedOnBinding(keyword);
        List<Map> mapList = new ArrayList<>();
        Map map;
        for (PoleLightemitEntity bean : poleLightemitEntities) {
@@ -215,13 +221,13 @@
    private final MonitorMapper monitorMapper;

    @GetMapping("/getMonitorList")
    public ResponseVO<Object> getMonitorList() {
    public ResponseVO<Object> getMonitorList(@RequestParam(required = false, value = "keyword") String keyword) {
        List<MonitorBo> monitorBos;
        //超管
        if (SecurityUtils.getClientId() == null) {
            monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2, null);
            monitorBos = monitorMapper.newListMonitorOnBind(null, keyword);
        } else {
            monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2, null);
            monitorBos = monitorMapper.newListMonitorOnBind(SecurityUtils.getUserId(), keyword);
        }
        List<Map> mapList = new ArrayList<>();
        Map map;
@@ -244,12 +250,8 @@
    private final IpVolumeService ipVolumeService;

    @GetMapping("/getIpVolumeList")
    public ResponseVO<Object> getIpVolumeList() {
        BroadcastTerminalV2Param param = new BroadcastTerminalV2Param();
        param.setBindingState(2);
        param.setKeyword(null);
        param.setWorkState(2);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.getBroadcastTerminalList(null, null, null, param);
    public ResponseVO<Object> getIpVolumeList(@RequestParam(required = false, value = "keyword") String keyword) {
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.newIpTerminalList(keyword);
        List<Map> mapList = new ArrayList<>();
        Map map;
        for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
@@ -271,8 +273,8 @@
    private final IpVolumeFileService ipVolumeFileService;

    @GetMapping("/getIpFileList")
    public ResponseVO<Object> getIpFileList() {
        List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listFiles();
    public ResponseVO<Object> getIpFileList(@RequestParam(required = false, value = "keyword") String keyword) {
        List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listFiles(keyword);
        List<Map> mapList = new ArrayList<>();
        Map map;
        for (IpVolumeFile bean : ipVolumeFiles) {