bug修复

liuhaonan

2022-03-11 00e622a2b65c95d7a3da8ac429dc188b7a85e8c0

bug修复

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

@@ -3,8 +3,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;

import java.io.Serializable;

/**
 * ip音柱设备/任务关联
 */

@Data
public class BroadcastTaskV2Entity {
public class BroadcastTaskV2Entity implements Serializable {

    private Integer taskId;

@@ -22,7 +28,6 @@

    @TableField(exist = false)
    private Integer exe;    //  è¿è¡ŒçŠ¶æ€ -1：不存在服务器  0：空闲    1：运行中   å…¶å®ƒï¼šå¼‚常



}

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

@@ -1,17 +1,16 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;

import java.io.Serializable;

/**
 * 
 * @TableName broadcast_v2_terminal
 * @TableName ip音柱设备
 */
@TableName(value ="broadcast_v2_terminal")
@TableName(value = "broadcast_v2_terminal")
@Data
public class BroadcastTerminalV2Entity implements Serializable {


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

ÎļþÒÑɾ³ý

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

ÎļþÃû´Ó dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastDataMapper.java ÐÞ¸Ä
@@ -1,11 +1,9 @@
package com.sandu.ximon.dao.mapper;



import com.sandu.common.domain.BaseMapper;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -15,11 +13,11 @@
 * @Entity com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity
 */
@Mapper
public interface IPBroadcastDataMapper extends BaseMapper<BroadcastTerminalV2Entity> {
public interface IPBroadcastMapper 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})")
    int insert(BroadcastTerminalV2Entity b);
//    @Insert("insert into broadcast_v2_terminal (id,terminal_name,streetlight_id,exist) values (#{id},#{terminalName},#{streetlightId},#{exist})")
//    int insert(BroadcastTerminalV2Entity b);

    List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(String keyword, Long clientId, int bindingState);
}

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

ÎļþÒÑɾ³ý

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

ÎļþÃû´Ó dao/src/main/resources/mapper/IPBroadcastDataMapper.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.IPBroadcastDataMapper">
<mapper namespace="com.sandu.ximon.dao.mapper.IPBroadcastMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity">
        <id property="id" column="id" jdbcType="INTEGER"/>
@@ -13,7 +13,8 @@
    </resultMap>

    <sql id="Base_Column_List">
        id,terminal_name,streetlight_id,
        id
        ,terminal_name,streetlight_id,
        bind_states,exist
    </sql>
    <select id="listAll" resultType="com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity">

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

ÎļþÒÑɾ³ý

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

@@ -10,7 +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.mapper.IPBroadcastDataMapper;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

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

    /**
     * åŒæ­¥ç»ˆç«¯
@@ -54,8 +54,8 @@
                b.setTerminalName(item.getName());
                b.setStreetlightId(0L);
                b.setExist(1);
//                save(b);
                broadcastTerminalV2EntityMapper.insert(b);
                save(b);
//                broadcastTerminalV2EntityMapper.insert(b);
            }
        });
    }

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

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/BroadcastPostUtils.java

@@ -19,7 +19,7 @@
public class BroadcastPostUtils {


    public static String Post (String json,String URL, String charset) {
    public static String Post(String json, String URL, String charset) {
        CloseableHttpClient client = HttpClients.createDefault();
        HttpPost post = new HttpPost(URL);
        post.setHeader("Content-Type", "application/json");
@@ -32,7 +32,7 @@
            HttpResponse httpResponse = client.execute(post);
            InputStream inStream = httpResponse.getEntity().getContent();

            result = streamToString(inStream,charset);
            result = streamToString(inStream, charset);

            inStream.close();
        } catch (Exception e) {
@@ -43,25 +43,23 @@
    }



    public static String streamToString(InputStream in, String encoding){
    public static String streamToString(InputStream in, String encoding) {
        // å°†æµè½¬æ¢ä¸ºå­—符串
        try {
            StringBuffer sb = new StringBuffer();
            byte[] b = new byte[1024];
            for (int n; (n = in.read(b)) != -1;) {
            for (int n; (n = in.read(b)) != -1; ) {
                sb.append(new String(b, 0, n, encoding));
            }
            return sb.toString();
        }  catch (IOException e) {
        } catch (IOException e) {
            e.printStackTrace();
            throw new RuntimeException("提取 requestBody å¼‚常", e);
        }
    }



    public static String taskPostEncoding (String json, String URL) {
    public static String taskPostEncoding(String json, String URL) {
        CloseableHttpClient client = HttpClients.createDefault();
        HttpPost post = new HttpPost(URL);
        post.setHeader("Content-Type", "application/json");
@@ -76,7 +74,7 @@
            HttpResponse httpResponse = client.execute(post);
            InputStream inStream = httpResponse.getEntity().getContent();

            result = streamToString(inStream,"utf-8");
            result = streamToString(inStream, "utf-8");


            inStream.close();