30965 : ANO - problème avec le ws getChildrenByConceptId

culturecommunication · Oct 29, 2018 · 22eb15d · 22eb15d
1 parent deb5890
commit 22eb15d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/ginco-api/src/main/java/fr/mcc/ginco/beans/ThesaurusConcept.java b/ginco-api/src/main/java/fr/mcc/ginco/beans/ThesaurusConcept.java
@@ -64,6 +64,10 @@ public class ThesaurusConcept implements Serializable, IAuditableBean {
 	private String lexicalValue;
 	/*** AAM EVO 2017 Evolutions v5  fin ***/
 
+	/*** MPL 30965 29/10/2018 debut ***/
+	private String languageId;
+	/*** MPL 30965 29/10/2018 fin ***/
+
 
 	@XmlTransient
 	private Thesaurus thesaurus;
@@ -90,6 +94,17 @@ public void setLexicalValue(String lexicalvalue) {
 	/*** AAM EVO 2017 Evolutions v5  fin ***/
 
 
+	/*** MPL 30965 29/10/2018 debut ***/
+	public String getLanguageId() {
+		return this.languageId;
+	}
+
+	public void setLanguageId(String languageId) {
+		this.languageId = languageId;
+	}
+	/*** MPL 30965 29/10/2018 fin ***/
+
+
 	public String getIdentifier() {
 		return identifier;
 	}

diff --git a/ginco-impl/src/main/java/fr/mcc/ginco/dao/hibernate/ThesaurusConceptDAO.java b/ginco-impl/src/main/java/fr/mcc/ginco/dao/hibernate/ThesaurusConceptDAO.java
@@ -176,6 +176,9 @@ private List<ThesaurusConcept> getConcepts(String conceptId, String thesaurusId,
 								.projectionList()
 								.add(Projections.property("tc.thesaurus").as("thesaurus"))
 								.add(Projections.property("tt.lexicalValue").as("lexicalValue"))
+								//MPL 30965 29/10/2018 debut
+								.add(Projections.property("tt.language.id").as("languageId"))
+								//MPL 30965 29/10/2018 fin
 								.add(Projections.property("tc.notation").as("notation"))
 								.add(Projections.property("tc.status").as("status"))
 								.add(Projections.property("tc.identifier").as(

diff --git a/ginco-webservices/src/main/java/fr/mcc/ginco/data/ReducedThesaurusConcept.java b/ginco-webservices/src/main/java/fr/mcc/ginco/data/ReducedThesaurusConcept.java
@@ -59,6 +59,10 @@ public class ReducedThesaurusConcept {
 
 	/*** AAM EVO 2017 Evolutions v5  fin ***/
 
+	/*** MPL 30965 29/10/2018 debut ***/
+	private String languageId;
+	/*** MPL 30965 29/10/2018 fin ***/
+
 	/*** AAM EVO 2017 Evolutions v5  début ***/
 
 
@@ -79,6 +83,16 @@ public void setLexicalValue(String lexicalvalue) {
 	}
 	/*** AAM EVO 2017 Evolutions v5  fin ***/
 
+	/*** MPL 30965 29/10/2018 debut ***/
+	public String getLanguageId() {
+		return this.languageId;
+	}
+
+	public void setLanguageId(String languageId) {
+		this.languageId = languageId;
+	}
+	/*** MPL 30965 29/10/2018 fin ***/
+
 	private List<ReducedThesaurusConcept> associates;
 
 	private List<ReducedThesaurusConcept> parents;
@@ -101,6 +115,9 @@ public static ReducedThesaurusConcept getReducedThesaurusConcept(ThesaurusConcep
 		}
 		reducedConcept.setLexicalValue(concept.getLexicalValue());
 		reducedConcept.setNotation(concept.getNotation());
+		//MPL 30965 29/10/2018 debut
+		reducedConcept.setLanguageId(concept.getLanguageId());
+		//MPL 30965 29/10/2018 fin
 		//FIXME TODO
 	//	reducedConcept.setLexicalValue("lexicalValue  aaaa");
 	//	reducedConcept.setNotation("notation bbbbbb");

diff --git a/ginco-webservices/src/main/java/fr/mcc/ginco/soap/SOAPThesaurusConceptServiceImpl.java b/ginco-webservices/src/main/java/fr/mcc/ginco/soap/SOAPThesaurusConceptServiceImpl.java
@@ -198,9 +198,8 @@ public List<ReducedThesaurusConcept> getChildrenByConceptId(String conceptId, Co
 	}
 	//JLSO 29055 21/06/2018 fin
 	@Override
-	public List<ReducedThesaurusConcept> getChildrenByConceptId_v2(String conceptId, ConceptStatusEnum status,
-			Boolean withAssociates,
-			Boolean withNotes) {
+	public List<ReducedThesaurusConcept> getChildrenByConceptId_v2(String conceptId,
+			ConceptStatusEnum status, Boolean withAssociates, Boolean withNotes) {
 		if (StringUtils.isNotEmpty(conceptId)) {
 			List<ReducedThesaurusConcept> results = new ArrayList<ReducedThesaurusConcept>();
 			ThesaurusConcept thesaurusConcept = thesaurusConceptService.getThesaurusConceptById(conceptId);