From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index 31390de..3e38b31 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -12,8 +12,8 @@
import com.moral.util.FileUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Service;
-import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -42,8 +42,10 @@
@Override
public Map<String, Object> add(MultipartFile[] files, Supervision supervision) {
-
- String path = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "static/img/";
+ //������jar���������������
+ ApplicationHome h = new ApplicationHome(getClass());
+ //���jar������������������������������upload������������������������������������
+ String path = h.getSource().getParentFile().toString() + "/static/img";
Map<String, Object> result = new HashMap<>();
@@ -122,7 +124,7 @@
public Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision) {
String path = this.getClass().getClassLoader()
- .getResource("").getFile() + "static/img/";
+ .getResource("").getFile() + "static/img";
Map<String, Object> result = new HashMap<>();
@@ -158,4 +160,9 @@
supervisionMapper.updateById(supervision);
return result;
}
+
+ @Override
+ public void deleteSupervision(Integer id) {
+ supervisionMapper.deleteById(id);
+ }
}
--
Gitblit v1.8.0