bug修复

liuhaonan

2022-03-14 a788e17b3d47d038b1f3173a111b06cd360cc805

bug修复

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

ÎļþÒÑɾ³ý

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

@@ -4,7 +4,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.service.IPBroadcastService;
import com.sandu.ximon.admin.service.IpVolumeService;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +20,7 @@
@AllArgsConstructor
@RequestMapping("/v1/IPColumn")
public class IPBroadcastController {
    private IPBroadcastService broadcastTerminalV2Service;
    private IpVolumeService broadcastTerminalV2Service;

    @PostMapping("/synchTerminal")
    public ResponseVO<Object> synchTerminal() {

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

@@ -13,7 +13,7 @@
import com.sandu.ximon.admin.param.PoleParam;
import com.sandu.ximon.admin.param.PoleStatesParam;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.admin.service.IPBroadcastService;
import com.sandu.ximon.admin.service.IpVolumeService;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.admin.service.PoleService;
import com.sandu.ximon.dao.domain.Pole;
@@ -35,7 +35,7 @@

    private final PoleService poleService;
    private MonitorService monitorService;
    private IPBroadcastService broadcastTerminalV2Service;
    private IpVolumeService broadcastTerminalV2Service;
    private AirEquipmentService airEquipmentService;

    @PostMapping("/add")

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

@@ -263,7 +263,15 @@
                        );
                    }
            );
            return ResponseUtil.success(list);
            CommonPage commonPage = CommonPage.restPage(list);
            int size = list.size();
            commonPage.setTotal((long) size);
            commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
            if (size % baseConditionVO.getPageSize() == 0) {
                commonPage.setTotalPage(size / baseConditionVO.getPageSize());
            }
            return ResponseUtil.success(commonPage);
           // return ResponseUtil.success(list);
        }
//        return ResponseUtil.success(poleLightemitService.list(wrapper));
    }

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

ÎļþÃû´Ó ximon-admin/src/main/java/com/sandu/ximon/admin/service/IPBroadcastService.java ÐÞ¸Ä
@@ -18,7 +18,7 @@
import java.util.List;

@Service
public class IPBroadcastService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
    //    private final BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalDao;
//    @Autowired
//    private SysUserRoleService sysUserRoleService;

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

@@ -67,4 +67,23 @@
            throw new BusinessException("设备不存在绑定情况或灯杆ID不正确");
        }
    }

    /**
     * è®¾å¤‡åˆ é™¤,直接解绑设备相关绑定数据
     *
     * @param deviceCode
     */
    public boolean unBindPole(String deviceCode) {
        if (deviceCode == null) {
            throw new BusinessException("设备编号不能为空");
        }
        //直接删除设备不需要灯杆ID
        PoleBinding one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));

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

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

@@ -251,7 +251,7 @@
            for (PoleLightemitEntity poleLightemitEntitie : poleLightemitEntities) {
                if (poleLightemitEntitie.getLightemitControlCode() != null) {
                    //删除绑定关系//先删除绑定关系
                    poleBindingService.unBindPole(null, poleLightemitEntitie.getLightemitControlCode());
                    poleBindingService.unBindPole(poleLightemitEntitie.getLightemitControlCode());
                }
            }
        }