首页

liuhaonan

2022-04-21 66566630296de0891f440ce853dddefa30333503

首页

 dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java

@@ -83,7 +83,7 @@
     * 绑定灯杆ID
     */
    @TableField(exist = false)
    private Long streetlightId;
    private Long poleId;

    /**
     * 
@@ -103,6 +103,6 @@
     * 灯杆名称
     */
    @TableField(exist = false)
    private String streetlightName;
    private String poleName;

}

 dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml

@@ -37,11 +37,11 @@
    <select id="listLed" resultType="com.sandu.ximon.dao.domain.PoleLightemitEntity">
        SELECT
        t1.*, t2.pole_id,
        t3.pole_name as streetlight_name , t3.id
        t3.pole_name  , t3.id
        FROM
        pole_lightemit t1
        LEFT JOIN pole_binding t2 ON t1.lightemit_control_code = t2.device_code
        AND t2.device_type = 1
        AND t2.device_type = 10
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        <where>
            <if test="keyword != null and keyword != ''">

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

@@ -1,9 +1,7 @@
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;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
@@ -19,11 +17,8 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

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

@@ -128,12 +128,12 @@
        boolean save = this.save(poleLightemit);
        // 绑定灯杆

        if (save && poleLightemit.getStreetlightId() != null) {
        if (save && poleLightemit.getPoleId() != null) {
            PoleBindingParam poleBindingParam = new PoleBindingParam();
            poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
            poleBindingParam.setDeviceType(1);
            poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
            poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
            poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
        }
        //  poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
    }
@@ -148,7 +148,7 @@
        boolean b = this.updateById(poleLightemit);
        // 绑定灯杆

        if (b && poleLightemit.getStreetlightId() != null) {
        if (b && poleLightemit.getPoleId() != null) {
            //先删除绑定关系
            poleBindingService.unBindPole(null, poleLightemit.getLightemitControlCode());
            //再绑定
@@ -156,7 +156,7 @@
            poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
            poleBindingParam.setDeviceType(1);
            poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
            poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
            poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
        }
        // poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
    }