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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 8237bfa..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,12 +12,11 @@
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.ObjectUtils;
-import org.springframework.util.ResourceUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -43,14 +42,10 @@
@Override
public Map<String, Object> add(MultipartFile[] files, Supervision supervision) {
-
- String path = null;
- try {
- path = ResourceUtils.getURL("classpath:").getPath() + "static/img/";
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
-
+ //������jar���������������
+ ApplicationHome h = new ApplicationHome(getClass());
+ //���jar������������������������������upload������������������������������������
+ String path = h.getSource().getParentFile().toString() + "/static/img";
Map<String, Object> result = new HashMap<>();
@@ -129,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<>();
@@ -165,4 +160,9 @@
supervisionMapper.updateById(supervision);
return result;
}
+
+ @Override
+ public void deleteSupervision(Integer id) {
+ supervisionMapper.deleteById(id);
+ }
}
--
Gitblit v1.8.0