Pārlūkot izejas kodu

Solved importing problems

Drowsito 4 dienas atpakaļ
vecāks
revīzija
b077208070

+ 1 - 1
src/main/java/es/uv/saic/domain/OrganRepository.java

@@ -25,7 +25,7 @@ public interface OrganRepository extends JpaRepository<Organ, OrganPK> {
 				"o2.nom_cas AS nomCas2, o2.nom_val AS nomVal2, " +
 				"o2.ruct AS ruct2 " + 
 				"FROM organs AS o1 JOIN organs AS o2 on o1.tlugar2 = o2.tlugar AND o1.lugar2 = o2.lugar WHERE o1.ruct = ?1 AND o1.actiu = true;"), nativeQuery=true)
-	public OrganDTO findByRuctDTO(Integer ruct);
+	public OrganRepositoryDTO findByRuctDTO(Integer ruct);
 
 	@Query(value=("""
 		SELECT lugar FROM organs WHERE tlugar = ?1 AND lugar = ?2

+ 2 - 2
src/main/java/es/uv/saic/dto/OrganDTO.java

@@ -64,8 +64,8 @@ public class OrganDTO{
     public OrganDTO(OrganRepositoryDTO organ) {
         this.lugar = Integer.parseInt(organ.getLugar());
         this.tlugar = organ.getTlugar();
-        this.lugar2 = Integer.parseInt(organ.getLugar());
-        this.tlugar2 =  organ.getTlugar();  
+        this.lugar2 = Integer.parseInt(organ.getLugar2());
+        this.tlugar2 =  organ.getTlugar2();  
         this.nomCas = organ.getNomCas();
         this.nomVal = organ.getNomVal();
         this.ruct = organ.getRuct();

+ 2 - 1
src/main/java/es/uv/saic/service/OrganService.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.OrganRepository;
 import es.uv.saic.dto.OrganDTO;
+import es.uv.saic.dto.OrganRepositoryDTO;
 
 
 @Service
@@ -27,7 +28,7 @@ public class OrganService {
 		return this.organRepository.findByRuct(ruct);
 	}
 
-	public OrganDTO findByRuctDTO(Integer ruct) {
+	public OrganRepositoryDTO findByRuctDTO(Integer ruct) {
 		return this.organRepository.findByRuctDTO(ruct);
 	}
 

+ 29 - 0
src/main/java/es/uv/saic/web/EmailController.java

@@ -0,0 +1,29 @@
+package es.uv.saic.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+import es.uv.saic.dto.EmailDTO;
+import es.uv.saic.service.EmailService;
+import jakarta.mail.MessagingException;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+@RestController
+public class EmailController {
+    @Autowired
+    EmailService es;
+
+    @PostMapping("/sendEmail")
+    public void sendEmail(@RequestBody EmailDTO email) {
+        try {
+            es.sendMail(email.getTo(), email.getSubject(), email.getMessage());
+        } catch (MessagingException e) {
+            e.printStackTrace();
+        }
+
+    }
+    
+}

+ 6 - 1
src/main/java/es/uv/saic/web/OrganController.java

@@ -22,6 +22,7 @@ import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Proces;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.dto.OrganDTO;
+import es.uv.saic.dto.OrganRepositoryDTO;
 import es.uv.saic.dto.OrganTransferDTO;
 import es.uv.saic.service.IndicadorEnquestaService;
 import es.uv.saic.service.OrganService;
@@ -64,7 +65,11 @@ public class OrganController {
 
     @GetMapping("/getOrgByRuct/{ruct}")
     public OrganDTO getOrgByRuct(@PathVariable Integer ruct) {
-        return os.findByRuctDTO(ruct);
+
+		OrganRepositoryDTO organ = os.findByRuctDTO(ruct);
+		OrganDTO organDto = new OrganDTO(organ);
+
+        return organDto;
     }
 
     /*