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

Gestito correttamente ritorno importazione listino MS

Browse Source
This commit is contained in:
Fabio Narracci
2024-05-23 16:29:52 +02:00
parent 78b68dc135
commit 997cd9ee31
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ems-engine/src/main/java/it/integry/ems/product/controller/ProductController.java
View File

@@ -67,13 +67,6 @@ public class ProductController {
@Autowired
private ServiceChecker serviceChecker;
@ExceptionHandler({Exception.class})
public @ResponseBody
ServiceRestResponse handleException(HttpServletRequest request, HttpServletResponse response, Exception ex) {
logger.error(request.getRequestURI(), ex);
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return ServiceRestResponse.createNegativeResponse(ex);
}
@RequestMapping(value = "/product/status", method = RequestMethod.GET)
public @ResponseBody
@@ -86,18 +79,12 @@ public class ProductController {
@RequestMapping(value = EmsRestConstants.PATH_CONFIRM_TEMP_LISTINO, method = RequestMethod.GET)
public @ResponseBody
List<ServiceRestResponse> confirmTempListino(
ServiceRestResponse confirmTempListino(
HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration) throws Exception {
List<ServiceRestResponse> respList = new ArrayList<ServiceRestResponse>();
try {
ServiceRestResponse response = ServiceRestResponse.createPositiveResponse();
response.setEntityList(importAnagListiniService.confirmTempListino());
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
respList.add(new ServiceRestResponse(EsitoType.KO, configuration, e));
}
return respList;
ServiceRestResponse response = ServiceRestResponse.createEntityPositiveResponse(importAnagListiniService.confirmTempListino());
return response;
}
@RequestMapping(value = EmsRestConstants.PATH_IMPORT_ANAG_LISTINI, method = RequestMethod.POST)

8
ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportAnagListiniService.java
View File

@@ -4,6 +4,8 @@ import com.annimon.stream.Optional;
import com.annimon.stream.Stream;
import it.integry.common.var.CommonConstants;
import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.response.EsitoType;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.user.UserSession;
@@ -13,6 +15,7 @@ import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.db.EntityToDatabaseMapper;
import it.integry.ems_model.db.ResultSetMapper;
import it.integry.ems_model.entity.*;
import it.integry.ems_model.exception.EntityException;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.*;
@@ -47,6 +50,7 @@ public class ImportAnagListiniService {
private UserSession userSession;
public List<AtbListData> confirmTempListino() throws Exception {
List<AtbListData> atbListDataToSave = new ArrayList<>();
if (!userSession.isAttivo())
throw new Exception("L'utente non è valido");
@@ -173,7 +177,6 @@ public class ImportAnagListiniService {
if (!atbListImpNoPrefsToUpdate.isEmpty()) {
entityProcessor.processEntityList(atbListImpNoPrefsToUpdate, true);
throw new Exception("Si sono verificati alcuni errori, controllare i dati importati.");
}
@@ -210,8 +213,6 @@ public class ImportAnagListiniService {
}
List<EntityBase> entitiesToSave = new ArrayList<>();
List<AtbListData> atbListDataToSave = new ArrayList<>();
for (AtbListImpNoPref data : dbData) {
@@ -405,7 +406,6 @@ public class ImportAnagListiniService {
ps.close();
}
return atbListDataToSave;
}