Pu Zhibing
2025-06-04 93c20ce82e56710f7cf93789e7ac7a06153111a1
优化附件
6个文件已修改
20 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-dataInterchange/src/main/java/com/ruoyi/dataInterchange/api/vo/UPWarnMsgAdptInfoVo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Warn.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/CarWarnInfoResp.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/WarnResp.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-dataInterchange/src/main/java/com/ruoyi/dataInterchange/api/vo/UPWarnMsgAdptInfoVo.java
@@ -90,4 +90,8 @@
     * 0x03:将来处理
     */
    private int result;
    /**
     * 抓拍图片
     */
    private String picUrl;
}
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Warn.java
@@ -143,4 +143,9 @@
     */
    @TableField("vehicle_number")
    private String vehicleNumber;
    /**
     * 报警抓拍图片
     */
    @TableField("pic_url")
    private String picUrl;
}
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java
@@ -130,6 +130,7 @@
            warnResp.setLon(new BigDecimal(warn.getLongitude()));
            warnResp.setLat(new BigDecimal(warn.getLatitude()));
            warnResp.setAddress(warn.getAddress());
            warnResp.setImageUrl(warn.getPicUrl());
            warnList.add(warnResp);
        }
        carWarnInfoResp.setWarnList(warnList);
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/CarWarnInfoResp.java
@@ -20,8 +20,6 @@
    private BigDecimal speed;
    @ApiModelProperty("当前位置")
    private String nowAddress;
    @ApiModelProperty("抓拍照片")
    private String imageUrl;
    @ApiModelProperty("报警列表")
    private List<WarnResp> warnList;
}
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/WarnResp.java
@@ -25,4 +25,6 @@
    private BigDecimal lat;
    @ApiModelProperty("地址")
    private String address;
    @ApiModelProperty("抓拍照片")
    private String imageUrl;
}
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WarnServiceImpl.java
@@ -121,6 +121,7 @@
            warn.setCreateTime(LocalDateTime.now());
            warn.setObjectId(vo.getInfoId());
            warn.setVehicleNumber(vo.getVehicleNo());
            warn.setPicUrl(vo.getPicUrl());
            warns.add(warn);
        }
        if (warns.size() > 0) {
@@ -179,8 +180,11 @@
                        warn.setTreatmentState("将来处理");
                        break;
                }
                this.updateById(warn);
            }
            if(null == warn.getPicUrl()){
                warn.setPicUrl(vo.getPicUrl());
            }
            this.updateById(warn);
        }
        
    }