瀏覽代碼

Refactor to use OrganDTO instead of OrganDTOImp

Replaced all references to OrganDTOImp with OrganDTO in CoreClient and DataService. This change simplifies the code by using the interface type directly and improves consistency across the service and client layers.
Mario Martínez Hernández 4 周之前
父節點
當前提交
125e086d06
共有 2 個文件被更改,包括 5 次插入6 次删除
  1. 1 3
      src/main/java/es/uv/saic/feing/CoreClient.java
  2. 4 3
      src/main/java/es/uv/saic/service/DataService.java

+ 1 - 3
src/main/java/es/uv/saic/feing/CoreClient.java

@@ -11,17 +11,15 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import es.uv.saic.domain.IndicadorEnquestaTmp;
-import es.uv.saic.domain.Organ;
 import es.uv.saic.dto.EmailDTO;
 import es.uv.saic.dto.IndicadorEnquestaTmpDup;
 import es.uv.saic.dto.OrganDTO;
-import es.uv.saic.dto.OrganDTOImp;
 
 @FeignClient(name = "core-service", url = "${saic.url.core.domain}")
 public interface CoreClient {
     
     @GetMapping("/getOrgByRuct/{ruct}")
-    public OrganDTOImp getOrgByRuct(@PathVariable Integer ruct);
+    public OrganDTO getOrgByRuct(@PathVariable Integer ruct);
     
     @GetMapping("/existsOrg/{tlugar}/{idTitulacio}")
     public boolean existsOrg(@PathVariable String tlugar,  @PathVariable Integer idTitulacio);

+ 4 - 3
src/main/java/es/uv/saic/service/DataService.java

@@ -38,6 +38,7 @@ import es.uv.saic.domain.IndicadorEnquestaTmp;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.dto.EmailDTO;
 import es.uv.saic.dto.IndicadorEnquestaTmpDup;
+import es.uv.saic.dto.OrganDTO;
 import es.uv.saic.dto.OrganDTOImp;
 import es.uv.saic.feing.CoreClient;
 import es.uv.saic.domain.Datasource;
@@ -136,7 +137,7 @@ public class DataService {
 			Integer centre;
 	    	Integer titulacio;
 			if(clau.equals("ruct") && ambit.equals("T") && ruct != null) {
-				OrganDTOImp o = findOrgByRuct(ruct);
+				OrganDTO o = findOrgByRuct(ruct);
 				if(o == null) {
 					errors.append("[WARNING] " + (locale.equals("es") ? "No se ha encontrado el RUCT "+ructStr+", se omiten los registros de esta entrada." : "No s'ha trobat el RUCT "+ructStr+", s'ometen els registres d'aquesta entrada.")).append("<br>").toString();
 					continue;
@@ -276,7 +277,7 @@ public class DataService {
 					else{
 						isValid = false;
 					}
-					OrganDTOImp o = findOrgByRuct(ruct);
+					OrganDTO o = findOrgByRuct(ruct);
 					if(o == null) {
 						errors.append("[WARNING] " + (locale.equals("es") ? "No se ha encontrado el RUCT "+ructStr+", se omiten los registros de esta entrada." : "No s'ha trobat el RUCT "+ructStr+", s'ometen els registres d'aquesta entrada.")).append("<br>").toString();
 						continue;
@@ -526,7 +527,7 @@ public class DataService {
 		return c;
 	}
 
-	private OrganDTOImp findOrgByRuct(Integer ruct) {
+	private OrganDTO findOrgByRuct(Integer ruct) {
 		return cc.getOrgByRuct(ruct);
 	}