功能完善

liuhaonan

2022-03-09 592588ea7ad576a53a7d59898cd5edff43675d98

功能完善

 dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastDataMapper.java

ÎļþÃû´Ó dao/src/main/java/com/sandu/ximon/dao/mapper/BroadcastTerminalV2EntityMapper.java ÐÞ¸Ä
@@ -15,7 +15,7 @@
 * @Entity com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity
 */
@Mapper
public interface BroadcastTerminalV2EntityMapper extends BaseMapper<BroadcastTerminalV2Entity> {
public interface IPBroadcastDataMapper extends BaseMapper<BroadcastTerminalV2Entity> {
    List<BroadcastTerminalV2Entity> listAll(@Param("terminalName") String name);
//
    @Insert("insert into broadcast_v2_terminal (id,terminal_name,streetlight_id,exist) values (#{id},#{terminalName},#{streetlightId},#{exist})")

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

ÎļþÃû´Ó dao/src/main/resources/mapper/BroadcastTerminalV2EntityMapper.xml ÐÞ¸Ä
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.BroadcastTerminalV2EntityMapper">
<mapper namespace="com.sandu.ximon.dao.mapper.IPBroadcastDataMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity">
        <id property="id" column="id" jdbcType="INTEGER"/>

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

ÎļþÃû´Ó ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BroadcastTerminalV2Controller.java ÐÞ¸Ä
@@ -4,9 +4,8 @@
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.BroadcastTerminalV2Service;
import com.sandu.ximon.admin.service.IPBroadcastService;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -20,8 +19,8 @@
@RestController
@AllArgsConstructor
@RequestMapping("/v1/IPColumn")
public class BroadcastTerminalV2Controller {
    private BroadcastTerminalV2Service broadcastTerminalV2Service;
public class IPBroadcastController {
    private IPBroadcastService broadcastTerminalV2Service;

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

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

@@ -2,9 +2,6 @@

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
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.CommonPage;
import com.sandu.common.domain.ResponseVO;
@@ -16,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.BroadcastTerminalV2Service;
import com.sandu.ximon.admin.service.IPBroadcastService;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.admin.service.PoleService;
import com.sandu.ximon.dao.domain.Pole;
@@ -24,10 +21,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.validation.constraints.NotEmpty;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

/**
 * ç¯æ†æ¨¡å—以及设置分组到对应灯杆
@@ -41,7 +35,7 @@

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

    @PostMapping("/add")

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

ÎļþÃû´Ó ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java ÐÞ¸Ä
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.object.BaseConditionVO;
@@ -11,10 +10,7 @@
import com.sandu.ximon.admin.vo.TerminalVO;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.mapper.BroadcastTerminalV2EntityMapper;
import com.sandu.ximon.dao.mapper.BroadcastV2TaskTerminalMapper;
import com.sandu.ximon.dao.mapper.IPBroadcastDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -22,7 +18,7 @@
import java.util.List;

@Service
public class BroadcastTerminalV2Service extends BaseServiceImpl<BroadcastTerminalV2EntityMapper, BroadcastTerminalV2Entity> {
public class IPBroadcastService extends BaseServiceImpl<IPBroadcastDataMapper, BroadcastTerminalV2Entity> {
    //    private final BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalDao;
//    @Autowired
//    private SysUserRoleService sysUserRoleService;
@@ -31,7 +27,7 @@
//    @Autowired
//    private BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalMapper;
    @Autowired
    private BroadcastTerminalV2EntityMapper broadcastTerminalV2EntityMapper;
    private IPBroadcastDataMapper broadcastTerminalV2EntityMapper;

    /**
     * åŒæ­¥ç»ˆç«¯