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

Finish Hotfix-1

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-08-19 15:48:50 +02:00
parent 077f002fbe 368154b80a
commit 3bcfd78adb
6 changed files with 95 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.idea/runConfigurations/Tomcat__1__Rosso_Gargano_.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #1 (Rosso Gargano)" type="Remote" folderName="Rosso Gargano">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="192.168.1.13" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

41
ems-core/src/main/java/it/integry/ems/schedule/new_cron_job/service/DefaultAutomatedOperationHandlerComponent.java
View File

@@ -1,6 +1,5 @@
package it.integry.ems.schedule.new_cron_job.service;
import com.annimon.stream.Optional;
import com.annimon.stream.Stream;
import it.integry.annotations.PostContextAutowired;
import it.integry.annotations.PostWebServerConstruct;
@@ -22,6 +21,8 @@ import org.springframework.web.context.ContextLoader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@Service
public class DefaultAutomatedOperationHandlerComponent {
@@ -45,13 +46,16 @@ public class DefaultAutomatedOperationHandlerComponent {
if (!UtilityDebug.isDebugExecution() && !UtilityDebug.isIntegryServer()) {
deleteJobFileDeleter(multiDBTransactionManager);
initServerInfoCheckJob();
initRemoveFpxInvioFilesJob();
initChkAutofatture();
initChkInvioFE();
initMinioOrphanFileCleaner(multiDBTransactionManager);
initPassaggioAnno(multiDBTransactionManager);
deleteChkScadenze(multiDBTransactionManager);
if (settingsModel.isPrimaryInstance()) {
initServerInfoCheckJob();
initRemoveFpxInvioFilesJob();
initMinioOrphanFileCleaner(multiDBTransactionManager);
initPassaggioAnno(multiDBTransactionManager);
initChkAutofatture();
initChkInvioFE();
}
}
} catch (Exception ex) {
@@ -126,6 +130,7 @@ public class DefaultAutomatedOperationHandlerComponent {
}
}
private void initPassaggioAnno(MultiDBTransactionManager data) {
try {
List<AdvancedDataSource> activeConnections = data.getActiveConnections();
@@ -176,15 +181,16 @@ public class DefaultAutomatedOperationHandlerComponent {
if (!activeOperations.containsKey(AutomatedOperationTypeEnum.METHOD_CALLS))
activeOperations.put(AutomatedOperationTypeEnum.METHOD_CALLS, new ArrayList<>());
activeConnections = Stream.of(activeConnections)
activeConnections = activeConnections.stream()
.filter(x -> x.isInternalDb() && x.getDataSource().getProfile().equalsIgnoreCase(x.getDataSource().getDbName()))
.toList();
.collect(Collectors.toList());
for (AdvancedDataSource activeConnection : activeConnections) {
final String operationName = "Controllo Scadenze " + activeConnection.getProfileName().toUpperCase();
Optional<BaseAutomatedOperationDTO> first = Stream.of(activeOperations.get(AutomatedOperationTypeEnum.METHOD_CALLS))
.filter(iScheduledOperation -> iScheduledOperation.getName().equals(operationName)).findFirst();
Optional<BaseAutomatedOperationDTO> first = activeOperations.get(AutomatedOperationTypeEnum.METHOD_CALLS).stream()
.filter(iScheduledOperation -> iScheduledOperation.getName().equals(operationName))
.findFirst();
if (first.isPresent()) {
automatedOperationHandlerComponent.remove(first.get().getId());
@@ -199,6 +205,7 @@ public class DefaultAutomatedOperationHandlerComponent {
}
}
private void deleteJobFileDeleter(MultiDBTransactionManager data) {
try {
List<AdvancedDataSource> activeConnections = data.getActiveConnections();
@@ -207,18 +214,18 @@ public class DefaultAutomatedOperationHandlerComponent {
if (!activeOperations.containsKey(AutomatedOperationTypeEnum.METHOD_CALLS))
activeOperations.put(AutomatedOperationTypeEnum.METHOD_CALLS, new ArrayList<>());
activeConnections = Stream.of(activeConnections)
activeConnections = activeConnections.stream()
.filter(x -> x.isInternalDb() && x.getDataSource().getProfile().equalsIgnoreCase(x.getDataSource().getDbName()))
.toList();
.collect(Collectors.toList());
for (AdvancedDataSource activeConnection : activeConnections) {
final String filesDeleterOperationName = "File deleter " + activeConnection.getProfileName().toUpperCase();
List<BaseAutomatedOperationDTO> list = Stream.of(activeOperations.get(AutomatedOperationTypeEnum.METHOD_CALLS))
List<BaseAutomatedOperationDTO> list = activeOperations.get(AutomatedOperationTypeEnum.METHOD_CALLS).stream()
.filter(iScheduledOperation -> iScheduledOperation.getName().equalsIgnoreCase(filesDeleterOperationName))
.toList();
.collect(Collectors.toList());
if (list != null && list.size() > 0) {
if (!list.isEmpty()) {
for (BaseAutomatedOperationDTO operationDTO : list) {
automatedOperationHandlerComponent.remove(operationDTO.getId());
}
@@ -263,7 +270,7 @@ public class DefaultAutomatedOperationHandlerComponent {
SettingsModel settingsModel = ContextLoader.getCurrentWebApplicationContext().getBean(SettingsModel.class);
Stream.of(settingsModel.getAvailableConnections())
settingsModel.getAvailableConnections().stream()
.filter(x -> x.getInternalDb() && x.getProfileName().equalsIgnoreCase(x.getDbName()))
.map(AvailableConnectionsModel::getProfileName)
.forEach(profileDb -> {

8
ems-core/src/main/java/it/integry/ems_model/entity/MtbColt.java
View File

@@ -708,6 +708,14 @@ public class MtbColt extends EntityBase implements EquatableEntityInterface<MtbC
return this;
}
@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof MtbColt)) return false;
MtbColt mtbColt = (MtbColt) obj;
return equalsContent(mtbColt);
}
@Override
public boolean equalsKey(MtbColt other) {
if (this == other) return true;

121
ems-engine/src/main/java/it/integry/ems/contabil/controller/ContabilController.java
View File

@@ -67,6 +67,7 @@ public class ContabilController {
@Autowired
private RossoGarganoSyncService rossoGarganoSyncService;
@RequestMapping(value = "/contabil/status", method = RequestMethod.GET)
public @ResponseBody
List<StatusResponse> status(HttpServletRequest request) {
@@ -98,7 +99,7 @@ public class ContabilController {
@RequestParam("dataDist") String dataDist, @RequestParam("rifDist") Integer rifDist) {
ServiceRestResponse resp = null;
try {
resp =SEPAService.getSepaXml(UtilityString.parseDate(dataDist), rifDist);
resp = SEPAService.getSepaXml(UtilityString.parseDate(dataDist), rifDist);
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
resp = new ServiceRestResponse(EsitoType.KO, configuration, e);
@@ -304,141 +305,81 @@ public class ContabilController {
@RequestMapping(value = "cancellaAutofattura", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse cancellaAutofattura(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody AutofatturaDTO autofatturaDTO) throws Exception {
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody AutofatturaDTO autofatturaDTO) throws Exception {
return ServiceRestResponse.createPositiveResponse(autofatturaService.cancellaAutofattura(autofatturaDTO));
}
@RequestMapping(value = EmsRestConstants.PATH_CHK_AUTOFATTURA, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse chkAutofattura(HttpServletRequest request) {
ServiceRestResponse response;
try {
autofatturaService.chkAutofattura();
response = ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, "", e);
}
return response;
ServiceRestResponse chkAutofattura(HttpServletRequest request) throws Exception {
autofatturaService.chkAutofattura();
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = "chkScadenze", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse chkScadenze(HttpServletRequest request) {
ServiceRestResponse response;
try {
scadenzeService.chkScadenze();
response = ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, "", e);
}
return response;
ServiceRestResponse chkScadenze(HttpServletRequest request) throws Exception {
scadenzeService.chkScadenze();
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_PASSAGGIO_ANNO, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse checkYear(HttpServletRequest request, @RequestParam(CommonConstants.PROFILE_DB) String configuration) {
ServiceRestResponse checkYear(HttpServletRequest request, @RequestParam(CommonConstants.PROFILE_DB) String configuration) throws Exception {
ServiceRestResponse response;
try {
if (passaggioAnno.checkYear()) {
response = ServiceRestResponse.createPositiveResponse();
} else {
response = ServiceRestResponse.createNegativeResponse();
}
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, "", e);
if (passaggioAnno.checkYear()) {
response = ServiceRestResponse.createPositiveResponse();
} else {
response = ServiceRestResponse.createNegativeResponse();
}
return response;
}
@RequestMapping(value = "SyncDulciar", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse syncDulciar(HttpServletRequest request, @RequestParam(CommonConstants.PROFILE_DB) String configuration) {
try {
dulciarSincronizzazione.sync();
return ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
return ServiceRestResponse.createNegativeResponse(e);
}
ServiceRestResponse syncDulciar(HttpServletRequest request, @RequestParam(CommonConstants.PROFILE_DB) String configuration) throws Exception {
dulciarSincronizzazione.sync();
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = "syncRossoGargano", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse syncRossoGargano(HttpServletRequest request, @RequestParam(CommonConstants.PROFILE_DB) String configuration) {
try {
rossoGarganoSyncService.sync();
return ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
return ServiceRestResponse.createNegativeResponse(e);
}
ServiceRestResponse syncRossoGargano(HttpServletRequest request, @RequestParam(CommonConstants.PROFILE_DB) String configuration) throws Exception {
rossoGarganoSyncService.sync();
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_CALCOLA_AMMORTAMENTI, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse calcolaAmmortamenti(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody CalcAmmortamentoDTO calcAmmortamentoDTO) {
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody CalcAmmortamentoDTO calcAmmortamentoDTO) throws Exception {
ServiceRestResponse response;
try {
ServiceRestResponse.createPositiveResponse(ammortamentiService.calcAmmortamento(calcAmmortamentoDTO));
response = ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
}
return response;
return ServiceRestResponse.createPositiveResponse(ammortamentiService.calcAmmortamento(calcAmmortamentoDTO));
}
@RequestMapping(value = EmsRestConstants.PATH_REGISTRA_MOVCONV_AMMORTAMENTI, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse registraMovContAmmortamenti(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody RegMovConAmmortamentoDTO regMovConAmmortamentoDTO) {
ServiceRestResponse response;
try {
ServiceRestResponse.createPositiveResponse(ammortamentiService.registraMovContAmmortamenti(regMovConAmmortamentoDTO));
response = ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
response = new ServiceRestResponse(EsitoType.KO, configuration, e);
}
return response;
@RequestBody RegMovConAmmortamentoDTO regMovConAmmortamentoDTO) throws Exception {
return ServiceRestResponse.createPositiveResponse(ammortamentiService.registraMovContAmmortamenti(regMovConAmmortamentoDTO));
}
@RequestMapping(value = "allineaPartiteContabili", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse allineaPartiteContabili(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration) {
try {
contabilService.allineaPartitaContabili();
return ServiceRestResponse.createPositiveResponse();
} catch (Exception e) {
logger.error(request.getRequestURI(), e);
return ServiceRestResponse.createNegativeResponse(e);
}
@RequestParam(CommonConstants.PROFILE_DB) String configuration) throws Exception {
contabilService.allineaPartitaContabili();
return ServiceRestResponse.createPositiveResponse();
}
}

27
ems-engine/src/main/java/it/integry/ems/document/controller/DocumentController.java
View File

@@ -767,14 +767,10 @@ public class DocumentController {
@RequestMapping(value = EmsRestConstants.PATH_REMOVE_FPX_INVIO_FILES, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse removeFpxInvioFiles(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDb) {
try {
documentService.removeFpxInvioFiles();
return ServiceRestResponse.createPositiveResponse();
} catch (Exception ex) {
logger.error(request.getRequestURI(), ex);
return new ServiceRestResponse(EsitoType.KO, profileDb, ex);
}
@RequestParam(CommonConstants.PROFILE_DB) String profileDb) throws Exception {
documentService.removeFpxInvioFiles();
return ServiceRestResponse.createPositiveResponse();
}
@@ -998,16 +994,17 @@ public class DocumentController {
}
}
@RequestMapping(value = "updateDtbDoctPrevistaFat", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse updateDtbDoctPrevistaFat(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestParam String codDtip,
@RequestParam String codAnag,
@RequestParam Date dataDoc,
@RequestParam String serDoc,
@RequestParam Integer numDoc,
@RequestParam String previstaFat) {
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestParam String codDtip,
@RequestParam String codAnag,
@RequestParam Date dataDoc,
@RequestParam String serDoc,
@RequestParam Integer numDoc,
@RequestParam String previstaFat) {
try {
return ServiceRestResponse.createPositiveResponse(documentService.updateDtbDoctPrevistaFat(codDtip, codAnag, dataDoc, serDoc, numDoc, previstaFat));

6
ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java
View File

@@ -171,14 +171,16 @@ public class ExchangeColliImportService {
mtbColrLavTableName, null, retrieveAlreadyImported);
mtbColtLav
.parallelStream()
.forEach(x -> {
x.setMtbColr(mtbColrLav.stream()
mtbColrLav.stream()
.filter(y -> y.getDataCollo().equals(x.getDataCollo()) &&
y.getGestione().equalsIgnoreCase(x.getGestione()) &&
y.getNumCollo().equals(x.getNumCollo()) &&
y.getSerCollo().equalsIgnoreCase(x.getSerCollo()))
.collect(Collectors.toList()));
.forEach(mtbColr -> x.getMtbColr().add(mtbColr));
});
return mtbColtLav;