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

Merge branch 'hotfix/Hotfix-1' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Valerio Castellana
2025-12-10 12:01:55 +01:00
parent 1d52f79337 60e4429c3f
commit 78dbf9f7e3
2 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ems-engine/src/main/java/it/integry/ems/retail/controller/AnomalieController.java
View File

@@ -26,14 +26,6 @@ public class AnomalieController {
this.anomalieProdService = anomalieProdService; this.anomalieProdService = anomalieProdService;
} }
@GetMapping(value = "/lista")
public ServiceRestResponse listaAnomalie(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody PageableRequestDTO requestData) throws Exception {
return ServiceRestResponse.createPositiveResponse(anomalieProdService.getAnomalieProd(requestData, multiDBTransactionManager.getPrimaryConnection()));
}
@GetMapping(value = "/livelli/lista") @GetMapping(value = "/livelli/lista")
public ServiceRestResponse listaLivelliAnomalie(HttpServletRequest request, public ServiceRestResponse listaLivelliAnomalie(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB) throws Exception { @RequestParam(CommonConstants.PROFILE_DB) String profileDB) throws Exception {
@@ -53,6 +45,27 @@ public class AnomalieController {
} }
} }
@PostMapping(value = "/livelli/{id}/elimina")
public ServiceRestResponse deleteLivelloAnomalia(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@PathVariable Long id) throws Exception {
try {
anomalieProdService.deleteLivelloAnomalia(multiDBTransactionManager, id);
return ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
multiDBTransactionManager.rollbackAll();
throw e;
}
}
@GetMapping(value = "/lista")
public ServiceRestResponse listaAnomalie(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody PageableRequestDTO requestData) throws Exception {
return ServiceRestResponse.createPositiveResponse(anomalieProdService.getAnomalieProd(requestData, multiDBTransactionManager.getPrimaryConnection()));
}
@GetMapping(value = "/{id}/ul") @GetMapping(value = "/{id}/ul")
public ServiceRestResponse getUlAnomalia(HttpServletRequest request, public ServiceRestResponse getUlAnomalia(HttpServletRequest request,
@@ -66,7 +79,8 @@ public class AnomalieController {
@RequestParam(CommonConstants.PROFILE_DB) String profileDB, @RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@PathVariable Long id) throws Exception { @PathVariable Long id) throws Exception {
try { try {
return ServiceRestResponse.createPositiveResponse(anomalieProdService.deleteAnomalia(multiDBTransactionManager, id)); anomalieProdService.deleteAnomalia(multiDBTransactionManager, id);
return ServiceRestResponse.createPositiveResponse();
} catch (Exception e) { } catch (Exception e) {
multiDBTransactionManager.rollbackAll(); multiDBTransactionManager.rollbackAll();
throw e; throw e;

23
ems-engine/src/main/java/it/integry/ems/retail/service/AnomalieUlService.java
View File

@@ -151,7 +151,7 @@ public class AnomalieUlService {
return anomalia; return anomalia;
} }
public Object deleteAnomalia(MultiDBTransactionManager multiDBTransactionManager, Long id) throws Exception { public void deleteAnomalia(MultiDBTransactionManager multiDBTransactionManager, Long id) throws Exception {
List<EntityBase> entities = new ArrayList<>(); List<EntityBase> entities = new ArrayList<>();
MtbAnomalieUl anomalia = new MtbAnomalieUl(); MtbAnomalieUl anomalia = new MtbAnomalieUl();
anomalia.setId(id) anomalia.setId(id)
@@ -160,13 +160,30 @@ public class AnomalieUlService {
List<MtbColt> ulAnomalia = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), List<MtbColt> ulAnomalia = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(),
"SELECT gestione,data_collo,ser_collo,num_collo, id_anomalia from mtb_colt where id_anomalia = " + id, "SELECT gestione,data_collo,ser_collo,num_collo, id_anomalia from mtb_colt where id_anomalia = " + id,
MtbColt.class); MtbColt.class);
if (!UtilityList.isNullOrEmpty(ulAnomalia)) {
ulAnomalia.forEach(x -> AnomalieUlUtility.detachAnomaliaFromUl(x)); ulAnomalia.forEach(x -> AnomalieUlUtility.detachAnomaliaFromUl(x));
entities.addAll(ulAnomalia); entities.addAll(ulAnomalia);
}
entities.add(anomalia); entities.add(anomalia);
entityProcessor.processEntityList(entities, multiDBTransactionManager, true); entityProcessor.processEntityList(entities, multiDBTransactionManager, true);
UtilityEntity.throwEntitiesException(entities); UtilityEntity.throwEntitiesException(entities);
return entities; }
public void deleteLivelloAnomalia(MultiDBTransactionManager multiDBTransactionManager, Long id) throws Exception {
Integer count = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(),"SELECT count(*) from "+MtbAnomalieUl.ENTITY+" \n\r" +
"where id_livello_anomalia = " + UtilityDB.valueToString(id) + "");
if (count > 0)
throw new Exception("Impossibile eliminare il livello di anomalia se esistono anomalie associate");
MtbLivelliAnomalie anomalia = new MtbLivelliAnomalie();
anomalia.setId(id)
.setOperation(OperationType.DELETE);
entityProcessor.processEntity(anomalia, true, multiDBTransactionManager);
} }
public List<MtbLivelliAnomalie> listaLivelliAnomalie(Connection connection) throws Exception { public List<MtbLivelliAnomalie> listaLivelliAnomalie(Connection connection) throws Exception {