Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Carla Delfine
2025-10-15 10:45:23 +02:00
parent 92e60c95e3 227025b526
commit cd98c3884f
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ems-engine/src/main/java/it/integry/ems/activity/controller/ActivityController.java
View File

@@ -131,20 +131,23 @@ public class ActivityController {
}
@RequestMapping(value = EmsRestConstants.PATH_UPLOAD_STB_ACTIVITY_FILE_ATTACHMENT, method = RequestMethod.POST)
@PostMapping(value = "uploadStbActivityFileAttachment")
public ServiceRestResponse uploadStbActivityFileAttachment(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam() String activityId,
@RequestPart() MultipartFile[] files) throws Exception {
if (files == null || files.length == 0) {
if (files == null || files.length == 0)
throw new Exception("Nessun file è stato rilevato");
}
StbActivity stbActivity = activityService.uploadAttachment(activityId, files);
return ServiceRestResponse.createPositiveResponse(activityService.uploadAttachment(activityId, files));
}
ServiceRestResponse serviceRestResponse = ServiceRestResponse.createPositiveResponse();
serviceRestResponse.setEntityList(stbActivity.getStbActivityFile());
@GetMapping(value = "activity/removeAttachment")
public ServiceRestResponse removeAttachment(@RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam() String activityId,
@RequestParam() String fileName) throws Exception {
return serviceRestResponse;
activityService.removeAttachment(activityId, fileName);
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_ACTIVITY_GET_ACTIVITY, method = RequestMethod.GET)

17
ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
View File

@@ -127,12 +127,19 @@ public class ActivityService {
}
public void removeAttachment(String activityId, String fileName) throws Exception {
StbActivityFile activityFile = new StbActivityFile();
if (activityId == null || fileName == null)
throw new Exception("activityId e fileName sono obbligatori");
StbActivityFile activityFile = new StbActivityFile()
.setId(activityId)
.setFileName(fileName);
activityFile.setOperation(OperationType.DELETE);
activityFile.setId(activityId);
activityFile.setFileName(fileName);
entityProcessor.processEntity(activityFile, multiDBTransactionManager);
multiDBTransactionManager.commitAll();
StbActivity stbActivity = new StbActivity().setActivityId(activityId);
stbActivity.getStbActivityFile().add(activityFile);
stbActivity.setOperation(OperationType.NO_OP);
entityProcessor.processEntity(stbActivity, multiDBTransactionManager);
}
public List<AttivitaDTO> save(List<AttivitaDTO> listAttivita) throws Exception {