From 7ab80059671cd9cc8b281882fceda393d080c855 Mon Sep 17 00:00:00 2001 From: oscarvarcar <51308529+oscarvarcar@users.noreply.github.com> Date: Wed, 4 Dec 2024 18:05:19 -0700 Subject: [PATCH] correcciones --- .../controllers/UsuarioModelController.java | 85 +++++++++++++++++++ .../repositories/ActivationKeyRepository.java | 4 +- .../PersonSoftwareRepository.java | 4 +- .../crov/repositories/SoftwareRepository.java | 2 +- .../repositories/UsuarioModelRepository.java | 22 +++++ .../crov/services/UsuarioModelService.java | 36 ++++++++ 6 files changed, 146 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/crov/controllers/UsuarioModelController.java create mode 100644 src/main/java/com/crov/repositories/UsuarioModelRepository.java create mode 100644 src/main/java/com/crov/services/UsuarioModelService.java diff --git a/src/main/java/com/crov/controllers/UsuarioModelController.java b/src/main/java/com/crov/controllers/UsuarioModelController.java new file mode 100644 index 0000000..bf85a7d --- /dev/null +++ b/src/main/java/com/crov/controllers/UsuarioModelController.java @@ -0,0 +1,85 @@ +package com.crov.controllers; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +import com.crov.services.UsuarioModelService; + +@RestController +@CrossOrigin(origins = "http://localhost:5173") +@RequestMapping("/api/usuariosModel") +public class UsuarioModelController { + + @Autowired + UsuarioModelService usuarioService; + //@Autowired + //CorteService corteService; + + PostMapping(value = "/getUsersByEmpresaUserModel", produces = MediaType.APPLICATION_JSON_VALUE) + @ResponseStatus(code = HttpStatus.OK) + public List getUsersByEmpresaUserModel(@RequestBody EmpresaUserModel empresaUserModel) { + return usuarioService.getListUsuarioModelByEmpresaUserModel(empresaUserModel); + } + + @PostMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseStatus(code = HttpStatus.OK) + public boolean saveUser(@RequestBody UsuarioModel usuarioModel) { + usuarioService.saveUser(usuarioModel); + UsuarioModel usuarioModelNuevo = usuarioService.getUsuarioModelByEmpresaUserModelAndIdPuntoVenta(usuarioModel.getEmpresaUserModel(), usuarioModel.getIdPuntoVenta()); + Utilerias util = new Utilerias(); + CorteModel corteModel = new CorteModel(); + corteModel.setComentarios("Corte del nuevo usuario"); + corteModel.setEmpresaUserModel(usuarioModel.getEmpresaUserModel()); + corteModel.setEstatus(1); + corteModel.setFecha(util.sumarDiasAFecha(new Date(), -30)); + corteModel.setId(UUID.randomUUID()); + corteModel.setIdPuntoVenta(1); + corteModel.setMontoEsperado(0d); + corteModel.setMontoReportado(0d); + corteModel.setUsuarioEntrega(usuarioModelNuevo); + corteModel.setUsuarioRecibe(usuarioModelNuevo); + corteModel.setPrecorte(0); + return corteService.save(corteModel); + } + + @PostMapping (value ="/sincronizacia-pv",produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE ) + @ResponseStatus(code =HttpStatus.OK) + public Map sincronizarUsuario(@RequestBody List listUsuarioModel) { + Map map = new HashMap<>(); + for(int i=0; i<=listUsuarioModel.size()-1;i++) { + try { + boolean owo = usuarioService.saveUser(listUsuarioModel.get(i)); + if(owo) { + map.put(listUsuarioModel.get(i).getIdPuntoVenta(), "Si"); + }else { + map.put(listUsuarioModel.get(i).getIdPuntoVenta(), "No"); + } + }catch(Exception e) { + + } + + } + return map; + } + + @PostMapping(value="status", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseStatus(code = HttpStatus.OK) + public boolean status(@RequestBody GenericSearchDTO genericSearchDTO) { + UsuarioModel usuarioModel = usuarioService.getUsuarioModelByEmpresaUserModelAndIdPuntoVenta(genericSearchDTO.getEmpresaUserModel(), genericSearchDTO.getIdExtra()); + usuarioModel.setActivo(genericSearchDTO.getIdExtraa()); + return usuarioService.saveUser(usuarioModel); + } +} diff --git a/src/main/java/com/crov/repositories/ActivationKeyRepository.java b/src/main/java/com/crov/repositories/ActivationKeyRepository.java index c8ef33f..60c995c 100644 --- a/src/main/java/com/crov/repositories/ActivationKeyRepository.java +++ b/src/main/java/com/crov/repositories/ActivationKeyRepository.java @@ -1,7 +1,5 @@ package com.crov.repositories; -import java.util.UUID; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -12,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.crov.models.ActivationKey; @Repository -public interface ActivationKeyRepository extends JpaRepository{ +public interface ActivationKeyRepository extends JpaRepository{ @Query(value="SELECT IF(EXISTS(SELECT ac.activation_code, ac.active_key " + "FROM activation_key ac WHERE ac.activation_code =:actCode AND active_key = 'Yes'),1,0)AS resul", nativeQuery=true) diff --git a/src/main/java/com/crov/repositories/PersonSoftwareRepository.java b/src/main/java/com/crov/repositories/PersonSoftwareRepository.java index 580d9c8..59cfc7b 100644 --- a/src/main/java/com/crov/repositories/PersonSoftwareRepository.java +++ b/src/main/java/com/crov/repositories/PersonSoftwareRepository.java @@ -1,13 +1,11 @@ package com.crov.repositories; -import java.util.UUID; - import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; import com.crov.models.PersonSoftware; @Repository -public interface PersonSoftwareRepository extends CrudRepository{ +public interface PersonSoftwareRepository extends CrudRepository{ } diff --git a/src/main/java/com/crov/repositories/SoftwareRepository.java b/src/main/java/com/crov/repositories/SoftwareRepository.java index 797874b..a5f100d 100644 --- a/src/main/java/com/crov/repositories/SoftwareRepository.java +++ b/src/main/java/com/crov/repositories/SoftwareRepository.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import com.crov.models.Software; @Repository -public interface SoftwareRepository extends JpaRepository{ +public interface SoftwareRepository extends JpaRepository{ @Query(value="SELECT IF(EXISTS(SELECT cl.mac FROM customer_license_by_product cl WHERE cl.mac =:vaMac ),1,0 )", nativeQuery=true) int revisarMacExistePreviamente(@Param ("vaMac")String valueMac ); diff --git a/src/main/java/com/crov/repositories/UsuarioModelRepository.java b/src/main/java/com/crov/repositories/UsuarioModelRepository.java new file mode 100644 index 0000000..f50f648 --- /dev/null +++ b/src/main/java/com/crov/repositories/UsuarioModelRepository.java @@ -0,0 +1,22 @@ +package com.crov.repositories; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.crov.models.EmpresaUser; +import com.crov.models.UsuarioModel; + +@Repository +public interface UsuarioModelRepository extends JpaRepository{ + + List findByEmpresaUserModel(EmpresaUser empresaUserModel); + + List findByEmpresaUserModelAndActivo(EmpresaUser empresaUserModel, Integer activo); + + UsuarioModel findByEmpresaUserModelAndIdPuntoVenta(EmpresaUser empresaModel, Integer idPuntoVenta); + + Optional findById(String uuid); +} diff --git a/src/main/java/com/crov/services/UsuarioModelService.java b/src/main/java/com/crov/services/UsuarioModelService.java new file mode 100644 index 0000000..a3ad0a0 --- /dev/null +++ b/src/main/java/com/crov/services/UsuarioModelService.java @@ -0,0 +1,36 @@ +package com.crov.services; + +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.crov.models.EmpresaUser; +import com.crov.models.UsuarioModel; +import com.crov.repositories.UsuarioModelRepository; + +@Service +public class UsuarioModelService { + + @Autowired + UsuarioModelRepository usuarioRepository; + + public List getListUsuarioModelByEmpresaUserModel(EmpresaUser empresaUserModel){ + return usuarioRepository.findByEmpresaUserModelAndActivo(empresaUserModel,1); + } + + public UsuarioModel getUsuarioModelByEmpresaUserModelAndIdPuntoVenta(EmpresaUser empresaModel, Integer idPuntoVenta) { + return usuarioRepository.findByEmpresaUserModelAndIdPuntoVenta(empresaModel, idPuntoVenta); + } + + + public Optional findById(String id){ + return usuarioRepository.findById(id); + + } + + public boolean saveUser(UsuarioModel usuarioModel) { + return usuarioRepository.save(usuarioModel) != null; + } +}