Avanzando llamadas a PlantillaService.java de docs

src/main/java/es/uv/saic/feign/PlantillaClient.java

@@ -0,0 +1,22 @@
+package es.uv.saic.feign;
+
+import java.util.List;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import es.uv.saic.domain.Plantilla;
+
+@FeignClient(value = "plantilla-controller", url = "${saic.url.docs.domain}")
+public interface PlantillaClient {
+
+    @GetMapping("/plantilla")
+    List<Plantilla> findAll();
+
+    @GetMapping("/plantilla/{id}")
+    Plantilla findByID(@PathVariable("id") Integer id);
+
+    @GetMapping("/plantilla/{versio}/{codi}/{ambit}")
+    Plantilla findByVersioCodiAmbit(@PathVariable("versio") Integer versio, @PathVariable("codi") String codi, @PathVariable("ambit") String ambit);
+}

src/main/java/es/uv/saic/service/InstanciaTascaService.java

@@ -37,6 +37,7 @@ import es.uv.saic.domain.Usuari;
 import es.uv.saic.dto.CategoriaDTO;
 import es.uv.saic.dto.InstanciaTascaDTO;
 import es.uv.saic.dto.TascaInformeTransferDTO;
+import es.uv.saic.feign.PlantillaClient;
 
 @Service
 public class InstanciaTascaService {
@@ -53,6 +54,8 @@ public class InstanciaTascaService {
 	private InstanciaService instanciaService;
 	@Autowired
 	private EmailService es;
+	@Autowired
+	private PlantillaClient plc;
 	@Value("${saic.data.filePath}")
 	private String filePath;
 	@Value("${saic.url.docs.domain}")
@@ -67,7 +70,7 @@ public class InstanciaTascaService {
 		return this.instanciaTascaRepository.findByInstanciaTascap(i_id, tascap);
 	}
 	
-	public List<TascaVersioTransfer> findOlderVersions(BigInteger idInstancia, Integer idTasca, Integer version, PlantillaService pls) {
+	public List<TascaVersioTransfer> findOlderVersions(BigInteger idInstancia, Integer idTasca, Integer version) {
 		List<InstanciaTasca> itlist = this.instanciaTascaRepository.findOlderVerions(idInstancia, idTasca, version);
 		List<TascaVersioTransfer> vtlist = new ArrayList<TascaVersioTransfer>();
 		if(itlist != null) {
@@ -81,12 +84,12 @@ public class InstanciaTascaService {
 					tvt.setDataFet(it.getDataFet());
 					tvt.setEstat(it.getEstat());
 					if(it.getTasca().getTipus().getTipus() == 11 || it.getTasca().getTipus().getTipus() == 15) {
-						Plantilla p = pls.findByID(Integer.parseInt(it.getTasca().getCodiEvidencia()));
+						Plantilla p = plc.findByID(Integer.parseInt(it.getTasca().getCodiEvidencia()));
 						Plantilla p2 = null;
 						
 						if(it.getInstancia().getTitulacio() > 0) {
 							if(!p.getAmbit().equals(it.getInstancia().getOrgan().getTambit())) {
-								p2 = pls.findByVersioCodiAmbit(p.getVersio(), p.getCodi(), it.getInstancia().getOrgan().getTambit());
+								p2 = plc.findByVersioCodiAmbit(p.getVersio(), p.getCodi(), it.getInstancia().getOrgan().getTambit());
 							}
 						}			
 						if(p2 != null) { p = p2; }
@@ -387,7 +390,7 @@ public class InstanciaTascaService {
 		}
 	}
 	
-	public List<EvidenciaTransfer> findOlderByProces(Integer centre, Integer titulacio, String nomProces, Integer minCurs, PlantillaService pls){
+	public List<EvidenciaTransfer> findOlderByProces(Integer centre, Integer titulacio, String nomProces, Integer minCurs){
 		List<EvidenciaTransfer> elist = new ArrayList<EvidenciaTransfer>();
 		List<InstanciaTasca> itlist = this.instanciaTascaRepository.findOlderByProces(centre, titulacio, nomProces, minCurs);
 		if(itlist != null) {
@@ -400,12 +403,12 @@ public class InstanciaTascaService {
 					et.setNomProces(i.getTasca().getProces().getNomProces());
 					et.setIdTascai(i.getIdInstanciaTasca());
 					if(i.getTasca().getTipus().getTipus() == 11 || i.getTasca().getTipus().getTipus() == 15) {
-						Plantilla p = pls.findByID(Integer.parseInt(i.getTasca().getCodiEvidencia()));
+						Plantilla p = plc.findByID(Integer.parseInt(i.getTasca().getCodiEvidencia()));
 						Plantilla p2 = null;
 						
 						if(i.getInstancia().getTitulacio() > 0) {
 							if(!p.getAmbit().equals(i.getInstancia().getOrgan().getTambit())) {
-								p2 = pls.findByVersioCodiAmbit(p.getVersio(), p.getCodi(), i.getInstancia().getOrgan().getTambit());
+								p2 = plc.findByVersioCodiAmbit(p.getVersio(), p.getCodi(), i.getInstancia().getOrgan().getTambit());
 							}
 						}			
 						if(p2 != null) { p = p2; }

src/main/java/es/uv/saic/web/AdminController.java

@@ -45,6 +45,7 @@ import es.uv.saic.domain.Rol;
 import es.uv.saic.domain.Tasca;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.domain.UsuarisRol;
+import es.uv.saic.feign.PlantillaClient;
 import es.uv.saic.service.AcreditacioService;
 import es.uv.saic.service.EmailService;
 import es.uv.saic.service.EvidenciaIndicadorEnquestaService;
@@ -93,6 +94,8 @@ public class AdminController {
 	@Autowired
 	private EvidenciaIndicadorEnquestaService eies;
 	@Autowired
+	private PlantillaClient plc;
+	@Autowired
 	private AcreditacioService as;
 	@Value("${saic.data.filePath}")
 	private String filePath;
@@ -968,7 +971,7 @@ public class AdminController {
 	public String getTemplateEditor(Model model, Authentication auth, HttpServletResponse response) {
 
 		List<String> inds = this.ies.findTypes();
-		List<Plantilla> templates = this.pls.findAll();
+		List<Plantilla> templates = this.plc.findAll();
 		model.addAttribute("templates", templates);
 		model.addAttribute("inds", inds);
 		this.loadInstanceData(model);
@@ -983,7 +986,7 @@ public class AdminController {
 	public String testTemplateEditor(Model model, Authentication auth, HttpServletResponse response,
 			@RequestParam Integer idPlantilla, @RequestParam Integer idTitulacio, @RequestParam Integer idCentre, @RequestParam Integer curs) {
 		
-		Plantilla p = pls.findByID(idPlantilla);
+		Plantilla p = plc.findByID(idPlantilla);
 		String text = pls.addTemplateData(idTitulacio, idCentre, curs, p.getText());
 		model.addAttribute("text", text);
 		

src/main/java/es/uv/saic/web/AjaxController.java

@@ -40,6 +40,7 @@ import es.uv.saic.domain.Rol;
 import es.uv.saic.domain.Tipus;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.dto.EvidenciaBuscadorDTO;
+import es.uv.saic.feign.PlantillaClient;
 import es.uv.saic.service.CalendariService;
 import es.uv.saic.service.EmailService;
 import es.uv.saic.service.EvidenciaIndicadorEnquestaService;
@@ -82,6 +83,8 @@ public class AjaxController {
 	private InstanciaTascaService its;
 	@Autowired
 	private EmailService es;
+	@Autowired
+	private PlantillaClient plc;
 	
 	@PostMapping("/ajax/active/centres")
 	public String getActiveCentres(Model model, Authentication auth) throws IOException {	
@@ -423,7 +426,7 @@ public class AjaxController {
 		Proces p = new Proces();
 		model.addAttribute("action", action);
 		List<Tipus> tipus = tps.findAll();
-		List<Plantilla> templates = pls.findAll();
+		List<Plantilla> templates = plc.findAll();
 		model.addAttribute("tipus", tipus);
 		model.addAttribute("templates", templates);
 		
@@ -487,7 +490,7 @@ public class AjaxController {
 	public String newTaskForm(Model model, Authentication auth, @PathVariable Integer i) throws IOException {	
 		List<Rol> roles = rs.findAssignables();
 		List<Tipus> tipus = tps.findAll();
-		List<Plantilla> templates = pls.findAll();
+		List<Plantilla> templates = plc.findAll();
 		model.addAttribute("tipus", tipus);
 		model.addAttribute("roles", roles);
 		model.addAttribute("i", i);
@@ -507,7 +510,7 @@ public class AjaxController {
 	@ResponseBody
 	@PostMapping("/ajax/find/template")
 	public String findTemplate(Model model, Authentication auth, @RequestParam("id") Integer idPlantilla) throws IOException {	
-		Plantilla p = pls.findByID(idPlantilla);
+		Plantilla p = plc.findByID(idPlantilla);
 		return p.getText();
 	}
 	
@@ -530,13 +533,13 @@ public class AjaxController {
 			return "components/form_template";
 		}
 		else if(action.equals("edit")) {
-			Plantilla p = pls.findByID(idPlantilla);
+			Plantilla p = plc.findByID(idPlantilla);
 			model.addAttribute("editable", false);
 			model.addAttribute("template", p);
 			return "components/form_template";
 		}
 		else if(action.equals("duplicate")) {
-			Plantilla p = pls.findByID(idPlantilla);
+			Plantilla p = plc.findByID(idPlantilla);
 			p.setVersio(p.getVersio()+1);
 			model.addAttribute("editable", true);
 			model.addAttribute("template", p);
@@ -554,7 +557,7 @@ public class AjaxController {
 			return "0";
 		}
 		else {
-			Plantilla p = pls.findByID(idPlantilla);
+			Plantilla p = plc.findByID(idPlantilla);
 			pls.delete(p);
 			return "1";
 		}
@@ -569,7 +572,7 @@ public class AjaxController {
 			@RequestParam("nomCas") String nomCas, @RequestParam("nomVal") String nomVal, @RequestParam("ambit") String ambit) throws IOException {	
 		
 		if(action.equals("edit")) {
-			Plantilla p = pls.findByID(idPlantilla);
+			Plantilla p = plc.findByID(idPlantilla);
 			p.setNomCas(nomCas);
 			p.setNomVal(nomVal);
 			p.setText(text);
@@ -579,7 +582,7 @@ public class AjaxController {
 		}
 		else if(action.equals("duplicate") || action.equals("new")) {
 			Plantilla p = new Plantilla();
-			Plantilla p2 = pls.findByVersioCodiAmbit(versio, codi, ambit);
+			Plantilla p2 = plc.findByVersioCodiAmbit(versio, codi, ambit);
 			if(p2 != null) {
 				return "0";
 			}
@@ -599,7 +602,7 @@ public class AjaxController {
 	@PostMapping("/ajax/draft/save/{id}")
 	public String saveTemplate(Model model, Authentication auth, @PathVariable("id") Integer idPlantilla, 
 			@RequestParam("text") String text) throws IOException {	
-		Plantilla p = pls.findByID(idPlantilla);
+		Plantilla p = plc.findByID(idPlantilla);
 		p.setText(text);
 		pls.save(p);
 		return "1";

src/main/java/es/uv/saic/web/PlantillaController.java

@@ -1,58 +0,0 @@
-package es.uv.saic.web;
-
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import es.uv.saic.dto.PdfDTO;
-import es.uv.saic.service.PlantillaService;
-
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-
-@RestController
-public class PlantillaController {
-    
-	@Value("${saic.url.docs.domain}")
-	private String uriDocs;
-	
-	private final HttpClient httpClient = HttpClient.newHttpClient();
-    private final ObjectMapper mapper = new ObjectMapper();
-
-    @PostMapping("/toPDF")
-    public ResponseEntity<?> toPDF(@RequestBody PdfDTO pdfDTO) {
-        byte[] file = null;
-		try {
-			String requestBody = mapper.writeValueAsString(pdfDTO);
-            HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(uriDocs + "/toPDF"))
-                .header("Content-Type", "application/json")
-                .POST(HttpRequest.BodyPublishers.ofString(requestBody))
-                .build();
-
-            HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-            if (response.statusCode() == HttpURLConnection.HTTP_OK){
-				return ResponseEntity.ok(file = mapper.readValue(response.body(), new TypeReference<byte[]>(){}));
-
-			} else {
-				System.err.println("Failed to convert the PDF. HTTP error code: " + response.statusCode());
-			}
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-		return ResponseEntity.badRequest().body("Failed to convert the PDF.");
-    }
-    
-}

src/main/java/es/uv/saic/web/ProceduresController.java

@@ -40,6 +40,7 @@ import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Plantilla;
 import es.uv.saic.domain.Proces;
 import es.uv.saic.domain.Usuari;
+import es.uv.saic.feign.PlantillaClient;
 import es.uv.saic.service.*;
 
 
@@ -60,6 +61,8 @@ public class ProceduresController {
 	private PlantillaService pls;
 	@Autowired
 	private OrganService ors;
+	@Autowired
+	private PlantillaClient plc;
 	@Value("${saic.data.filePath}")
 	private String filePath;
 
@@ -400,12 +403,12 @@ public class ProceduresController {
 			}
 			
 			if(it.getTasca().getTipus().getTipus() == 11 || it.getTasca().getTipus().getTipus() == 15) {
-				Plantilla p = pls.findByID(Integer.parseInt(it.getTasca().getCodiEvidencia()));
+				Plantilla p = plc.findByID(Integer.parseInt(it.getTasca().getCodiEvidencia()));
 				Plantilla p2 = null;
 				
 				if(i.getTitulacio() > 0) {
 					if(!p.getAmbit().equals(i.getOrgan().getTambit())) {
-						p2 = pls.findByVersioCodiAmbit(p.getVersio(), p.getCodi(), i.getOrgan().getTambit());
+						p2 = plc.findByVersioCodiAmbit(p.getVersio(), p.getCodi(), i.getOrgan().getTambit());
 					}
 				}			
 				
@@ -438,8 +441,8 @@ public class ProceduresController {
 				itt.setUsuariFet("");
 			}			
 			itt.setAssignedToUser(its.isUserAuthorized(((Usuari)auth.getPrincipal()), itt.getIdInstanciaTasca()));
-			itt.setOldEvidences(its.findOlderByProces(it.getInstancia().getCentre(), it.getInstancia().getTitulacio(), it.getInstancia().getProces().getNomProces(), i.getProces().getCursActivacio(), this.pls));
-			itt.setVersions(its.findOlderVersions(it.getInstancia().getIdInstancia(), it.getTasca().getIdTasca(), it.getVersion(), this.pls));
+			itt.setOldEvidences(its.findOlderByProces(it.getInstancia().getCentre(), it.getInstancia().getTitulacio(), it.getInstancia().getProces().getNomProces(), i.getProces().getCursActivacio()));
+			itt.setVersions(its.findOlderVersions(it.getInstancia().getIdInstancia(), it.getTasca().getIdTasca(), it.getVersion()));
 			tasks.add(itt);
 		}
 		model.addAttribute("tasks", tasks);