puzhibing
6 天以前 35b0088fa28dab8a28758dcbcc056620c1ea5e2c
修改公交公司的事件订阅功能
3个文件已修改
10 ■■■■ 已修改文件
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgUrgeTodoAck.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarServiceImpl.java
@@ -228,7 +228,7 @@
        String body = execute.body();
        JSONObject jsonObject = JSON.parseObject(body);
        Integer resultState = jsonObject.getInteger("ResultState");
        if(1 == resultState){
        if(null != resultState && 1 == resultState){
            JSONArray resultData = jsonObject.getJSONArray("ResultData");
            for (int i = 0; i < resultData.size(); i++) {
                JSONObject jsonObject1 = resultData.getJSONObject(i);
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgUrgeTodoAck.java
@@ -40,8 +40,8 @@
    /**
     * 报警督办ID
     */
    @Field(type = FieldType.Integer)
    private int supervisionId;
    @Field(type = FieldType.Object)
    private Object supervisionId;
    /**
     * 报警处理结果
     * 0x00:处理中
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
@@ -210,8 +210,8 @@
            upWarnMsgAdptInfo.setWarnTime(LocalDateTime.parse(data.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).toEpochSecond(ZoneOffset.ofHours(8)));
            upWarnMsgAdptInfo.setInfoId(data.getAlarmId());
            upWarnMsgAdptInfo.setLevel(getLevel(data.getLevel()));
            upWarnMsgAdptInfo.setLongitude(data.getLongitude().intValue());
            upWarnMsgAdptInfo.setLatitude(data.getLatitude().intValue());
            upWarnMsgAdptInfo.setLongitude(data.getLatitude().intValue() * 10);
            upWarnMsgAdptInfo.setLatitude(data.getLongitude().intValue());
            upWarnMsgAdptInfo.setAltitude(data.getHeight().intValue() / 10);
            upWarnMsgAdptInfo.setSpeed(data.getSpeed().intValue() / 100000);
            upWarnMsgAdptInfo.setVec2(data.getSpeed().intValue() / 100000);