吉安感知网项目-后端
linwei
2026-04-07 7c5e92240e7bcf270c4cb46516a48ef8688e473e
opt: 人大金仓数据库改造
2 files modified
8 ■■■■ changed files
drone-ops/drone-resource/src/main/java/org/sxkj/resource/endpoint/OssEndpoint.java 2 ●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml 6 ●●●● patch | view | raw | blame | history
drone-ops/drone-resource/src/main/java/org/sxkj/resource/endpoint/OssEndpoint.java
@@ -223,7 +223,7 @@
    @NotNull
    private BladeFile getBladeFile(@RequestParam MultipartFile file) throws IOException {
        String fileName = file.getOriginalFilename();
        BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
        BladeFile bladeFile = ossBuilder.template("estack").putFile(fileName, file.getInputStream());
        Long attachId = buildAttach(fileName, null, file.getSize(), bladeFile);
        bladeFile.setAttachId(attachId);
        return bladeFile;
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -74,10 +74,10 @@
                and (
                1=2
                <if test="param2.droneName != null and param2.droneName != ''">
                    or dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
                    or dar.drone_name::text like CONCAT('%', #{param2.droneName}::text, '%')
                </if>
                <if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
                    or dar.drone_serial_no like CONCAT('%', #{param2.droneSerialNo}, '%')
                    or dar.drone_serial_no::text like CONCAT('%', #{param2.droneSerialNo}::text, '%')
                </if>
                )
            </if>
@@ -99,7 +99,7 @@
            </if>
            <if test="param2.areaName != null and param2.areaName != ''">
                and dar.area_name like CONCAT('%', #{param2.areaName}, '%')
                and dar.area_name::text like CONCAT('%', #{param2.areaName}::text, '%')
            </if>
        </where>
        order by favorited desc, dar.alarm_time desc