|
@@ -9,10 +9,15 @@ import cn.iocoder.yudao.module.museum.dal.mysql.museummodel.MuseummodelMapper;
|
|
|
import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.io.IOException;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
|
+import java.util.zip.ZipEntry;
|
|
|
+import java.util.zip.ZipInputStream;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.singleton;
|
|
|
|
|
@@ -35,9 +40,14 @@ public class MuseummodelServiceImpl implements MuseummodelService {
|
|
|
|
|
|
@Override
|
|
|
public void deleteMuseumModel(Integer id){
|
|
|
-// museumModelMapper.deleteMuseumModel(id);
|
|
|
+ museumModelMapper.deleteMuseumModel(id);
|
|
|
museumModelMapper.deleteById(id);
|
|
|
}
|
|
|
+//废料
|
|
|
+ @Override
|
|
|
+ public void batchImportModels(String specimenNumber, MultipartFile zipFile) {
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
|
public MuseummodelDO selectMuseumModel(Integer id){
|
|
@@ -63,6 +73,44 @@ public class MuseummodelServiceImpl implements MuseummodelService {
|
|
|
// 修改为正确的方法调用
|
|
|
return museumModelMapper.getMuseumModelBySpecimenType(specimenType);
|
|
|
}
|
|
|
+//
|
|
|
+// @Override
|
|
|
+// public void batchImportModels(String specimenNumber, MultipartFile zipFile) {
|
|
|
+// try {
|
|
|
+// // 处理zip文件,解析并保存模型信息
|
|
|
+// byte[] bytes = zipFile.getBytes();
|
|
|
+// // 这里需要根据具体需求实现zip文件解析和模型信息保存逻辑
|
|
|
+// } catch (IOException e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// }
|
|
|
+// }
|
|
|
+//
|
|
|
+// 正在写
|
|
|
+// @Override
|
|
|
+// public void batchImportModels(String specimenNumber, MultipartFile zipFile) {
|
|
|
+// List<MuseummodelDO> museummodelDOList = new ArrayList<>();
|
|
|
+// try (ZipInputStream zis = new ZipInputStream(zipFile.getInputStream())) {
|
|
|
+// ZipEntry zipEntry;
|
|
|
+// while ((zipEntry = zis.getNextEntry()) != null) {
|
|
|
+// if (!zipEntry.isDirectory()) {
|
|
|
+// // 这里需要根据 zip 文件中的具体内容解析出模型信息
|
|
|
+// // 示例:假设文件名就是模型名称,这里仅为示例,实际需根据情况调整
|
|
|
+// String modelName = zipEntry.getName();
|
|
|
+// MuseummodelDO museummodelDO = new MuseummodelDO();
|
|
|
+// museummodelDO.setModelName(modelName);
|
|
|
+// museummodelDO.setSpecimenNumber(specimenNumber);
|
|
|
+// // 假设模型路径暂时用文件名替代,实际需根据存储情况调整
|
|
|
+// museummodelDO.setModelWay(modelName);
|
|
|
+// museummodelDOList.add(museummodelDO);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// if (!museummodelDOList.isEmpty()) {
|
|
|
+// MuseummodelMapper.batchInsert(museummodelDOList);
|
|
|
+// }
|
|
|
+// } catch (IOException e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
// @Override
|
|
|
// public PageResult<MuseummodelDO> getPage (MuseummodelPageReqVO pageReqVO){
|