|
|
|
@ -6,7 +6,6 @@ import com.github.pagehelper.PageInfo;
|
|
|
|
|
import com.nimbusds.jose.shaded.gson.Gson;
|
|
|
|
|
import com.nimbusds.jose.shaded.gson.JsonSyntaxException;
|
|
|
|
|
import com.sztzjy.resource_center.annotation.AnonymousAccess;
|
|
|
|
|
import com.sztzjy.resource_center.entity.FileData;
|
|
|
|
|
import com.sztzjy.resource_center.entity.admin.*;
|
|
|
|
|
import com.sztzjy.resource_center.mapper.admin.AdminDataLabelMapper;
|
|
|
|
|
import com.sztzjy.resource_center.mapper.admin.AdminDataMapper;
|
|
|
|
@ -29,7 +28,6 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @Author xcj
|
|
|
|
@ -176,8 +174,7 @@ public class AdminDataController {
|
|
|
|
|
@AnonymousAccess
|
|
|
|
|
@Transactional
|
|
|
|
|
ResultEntity<String> updateAdminData(@RequestParam String adminDataDtoJSON,
|
|
|
|
|
@RequestParam(required = false) MultipartFile pictureFile,
|
|
|
|
|
@RequestParam(required = false) List<MultipartFile> dataFileList) {
|
|
|
|
|
@RequestParam(required = false) MultipartFile pictureFile) {
|
|
|
|
|
Gson gson = new Gson();
|
|
|
|
|
AdminDataDto adminDataDto = null;
|
|
|
|
|
try {
|
|
|
|
@ -205,7 +202,7 @@ public class AdminDataController {
|
|
|
|
|
// 更新标签,批量更新操作
|
|
|
|
|
if (adminDataDto.getAdminLabelList() != null && !adminDataDto.getAdminLabelList().isEmpty()) {
|
|
|
|
|
List<AdminLabel> adminLabelList = adminDataDto.getAdminLabelList();
|
|
|
|
|
AdminDataLabelExample example =new AdminDataLabelExample();
|
|
|
|
|
AdminDataLabelExample example = new AdminDataLabelExample();
|
|
|
|
|
example.createCriteria().andDataCaseIdEqualTo(adminDataDto.getDataId());
|
|
|
|
|
adminDataLabelMapper.deleteByExample(example);
|
|
|
|
|
|
|
|
|
@ -225,48 +222,6 @@ public class AdminDataController {
|
|
|
|
|
adminDataLabelMapper.insertBatch(list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<FileData> fileDataList = new ArrayList<>();
|
|
|
|
|
if (adminDataDto.getIdList() != null && !adminDataDto.getIdList().isEmpty()
|
|
|
|
|
&& dataFileList != null && !dataFileList.isEmpty()) {
|
|
|
|
|
|
|
|
|
|
List<String> idList = adminDataDto.getIdList();
|
|
|
|
|
|
|
|
|
|
//两个长度一样才新增
|
|
|
|
|
if (idList.size() == dataFileList.size()) {
|
|
|
|
|
for (int i = 0; i < idList.size(); i++) {
|
|
|
|
|
FileData fileData = new FileData();
|
|
|
|
|
fileData.setFileId(idList.get(i));
|
|
|
|
|
fileData.setFile(dataFileList.get(i));
|
|
|
|
|
fileDataList.add(fileData);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//设置数据文件
|
|
|
|
|
if (!fileDataList.isEmpty()) {
|
|
|
|
|
List<AdminFile> list = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
//原来的删了再新增
|
|
|
|
|
AdminFileExample example =new AdminFileExample();
|
|
|
|
|
List<String> ids = fileDataList.stream().map(FileData::getFileId).collect(Collectors.toList());
|
|
|
|
|
example.createCriteria().andFileIdIn(ids);
|
|
|
|
|
adminFileMapper.deleteByExample(example);
|
|
|
|
|
|
|
|
|
|
for (FileData file : fileDataList) {
|
|
|
|
|
AdminFile adminFile = new AdminFile();
|
|
|
|
|
adminFile.setFileId(IdUtil.randomUUID());
|
|
|
|
|
String fileUrl = fileUtil.upload(file.getFile());
|
|
|
|
|
String fullFileName = file.getFile().getOriginalFilename();
|
|
|
|
|
adminFile.setFileUrl(fileUrl);
|
|
|
|
|
adminFile.setName(fullFileName);
|
|
|
|
|
adminFile.setSource("数据表");
|
|
|
|
|
adminFile.setDataCaseId(adminDataDto.getDataId());
|
|
|
|
|
list.add(adminFile);
|
|
|
|
|
}
|
|
|
|
|
//批量新增数据文件
|
|
|
|
|
adminFileMapper.insertBatch(list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 更新对象
|
|
|
|
|
adminDataMapper.updateByPrimaryKeyWithBLOBs(adminDataWithBLOBs);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
@ -276,4 +231,42 @@ public class AdminDataController {
|
|
|
|
|
return new ResultEntity<>(HttpStatus.OK, "编辑成功!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("addFile")
|
|
|
|
|
@ApiOperation("编辑/文件单独新增")
|
|
|
|
|
@AnonymousAccess
|
|
|
|
|
private ResultEntity<HttpStatus> addFile(@RequestParam String dataId,
|
|
|
|
|
@RequestParam MultipartFile dataFile) {
|
|
|
|
|
try {
|
|
|
|
|
AdminFile adminFile = new AdminFile();
|
|
|
|
|
String url = fileUtil.upload(dataFile);
|
|
|
|
|
adminFile.setFileId(IdUtil.randomUUID());
|
|
|
|
|
adminFile.setDataCaseId(dataId);
|
|
|
|
|
adminFile.setName(dataFile.getOriginalFilename());
|
|
|
|
|
adminFile.setSource("管理员");
|
|
|
|
|
adminFile.setFileUrl(url);
|
|
|
|
|
adminFileMapper.insert(adminFile);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
return new ResultEntity<>(HttpStatus.BAD_REQUEST, "上传失败,请联系管理员!");
|
|
|
|
|
}
|
|
|
|
|
return new ResultEntity<HttpStatus>(HttpStatus.OK, "上传成功!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("deleteFile")
|
|
|
|
|
@ApiOperation("编辑/单个数据文件删除")
|
|
|
|
|
@AnonymousAccess
|
|
|
|
|
private ResultEntity<HttpStatus> deleteFile(@RequestParam String fileId) {
|
|
|
|
|
try {
|
|
|
|
|
AdminFile adminFile = adminFileMapper.selectByPrimaryKey(fileId);
|
|
|
|
|
if (adminFile != null) {
|
|
|
|
|
adminFileMapper.deleteByPrimaryKey(adminFile.getFileId());
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
return new ResultEntity<>(HttpStatus.BAD_REQUEST, "删除失败,请联系管理员!");
|
|
|
|
|
}
|
|
|
|
|
return new ResultEntity<HttpStatus>(HttpStatus.OK, "删除成功!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|