功能完善

liuhaonan

2022-02-25 6881da4400dba323d6e11a810de0571a7453cfd7

功能完善

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

@@ -10,6 +10,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.param.PoleBindParam;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
import com.sandu.ximon.admin.service.PoleService;
@@ -20,6 +21,7 @@

import java.util.Arrays;
import java.util.List;
import java.util.Map;

/**
 * ç¯æ†æ¨¡å—以及设置分组到对应灯杆
@@ -119,9 +121,8 @@
    }

    @PostMapping("/ClientBindingPole")
    public ResponseVO<Object> ClientBindingPole(@RequestBody long clientId, @RequestBody int[] poleIds) {

        return ResponseUtil.success(poleService.ClientBindingPole(clientId, poleIds));//////////////
    public ResponseVO<Object> ClientBindingPole(@RequestBody PoleBindParam param) {
        return ResponseUtil.success(poleService.ClientBindingPole(param.getClientId(), param.getPoleIds()));//////////////
    }



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

@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -15,6 +16,7 @@
import com.sandu.ximon.admin.service.PoleLightemitService;
import com.sandu.ximon.admin.service.XiXunPlayerService;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -57,10 +59,24 @@
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        LambdaQueryWrapper<PoleXixunPlayerEntity> wrapper = Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).like(PoleXixunPlayerEntity::getProgramName, keyword);
//        if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){
//            boolean clientId = clientService.findClientId();
//            if(clientId){
//                wrapper= wrapper.eq(PoleXixunPlayerEntity::getUserId,SecurityUtils.getUserId());
//            }
//            wrapper= wrapper.eq(PoleXixunPlayerEntity::getClientId,clientService.getClientId());
//        }
//        wrapper=Wrappers.lambdaQuery(PoleXixunPlayerEntity.class);
//        if(StrUtil.isNotBlank(keyword)){
//            wrapper.like(PoleXixunPlayerEntity::getLightemitName,keyword).or(
//                    lambdaQueryWrapper -> {
//                        lambdaQueryWrapper.like(PoleXixunPlayerEntity::getLightemitControlCode, keyword);
//                    }
//            );
//        }
//        return ResponseUtil.success(poleLightemitService.list(wrapper));
        if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
//            clientService.findClientId()
//            wrapper.eq(PoleXixunPlayerEntity::getCreateUserId,)
            //wrapper.eq(LedPlayerEntity::get)

            return ResponseUtil.success(xiXunPlayerService.list(wrapper)); //  todo
        }else {
            return ResponseUtil.success(xiXunPlayerService.list(wrapper));
@@ -85,7 +101,46 @@

        poleLightemitService.savePoleLightemit(poleLightemit);


        return ResponseUtil.success("新增成功");
    }

    @PostMapping("/updateLed/{ledId}")
    public ResponseVO<Object> updatePoleLightemit(@PathVariable Long ledId,@RequestBody PoleLightemitEntity poleLightemit){
        poleLightemitService.updatePoleLightemit(ledId,poleLightemit);
        return ResponseUtil.success("修改成功");
    }

    @PostMapping("/deleteLed")
    public ResponseVO<Object> deleteLed(@RequestBody List<Long> ledIds){
        boolean b = poleLightemitService.deletePoleLightemit(ledIds);
        if(b){
            return ResponseUtil.success("删除成功");
        }else {
            return ResponseUtil.success("删除失败");
        }
    }


    @GetMapping("/listLed")
    public ResponseVO<Object> listLed(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<PoleLightemitEntity> wrapper = Wrappers.lambdaQuery(PoleLightemitEntity.class);
        if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){
            boolean clientId = clientService.findClientId();
            if(clientId){
                wrapper= wrapper.eq(PoleLightemitEntity::getUserId,SecurityUtils.getUserId());
            }
            wrapper= wrapper.eq(PoleLightemitEntity::getClientId,clientService.getClientId());
        }
        wrapper=Wrappers.lambdaQuery(PoleLightemitEntity.class);
        if(StrUtil.isNotBlank(keyword)){
            wrapper.like(PoleLightemitEntity::getLightemitName,keyword).or(
                    lambdaQueryWrapper -> {
                        lambdaQueryWrapper.like(PoleLightemitEntity::getLightemitControlCode, keyword);
                    }
            );
        }
        return ResponseUtil.success(poleLightemitService.list(wrapper));
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/PoleBindParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.sandu.ximon.admin.param;

import lombok.Data;

/**
 * @Author liuhaonan
 * @Date 2022/2/25 14:57
 * @Version 1.0
 */
@Data
public class PoleBindParam {
    private Long clientId;
    private int[] poleIds;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.config.NginxConfigBean;
import com.sandu.ximon.admin.config.RealtimeServerBean;
@@ -190,17 +191,41 @@
    public void savePoleLightemit(PoleLightemitEntity poleLightemit) {
        boolean save = this.save(poleLightemit);
        // ç»‘定灯杆
        if(save&&!("").equals(poleLightemit.getStreetlightId())){

        if(save&&poleLightemit.getStreetlightId()!=null){
            System.out.println("-------------");
        }
      //  poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
    }


  /*  public void updatePoleLightemit(PoleLightemitEntity poleLightemit) {
        this.updateById(poleLightemit);
        poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
    }*/
    public void updatePoleLightemit(Long ledId,PoleLightemitEntity poleLightemit) {
        PoleLightemitEntity byId = getById(ledId);
        if(byId==null){
            throw new BusinessException("未找到LED屏");
        }
        poleLightemit.setLightemitId(ledId);
        boolean b = this.updateById(poleLightemit);
        // ç»‘定灯杆

        if(b&&poleLightemit.getStreetlightId()!=null){
            System.out.println("-------------");
        }
       // poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
    }

    public boolean deletePoleLightemit(List<Long> ledIds) {
        boolean b = removeByIds(ledIds);

        // ç»‘定灯杆

//        if(b&&byId.getStreetlightId()!=null){
//            //删除绑定关系
//            System.out.println("-------------");
//        }
        return b;
        // poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
    }

    /**
     * æŸ¥è¯¢æƒé™èŒƒå›´å†…的所有led屏信息

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java

@@ -11,6 +11,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.JsonUtil;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
@@ -123,7 +124,8 @@
            for (PoleLightemitEntity entity: poleLightemitEntities) {
                lightemitUtils.clear(entity.getLightemitControlCode());
                poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
                lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
                String post = lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
                LogUtils.error("结果:"+post);
            }
        }
    }