fix

zhanzhiqin

2022-04-22 1a8340a0bb7dd7cd72bb6ca5fb5a3e3accda2924

fix

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

@@ -8,6 +8,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.param.PoleBindParam;
import com.sandu.ximon.admin.param.PoleBindingParam;
@@ -172,6 +173,12 @@
            //设备类型，0路灯，1led屏幕，2充电桩，3大气监测，4水质监测，5ip音柱，6lcd广告机，7摄像头，8杆体倾测，9一键救助, 10熙讯
            switch (param.getDeviceType()) {
                case 0:
                    //删除灯杆的devicescode
                    Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
                    if (pole != null) {
                        pole.setDeviceCode(null);
                        poleService.updateById(pole);
                    }
                    break;
                case 1:
                    break;

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

@@ -56,12 +56,15 @@
            poleBinding.setDeviceCode(param.getDeviceCode());
            return save(poleBinding);
        } else {
            //删除灯杆的devicescode
            PoleService poleService = SpringContextHolder.getBean(PoleService.class);
            Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, one.getPoleId()));
            if (pole != null) {
                pole.setDeviceCode(null);
                poleService.updateById(pole);
            //修改单灯的绑定关系的时候要额外处理的事务
            // 删除灯杆的devicescode
            if(param.getDeviceType() == 0){
                PoleService poleService = SpringContextHolder.getBean(PoleService.class);
                Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, one.getPoleId()));
                if (pole != null) {
                    pole.setDeviceCode(null);
                    poleService.updateById(pole);
                }
            }

            one.setPoleId(poleId);
@@ -87,16 +90,6 @@
            one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));
        } else {
            one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode).eq(PoleBinding::getPoleId, poleId));

            //删除灯杆的devicescode
            PoleService poleService = SpringContextHolder.getBean(PoleService.class);
            Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
            if (pole != null) {
                pole.setDeviceCode(null);
                poleService.updateById(pole);
            }


        }
        if (one != null) {
            return removeById(one.getId());