jjimenez/erp-imprimelibros
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/erp-imprimelibros.git synced 2026-01-13 08:58:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

trabajando en añadir

Browse Source
This commit is contained in:
Jaime Jiménez
2025-10-24 16:15:05 +02:00
parent 3517918afe
commit 2ed032d7c6
18 changed files with 1412 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/com/imprimelibros/erp/paises/PaisesController.java
View File

@ -1,22 +1,17 @@
package com.imprimelibros.erp.paises;
import org.springframework.context.MessageSource;
import org.springframework.web.bind.annotation.*;
import java.text.Collator;
import java.util.*;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/api/paises")
public class PaisesController {
private final PaisesRepository paisesRepository;
private final MessageSource messageSource;
private final PaisesService paisesService;
public PaisesController(PaisesRepository paisesRepository, MessageSource messageSource) {
this.paisesRepository = paisesRepository;
this.messageSource = messageSource;
public PaisesController(PaisesService paisesService) {
this.paisesService = paisesService;
}
/**
@ -34,40 +29,8 @@ public class PaisesController {
@RequestParam(value = "term", required = false) String q2,
Locale locale) {
// Termino de búsqueda (Select2 usa 'q' o 'term' según versión/config)
String search = Optional.ofNullable(q1).orElse(q2);
if (search != null) {
search = search.trim();
}
final String q = (search == null || search.isEmpty())
? null
: search.toLowerCase(locale);
List<Paises> all = paisesRepository.findAll();
// Mapear a opciones id/text con i18n y filtrar por búsqueda si llega
List<Map<String, String>> options = all.stream()
.map(cc -> {
String key = cc.getKeyword();
String text = messageSource.getMessage("paises." + key, null, key, locale);
Map<String, String> m = new HashMap<>();
m.put("id", key); // lo normal en Select2: id = valor que guardarás (keyword)
m.put("text", text); // texto mostrado, i18n con fallback a keyword
return m;
})
.filter(opt -> {
if (q == null || q.isEmpty())
return true;
String text = opt.get("text").toLowerCase(locale);
String id = opt.get("id").toLowerCase(locale);
return text.contains(q) || id.contains(q);
})
.sorted(Comparator.comparing(m -> m.get("text"), Collator.getInstance(locale)))
.collect(Collectors.toList());
// Estructura Select2
Map<String, Object> resp = new HashMap<>();
resp.put("results", options);
return resp;
return paisesService.getForSelect(q1, q2, locale);
}
}