From b8cc591541b88dd2bb93f111f8e8075842dce7ca Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 13 八月 2024 17:21:06 +0800
Subject: [PATCH] 1. 新增设备信息相关功能 2. 修正自评估中数据自动评分的部分逻辑

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MediafileServiceImpl.kt |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MediafileServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MediafileServiceImpl.kt
index f320255..8f142eb 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MediafileServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MediafileServiceImpl.kt
@@ -13,11 +13,16 @@
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Value
 import java.io.File
 
 
 @Service
-class MediafileServiceImpl(val mediafileMapper: MediafileMapper) : MediafileService {
+class MediafileServiceImpl(
+    val mediafileMapper: MediafileMapper,
+    @Value("\${filePath}") var filePath: String,
+    @Value("\${imgPath}") var imgPath: String,
+) : MediafileService {
 
     private val logging: Logger = LoggerFactory.getLogger(MediafileServiceImpl::class.java)
 
@@ -50,8 +55,8 @@
 
     //鏂板濯掍綋鏂囦欢
     override fun addMedifile(mediafileVoList: String, files: Array<MultipartFile>) {
-        logging.info("涓婁紶鏂囦欢鏂规硶璋冪敤")
-        logging.info("mediafileVoList:" + mediafileVoList)
+//        logging.info("涓婁紶鏂囦欢鏂规硶璋冪敤")
+//        logging.info("mediafileVoList:" + mediafileVoList)
         val mapper = ObjectMapper()
 
         //json杞琽bject
@@ -79,7 +84,7 @@
                 val filePath = "${Constant.DEFAULT_FILE_PATH}/images/$path/"
                 try {
                     //璋冪敤鏂囦欢淇濆瓨鏂规硶
-                    FileUtil().uploadFile(image.bytes, filePath, fileName!!)
+                    FileUtil.uploadFile(image.bytes, filePath, fileName!!)
                 } catch (e: Exception) {
                     // TODO: handle exception
                 }
@@ -117,7 +122,7 @@
         val path = mediafile.extension1
         //File("/Users/liwei/images/${path}/${id}.jpg").delete()
         //鍏堝垹鍥剧墖
-        val  f = File("${Constant.DEFAULT_FILE_PATH}/images/$path/$id.jpg")
+        val f = File("${Constant.DEFAULT_FILE_PATH}/images/$path/$id.jpg")
         if (f.exists()) {
             f.delete()
         }

--
Gitblit v1.9.3