Refactor UtilityController
This commit is contained in:
@@ -6,14 +6,12 @@ import it.integry.ems.response.EsitoType;
|
||||
import it.integry.ems.response.ServiceRestResponse;
|
||||
import it.integry.ems.response.StatusResponse;
|
||||
import it.integry.ems.status.ServiceChecker;
|
||||
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
|
||||
import it.integry.ems.utility.dto.C2EArgDTO;
|
||||
import it.integry.ems.utility.dto.PdfDTO;
|
||||
import it.integry.ems.utility.request.SqlToExcelRequest;
|
||||
import it.integry.ems.utility.service.UtilityService;
|
||||
import it.integry.ems_model.config.EmsRestConstants;
|
||||
import it.integry.ems_model.utility.BarcodeEan128.UtilityBarcodeEan128;
|
||||
import it.integry.ems_model.utility.dto.IndirizzoDTO;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -44,9 +42,6 @@ public class UtilityController {
|
||||
@Autowired
|
||||
private ServiceChecker serviceChecker;
|
||||
|
||||
@Autowired
|
||||
private MultiDBTransactionManager multiDBTransactionManager;
|
||||
|
||||
@RequestMapping(value = "/utility/status", method = RequestMethod.GET)
|
||||
public @ResponseBody
|
||||
List<StatusResponse> status(HttpServletRequest request) {
|
||||
@@ -60,44 +55,26 @@ public class UtilityController {
|
||||
public @ResponseBody
|
||||
ServiceRestResponse mergePDF(HttpServletRequest request,
|
||||
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
|
||||
@RequestBody List<PdfDTO> pdfList) {
|
||||
ServiceRestResponse response = null;
|
||||
try {
|
||||
response = utilityService.mergePDF(pdfList);
|
||||
} catch (Exception e) {
|
||||
logger.error(request.getRequestURI(), e);
|
||||
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
|
||||
}
|
||||
return response;
|
||||
@RequestBody List<PdfDTO> pdfList) throws Exception {
|
||||
|
||||
return utilityService.mergePDF(pdfList);
|
||||
}
|
||||
|
||||
@RequestMapping(value = EmsRestConstants.PATH_SPLIT_PDF, method = RequestMethod.POST)
|
||||
public @ResponseBody
|
||||
Object splitPDF(HttpServletRequest request,
|
||||
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
|
||||
@RequestBody List<PdfDTO> pdfList) {
|
||||
ServiceRestResponse response = null;
|
||||
try {
|
||||
response = utilityService.splitPDF(pdfList);
|
||||
} catch (Exception e) {
|
||||
logger.error(request.getRequestURI(), e);
|
||||
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
|
||||
}
|
||||
return response;
|
||||
@RequestBody List<PdfDTO> pdfList) throws Exception {
|
||||
|
||||
return utilityService.splitPDF(pdfList);
|
||||
}
|
||||
|
||||
@RequestMapping(value = EmsRestConstants.PATH_GEOCODE, method = RequestMethod.GET)
|
||||
public @ResponseBody
|
||||
ServiceRestResponse geocode(HttpServletRequest request,
|
||||
@RequestParam("address") String address) {
|
||||
ServiceRestResponse response;
|
||||
try {
|
||||
response = utilityService.geocode(address);
|
||||
} catch (Exception e) {
|
||||
logger.error(request.getRequestURI(), e);
|
||||
response = new ServiceRestResponse(EsitoType.KO, "", e);
|
||||
}
|
||||
return response;
|
||||
@RequestParam("address") String address) throws Exception {
|
||||
|
||||
return utilityService.geocode(address);
|
||||
}
|
||||
|
||||
|
||||
@@ -105,15 +82,9 @@ public class UtilityController {
|
||||
public @ResponseBody
|
||||
Object cmd2Export(HttpServletRequest request,
|
||||
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
|
||||
@RequestBody C2EArgDTO arguments) {
|
||||
ServiceRestResponse response = null;
|
||||
try {
|
||||
response = utilityService.cmd2Export(arguments);
|
||||
} catch (Exception e) {
|
||||
logger.error(request.getRequestURI(), e);
|
||||
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
|
||||
}
|
||||
return response;
|
||||
@RequestBody C2EArgDTO arguments) throws Exception {
|
||||
|
||||
return utilityService.cmd2Export(arguments);
|
||||
}
|
||||
|
||||
@RequestMapping(value = EmsRestConstants.PATH_VALIDATE_XML_BY_SCHEMA, method = RequestMethod.POST)
|
||||
@@ -150,18 +121,10 @@ public class UtilityController {
|
||||
@RequestMapping(value = EmsRestConstants.PATH_SQL_TO_EXCEL, method = RequestMethod.POST)
|
||||
public @ResponseBody
|
||||
ServiceRestResponse getXlsFromSql(@RequestBody SqlToExcelRequest payload) throws Exception {
|
||||
ServiceRestResponse response = new ServiceRestResponse();
|
||||
String query = payload.getSql();
|
||||
List<String> fields = payload.getFields();
|
||||
try {
|
||||
byte[] file = utilityService.getXlsFromSqlQuery(query, fields);
|
||||
response.setEsito(EsitoType.OK);
|
||||
response.setJsonObject(file);
|
||||
} catch (Exception e) {
|
||||
response.setEsito(EsitoType.KO);
|
||||
response.setErrorMessage(e.getMessage());
|
||||
}
|
||||
return response;
|
||||
|
||||
return ServiceRestResponse.createPositiveResponse(utilityService.getXlsFromSqlQuery(query, fields));
|
||||
}
|
||||
|
||||
@RequestMapping(value = EmsRestConstants.PATH_READ_REMOTE_FILE, method = RequestMethod.POST)
|
||||
@@ -220,24 +183,12 @@ public class UtilityController {
|
||||
|
||||
@RequestMapping(value = EmsRestConstants.PATH_GET_POSITION_FROM_COORDS, method = RequestMethod.GET)
|
||||
public @ResponseBody
|
||||
ServiceRestResponse getPositionFromCoords(
|
||||
HttpServletRequest request,
|
||||
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
|
||||
@RequestParam BigDecimal lat,
|
||||
@RequestParam BigDecimal lng
|
||||
) {
|
||||
ServiceRestResponse getPositionFromCoords(HttpServletRequest request,
|
||||
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
|
||||
@RequestParam BigDecimal lat,
|
||||
@RequestParam BigDecimal lng) throws Exception {
|
||||
|
||||
ServiceRestResponse response;
|
||||
try {
|
||||
IndirizzoDTO indirizzo = utilityService.getPositionFromCoords(lat, lng);
|
||||
response = new ServiceRestResponse(EsitoType.OK);
|
||||
response.setJsonObject(indirizzo);
|
||||
return response;
|
||||
} catch (Exception e) {
|
||||
logger.error(request.getRequestURI(), e);
|
||||
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
|
||||
}
|
||||
return response;
|
||||
return ServiceRestResponse.createPositiveResponse(utilityService.getPositionFromCoords(lat, lng));
|
||||
}
|
||||
|
||||
@RequestMapping(value = EmsRestConstants.PATH_GET_RICORRENZE, method = RequestMethod.GET)
|
||||
@@ -245,11 +196,6 @@ public class UtilityController {
|
||||
@RequestParam(CommonConstants.PROFILE_DB) String config,
|
||||
@RequestParam(value = "anno") String anno) throws Exception {
|
||||
|
||||
try {
|
||||
return ServiceRestResponse.createPositiveResponse(utilityService.getRicorrenze(anno));
|
||||
} catch (Exception e) {
|
||||
logger.error(request.getRequestURI(), e);
|
||||
return ServiceRestResponse.createNegativeResponse(e);
|
||||
}
|
||||
return ServiceRestResponse.createPositiveResponse(utilityService.getRicorrenze(anno));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user