jiangping
2025-02-28 d7aaa1eae5335b38ba1e8e9a465ef9099bc334c5
jtt808初始化
已修改4个文件
29 ■■■■ 文件已修改
server/jtt808_parent/jtt808-server/src/test/java/org/yzh/client/ClientTest.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/resources/logback-spring.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/utils/PositionUtil.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/jtt808_parent/jtt808-server/src/test/java/org/yzh/client/ClientTest.java
@@ -26,10 +26,11 @@
    public static final JTMessageAdapter messageAdapter = new JTMessageAdapter("org.yzh.protocol");
    // tcp://server.demo.natool.cn:19392
//    dmtest.ahapp.net:7611
    public static final ClientConfig jtConfig = new ClientConfig.Builder()
//            .setIp("server.demo.natool.cn")
//            .setPort(31146)
            .setIp("64a6882b1b1d7823.natapp.cc")
            .setIp("dmtest.ahapp.net")
            .setPort(7611)
            .setMaxFrameLength(2 + 21 + 1023 * 2 + 1 + 2)
            .setDelimiters(new byte[]{0x7e})
server/platform/src/main/resources/logback-spring.xml
@@ -27,7 +27,6 @@
            <totalSizeCap>1GB</totalSizeCap>
        </rollingPolicy>
    </appender>
    <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>ERROR</level>
server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java
@@ -98,16 +98,16 @@
        if(StringUtils.isBlank(bikeCode)){
            return;
        }
        desc.replace("{车辆编号}",bikeCode);
        desc=  desc.replace("{车辆编号}",bikeCode);
        if(StringUtils.isNotBlank(place)){
           desc.replace("{定位位置}",place);
            desc= desc.replace("{定位位置}",place);
        }else{
            desc.replace("{定位位置}","未知");
            desc=desc.replace("{定位位置}","未知");
        }
        if(StringUtils.isNotBlank(siteName)){
            desc.replace("{站点名称}",siteName);
            desc=     desc.replace("{站点名称}",siteName);
        }else{
            desc.replace("{站点名称}","未知");
            desc=desc.replace("{站点名称}","未知");
        }
        sendNoticeNew(desc,token,robotCode,chatToken);
    }
server/services/src/main/java/com/doumee/core/utils/PositionUtil.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.doumee.dao.business.web.request.LocaltionDTO;
import java.awt.geom.GeneralPath;
@@ -38,7 +39,19 @@
        }
        return null;
    }
    /**
    public static void main(String[] args) {
        String str ="[{\"lat\": 31.71383446224521, \"lng\": 117.39342857107226, \"height\": 0}, {\"lat\": 31.71393087373135, \"lng\": 117.39402357524818, \"height\": 0}, {\"lat\": 31.713593433089077, \"lng\": 117.39433170240886, \"height\": 0}, {\"lat\": 31.713280450806966, \"lng\": 117.39358710879355, \"height\": 0}]";
        TypeReference typeReference =  new TypeReference<List<LocaltionDTO>>(){};
        List<LocaltionDTO> array = JSONObject.parseObject(str, typeReference.getType());
        if(array == null || array.size() ==0){
           System.out.println("=================");
        }
        System.out.println(isInPolygon(117.39, 31.71551600,array));
    }
   /* "latitude": 31.71551600,
            "longitude": 117.39,
   */ /**
     * 判断坐标点是否在多边形区域内
     *
     * @param pointLon 要判断的点的经度