From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 31 十二月 2024 10:13:35 +0800 Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/VersionServiceImpl.kt | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/VersionServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/VersionServiceImpl.kt index a16d7b3..e8b031e 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/VersionServiceImpl.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/VersionServiceImpl.kt @@ -5,12 +5,16 @@ import cn.flightfeather.supervision.common.utils.Constant import cn.flightfeather.supervision.common.utils.FileUtil import cn.flightfeather.supervision.lightshare.service.VersionService +import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Service import org.springframework.web.multipart.MultipartFile import tk.mybatis.mapper.entity.Example @Service -class VersionServiceImpl(val versionMapper: VersionMapper): VersionService { +class VersionServiceImpl( + val versionMapper: VersionMapper, @Value("\${filePath}") var filePath: String, + @Value("\${imgPath}") var imgPath: String, +): VersionService { override fun save(version: Version): Int = versionMapper.insert(version) @@ -32,11 +36,11 @@ if (files.isNotEmpty()) { val file = files[0] val fileName = files[0].originalFilename - val basePath = Constant.DEFAULT_FILE_PATH + "/files/" - val path = "crash/" + val basePath = filePath + val path = "/crash/" try { //璋冪敤鏂囦欢淇濆瓨鏂规硶 - FileUtil().uploadFile(file.bytes, basePath + path, fileName!!) + FileUtil.uploadFile(file.bytes, basePath + path, fileName!!) return true } catch (e: Exception) { e.printStackTrace() -- Gitblit v1.9.3