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

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-02-17 18:29:27 +01:00
parent e86a9ee668 72307ca9b4
commit c0433e68e6
5 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-core/src/main/java/it/integry/ems/javabeans/RequestDataDTO.java
View File

@@ -117,6 +117,10 @@ public class RequestDataDTO {
} }
public boolean isValidPassword() { public boolean isValidPassword() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken))
return true;
return !UtilityString.isNullOrEmpty(password); return !UtilityString.isNullOrEmpty(password);
} }

3
ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java
View File

@@ -10,7 +10,6 @@ import it.integry.ems.response.FileItem;
import it.integry.ems.response.ServiceRestResponse; import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.service.EntityProcessor; import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.user.UtilityUser;
import it.integry.ems.utility.BarcodeUtility; import it.integry.ems.utility.BarcodeUtility;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.db.ResultSetMapper; import it.integry.ems_model.db.ResultSetMapper;
@@ -334,8 +333,6 @@ public class SmartLogisticService {
public FileItem getInfoArticolo(String username, String password, public FileItem getInfoArticolo(String username, String password,
String codDepo, String codDepoClie, String barcode) throws Exception { String codDepo, String codDepoClie, String barcode) throws Exception {
UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), username, password);
FileItem fileItem = null; FileItem fileItem = null;
String sql = "select giacenza.cod_mart, giacenza.cod_col, giacenza.cod_tagl, " + String sql = "select giacenza.cod_mart, giacenza.cod_col, giacenza.cod_tagl, " +

2
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java
View File

@@ -51,8 +51,6 @@ public class PvmAccettazioneService {
final String gestione = "A"; final String gestione = "A";
List<EntityBase> entityList = new ArrayList<>(); List<EntityBase> entityList = new ArrayList<>();
UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), requestDataDTO.getUsername(), requestDataDTO.getPassword());
String codDtipFatNoRic = getAndCheckTipoDoc("COD_DTIP_FATT_NO_RIC"); String codDtipFatNoRic = getAndCheckTipoDoc("COD_DTIP_FATT_NO_RIC");
String codDtipFatNoRicNC = getAndCheckTipoDoc("COD_DTIP_FATT_NO_RIC_NC"); String codDtipFatNoRicNC = getAndCheckTipoDoc("COD_DTIP_FATT_NO_RIC_NC");
String codDtipRicNoFatResa = getAndCheckTipoDoc("COD_DTIP_RIC_NO_FAT_RESA"); String codDtipRicNoFatResa = getAndCheckTipoDoc("COD_DTIP_RIC_NO_FAT_RESA");

2
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmPropostaOrdineService.java
View File

@@ -4,7 +4,6 @@ import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.retail.pvmRetail.dto.save.PropostaOrdineDTO; import it.integry.ems.retail.pvmRetail.dto.save.PropostaOrdineDTO;
import it.integry.ems.service.EntityProcessor; import it.integry.ems.service.EntityProcessor;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.user.UtilityUser;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.DtbOrdr; import it.integry.ems_model.entity.DtbOrdr;
import it.integry.ems_model.entity.DtbOrdt; import it.integry.ems_model.entity.DtbOrdt;
@@ -40,7 +39,6 @@ public class PvmPropostaOrdineService {
String username = requestDataDTO.getUsername(); String username = requestDataDTO.getUsername();
String password = requestDataDTO.getPassword(); String password = requestDataDTO.getPassword();
List<EntityBase> ordini = new ArrayList<EntityBase>(); List<EntityBase> ordini = new ArrayList<EntityBase>();
UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), username, password);
String codMdep = pvmService.getCodMdep(username); String codMdep = pvmService.getCodMdep(username);
DtbOrdt dtbOrdt; DtbOrdt dtbOrdt;

6
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmServiceSave.java
View File

@@ -64,7 +64,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Statement; import java.sql.Statement;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*; import java.util.*;
import static it.integry.common.var.CommonConstants.DATE_FORMAT_YMD; import static it.integry.common.var.CommonConstants.DATE_FORMAT_YMD;
@@ -100,8 +99,6 @@ public class PvmServiceSave {
public List<ServiceRestResponse> SM2Save(SaveDTO saveDTO) throws Exception { public List<ServiceRestResponse> SM2Save(SaveDTO saveDTO) throws Exception {
UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), requestDataDTO.getUsername(), requestDataDTO.getPassword());
String gestione = saveDTO.getGestione(); String gestione = saveDTO.getGestione();
String idDisp = saveDTO.getIdDisp(); String idDisp = saveDTO.getIdDisp();
String zona = saveDTO.getZona(); String zona = saveDTO.getZona();
@@ -161,9 +158,6 @@ public class PvmServiceSave {
} }
public List<ServiceRestResponse> saveTerminalino(String xmlInput) throws Exception { public List<ServiceRestResponse> saveTerminalino(String xmlInput) throws Exception {
UtilityUser.checkUserWeb(multiDBTransactionManager.getPrimaryConnection(), requestDataDTO.getUsername(), requestDataDTO.getPassword());
Document doc = UtilityXML.convertStringToDocument(xmlInput); Document doc = UtilityXML.convertStringToDocument(xmlInput);
XPath xPath = XPathFactory.newInstance().newXPath(); XPath xPath = XPathFactory.newInstance().newXPath();