LED节目完善

liuhaonan

2021-12-24 4965d8affe8ab2f3302bda6c62f45dc5fd455f93

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

@@ -1,12 +1,8 @@
package com.sandu.ximon.admin.controller;

import cn.hutool.core.util.RadixUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.param.LampPostParam;
@@ -19,35 +15,35 @@
import java.util.List;

/**
 * 灯杆模块以及设置分组到对应灯杆
 * 灯杆模块以及设置分组到对应灯杆   弃用
 */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/LampPost")
public class LampPostController {

    private final LampPostService lampPostService;
    private final LampPostService poleService;

    @GetMapping("/add")
    public ResponseVO<Object> addLampPost(@RequestBody LampPostParam lampPostParam){
        return ResponseUtil.success( lampPostService.addLamp(lampPostParam));
        return ResponseUtil.success( poleService.addLamp(lampPostParam));
    }

    @GetMapping("/update/{id}")
    public ResponseVO<Object> updateLampPost(@PathVariable Long id, @RequestBody LampPostParam lampPostParam){
        return ResponseUtil.success( lampPostService.updateLamp(id,lampPostParam));
        return ResponseUtil.success( poleService.updateLamp(id,lampPostParam));
    }

    @GetMapping("/delete/{id}")
    public ResponseVO<Object> deleteLampPost(@PathVariable Long id){
        return ResponseUtil.success(lampPostService.deleteLampPost(id));
        return ResponseUtil.success(poleService.deleteLampPost(id));
    }



    @PostMapping("/setGroup")
    public ResponseVO<Object> setGroup(@RequestBody GroupParam groupParam){
        lampPostService.setGroup(groupParam.getGroup(), groupParam.getId());
        poleService.setGroup(groupParam.getGroup(), groupParam.getId());
        return ResponseUtil.success("分组设置成功");
    }

@@ -65,7 +61,7 @@
     */
    @PostMapping("/list")
    public ResponseVO<Object> listLamp(){
        return ResponseUtil.success(lampPostService.queryStates());
        return ResponseUtil.success(poleService.queryStates());
    }

    /**
@@ -75,7 +71,7 @@
     */
    @GetMapping("/lightReset/{id}")
    public ResponseVO<Object> LightReset(@PathVariable Long id){
        return ResponseUtil.success(lampPostService.LightReset(id));
        return ResponseUtil.success(poleService.LightReset(id));
    }


@@ -85,12 +81,10 @@
        LambdaQueryWrapper<LampPost> wrapper = Wrappers.lambdaQuery(LampPost.class);
        if(receiveParam.getKeyWord()!=null){
            wrapper.like(LampPost::getLampId,receiveParam.getKeyWord())
                    .or(lampPostLambdaQueryWrapper -> {
                        lampPostLambdaQueryWrapper.like(LampPost::getName,receiveParam.getKeyWord());
                    });
                    .or(lampPostLambdaQueryWrapper -> lampPostLambdaQueryWrapper.like(LampPost::getName,receiveParam.getKeyWord()));
        }
        List<LampPost> lsit=lampPostService.list(wrapper);
        return ResponseUtil.success(lsit);
        List<LampPost> list= poleService.list(wrapper);
        return ResponseUtil.success(list);
    }

}