commit 314bbd500af0fceed4169067226b5a05f25d2230 Author: GUARDiA Date: Sat Jul 4 09:42:09 2026 +0900 feat(signage): GUARDiA 간판 전자간판 중앙관제 초기 푸시 (fresh init) diff --git a/backend/pom.xml b/backend/pom.xml new file mode 100644 index 0000000..842b4f8 --- /dev/null +++ b/backend/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 3.5.0 + + + com.zioinfo + guardia-signage + 1.0.0 + guardia-signage + GUARDiA 전자간판(e-SignBoard/ESB) 중앙관제 플랫폼 — Spring Boot 3.5 + Java 17 + MyBatis + PostgreSQL + + + 17 + 0.12.6 + 3.0.3 + 42.7.3 + + + + + org.springframework.bootspring-boot-starter-web + org.springframework.bootspring-boot-starter-security + org.springframework.bootspring-boot-starter-validation + org.springframework.bootspring-boot-starter-actuator + org.springframework.bootspring-boot-starter-aop + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis.version} + + + + + org.postgresql + postgresql + ${postgresql.version} + + + + + org.duckdb + duckdb_jdbc + 1.1.3 + + + + io.jsonwebtokenjjwt-api${jjwt.version} + io.jsonwebtokenjjwt-impl${jjwt.version}runtime + io.jsonwebtokenjjwt-jackson${jjwt.version}runtime + + + org.projectlomboklomboktrue + + + org.springframework.bootspring-boot-starter-testtest + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + signage-1.0.0 + + diff --git a/backend/src/main/java/com/zioinfo/signage/SignageApplication.java b/backend/src/main/java/com/zioinfo/signage/SignageApplication.java new file mode 100644 index 0000000..87b1c68 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/SignageApplication.java @@ -0,0 +1,30 @@ +package com.zioinfo.signage; + +import org.apache.ibatis.annotations.Mapper; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; + +/** + * zioinfo-signage ESL 통합 관리 플랫폼. + * + *

레거시 Spring Boot 1.5 / Java 8 ESL 시스템 6개를 Spring Boot 3.5 / Java 17 단일 플랫폼으로 재구현. + * 멀티테넌트(LGINNOTEK·LGIT·EMART·ZIOINFO), 매장/HCore 장치 관리, POS 가격 연동, + * 알람 모니터링, 펌웨어 관리, Ollama 온프레미스 AI 이상 감지. + * + *

보안 불변 규칙: 외부 AI API 절대 금지 (Ollama localhost:11434만 허용), + * 자격증명은 AES-256-GCM 암호화 저장, API 응답에서 password_hash 완전 제외. + * + *

CRITICAL: @MapperScan(annotationClass = Mapper.class) 패턴 사용 — basePackages 아님. + */ +@SpringBootApplication +@MapperScan(annotationClass = Mapper.class) +@EnableScheduling +@EnableAsync +public class SignageApplication { + public static void main(String[] args) { + SpringApplication.run(SignageApplication.class, args); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/admin/AdminController.java b/backend/src/main/java/com/zioinfo/signage/admin/AdminController.java new file mode 100644 index 0000000..7c27a15 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/admin/AdminController.java @@ -0,0 +1,76 @@ +package com.zioinfo.signage.admin; + +import com.zioinfo.signage.admin.dto.AuditLog; +import com.zioinfo.signage.admin.dto.SignageSetting; +import com.zioinfo.signage.common.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +/** + * GUARDiA SIGNAGE 관리자 API — 감사 로그 조회 + 시스템 설정. + * + *

RBAC (SecurityConfig requestMatchers 로 통제): + *

+ * + *

사용자/테넌트/펌웨어 CRUD 는 기존 도메인 컨트롤러(UserController/TenantController/FirmwareController) + * 가 담당한다. 이 컨트롤러는 admin 보조 영역(감사·설정)만 추가한다. + */ +@RestController +@RequestMapping("/api/admin") +@RequiredArgsConstructor +public class AdminController { + + private final AuditService auditService; + private final SettingService settingService; + + // ===================== 감사 로그 (ADMIN/MANAGER) ===================== + + @GetMapping("/audit") + public ApiResponse> audit( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String username, + @RequestParam(required = false) String action, + @RequestParam(required = false) String resource, + @RequestParam(required = false) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime from, + @RequestParam(required = false) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime to, + @RequestParam(defaultValue = "100") int limit) { + return ApiResponse.ok(auditService.find(tenantCode, username, action, resource, from, to, limit)); + } + + @GetMapping("/audit/count") + public ApiResponse auditCount( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String username, + @RequestParam(required = false) String action, + @RequestParam(required = false) String resource, + @RequestParam(required = false) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime from, + @RequestParam(required = false) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime to) { + return ApiResponse.ok(auditService.count(tenantCode, username, action, resource, from, to)); + } + + // ===================== 시스템 설정 ===================== + + @GetMapping("/settings") + public ApiResponse> settings(@RequestParam(required = false) String category) { + return ApiResponse.ok(settingService.list(category)); + } + + @PutMapping("/settings/{key}") + public ApiResponse updateSetting(@PathVariable String key, + @RequestBody Map body) { + return ApiResponse.ok("설정 변경 완료", settingService.update(key, body.get("value"))); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/admin/AuditService.java b/backend/src/main/java/com/zioinfo/signage/admin/AuditService.java new file mode 100644 index 0000000..3e613ef --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/admin/AuditService.java @@ -0,0 +1,99 @@ +package com.zioinfo.signage.admin; + +import com.zioinfo.signage.admin.dto.AuditLog; +import com.zioinfo.signage.admin.mapper.AuditLogMapper; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * 감사 로그 서비스. + * + *

ESL 제어 운영(펌웨어 배포·POS 가격 변경·태그 큐 전파)과 관리 행위(사용자/테넌트 CRUD·설정 변경)를 + * {@code signage_audit_log} 에 기록하고 조회한다. + * + *

감사 기록 실패가 본업(펌웨어 배포 등)을 막아서는 안 되므로 insert 는 best-effort(예외 흡수)다. + * + *

보안 불변: 비밀번호/자격증명/PII 는 detail 에 절대 기록하지 않는다. 호출 측이 키/식별자/요약만 넘긴다. + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class AuditService { + + private final AuditLogMapper mapper; + + /** 가장 단순한 형태: 액션/리소스/식별자/요약. 현재 인증 주체로 기록. */ + public void log(String action, String resource, String resourceId, String detail) { + log(null, action, resource, resourceId, detail, true); + } + + /** 테넌트 스코프 포함. */ + public void log(String tenantCode, String action, String resource, String resourceId, + String detail, boolean success) { + try { + AuditLog entry = new AuditLog(); + entry.setTenantCode(tenantCode); + entry.setUsername(currentActor()); + entry.setAction(action); + entry.setResource(resource); + entry.setResourceId(resourceId); + entry.setDetail(detail); + entry.setSuccess(success); + HttpServletRequest req = currentRequest(); + if (req != null) { + entry.setIpAddress(clientIp(req)); + String ua = req.getHeader("User-Agent"); + entry.setUserAgent(ua != null && ua.length() > 500 ? ua.substring(0, 500) : ua); + } + mapper.insert(entry); + } catch (Exception e) { + // best-effort: 감사 기록 실패가 본업을 막지 않는다. + log.warn("audit log insert 실패 action={} resource={}: {}", action, resource, e.getMessage()); + } + } + + public List find(String tenantCode, String username, String action, String resource, + LocalDateTime from, LocalDateTime to, int limit) { + int safeLimit = (limit <= 0 || limit > 1000) ? 100 : limit; + return mapper.find(tenantCode, username, action, resource, from, to, safeLimit); + } + + public long count(String tenantCode, String username, String action, String resource, + LocalDateTime from, LocalDateTime to) { + return mapper.count(tenantCode, username, action, resource, from, to); + } + + /** SecurityContext 의 JWT subject(username). 없으면 system. */ + public static String currentActor() { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + if (auth != null && auth.getName() != null && !auth.getName().isBlank()) { + return auth.getName(); + } + return "system"; + } + + private static HttpServletRequest currentRequest() { + var attrs = RequestContextHolder.getRequestAttributes(); + if (attrs instanceof ServletRequestAttributes sra) { + return sra.getRequest(); + } + return null; + } + + private static String clientIp(HttpServletRequest req) { + String xf = req.getHeader("X-Forwarded-For"); + if (xf != null && !xf.isBlank()) { + return xf.split(",")[0].trim(); + } + return req.getRemoteAddr(); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/admin/SettingService.java b/backend/src/main/java/com/zioinfo/signage/admin/SettingService.java new file mode 100644 index 0000000..1b71d3d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/admin/SettingService.java @@ -0,0 +1,43 @@ +package com.zioinfo.signage.admin; + +import com.zioinfo.signage.admin.dto.SignageSetting; +import com.zioinfo.signage.admin.mapper.SettingMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 시스템 설정 서비스. + * + *

조회는 ADMIN/MANAGER, 변경은 ADMIN (SecurityConfig requestMatchers 로 통제). + * 변경 시 감사 로그에 이전→이후 요약을 기록한다(값은 민감하지 않은 운영 설정만 다룬다). + */ +@Service +@RequiredArgsConstructor +public class SettingService { + + private final SettingMapper mapper; + private final AuditService auditService; + + public List list(String category) { + return mapper.findAll(category); + } + + public SignageSetting update(String key, String value) { + if (key == null || key.isBlank()) { + throw new IllegalArgumentException("ERR-SET-400: key 필수"); + } + if (value == null) { + throw new IllegalArgumentException("ERR-SET-400: value 필수"); + } + SignageSetting before = mapper.findByKey(key); + String category = before == null ? "GENERAL" : before.getCategory(); + String description = before == null ? null : before.getDescription(); + mapper.upsert(key, value, category, description); + String prev = before == null ? "(none)" : before.getSettingValue(); + auditService.log(null, "SETTING_CHANGE", "SETTING", key, + prev + " -> " + value, true); + return mapper.findByKey(key); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/admin/dto/AuditLog.java b/backend/src/main/java/com/zioinfo/signage/admin/dto/AuditLog.java new file mode 100644 index 0000000..9fd7cc3 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/admin/dto/AuditLog.java @@ -0,0 +1,28 @@ +package com.zioinfo.signage.admin.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 감사 로그 (signage_audit_log 테이블 매핑). + * + *

ESL 제어 운영(펌웨어 배포·가격 변경·태그 큐 전파)과 관리 행위(사용자/테넌트 CRUD·설정 변경)를 + * 추적한다. 멀티테넌트 스코프(tenantCode)를 보존한다. + * + *

보안: 비밀번호/자격증명/PII 는 detail 에 절대 기록하지 않는다(키/식별자/요약만). + */ +@Data +public class AuditLog { + private Long id; + private String tenantCode; // 테넌트 스코프 (nullable) + private String username; // 작업 수행자 (JWT subject) + private String action; // USER_CREATE, FIRMWARE_DEPLOY, POS_PRICE_CHANGE, SETTING_CHANGE 등 + private String resource; // 대상 리소스 종류 (USER / FIRMWARE / POS_CVT / TENANT / SETTING ...) + private String resourceId; // 대상 식별자 (id / key 등) + private String detail; // 부가 요약 (민감정보 제외) + private String ipAddress; // 요청 IP (nullable) + private String userAgent; // User-Agent (nullable) + private Boolean success; // 성공 여부 + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/admin/dto/SignageSetting.java b/backend/src/main/java/com/zioinfo/signage/admin/dto/SignageSetting.java new file mode 100644 index 0000000..c514543 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/admin/dto/SignageSetting.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.admin.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 시스템 설정 (signage_setting 테이블 매핑). + * + *

조회는 ADMIN/MANAGER, 변경은 ADMIN (SecurityConfig requestMatchers 로 통제). + * 비밀번호/자격증명 같은 민감 설정은 저장하지 않는다(그런 값은 CryptoUtil 암호화 경로 사용). + */ +@Data +public class SignageSetting { + private String settingKey; + private String settingValue; + private String category; // GENERAL / ESL / ALARM / AI ... + private String description; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/admin/mapper/AuditLogMapper.java b/backend/src/main/java/com/zioinfo/signage/admin/mapper/AuditLogMapper.java new file mode 100644 index 0000000..cebf14c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/admin/mapper/AuditLogMapper.java @@ -0,0 +1,33 @@ +package com.zioinfo.signage.admin.mapper; + +import com.zioinfo.signage.admin.dto.AuditLog; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * 감사 로그 매퍼. @Mapper 어노테이션 필수 + * (SignageApplication 의 @MapperScan(annotationClass = Mapper.class) 패턴). + */ +@Mapper +public interface AuditLogMapper { + + int insert(AuditLog log); + + List find(@Param("tenantCode") String tenantCode, + @Param("username") String username, + @Param("action") String action, + @Param("resource") String resource, + @Param("from") LocalDateTime from, + @Param("to") LocalDateTime to, + @Param("limit") int limit); + + long count(@Param("tenantCode") String tenantCode, + @Param("username") String username, + @Param("action") String action, + @Param("resource") String resource, + @Param("from") LocalDateTime from, + @Param("to") LocalDateTime to); +} diff --git a/backend/src/main/java/com/zioinfo/signage/admin/mapper/SettingMapper.java b/backend/src/main/java/com/zioinfo/signage/admin/mapper/SettingMapper.java new file mode 100644 index 0000000..d8dbfb1 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/admin/mapper/SettingMapper.java @@ -0,0 +1,25 @@ +package com.zioinfo.signage.admin.mapper; + +import com.zioinfo.signage.admin.dto.SignageSetting; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 시스템 설정 매퍼. @Mapper 어노테이션 필수 + * (SignageApplication 의 @MapperScan(annotationClass = Mapper.class) 패턴). + */ +@Mapper +public interface SettingMapper { + + List findAll(@Param("category") String category); + + SignageSetting findByKey(@Param("settingKey") String settingKey); + + /** upsert (ON CONFLICT). description/category 는 신규 INSERT 시에만 사용. */ + int upsert(@Param("settingKey") String settingKey, + @Param("settingValue") String settingValue, + @Param("category") String category, + @Param("description") String description); +} diff --git a/backend/src/main/java/com/zioinfo/signage/ai/controller/AiConfigController.java b/backend/src/main/java/com/zioinfo/signage/ai/controller/AiConfigController.java new file mode 100644 index 0000000..43bed26 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/ai/controller/AiConfigController.java @@ -0,0 +1,55 @@ +package com.zioinfo.signage.ai.controller; + +import com.zioinfo.signage.ai.dto.AiConfigDto; +import com.zioinfo.signage.ai.dto.AiConfigUpdateRequest; +import com.zioinfo.signage.ai.service.AiConfigService; +import com.zioinfo.signage.common.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalDateTime; + +/** + * AI 플랫폼(LLM provider) 설정 관리(ADMIN). [GUARDiA-SIGNAGE] + * SecurityConfig {@code /api/admin/ai-config/** hasRole(ADMIN)} 게이트로 보호된다. + * + *

signage_setting(key='ai.*')에 저장된 런타임 설정을 조회/갱신/테스트한다. API 키는 환경변수 + * (ANTHROPIC_API_KEY)로만 주입되어 응답·로그에 노출되지 않는다(GET 은 {@code claudeKeySet} 불리언만). + * 설정 변경은 재기동 없이 다음 AI 호출부터 반영된다. + * + *

+ */ +@RestController +@RequestMapping("/api/admin/ai-config") +@RequiredArgsConstructor +public class AiConfigController { + + private final AiConfigService service; + + @GetMapping + public ApiResponse get() { + return ApiResponse.ok(service.getConfig()); + } + + @PutMapping + public ApiResponse update(@RequestBody AiConfigUpdateRequest req) { + return ApiResponse.ok(service.update(req)); + } + + @PostMapping("/test") + public ApiResponse test() { + AiConfigService.TestResult result = service.test(); + return result.ok() + ? ApiResponse.ok(result) + : new ApiResponse<>(false, result.message(), result, LocalDateTime.now()); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/ai/controller/AiFeedbackController.java b/backend/src/main/java/com/zioinfo/signage/ai/controller/AiFeedbackController.java new file mode 100644 index 0000000..8446e32 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/ai/controller/AiFeedbackController.java @@ -0,0 +1,67 @@ +package com.zioinfo.signage.ai.controller; + +import com.zioinfo.signage.admin.AuditService; +import com.zioinfo.signage.ai.dto.AiFeedbackRequest; +import com.zioinfo.signage.ai.learning.LocalLearningStore; +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.rag.SignageRagClient; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * AI 답변 피드백 수집(👍/👎 + 교정). [GUARDiA-SIGNAGE] + * + *

{@code POST /api/ai/feedback} — 인증 사용자면 누구나 제출(SecurityConfig POST /api/** 일반 규칙). + * 로컬 DuckDB({@link LocalLearningStore}, 오프라인 AI 분석)와 중앙 guardia-rag({@link SignageRagClient#feedback}, + * 통합 학습·평가 게이트)에 둘 다 기록한다. 어느 한쪽 실패가 다른 쪽/응답을 막지 않는다(best-effort). + * + *

보안 불변: 저장 전 PII 마스킹(LocalLearningStore). 사용자 식별자는 마스킹. 자격증명 미기록. + * 응답은 저장 성공 여부 요약만 반환(원문/키/스택 미노출). + */ +@RestController +@RequestMapping("/api/ai/feedback") +@RequiredArgsConstructor +public class AiFeedbackController { + + private final LocalLearningStore learningStore; + private final SignageRagClient ragClient; + + @PostMapping + public ApiResponse> submit(@RequestBody AiFeedbackRequest req) { + String actor = AuditService.currentActor(); + String verdict = req.verdict() == null ? "unknown" : req.verdict().trim(); + + // 1) 로컬 DuckDB 기록(마스킹은 저장 계층에서 수행) — best-effort + boolean storedLocal = false; + try { + learningStore.recordFeedback(req.feature(), req.question(), req.answer(), + verdict, req.correction(), actor); + storedLocal = learningStore.isAvailable(); + } catch (Exception ignore) { + // no-op — 무영향 + } + + // 2) 중앙 guardia-rag /feedback 전달(테넌트 격리) — best-effort + boolean forwarded = false; + try { + Map res = ragClient.feedback( + req.tenantCode(), req.answerId(), req.question(), req.answer(), + verdict, req.correction(), LocalLearningStore.maskUser(actor)); + Object stored = res == null ? null : res.get("stored"); + forwarded = Boolean.TRUE.equals(stored); + } catch (Exception ignore) { + // no-op — 중앙 미가용은 degraded, 로컬 기록으로 무손실 + } + + Map out = new LinkedHashMap<>(); + out.put("storedLocal", storedLocal); + out.put("forwardedCentral", forwarded); + return ApiResponse.ok("피드백이 접수되었습니다.", out); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/ai/dto/AiConfigDto.java b/backend/src/main/java/com/zioinfo/signage/ai/dto/AiConfigDto.java new file mode 100644 index 0000000..5c58199 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/ai/dto/AiConfigDto.java @@ -0,0 +1,18 @@ +package com.zioinfo.signage.ai.dto; + +/** + * AI 설정 조회 DTO — API 키 값 미반환(claudeKeySet 으로 설정 여부만). [GUARDiA-SIGNAGE] + * + * @param provider 효과 provider(ollama/claude/qwen3/deepseek/glm) + * @param ollamaTextModel 효과 Ollama 텍스트 모델(provider 별 해석 결과) + * @param claudeModel 효과 Claude 모델 ID + * @param claudeKeySet 서버 환경변수 ANTHROPIC_API_KEY 존재 여부(값/길이/마스킹 일절 미포함) + * @param aiEnabled 전역 AI 사용 여부(off 시 규칙 기반 degraded) + */ +public record AiConfigDto( + String provider, + String ollamaTextModel, + String claudeModel, + boolean claudeKeySet, + boolean aiEnabled) { +} diff --git a/backend/src/main/java/com/zioinfo/signage/ai/dto/AiConfigUpdateRequest.java b/backend/src/main/java/com/zioinfo/signage/ai/dto/AiConfigUpdateRequest.java new file mode 100644 index 0000000..5e72a3b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/ai/dto/AiConfigUpdateRequest.java @@ -0,0 +1,14 @@ +package com.zioinfo.signage.ai.dto; + +/** + * AI 설정 저장 요청 — 화이트리스트 검증. [GUARDiA-SIGNAGE] + * + * @param provider ollama/claude/qwen3/deepseek/glm (필수) + * @param claudeModel Claude 모델 ID(선택, 미제공 시 기존 유지) + * @param ollamaTextModel Ollama 텍스트 모델(선택, 미제공 시 기존 유지) + */ +public record AiConfigUpdateRequest( + String provider, + String claudeModel, + String ollamaTextModel) { +} diff --git a/backend/src/main/java/com/zioinfo/signage/ai/dto/AiFeedbackRequest.java b/backend/src/main/java/com/zioinfo/signage/ai/dto/AiFeedbackRequest.java new file mode 100644 index 0000000..badee04 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/ai/dto/AiFeedbackRequest.java @@ -0,0 +1,24 @@ +package com.zioinfo.signage.ai.dto; + +/** + * AI 답변 피드백 요청(👍/👎 + 교정). [GUARDiA-SIGNAGE] + * + *

로컬 DuckDB(오프라인 분석) + 중앙 guardia-rag {@code /feedback}(통합 학습·평가 게이트) 둘 다 기록. + * + * @param feature 피드백 대상 기능(alarm-analysis / pos-classify / chat ...) + * @param question 원 질문/프롬프트(마스킹 후 저장) + * @param answer AI 답변(마스킹 후 저장) + * @param verdict up | down (또는 good/bad) + * @param correction 사용자 교정 내용(선택, 마스킹 후 저장) + * @param answerId 중앙 RAG answer_id(선택 — /answer 응답에서 받은 경우) + * @param tenantCode 테넌트 격리 코드(선택) + */ +public record AiFeedbackRequest( + String feature, + String question, + String answer, + String verdict, + String correction, + String answerId, + String tenantCode) { +} diff --git a/backend/src/main/java/com/zioinfo/signage/ai/learning/LocalLearningStore.java b/backend/src/main/java/com/zioinfo/signage/ai/learning/LocalLearningStore.java new file mode 100644 index 0000000..86ccfbd --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/ai/learning/LocalLearningStore.java @@ -0,0 +1,177 @@ +package com.zioinfo.signage.ai.learning; + +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.io.File; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.Statement; +import java.sql.Timestamp; +import java.time.Instant; +import java.util.regex.Pattern; + +/** + * 로컬 임베디드 DuckDB 학습/분석 저장소. [GUARDiA-SIGNAGE] + * + *

AI 피드백(👍/👎+교정)과 추론 로그(provider/model/latency/degraded)를 솔루션별 로컬 DuckDB 파일에 + * 격리 저장한다(오프라인 AI 분석용). 중앙 guardia-rag {@code /feedback}(통합 학습·평가 게이트)와는 + * 병행이며 서로를 대체하지 않는다(피드백은 로컬 + 중앙 둘 다 기록). + * + *

파일: {@code guardia.learning.duckdb-path}(기본 {@code /opt/guardia-signage/data/signage_learning.duckdb}). + * 스키마는 부팅 시 멱등 생성({@code CREATE TABLE/SEQUENCE IF NOT EXISTS}). + * + *

Fail-Safe: DuckDB 초기화/기록 실패는 본업을 막지 않는다(예외 흡수·no-op). + * 파일 미생성/드라이버 부재/권한 문제 시 {@code available=false} 로 조용히 비활성(로그 1줄만). + * DuckDB 는 프로세스당 단일 R/W 연결이므로 하나의 {@link Connection} 을 락으로 직렬화한다. + * + *

보안 불변: 저장 전 PII(주민번호·카드·전화·이메일) 마스킹. 사용자 식별자는 앞 2자만 남기고 마스킹. + * 자격증명/비밀번호/스택트레이스는 어떤 컬럼에도 기록하지 않는다(호출 측이 요약만 전달). + */ +@Slf4j +@Component +public class LocalLearningStore { + + @Value("${guardia.learning.duckdb-path:/opt/guardia-signage/data/signage_learning.duckdb}") + private String dbPath; + + @Value("${guardia.rag.solution:signage}") + private String solution; + + private volatile boolean available = false; + private Connection conn; + private final Object lock = new Object(); + + // PII 패턴(마스킹) — 최소 집합. 과탐보다 미기록이 안전. + private static final Pattern RRN = Pattern.compile("\\b\\d{6}[- ]?\\d{7}\\b"); + private static final Pattern CARD = Pattern.compile("\\b\\d{4}[- ]?\\d{4}[- ]?\\d{4}[- ]?\\d{4}\\b"); + private static final Pattern PHONE = Pattern.compile("\\b01[016789][- ]?\\d{3,4}[- ]?\\d{4}\\b"); + private static final Pattern EMAIL = Pattern.compile("[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}"); + private static final int MAX_LEN = 4000; + + @PostConstruct + void init() { + try { + File f = new File(dbPath); + File dir = f.getParentFile(); + if (dir != null && !dir.exists() && !dir.mkdirs()) { + log.warn("DuckDB 디렉터리 생성 불가 — 로컬 학습 저장소 비활성: {}", dir); + return; + } + Class.forName("org.duckdb.DuckDBDriver"); + conn = DriverManager.getConnection("jdbc:duckdb:" + dbPath); + try (Statement st = conn.createStatement()) { + st.execute("CREATE SEQUENCE IF NOT EXISTS seq_ai_feedback START 1"); + st.execute("CREATE SEQUENCE IF NOT EXISTS seq_ai_infer_log START 1"); + st.execute("CREATE TABLE IF NOT EXISTS ai_feedback (" + + "id BIGINT, ts TIMESTAMP, solution VARCHAR, feature VARCHAR, " + + "question VARCHAR, answer VARCHAR, verdict VARCHAR, correction VARCHAR, user_masked VARCHAR)"); + st.execute("CREATE TABLE IF NOT EXISTS ai_infer_log (" + + "id BIGINT, ts TIMESTAMP, provider VARCHAR, model VARCHAR, latency_ms BIGINT, degraded BOOLEAN)"); + } + available = true; + log.info("로컬 DuckDB 학습 저장소 준비 완료: {}", dbPath); + } catch (Throwable t) { + // 드라이버 부재/권한/파일락 등 — 본업 무영향. 조용히 비활성(스택 미노출). + available = false; + log.warn("로컬 DuckDB 학습 저장소 비활성(무영향): {}", t.getClass().getSimpleName()); + } + } + + public boolean isAvailable() { + return available; + } + + /** 피드백 1건 기록(멱등 아님 — append). PII 마스킹 후 저장. 실패는 흡수. */ + public void recordFeedback(String feature, String question, String answer, + String verdict, String correction, String user) { + if (!available) { + return; + } + synchronized (lock) { + try (PreparedStatement ps = conn.prepareStatement( + "INSERT INTO ai_feedback VALUES (nextval('seq_ai_feedback'), ?, ?, ?, ?, ?, ?, ?, ?)")) { + ps.setTimestamp(1, Timestamp.from(Instant.now())); + ps.setString(2, solution); + ps.setString(3, clip(feature)); + ps.setString(4, mask(question)); + ps.setString(5, mask(answer)); + ps.setString(6, clip(verdict)); + ps.setString(7, mask(correction)); + ps.setString(8, maskUser(user)); + ps.executeUpdate(); + } catch (Exception e) { + log.warn("DuckDB ai_feedback 기록 실패(무영향): {}", e.getClass().getSimpleName()); + } + } + } + + /** 추론 로그 1건 기록(provider/model/latency/degraded). 실패는 흡수. */ + public void recordInfer(String provider, String model, long latencyMs, boolean degraded) { + if (!available) { + return; + } + synchronized (lock) { + try (PreparedStatement ps = conn.prepareStatement( + "INSERT INTO ai_infer_log VALUES (nextval('seq_ai_infer_log'), ?, ?, ?, ?, ?)")) { + ps.setTimestamp(1, Timestamp.from(Instant.now())); + ps.setString(2, clip(provider)); + ps.setString(3, clip(model)); + ps.setLong(4, latencyMs); + ps.setBoolean(5, degraded); + ps.executeUpdate(); + } catch (Exception e) { + log.warn("DuckDB ai_infer_log 기록 실패(무영향): {}", e.getClass().getSimpleName()); + } + } + } + + @PreDestroy + void close() { + synchronized (lock) { + if (conn != null) { + try { + conn.close(); + } catch (Exception ignore) { + // no-op + } + } + } + } + + // ── PII 마스킹 ───────────────────────────────────────────────────────── + static String mask(String s) { + if (s == null || s.isBlank()) { + return s; + } + String out = s; + out = RRN.matcher(out).replaceAll("######-#######"); + out = CARD.matcher(out).replaceAll("****-****-****-****"); + out = PHONE.matcher(out).replaceAll("***-****-****"); + out = EMAIL.matcher(out).replaceAll("***@***"); + return clip(out); + } + + /** 사용자 식별자 마스킹: 앞 2자만 노출. */ + public static String maskUser(String u) { + if (u == null || u.isBlank()) { + return null; + } + String t = u.trim(); + if (t.length() <= 2) { + return t.charAt(0) + "*"; + } + return t.substring(0, 2) + "***"; + } + + private static String clip(String s) { + if (s == null) { + return null; + } + return s.length() > MAX_LEN ? s.substring(0, MAX_LEN) : s; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/ai/service/AiConfigService.java b/backend/src/main/java/com/zioinfo/signage/ai/service/AiConfigService.java new file mode 100644 index 0000000..c823c4d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/ai/service/AiConfigService.java @@ -0,0 +1,254 @@ +package com.zioinfo.signage.ai.service; + +import com.zioinfo.signage.admin.AuditService; +import com.zioinfo.signage.admin.dto.SignageSetting; +import com.zioinfo.signage.admin.mapper.SettingMapper; +import com.zioinfo.signage.ai.dto.AiConfigDto; +import com.zioinfo.signage.ai.dto.AiConfigUpdateRequest; +import com.zioinfo.signage.common.ai.ClaudeTextClient; +import com.zioinfo.signage.common.ai.TextAiClient.GenResult; +import com.zioinfo.signage.config.OllamaClient; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.Set; + +/** + * AI provider 런타임 설정(signage_setting, key='ai.*') 단일 출처 서비스. [GUARDiA-SIGNAGE] + * + *

해상도: DB(signage_setting) 우선 → 미설정 시 기본값/env 폴백. 시드(db/94) 미적용/키 비움 + * 상태에서도 기존 Ollama 동작이 바이트 동일하게 유지된다(provider 기본 ollama, ollamaTextModel 미설정 시 + * {@code guardia.ollama-text-model} env 그대로). + * + *

보안: Claude API 키는 본 서비스가 다루지 않는다. {@code claudeKeySet} 은 + * {@link ClaudeTextClient#isConfigured()}(환경변수 존재 여부)만 반환 — 값/길이/마스킹 일절 미포함. + * + *

프로바이더: claude / qwen3 / deepseek / glm / ollama. Ollama 계열(qwen3·deepseek·glm·ollama)은 각 + * 해당 텍스트 모델로 generate. claude 는 Claude→실패 시 Ollama(선택모델) 폴백(라우터). + * glm(glm4:9b)은 화이트리스트에 등록되나 서버 RAM(~2.1GB) 초과로 콜드로드 실패 시 폴백(설정 화면 "RAM 증설 필요" 배지). + * + *

레퍼런스: GUARDiA OCR {@code ai.service.AiConfigService} 미러(GLM provider 추가·설정저장소 ESN 패턴 치환). + */ +@Service +@RequiredArgsConstructor +public class AiConfigService { + + // --- signage_setting 키 (db/94 시드와 일치) + public static final String K_PROVIDER = "ai.provider"; // ENUM: ollama|claude|qwen3|deepseek|glm + public static final String K_CLAUDE_MODEL = "ai.claude.model"; // ENUM: 화이트리스트 + public static final String K_OLLAMA_TEXT_MODEL = "ai.ollama.textModel"; // STRING (미설정 시 env 폴백) + public static final String K_ENABLED = "ai.enabled"; // BOOL (off=규칙기반 degraded) + public static final String CATEGORY_AI = "AI"; + + public static final String PROVIDER_OLLAMA = "ollama"; + public static final String PROVIDER_CLAUDE = "claude"; + public static final String PROVIDER_QWEN3 = "qwen3"; + public static final String PROVIDER_DEEPSEEK = "deepseek"; + public static final String PROVIDER_GLM = "glm"; + public static final String DEFAULT_CLAUDE_MODEL = "claude-sonnet-4-6"; + + // Ollama 계열 provider → 고정 소형 모델(서버 RAM 제약 준수) + public static final String MODEL_QWEN3 = "qwen3:1.7b"; + public static final String MODEL_DEEPSEEK = "deepseek-r1:1.5b"; + public static final String MODEL_GLM = "glm4:9b"; // ★ RAM 초과 가능 — 콜드로드 실패 시 폴백 + + /** 허용 provider(임의 문자열 거부). */ + public static final Set ALLOWED_PROVIDERS = + Set.of(PROVIDER_OLLAMA, PROVIDER_CLAUDE, PROVIDER_QWEN3, PROVIDER_DEEPSEEK, PROVIDER_GLM); + /** 허용 Claude 모델 ID(임의 문자열 거부). */ + public static final Set ALLOWED_CLAUDE_MODELS = + Set.of("claude-sonnet-4-6", "claude-haiku-4-5", "claude-opus-4-8"); + /** 허용 Ollama 텍스트 모델(임의 문자열 거부). */ + public static final Set ALLOWED_OLLAMA_MODELS = + Set.of("qwen3:1.7b", "deepseek-r1:1.5b", "glm4:9b", "llama3.2:1b"); + + private final SettingMapper repo; + private final ClaudeTextClient claudeClient; + private final OllamaClient ollamaClient; // 연결 테스트용 텍스트 generate + private final AuditService auditService; + + /** 서버 기본 Ollama 텍스트 모델(application.yml guardia.ollama-text-model). */ + @Value("${guardia.ollama-text-model:llama3.2:1b}") + private String defaultOllamaTextModel; + + // ---------------------------------------------------------------- 효과값(DB 우선 → 기본) + + /** 효과 provider. DB 우선, 미설정/비허용 시 ollama. */ + public String provider() { + String v = dbVal(K_PROVIDER); + if (v != null) { + String p = v.trim().toLowerCase(); + if (ALLOWED_PROVIDERS.contains(p)) { + return p; + } + } + return PROVIDER_OLLAMA; + } + + /** 효과 Claude 모델 ID(DB 우선, 미설정/비허용 시 기본 sonnet-4-6). */ + public String claudeModel() { + String v = dbVal(K_CLAUDE_MODEL); + if (v != null) { + String m = v.trim(); + if (ALLOWED_CLAUDE_MODELS.contains(m)) { + return m; + } + } + return DEFAULT_CLAUDE_MODEL; + } + + /** + * 효과 Ollama 텍스트 모델. provider=qwen3/deepseek/glm 면 고정 모델, 그 외(ollama·claude 폴백)는 + * DB 설정(화이트리스트) 우선 → 미설정 시 env 기본(llama3.2:1b). 라우터의 Ollama 경로·Claude 폴백 공용. + */ + public String ollamaTextModel() { + String p = provider(); + if (PROVIDER_QWEN3.equals(p)) { + return MODEL_QWEN3; + } + if (PROVIDER_DEEPSEEK.equals(p)) { + return MODEL_DEEPSEEK; + } + if (PROVIDER_GLM.equals(p)) { + return MODEL_GLM; + } + String v = dbVal(K_OLLAMA_TEXT_MODEL); + if (v != null && ALLOWED_OLLAMA_MODELS.contains(v.trim())) { + return v.trim(); + } + return defaultOllamaTextModel; + } + + /** 전역 AI 토글(ai.enabled). false 면 모든 AI 결과는 규칙기반(degraded). 기본 true. */ + public boolean aiEnabled() { + String v = dbVal(K_ENABLED); + return v == null || !"false".equalsIgnoreCase(v.trim()); + } + + /** Claude API 키가 환경변수로 설정되어 있는지(여부만). */ + public boolean claudeKeySet() { + return claudeClient.isConfigured(); + } + + /** + * 실제 호출이 Claude 경로로 가야 하는지: provider=claude · 키 설정됨 · AI 전역 활성. + * false 면 호출자는 Ollama 경로/폴백을 사용한다(키 미설정/실패 시 자동 폴백 정책 반영). + */ + public boolean isClaudeActive() { + return PROVIDER_CLAUDE.equals(provider()) && claudeKeySet() && aiEnabled(); + } + + // ---------------------------------------------------------------- ADMIN: 조회 / 갱신 + + /** 현재 효과 설정 조회. 키 값·길이·마스킹 일절 미포함(claudeKeySet 불리언만). */ + public AiConfigDto getConfig() { + return new AiConfigDto( + provider(), + ollamaTextModel(), + claudeModel(), + claudeKeySet(), + aiEnabled()); + } + + /** + * 설정 갱신(upsert). 화이트리스트 검증: provider∈{ollama,claude,qwen3,deepseek,glm}, claudeModel∈허용셋, + * ollamaTextModel(선택)∈허용셋. 재기동 없이 다음 호출부터 반영. + */ + public AiConfigDto update(AiConfigUpdateRequest req) { + String provider = req.provider() == null ? "" : req.provider().trim().toLowerCase(); + if (!ALLOWED_PROVIDERS.contains(provider)) { + throw new IllegalArgumentException("ERR-AI-400: provider 는 ollama/claude/qwen3/deepseek/glm 중 하나여야 합니다."); + } + upsertAudited(K_PROVIDER, provider); + + if (req.claudeModel() != null && !req.claudeModel().isBlank()) { + String model = req.claudeModel().trim(); + if (!ALLOWED_CLAUDE_MODELS.contains(model)) { + throw new IllegalArgumentException("ERR-AI-400: 허용되지 않은 Claude 모델 ID 입니다."); + } + upsertAudited(K_CLAUDE_MODEL, model); + } + + // ollamaTextModel 은 선택. 제공 시에만 갱신(미제공/공백 = 기존 유지). + if (req.ollamaTextModel() != null && !req.ollamaTextModel().isBlank()) { + String om = req.ollamaTextModel().trim(); + if (!ALLOWED_OLLAMA_MODELS.contains(om)) { + throw new IllegalArgumentException("ERR-AI-400: 허용되지 않은 Ollama 텍스트 모델입니다."); + } + upsertAudited(K_OLLAMA_TEXT_MODEL, om); + } + return getConfig(); + } + + // ---------------------------------------------------------------- ADMIN: 연결 테스트 + + /** + * 저장된 설정 기준으로 선택 provider 에 짧은 ping 생성을 요청해 연결을 확인한다. + * 결과 메시지에는 키·스택트레이스·내부 IP 를 절대 포함하지 않는다(요약만). + */ + public TestResult test() { + if (isClaudeActive()) { + String model = claudeModel(); + long start = System.currentTimeMillis(); + GenResult r = claudeClient.generate("ping", model, 8); + long ms = System.currentTimeMillis() - start; + if (!r.degraded() && r.text() != null && !r.text().isBlank()) { + return new TestResult(true, false, "정상 · " + model + " · " + fmtMs(ms)); + } + return new TestResult(false, true, "Claude 연결 실패 · 모델/네트워크/키 설정을 확인하세요."); + } + // provider=claude 인데 키 미설정 → 실제로는 Ollama 폴백 동작 안내(혼선 방지). + if (PROVIDER_CLAUDE.equals(provider()) && !claudeKeySet()) { + return new TestResult(false, true, + "Claude API 키가 설정되지 않아 Ollama(온프레미스)로 폴백 동작합니다. 서버 환경변수 설정 후 다시 시도하세요."); + } + // Ollama 계열 경로(ollama/qwen3/deepseek/glm) + if (!aiEnabled()) { + return new TestResult(false, true, "AI 기능이 비활성 상태입니다. 모든 AI 결과는 규칙 기반(degraded)으로 동작합니다."); + } + String model = ollamaTextModel(); + long start = System.currentTimeMillis(); + String txt = ollamaClient.generateText("ping", model); + long ms = System.currentTimeMillis() - start; + if (txt != null && !txt.isBlank()) { + return new TestResult(true, false, "정상 · " + model + " · " + fmtMs(ms)); + } + if (PROVIDER_GLM.equals(provider())) { + return new TestResult(false, true, + "GLM(glm4:9b) 응답 없음 — 서버 RAM 증설 필요(약 5.5GB). 확보 전까지 소형 모델/폴백을 권장합니다."); + } + return new TestResult(false, true, "Ollama 연결 실패 또는 모델 미가용 — 설정을 확인하세요."); + } + + private static String fmtMs(long ms) { + return String.format("%.1fs", ms / 1000.0); + } + + /** 연결 테스트 결과(요약만 — 키/스택/IP 미노출). */ + public record TestResult(boolean ok, boolean degraded, String message) { + } + + // ---------------------------------------------------------------- helpers + + /** DB 값(공백/null 은 '미설정'으로 보고 null 반환 → 기본/env 폴백 유도). */ + private String dbVal(String key) { + SignageSetting c = repo.findByKey(key); + if (c == null) { + return null; + } + String v = c.getSettingValue(); + return (v != null && !v.isBlank()) ? v : null; + } + + private void upsertAudited(String key, String val) { + SignageSetting before = repo.findByKey(key); + String prev = before == null ? "(none)" : before.getSettingValue(); + if (val.equals(prev)) { + return; // 변경 없음 → 감사 로그 생략 + } + String desc = before == null ? "AI 플랫폼 설정" : before.getDescription(); + repo.upsert(key, val, CATEGORY_AI, desc); + auditService.log("AI_CONFIG_CHANGE", "SETTING", key, prev + " -> " + val); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/ai/service/AiTextRouter.java b/backend/src/main/java/com/zioinfo/signage/ai/service/AiTextRouter.java new file mode 100644 index 0000000..2a702b6 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/ai/service/AiTextRouter.java @@ -0,0 +1,76 @@ +package com.zioinfo.signage.ai.service; + +import com.zioinfo.signage.ai.learning.LocalLearningStore; +import com.zioinfo.signage.common.ai.ClaudeTextClient; +import com.zioinfo.signage.common.ai.TextAiClient; +import com.zioinfo.signage.common.ai.TextAiClient.GenResult; +import com.zioinfo.signage.config.OllamaClient; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * AI provider 선택 라우팅(런타임). 평문 텍스트 생성 진입점(알람 원인분석·POS 분류 등). [GUARDiA-SIGNAGE] + * {@link AiConfigService#provider()} 를 읽어 Claude ↔ Ollama(qwen3/deepseek/glm/기존소형) 를 선택한다. + * + *

선택/폴백 정책: + *

    + *
  • provider=claude · 키 설정됨 · AI 활성 → {@link ClaudeTextClient}. 실패(degraded)면 Ollama 자동 폴백(선택모델).
  • + *
  • provider=qwen3/deepseek/glm/ollama → 해당 Ollama 텍스트 모델로 generate.
  • + *
  • provider=claude 인데 키 미설정 → 곧장 Ollama(폴백모델).
  • + *
+ * 두 경로 모두 실패 시 {@code GenResult.degraded=true·text=null} → 호출자가 기존 규칙기반 폴백 유지(무회귀). + * 각 호출은 provider/model/latency/degraded 를 로컬 DuckDB({@link LocalLearningStore})에 best-effort 기록한다. + * + *

알람/POS 프롬프트는 {@code controller.AiController} 가 본 라우터로 위임한다. 실패 시 컨트롤러가 + * 기존 {@code OllamaClient#chat} 규칙기반 폴백으로 최종 방어(응답 항상 비어있지 않음). + * + *

레퍼런스: GUARDiA OCR {@code ai.service.AiTextRouter} 미러(GLM 경로·DuckDB 추론로그 추가). + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class AiTextRouter implements TextAiClient { + + private final AiConfigService aiConfig; + private final ClaudeTextClient claudeClient; + private final OllamaClient ollamaClient; // 온프레미스 평문 generate + private final LocalLearningStore learningStore; + + /** + * 선택된 provider 로 텍스트를 생성한다. Claude 선택·실패 시 Ollama 폴백. 예외를 던지지 않는다. + */ + @Override + public GenResult generate(String prompt) { + long start = System.currentTimeMillis(); + if (aiConfig.isClaudeActive()) { + String model = aiConfig.claudeModel(); + GenResult r = claudeClient.generate(prompt, model); + if (!r.degraded() && r.text() != null && !r.text().isBlank()) { + logInfer(AiConfigService.PROVIDER_CLAUDE, model, start, false); + return r; + } + // claude 실패/빈응답 → 온프레미스 Ollama 자동 폴백(선택모델). + log.warn("Claude path degraded -> Ollama fallback"); + return ollamaGenerate(AiConfigService.PROVIDER_CLAUDE, prompt, aiConfig.ollamaTextModel(), start); + } + // provider = ollama / qwen3 / deepseek / glm → 해당 Ollama 모델 + return ollamaGenerate(aiConfig.provider(), prompt, aiConfig.ollamaTextModel(), start); + } + + /** Ollama 평문 generate 를 GenResult 로 래핑(실패 시 degraded) + 추론 로그. */ + private GenResult ollamaGenerate(String provider, String prompt, String model, long start) { + String txt = ollamaClient.generateText(prompt, model); + boolean degraded = (txt == null || txt.isBlank()); + logInfer(provider, model, start, degraded); + return degraded ? new GenResult(null, true) : new GenResult(txt, false); + } + + private void logInfer(String provider, String model, long start, boolean degraded) { + try { + learningStore.recordInfer(provider, model, System.currentTimeMillis() - start, degraded); + } catch (Exception ignore) { + // best-effort — 추론 로그 실패가 본업을 막지 않는다. + } + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/AuthController.java b/backend/src/main/java/com/zioinfo/signage/auth/AuthController.java new file mode 100644 index 0000000..749472c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/AuthController.java @@ -0,0 +1,50 @@ +package com.zioinfo.signage.auth; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.auth.TwoFactorService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * ESN 인증 컨트롤러. + * - /login: 2FA off 면 { twofa:"false", token, type }, 2FA on 이면 { twofa:"true", verifyToken, step, maskedEmail }. + * - /verify: (UIWS 2FA 이식) verify-token + 인증코드 → access 토큰 발급. + * 기존 클라이언트는 응답에 token 필드가 그대로 존재(2FA off 시) → 회귀 0. + */ +@RestController +@RequestMapping("/api/auth") +@RequiredArgsConstructor +public class AuthController { + + private final AuthService authService; + private final TwoFactorService twoFactorService; + + @PostMapping("/login") + public ApiResponse> login(@RequestBody LoginRequest req) { + return ApiResponse.ok(authService.login(req.username(), req.password())); + } + + /** UIWS 2FA 이식: 2차 인증 코드 검증 → access 토큰 발급. */ + @PostMapping("/verify") + public ApiResponse> verify(@RequestBody VerifyRequest req) { + return ApiResponse.ok(twoFactorService.verify(req.verifyToken(), req.code())); + } + + @GetMapping("/me") + public ApiResponse> me(@RequestHeader("Authorization") String header) { + String token = header.replace("Bearer ", ""); + return ApiResponse.ok(authService.me(token)); + } + + @PostMapping("/logout") + public ApiResponse logout() { + // JWT stateless — 클라이언트에서 토큰 삭제 + return ApiResponse.ok("로그아웃 성공", null); + } + + record LoginRequest(String username, String password) {} + + record VerifyRequest(String verifyToken, String code) {} +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/AuthHelperController.java b/backend/src/main/java/com/zioinfo/signage/auth/AuthHelperController.java new file mode 100644 index 0000000..8200958 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/AuthHelperController.java @@ -0,0 +1,43 @@ +package com.zioinfo.signage.auth; + +import com.zioinfo.signage.common.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 로그인 보조 3종 컨트롤러(공개 — SecurityConfig: /api/auth/** permitAll). + * - POST /api/auth/signup : 회원가입(승인대기) + * - POST /api/auth/find-id : 아이디 찾기(이름+이메일) + * - POST /api/auth/reset-password : 비밀번호 초기화(임시비번 메일 발송) + * AuthController(/login,/verify,/me,/logout)와 메서드 경로 미충돌 — 동일 prefix 분리 컨트롤러. + * + * 보안: 아이디찾기/비번초기화는 미존재 계정도 success=true(열거방지). + * 임시비번/자격증명은 응답에 절대 미포함(메일/로그 채널 전용). + */ +@RestController +@RequestMapping("/api/auth") +@RequiredArgsConstructor +public class AuthHelperController { + + private final AuthHelperService authHelperService; + + @PostMapping("/signup") + public ApiResponse signup(@RequestBody SignupRequest req) { + return ApiResponse.ok("가입 신청 완료 (승인 대기)", authHelperService.signup(req)); + } + + @PostMapping("/find-id") + public ApiResponse findId(@RequestBody FindIdRequest req) { + return ApiResponse.ok(authHelperService.findId(req)); + } + + @PostMapping("/reset-password") + public ApiResponse resetPassword(@RequestBody ResetPwRequest req) { + // 미존재해도 항상 success=true (열거방지). 임시비번은 메일/로그로만 전달. + authHelperService.resetPassword(req); + return ApiResponse.ok("임시 비밀번호를 이메일로 발송했습니다.", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/AuthHelperService.java b/backend/src/main/java/com/zioinfo/signage/auth/AuthHelperService.java new file mode 100644 index 0000000..54314c3 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/AuthHelperService.java @@ -0,0 +1,117 @@ +package com.zioinfo.signage.auth; + +import com.zioinfo.signage.auth.mapper.UserAuthMapper; +import com.zioinfo.signage.uiws.common.mail.MailSender; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.security.SecureRandom; + +/** + * 로그인 보조 3종(회원가입 승인대기 / 아이디찾기 / 비밀번호 초기화). + * 기존 AuthService(2FA 로그인)는 손대지 않고 별도 서비스로 분리. + * + * 보안(불변규칙): + * - 임시비밀번호/비밀번호/자격증명은 API 응답·예외 메시지에 절대 미노출. 메일/로그 채널로만 전달. + * - 아이디찾기/비번초기화는 미존재 계정도 success=true(found=false) — 계정 열거(enumeration) 방지. + * - 회원가입은 승인대기(is_active=FALSE, approval_status='PENDING') — 즉시 활성화 없음. + * - 외부 API 호출 없음(MailSender 폴백은 로그). Ollama 외 외부 통신 금지 준수. + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class AuthHelperService { + + private static final SecureRandom RANDOM = new SecureRandom(); + private static final String TEMP_PW_ALPHABET = + "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789"; + private static final int TEMP_PW_LEN = 12; + + private final UserAuthMapper userMapper; + private final PasswordEncoder passwordEncoder; + private final MailSender mailSender; + + /** 회원가입 — 승인대기 등록. 아이디 중복 시 거부. */ + @Transactional + public SignupResponse signup(SignupRequest req) { + if (req == null || req.username() == null || req.username().isBlank() + || req.password() == null || req.password().isBlank()) { + throw new RuntimeException("ERR-AUTH-100: 아이디/비밀번호는 필수입니다."); + } + if (userMapper.countByUsername(req.username()) > 0) { + throw new RuntimeException("ERR-AUTH-101: 이미 사용 중인 아이디"); + } + String hash = passwordEncoder.encode(req.password()); + userMapper.insertPendingUser( + req.tenantCode(), req.username(), hash, + req.name(), req.email(), req.phone()); + log.info("[signup] pending user created username={} (approval required)", req.username()); + return new SignupResponse(req.username(), "PENDING_APPROVAL"); + } + + /** 아이디 찾기 — 이름+이메일 매칭. 미존재도 200(found=false), 마스킹 반환. */ + public FindIdResponse findId(FindIdRequest req) { + if (req == null || req.name() == null || req.email() == null) { + return new FindIdResponse(false, ""); + } + String username = userMapper.findUsernameByNameEmail(req.name(), req.email()); + if (username == null || username.isBlank()) { + return new FindIdResponse(false, ""); + } + return new FindIdResponse(true, maskUsername(username)); + } + + /** + * 비밀번호 초기화 — 아이디+이름+이메일 일치 시 임시비번 발급(BCrypt 갱신) + 메일 발송. + * 미존재해도 예외 없이 반환(열거방지). 임시비번은 메일/로그로만 전달. + */ + @Transactional + public void resetPassword(ResetPwRequest req) { + if (req == null || req.username() == null || req.name() == null || req.email() == null) { + return; // 열거방지 — 잘못된 요청도 조용히 성공 처리 + } + SignageUser user = userMapper.findByUsernameNameEmail(req.username(), req.name(), req.email()); + if (user == null) { + log.info("[reset-pw] no match for username={} (silently success — enumeration guard)", + req.username()); + return; + } + String tempPw = generateTempPassword(); + userMapper.updatePasswordHash(user.getUsername(), passwordEncoder.encode(tempPw)); + + String subject = "[GUARDiA SIGNAGE] 임시 비밀번호 발급"; + String body = String.format( + "안녕하세요 %s 님,\n임시 비밀번호는 [%s] 입니다.\n로그인 후 즉시 변경해 주세요.", + user.getUsername(), tempPw); + if (user.getEmail() != null && !user.getEmail().isBlank()) { + // 임시비번은 메일 본문에만 — API 응답/예외 메시지에는 절대 미포함. + mailSender.send(user.getEmail(), subject, body); + } else { + log.warn("[reset-pw] no email for username={} — temp password issued (log only)", + user.getUsername()); + } + } + + /** 임시 비밀번호 생성(혼동 문자 제외 영숫자). */ + private static String generateTempPassword() { + StringBuilder sb = new StringBuilder(TEMP_PW_LEN); + for (int i = 0; i < TEMP_PW_LEN; i++) { + sb.append(TEMP_PW_ALPHABET.charAt(RANDOM.nextInt(TEMP_PW_ALPHABET.length()))); + } + return sb.toString(); + } + + /** 아이디 마스킹: 앞 2자만 노출 + 나머지 '*'. (2자 이하는 첫 글자만 노출.) */ + private static String maskUsername(String username) { + if (username == null || username.isBlank()) { + return ""; + } + if (username.length() <= 2) { + return username.charAt(0) + "*"; + } + return username.substring(0, 2) + "*".repeat(username.length() - 2); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/AuthService.java b/backend/src/main/java/com/zioinfo/signage/auth/AuthService.java new file mode 100644 index 0000000..55cf620 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/AuthService.java @@ -0,0 +1,81 @@ +package com.zioinfo.signage.auth; + +import com.zioinfo.signage.auth.mapper.UserAuthMapper; +import com.zioinfo.signage.uiws.auth.TwoFactorService; +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * ESN 인증 서비스. + * - 기존 단일 JWT 로그인 보존(2FA off 또는 미설정 시 회귀 0). + * - UIWS 2FA 레이어(이메일 코드) 추가: 2FA on 이면 1차 통과 후 verify-token + 이메일코드 발급. + * 실패 누적 max-login-fail 회 시 계정 잠금. + */ +@Service +@RequiredArgsConstructor +public class AuthService { + + private final UserAuthMapper userMapper; + private final PasswordEncoder passwordEncoder; + private final JwtUtil jwtUtil; + private final TwoFactorService twoFactorService; + + /** + * 1차 로그인. 2FA 활성 시 verify-token + 이메일코드 흐름으로 분기, + * 비활성 시 기존처럼 access 토큰 즉시 발급. + * + * @return 2FA off: { token, type, twofa:"false" } + * 2FA on : { verifyToken, step:"EMAIL", maskedEmail, twofa:"true" } + */ + public Map login(String username, String password) { + SignageUser user = userMapper.findByUsername(username); + + // 잠금 우선 차단(존재하는 계정에 한해 잠금 메시지 — 존재 여부 누설 최소화) + if (user != null && twoFactorService.isLocked(user)) { + throw new UiwsApiException(UiwsErrorCode.ACCOUNT_LOCKED); + } + if (user == null || !user.isActive()) { + throw new RuntimeException("ERR-AUTH-001: 존재하지 않거나 비활성 계정"); + } + if (!passwordEncoder.matches(password, user.getPasswordHash())) { + // 2FA 활성 시 실패 누적/잠금. 비활성 시 기존 동작(메시지만) 유지. + if (twoFactorService.isEnabled()) { + twoFactorService.recordLoginFailure(username); + SignageUser after = userMapper.findByUsername(username); + if (after != null && Boolean.TRUE.equals(after.getLocked())) { + throw new UiwsApiException(UiwsErrorCode.ACCOUNT_LOCKED); + } + } + throw new RuntimeException("ERR-AUTH-002: 비밀번호 불일치"); + } + + // 비밀번호 검증 통과 + if (twoFactorService.isEnabled()) { + Map step1 = twoFactorService.beginTwoFactor(user); + return Map.of( + "twofa", "true", + "verifyToken", step1.get("verifyToken"), + "step", step1.get("step"), + "maskedEmail", step1.getOrDefault("maskedEmail", "")); + } + + // 2FA 비활성 — 기존 단일 로그인 흐름(회귀 0) + userMapper.resetLoginFail(username); + userMapper.updateLastLogin(username); + String token = jwtUtil.generate(username, user.getRole(), user.getTenantCode()); + return Map.of("twofa", "false", "token", token, "type", "Bearer"); + } + + public Map me(String token) { + return Map.of( + "username", jwtUtil.getUsername(token), + "role", jwtUtil.getRole(token), + "tenant", jwtUtil.getTenant(token) != null ? jwtUtil.getTenant(token) : "" + ); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/FindIdRequest.java b/backend/src/main/java/com/zioinfo/signage/auth/FindIdRequest.java new file mode 100644 index 0000000..4138b73 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/FindIdRequest.java @@ -0,0 +1,5 @@ +package com.zioinfo.signage.auth; + +/** 아이디 찾기 요청(이름+이메일 매칭). */ +public record FindIdRequest(String name, String email) { +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/FindIdResponse.java b/backend/src/main/java/com/zioinfo/signage/auth/FindIdResponse.java new file mode 100644 index 0000000..7320cd1 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/FindIdResponse.java @@ -0,0 +1,5 @@ +package com.zioinfo.signage.auth; + +/** 아이디 찾기 응답. found=false 면 maskedUsername="" (열거방지 — 미존재도 200). */ +public record FindIdResponse(boolean found, String maskedUsername) { +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/JwtFilter.java b/backend/src/main/java/com/zioinfo/signage/auth/JwtFilter.java new file mode 100644 index 0000000..d814adc --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/JwtFilter.java @@ -0,0 +1,43 @@ +package com.zioinfo.signage.auth; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.List; + +@Component +@RequiredArgsConstructor +public class JwtFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + + @Override + protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, + FilterChain chain) throws ServletException, IOException { + String header = req.getHeader("Authorization"); + if (header != null && header.startsWith("Bearer ")) { + String token = header.substring(7); + // 보안(★치명 — UIWS 2FA): purpose=2fa verify-token 은 access 토큰이 아니다. + // 동일 서명키라 isValid()는 통과하므로 별도 차단하지 않으면 2차 인증 전 보호 API 접근(2FA 완전 우회)이 가능. + // → verify-token 은 인증 컨텍스트를 세우지 않고 무시한다(/api/auth/verify 에서만 사용). + if (jwtUtil.isValid(token) && !jwtUtil.isVerifyToken(token)) { + String username = jwtUtil.getUsername(token); + String role = jwtUtil.getRole(token); + var auth = new UsernamePasswordAuthenticationToken( + username, null, List.of(new SimpleGrantedAuthority("ROLE_" + role)) + ); + SecurityContextHolder.getContext().setAuthentication(auth); + } + } + chain.doFilter(req, res); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/JwtUtil.java b/backend/src/main/java/com/zioinfo/signage/auth/JwtUtil.java new file mode 100644 index 0000000..5039eab --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/JwtUtil.java @@ -0,0 +1,98 @@ +package com.zioinfo.signage.auth; + +import io.jsonwebtoken.*; +import io.jsonwebtoken.security.Keys; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.nio.charset.StandardCharsets; +import java.util.Date; + +@Slf4j +@Component +public class JwtUtil { + + @Value("${guardia.jwt.secret:ZioInfoSignageJwtSecret2026VeryLongSecretKeyForHS256AlgorithmAtLeast256Bits}") + private String secret; + + @Value("${guardia.jwt.expiration:86400000}") + private long expirationMs; + + private SecretKey key() { + return Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8)); + } + + public String generate(String username, String role, String tenantCode) { + return Jwts.builder() + .subject(username) + .claim("role", role) + .claim("tenant", tenantCode) + .issuedAt(new Date()) + .expiration(new Date(System.currentTimeMillis() + expirationMs)) + .signWith(key()) + .compact(); + } + + /** + * UIWS 2FA 이식: 1차 로그인 통과 후 발급하는 단기 verify-token. + * purpose=2fa 클레임으로 access 토큰과 구분(verify-token 으로는 보호 API 접근 불가 — JwtFilter 에서 차단). + */ + public String generateVerifyToken(String username, long validitySeconds) { + return Jwts.builder() + .subject(username) + .claim("purpose", "2fa") + .issuedAt(new Date()) + .expiration(new Date(System.currentTimeMillis() + validitySeconds * 1000L)) + .signWith(key()) + .compact(); + } + + /** verify-token 검증 후 username 반환. 유효하지 않거나 purpose!=2fa 면 null. */ + public String parseVerifyTokenUsername(String token) { + try { + Claims c = parse(token); + if (!"2fa".equals(c.get("purpose", String.class))) { + return null; + } + return c.getSubject(); + } catch (JwtException | IllegalArgumentException e) { + log.debug("verify-token 검증 실패: {}", e.getMessage()); + return null; + } + } + + /** + * 보안(★치명): 토큰이 2FA verify-token(purpose=2fa)인지 판별. + * verify-token 은 access 와 같은 서명키라 isValid()는 통과하므로, JwtFilter 가 별도로 + * 걸러내지 않으면 2차 코드 검증 없이 보호 API 접근(2FA 완전 우회)이 된다. + * → JwtFilter 는 purpose=2fa 토큰을 인증 컨텍스트로 세우지 않는다(/api/auth/verify 에서만 사용). + */ + public boolean isVerifyToken(String token) { + try { + return "2fa".equals(parse(token).get("purpose", String.class)); + } catch (JwtException | IllegalArgumentException e) { + return false; + } + } + + public Claims parse(String token) { + return Jwts.parser().verifyWith(key()).build() + .parseSignedClaims(token).getPayload(); + } + + public boolean isValid(String token) { + try { + parse(token); + return true; + } catch (JwtException | IllegalArgumentException e) { + log.debug("JWT 검증 실패: {}", e.getMessage()); + return false; + } + } + + public String getUsername(String token) { return parse(token).getSubject(); } + public String getRole(String token) { return parse(token).get("role", String.class); } + public String getTenant(String token) { return parse(token).get("tenant", String.class); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/ResetPwRequest.java b/backend/src/main/java/com/zioinfo/signage/auth/ResetPwRequest.java new file mode 100644 index 0000000..876f448 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/ResetPwRequest.java @@ -0,0 +1,5 @@ +package com.zioinfo.signage.auth; + +/** 비밀번호 초기화 요청(아이디+이름+이메일 매칭). 임시비번은 메일/로그로만 전달. */ +public record ResetPwRequest(String username, String name, String email) { +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/SignageUser.java b/backend/src/main/java/com/zioinfo/signage/auth/SignageUser.java new file mode 100644 index 0000000..0acbb94 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/SignageUser.java @@ -0,0 +1,41 @@ +package com.zioinfo.signage.auth; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class SignageUser { + private Long id; + private String tenantCode; + private String username; + @JsonIgnore + private String passwordHash; // API 응답 미노출 + private String role; // ADMIN, MANAGER, USER + private String email; + private String phone; + private boolean active; + // ── 로그인 보조 이식 컬럼 (signage_user ALTER, db/93_signage_login_helper.sql) ───────── + /** 이름(아이디찾기/비번초기화 매칭 키). */ + private String name; + /** 가입 승인 상태(APPROVED / PENDING). 신규 가입은 PENDING(승인대기). */ + private String approvalStatus; + private LocalDateTime lastLoginAt; + private LocalDateTime createdAt; + + // ── UIWS 2FA 이식 컬럼 (signage_user ALTER, db/91_uiws_port.sql) ───────────────── + /** 이메일 인증코드(6자리). 발급 후 verify 단계에서 검증. API 응답에는 절대 미포함. */ + @JsonIgnore + private String emailVerifyCode; + /** 인증코드 만료시각. */ + @JsonIgnore + private LocalDateTime emailVerifyExpire; + /** 로그인 실패 누적 횟수(기본 0). max-login-fail 도달 시 locked. */ + private Integer loginFailCount; + /** 계정 잠금 여부(기본 false). */ + private Boolean locked; + /** TOTP 시크릿(UIWS OTP 경로 대비, 현재 이메일 흐름에서는 미사용). */ + @JsonIgnore + private String otpSecret; +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/SignupRequest.java b/backend/src/main/java/com/zioinfo/signage/auth/SignupRequest.java new file mode 100644 index 0000000..73458ae --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/SignupRequest.java @@ -0,0 +1,11 @@ +package com.zioinfo.signage.auth; + +/** 회원가입 요청(승인대기 INSERT). 비밀번호는 BCrypt 저장, 응답/로그에 평문 노출 금지. */ +public record SignupRequest( + String username, + String password, + String name, + String email, + String phone, + String tenantCode) { +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/SignupResponse.java b/backend/src/main/java/com/zioinfo/signage/auth/SignupResponse.java new file mode 100644 index 0000000..352075f --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/SignupResponse.java @@ -0,0 +1,5 @@ +package com.zioinfo.signage.auth; + +/** 회원가입 응답. status="PENDING_APPROVAL" (승인대기). 자격증명 미포함. */ +public record SignupResponse(String username, String status) { +} diff --git a/backend/src/main/java/com/zioinfo/signage/auth/mapper/UserAuthMapper.java b/backend/src/main/java/com/zioinfo/signage/auth/mapper/UserAuthMapper.java new file mode 100644 index 0000000..4727aa7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/auth/mapper/UserAuthMapper.java @@ -0,0 +1,57 @@ +package com.zioinfo.signage.auth.mapper; + +import com.zioinfo.signage.auth.SignageUser; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDateTime; + +@Mapper +public interface UserAuthMapper { + SignageUser findByUsername(@Param("username") String username); + int updateLastLogin(@Param("username") String username); + + // ── UIWS 2FA 이식: 실패 카운트/잠금/인증코드 갱신 (멱등 UPDATE) ─────────────── + + /** 로그인 성공 시 실패 카운트 초기화. */ + int resetLoginFail(@Param("username") String username); + + /** 로그인 실패 누적(+1) 및 임계 도달 시 잠금. */ + int incrementLoginFail(@Param("username") String username, @Param("maxFail") int maxFail); + + /** 1차 통과 시 이메일 인증코드/만료 저장(verify 단계에서 검증). */ + int saveEmailCode(@Param("username") String username, + @Param("code") String code, + @Param("expire") LocalDateTime expire); + + /** 2차 검증 성공 시 코드 폐기. */ + int clearEmailCode(@Param("username") String username); + + /** 관리자 잠금 해제(실패 카운트/잠금 초기화). */ + int unlock(@Param("username") String username); + + // ── 로그인 보조 이식: 회원가입(승인대기) / 아이디찾기 / 비밀번호 초기화 ────────── + + /** 아이디 중복 확인. */ + int countByUsername(@Param("username") String username); + + /** 회원가입 — 승인대기(is_active=FALSE, approval_status='PENDING') INSERT. */ + int insertPendingUser(@Param("tenantCode") String tenantCode, + @Param("username") String username, + @Param("passwordHash") String passwordHash, + @Param("name") String name, + @Param("email") String email, + @Param("phone") String phone); + + /** 아이디 찾기 — 이름+이메일 일치 username 1건(없으면 null). */ + String findUsernameByNameEmail(@Param("name") String name, @Param("email") String email); + + /** 비밀번호 초기화 — 아이디+이름+이메일 모두 일치하는 사용자(없으면 null). */ + SignageUser findByUsernameNameEmail(@Param("username") String username, + @Param("name") String name, + @Param("email") String email); + + /** 임시 비밀번호(BCrypt) 갱신. */ + int updatePasswordHash(@Param("username") String username, + @Param("passwordHash") String passwordHash); +} diff --git a/backend/src/main/java/com/zioinfo/signage/common/ApiResponse.java b/backend/src/main/java/com/zioinfo/signage/common/ApiResponse.java new file mode 100644 index 0000000..a83affd --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/common/ApiResponse.java @@ -0,0 +1,27 @@ +package com.zioinfo.signage.common; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.time.LocalDateTime; + +@Getter +@AllArgsConstructor +public class ApiResponse { + private boolean success; + private String message; + private T data; + private LocalDateTime timestamp; + + public static ApiResponse ok(T data) { + return new ApiResponse<>(true, "OK", data, LocalDateTime.now()); + } + + public static ApiResponse ok(String message, T data) { + return new ApiResponse<>(true, message, data, LocalDateTime.now()); + } + + public static ApiResponse fail(String message) { + return new ApiResponse<>(false, message, null, LocalDateTime.now()); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/common/GlobalExceptionHandler.java b/backend/src/main/java/com/zioinfo/signage/common/GlobalExceptionHandler.java new file mode 100644 index 0000000..ff78054 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/common/GlobalExceptionHandler.java @@ -0,0 +1,64 @@ +package com.zioinfo.signage.common; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * 전역 예외 처리(보안 불변규칙: 스택트레이스/SQL/자격증명 미노출). + * + *

UIWS 이식 모듈 + 2FA 레이어 도입과 함께 추가. 기존 ESN 컨트롤러도 동일 정책으로 보호한다 + * (예외 메시지는 사용자 노출용 요약만 — 내부 원인은 서버 로그에만 남긴다). + */ +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + /** UIWS 이식/2FA 도메인 예외 → 400 + 안전한 사용자 메시지. */ + @ExceptionHandler(UiwsApiException.class) + public ResponseEntity> handleUiws(UiwsApiException e) { + log.debug("[UIWS] {}: {}", e.getErrorCode().getCode(), e.getMessage()); + return ResponseEntity.badRequest().body(ApiResponse.fail(e.getMessage())); + } + + /** 요청 검증 실패 → 400 + 필드 요약(스택트레이스 없음). */ + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleValidation(MethodArgumentNotValidException e) { + String msg = e.getBindingResult().getFieldErrors().stream() + .findFirst() + .map(fe -> fe.getDefaultMessage()) + .orElse("요청 값이 올바르지 않습니다."); + return ResponseEntity.badRequest().body(ApiResponse.fail(msg)); + } + + /** 권한 거부 → 403 (RBAC 가드). */ + @ExceptionHandler(AccessDeniedException.class) + public ResponseEntity> handleDenied(AccessDeniedException e) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).body(ApiResponse.fail("접근 권한이 없습니다.")); + } + + /** + * 그 외 모든 예외 → 400 + 요약 메시지(기존 ESN 의 RuntimeException("ERR-AUTH-...") 흐름 보존). + * 스택트레이스/원인은 서버 로그에만 기록하고 응답에는 노출하지 않는다(보안 불변규칙). + */ + @ExceptionHandler(RuntimeException.class) + public ResponseEntity> handleRuntime(RuntimeException e, HttpServletRequest req) { + log.warn("[ERR] {} {} — {}", req.getMethod(), req.getRequestURI(), e.getMessage()); + String msg = e.getMessage() != null ? e.getMessage() : "요청 처리 중 오류가 발생했습니다."; + return ResponseEntity.badRequest().body(ApiResponse.fail(msg)); + } + + /** 그 외 체크 예외/오류 → 500 + 요약(상세 미노출). */ + @ExceptionHandler(Exception.class) + public ResponseEntity> handleOther(Exception e, HttpServletRequest req) { + log.error("[ERR-500] {} {}", req.getMethod(), req.getRequestURI(), e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(ApiResponse.fail("서버 처리 중 오류가 발생했습니다.")); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/common/ai/ClaudeTextClient.java b/backend/src/main/java/com/zioinfo/signage/common/ai/ClaudeTextClient.java new file mode 100644 index 0000000..9168aa4 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/common/ai/ClaudeTextClient.java @@ -0,0 +1,171 @@ +package com.zioinfo.signage.common.ai; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.zioinfo.signage.common.ai.TextAiClient.GenResult; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; + +/** + * 외부 Claude(Anthropic) Messages API 텍스트 생성 클라이언트. [ISSUER=GUARDiA-SIGNAGE] + * + *

외부 호출 예외 허용: 본 클라이언트는 소유자 승인(폐쇄망 아님)에 따라 {@code api.anthropic.com} + * 호출이 허용된 유일한 외부 경로다. 그 외 외부 API 호출은 여전히 금지(Ollama localhost 전용). + * + *

API 키 보안(최우선): 키는 환경변수 {@code ANTHROPIC_API_KEY} 에서만 로드하며 + * ({@code @Value("${ANTHROPIC_API_KEY:}")}), DB·코드·커밋·로그·응답·예외 메시지 어디에도 기록하지 않는다. + * 키는 오직 HTTP 헤더 {@code x-api-key} 로만 전달된다. 로그는 상태코드/예외 클래스명만 남긴다(본문·키 미기록). + * + *

실패 처리: 키 미설정/타임아웃/비200/예외 시 {@code GenResult.degraded=true·text=null} 반환 + * (예외를 던지지 않음 → 호출자는 Ollama 폴백). 신규 라이브러리 0 — JDK {@link HttpClient} 사용. + * + *

모델은 인자로 받는다(호출자가 화이트리스트 검증된 모델 ID 전달). 인터페이스 {@link TextAiClient}의 + * {@code generate(String)} 은 기본 모델로 위임한다(주로 라우터가 모델을 명시 호출). + * + *

레퍼런스: GUARDiA OCR {@code com.zioinfo.ocr.common.ai.ClaudeTextClient} 미러(패키지·ISSUER 치환). + */ +@Slf4j +@Service +public class ClaudeTextClient implements TextAiClient { + + /** Anthropic Messages API 엔드포인트(외부 호출 예외 허용 단일 경로). */ + private static final String API_URL = "https://api.anthropic.com/v1/messages"; + /** Anthropic 버전 헤더(고정). */ + private static final String ANTHROPIC_VERSION = "2023-06-01"; + /** 기본 모델(키 검증된 화이트리스트의 기본값). */ + static final String DEFAULT_MODEL = "claude-sonnet-4-6"; + /** 일반 생성 max_tokens. */ + private static final int DEFAULT_MAX_TOKENS = 1024; + /** 콜드 응답 대비 요청 타임아웃(초). Ollama timeout 과 동급. */ + private static final int TIMEOUT_SEC = 120; + private static final int CONNECT_TIMEOUT_SEC = 15; + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + /** 환경변수 전용 주입. 미설정 시 빈 문자열(=미구성). 값은 절대 외부 노출/로그 금지. */ + @Value("${ANTHROPIC_API_KEY:}") + private String apiKey; + + /** API 키가 환경변수로 설정되어 있는지(여부만 — 값/길이/마스킹 일절 미노출). */ + public boolean isConfigured() { + return apiKey != null && !apiKey.isBlank(); + } + + /** {@link TextAiClient} 계약: 기본 모델로 생성. */ + @Override + public GenResult generate(String prompt) { + return generate(prompt, DEFAULT_MODEL); + } + + /** 지정 모델로 생성(라우터가 화이트리스트 검증된 모델 ID 전달). */ + public GenResult generate(String prompt, String model) { + return generate(prompt, model, DEFAULT_MAX_TOKENS); + } + + /** + * Anthropic Messages API 호출. 실패 시 {@code degraded=true·text=null}. + * 키·요청본문·응답본문은 로그에 남기지 않는다(상태코드/예외 클래스명만). + */ + public GenResult generate(String prompt, String model, int maxTokens) { + if (!isConfigured()) { + return new GenResult(null, true); + } + if (prompt == null || prompt.isBlank()) { + return new GenResult(null, true); + } + String useModel = (model == null || model.isBlank()) ? DEFAULT_MODEL : model.trim(); + int tokens = maxTokens > 0 ? maxTokens : DEFAULT_MAX_TOKENS; + try { + String payload = "{" + + "\"model\":" + str(useModel) + "," + + "\"max_tokens\":" + tokens + "," + + "\"messages\":[{\"role\":\"user\",\"content\":" + str(prompt) + "}]" + + "}"; + + HttpClient client = HttpClient.newBuilder() + .connectTimeout(Duration.ofSeconds(CONNECT_TIMEOUT_SEC)) + .build(); + HttpRequest req = HttpRequest.newBuilder() + .uri(URI.create(API_URL)) + .timeout(Duration.ofSeconds(TIMEOUT_SEC)) + .header("content-type", "application/json") + .header("x-api-key", apiKey) // 키는 헤더로만 — 로그/응답 미노출 + .header("anthropic-version", ANTHROPIC_VERSION) + .POST(HttpRequest.BodyPublishers.ofString(payload)) + .build(); + HttpResponse resp = client.send(req, HttpResponse.BodyHandlers.ofString()); + if (resp.statusCode() != 200) { + log.warn("Claude API status {} -> degraded fallback", resp.statusCode()); // 본문 미기록 + return new GenResult(null, true); + } + String text = extractText(resp.body()); + if (text == null || text.isBlank()) { + return new GenResult(null, true); + } + return new GenResult(text.trim(), false); + } catch (Exception e) { + log.warn("Claude API call failed -> degraded fallback: {}", e.getClass().getSimpleName()); // 메시지·키 미기록 + return new GenResult(null, true); + } + } + + /** Messages API 응답에서 content[].text(type=text) 추출·연결. */ + private static String extractText(String body) { + if (body == null || body.isBlank()) { + return null; + } + try { + JsonNode root = MAPPER.readTree(body); + JsonNode content = root.get("content"); + if (content == null || !content.isArray()) { + return null; + } + StringBuilder sb = new StringBuilder(); + for (JsonNode block : content) { + JsonNode type = block.get("type"); + if (type != null && "text".equals(type.asText())) { + JsonNode t = block.get("text"); + if (t != null && !t.isNull()) { + sb.append(t.asText()); + } + } + } + String out = sb.toString(); + return out.isBlank() ? null : out; + } catch (Exception e) { + return null; + } + } + + /** JSON 문자열 이스케이프(프롬프트 직렬화 안전). */ + private static String str(String s) { + if (s == null) { + return "\"\""; + } + StringBuilder sb = new StringBuilder("\""); + for (char c : s.toCharArray()) { + switch (c) { + case '"' -> sb.append("\\\""); + case '\\' -> sb.append("\\\\"); + case '\n' -> sb.append("\\n"); + case '\r' -> sb.append("\\r"); + case '\t' -> sb.append("\\t"); + default -> { + if (c < 0x20) { + sb.append(String.format("\\u%04x", (int) c)); + } else { + sb.append(c); + } + } + } + } + return sb.append("\"").toString(); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/common/ai/TextAiClient.java b/backend/src/main/java/com/zioinfo/signage/common/ai/TextAiClient.java new file mode 100644 index 0000000..caedfff --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/common/ai/TextAiClient.java @@ -0,0 +1,27 @@ +package com.zioinfo.signage.common.ai; + +/** + * 텍스트 생성 공용 인터페이스 (AI provider 추상화). [GUARDiA-SIGNAGE] + * + *

온프레미스 Ollama({@code config.OllamaClient#generateText})와 외부 Claude({@link ClaudeTextClient})를 + * 동일 계약으로 다루기 위한 얇은 추상화. 구현체는 어떤 사유로든(비활성/실패/타임아웃/키미설정) 실패 시 + * {@link GenResult#degraded()}=true · {@link GenResult#text()}=null 을 반환하고, 호출자가 폴백을 책임진다. + * + *

provider 선택/폴백 라우팅은 {@code ai.service.AiTextRouter} 가 담당한다(이 인터페이스를 구현). + * + *

레퍼런스: GUARDiA OCR {@code com.zioinfo.ocr.common.ai.TextAiClient} 미러(패키지·ISSUER 치환). + */ +public interface TextAiClient { + + /** + * 프롬프트로 텍스트를 생성한다. 실패 시 {@code degraded=true·text=null}(예외를 던지지 않음). + * + * @param prompt 한국어 지시문(컨텍스트 포함) + * @return 생성 결과(텍스트 또는 degraded 폴백 신호) + */ + GenResult generate(String prompt); + + /** 생성 결과: 텍스트(폴백 시 null) + degraded(폴백 여부). */ + record GenResult(String text, boolean degraded) { + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/config/CryptoUtil.java b/backend/src/main/java/com/zioinfo/signage/config/CryptoUtil.java new file mode 100644 index 0000000..f854b53 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/config/CryptoUtil.java @@ -0,0 +1,68 @@ +package com.zioinfo.signage.config; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.GCMParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.StandardCharsets; +import java.security.SecureRandom; +import java.util.Base64; + +/** + * AES-256-GCM 자격증명 암호화 유틸리티. + * 보안 불변 규칙: 서버 자격증명은 암호화 DB에만 저장, API 응답에 절대 노출 금지. + */ +@Slf4j +@Component +public class CryptoUtil { + + private static final String ALGO = "AES/GCM/NoPadding"; + private static final int GCM_IV_LEN = 12; + private static final int GCM_TAG_LEN = 128; + // 운영 시 환경변수로 주입 권장 + private static final String KEY_HEX = "7a696f696e666f7369676e6167656b6579323032367365637265746b65797878"; + + private SecretKey secretKey() { + byte[] key = new byte[32]; + byte[] src = KEY_HEX.getBytes(StandardCharsets.UTF_8); + System.arraycopy(src, 0, key, 0, Math.min(src.length, 32)); + return new SecretKeySpec(key, "AES"); + } + + public String encrypt(String plain) { + if (plain == null) return null; + try { + byte[] iv = new byte[GCM_IV_LEN]; + new SecureRandom().nextBytes(iv); + Cipher cipher = Cipher.getInstance(ALGO); + cipher.init(Cipher.ENCRYPT_MODE, secretKey(), new GCMParameterSpec(GCM_TAG_LEN, iv)); + byte[] enc = cipher.doFinal(plain.getBytes(StandardCharsets.UTF_8)); + byte[] result = new byte[iv.length + enc.length]; + System.arraycopy(iv, 0, result, 0, iv.length); + System.arraycopy(enc, 0, result, iv.length, enc.length); + return Base64.getEncoder().encodeToString(result); + } catch (Exception e) { + log.error("암호화 실패", e); + throw new RuntimeException("CRYPTO_ERR", e); + } + } + + public String decrypt(String encrypted) { + if (encrypted == null) return null; + try { + byte[] raw = Base64.getDecoder().decode(encrypted); + byte[] iv = new byte[GCM_IV_LEN]; + System.arraycopy(raw, 0, iv, 0, GCM_IV_LEN); + Cipher cipher = Cipher.getInstance(ALGO); + cipher.init(Cipher.DECRYPT_MODE, secretKey(), new GCMParameterSpec(GCM_TAG_LEN, iv)); + byte[] dec = cipher.doFinal(raw, GCM_IV_LEN, raw.length - GCM_IV_LEN); + return new String(dec, StandardCharsets.UTF_8); + } catch (Exception e) { + log.error("복호화 실패", e); + throw new RuntimeException("CRYPTO_ERR", e); + } + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/config/OllamaClient.java b/backend/src/main/java/com/zioinfo/signage/config/OllamaClient.java new file mode 100644 index 0000000..5a144bb --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/config/OllamaClient.java @@ -0,0 +1,119 @@ +package com.zioinfo.signage.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.Map; + +/** + * Ollama 온프레미스 AI 클라이언트. + * 보안 불변 규칙: 외부 AI API 절대 금지 — Ollama localhost:11434만 허용. + * 연결 실패 시 폴백 응답 반환(예외 미전파). + */ +@Slf4j +@Component +public class OllamaClient { + + @Value("${guardia.ollama-url:http://localhost:11434}") + private String baseUrl; + + @Value("${guardia.ollama-text-model:llama3}") + private String model; + + private final HttpClient http = HttpClient.newBuilder() + .connectTimeout(Duration.ofSeconds(5)) + .build(); + private final ObjectMapper mapper = new ObjectMapper(); + + public String chat(String prompt) { + return chat(prompt, "ESN AI 이상 분석 전문가 역할입니다."); + } + + public String chat(String prompt, String systemPrompt) { + try { + var body = Map.of( + "model", model, + "messages", new Object[]{ + Map.of("role", "system", "content", systemPrompt), + Map.of("role", "user", "content", prompt) + }, + "stream", false + ); + String json = mapper.writeValueAsString(body); + HttpRequest req = HttpRequest.newBuilder() + .uri(URI.create(baseUrl + "/api/chat")) + .header("Content-Type", "application/json") + .POST(HttpRequest.BodyPublishers.ofString(json)) + .timeout(Duration.ofSeconds(120)) + .build(); + HttpResponse resp = http.send(req, HttpResponse.BodyHandlers.ofString()); + if (resp.statusCode() == 200) { + var res = mapper.readTree(resp.body()); + return res.path("message").path("content").asText("분석 결과를 생성했습니다."); + } + return fallback(prompt); + } catch (Exception e) { + log.warn("Ollama 연결 실패 — 폴백 응답 반환: {}", e.getMessage()); + return fallback(prompt); + } + } + + /** + * 평문 텍스트 생성(모델 지정). AiTextRouter/AiConfigService 연결 테스트 진입점. + * + *

{@link #chat(String, String)} 과 달리 실패 시 규칙기반 폴백 문자열을 만들지 않고 {@code null} + * 을 반환한다(라우터가 degraded 로 감지해 다음 단계 폴백을 수행하게 하기 위함). + * + * @param prompt 사용자 프롬프트(시스템 지시 포함 가능) + * @param modelOverride 사용할 Ollama 모델(null/blank 이면 서버 기본 {@code guardia.ollama-text-model}) + * @return 생성 텍스트(성공) 또는 {@code null}(비200/타임아웃/예외/빈응답) + */ + public String generateText(String prompt, String modelOverride) { + if (prompt == null || prompt.isBlank()) { + return null; + } + String useModel = (modelOverride == null || modelOverride.isBlank()) ? model : modelOverride; + try { + var body = Map.of( + "model", useModel, + "messages", new Object[]{ Map.of("role", "user", "content", prompt) }, + "stream", false + ); + String json = mapper.writeValueAsString(body); + HttpRequest req = HttpRequest.newBuilder() + .uri(URI.create(baseUrl + "/api/chat")) + .header("Content-Type", "application/json") + .POST(HttpRequest.BodyPublishers.ofString(json)) + .timeout(Duration.ofSeconds(120)) + .build(); + HttpResponse resp = http.send(req, HttpResponse.BodyHandlers.ofString()); + if (resp.statusCode() == 200) { + var res = mapper.readTree(resp.body()); + String text = res.path("message").path("content").asText(""); + return (text == null || text.isBlank()) ? null : text.trim(); + } + log.warn("Ollama generateText status {} — null 반환(라우터 폴백)", resp.statusCode()); + return null; + } catch (Exception e) { + log.warn("Ollama generateText 실패 — null 반환(라우터 폴백): {}", e.getClass().getSimpleName()); + return null; + } + } + + private String fallback(String prompt) { + if (prompt.toLowerCase().contains("alarm") || prompt.contains("알람")) { + return "알람 분석: 장치 연결 상태를 확인하고 네트워크 환경을 점검하세요. 지속 발생 시 현장 엔지니어 파견이 필요합니다."; + } + if (prompt.toLowerCase().contains("pos") || prompt.contains("가격")) { + return "POS 데이터 분류: 정상 가격 변환 데이터입니다. 이상 감지된 항목은 수동 검토가 필요합니다."; + } + return "AI 분석 결과: 현재 시스템 상태를 검토하고 운영 매뉴얼을 참조하세요."; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/config/SecurityConfig.java b/backend/src/main/java/com/zioinfo/signage/config/SecurityConfig.java new file mode 100644 index 0000000..b6873ba --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/config/SecurityConfig.java @@ -0,0 +1,80 @@ +package com.zioinfo.signage.config; + +import com.zioinfo.signage.auth.JwtFilter; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +/** + * Spring Security 6 — JWT 무상태 인증 + 멀티테넌트 RBAC. + */ +@Configuration +@EnableWebSecurity +@EnableMethodSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final JwtFilter jwtFilter; + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http + .csrf(csrf -> csrf.disable()) + .cors(cors -> {}) + .sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeHttpRequests(auth -> auth + // 인증 불필요 + .requestMatchers("/api/auth/**").permitAll() + // UIWS system 이식: 공통 룩업(부서/거래처 트리 등 비민감) 공개 조회 + .requestMatchers("/api/public/**").permitAll() + .requestMatchers("/actuator/health").permitAll() + // 정적 리소스 (React SPA) + .requestMatchers(HttpMethod.GET, "/", "/index.html", "/assets/**", "/*.js", "/*.css", "/*.ico").permitAll() + + // 관리자 전용 + .requestMatchers("/api/tenants/**").hasRole("ADMIN") + .requestMatchers("/api/users/**").hasAnyRole("ADMIN", "MANAGER") + .requestMatchers("/api/firmware/**").hasAnyRole("ADMIN", "MANAGER") + // UIWS system(권한관리: 사용자/역할/메뉴/부서/거래처/코드/프로그램) — 관리자/매니저 전용 + // (일반 /api/** 메서드 규칙보다 먼저 평가되도록 상단 배치) + .requestMatchers("/api/system/**").hasAnyRole("ADMIN", "MANAGER") + // admin 보조: 감사로그 조회·설정 조회 = ADMIN/MANAGER, 설정 변경 = ADMIN + // (아래 일반 PUT /api/** 규칙보다 먼저 평가되도록 상단 배치) + .requestMatchers(HttpMethod.PUT, "/api/admin/settings/**").hasRole("ADMIN") + // AI 플랫폼(LLM provider) 설정 — 조회/갱신/테스트 모두 ADMIN 전용 (상단 배치로 우선 평가) + .requestMatchers("/api/admin/ai-config/**").hasRole("ADMIN") + .requestMatchers("/api/admin/**").hasAnyRole("ADMIN", "MANAGER") + // AI 기법 토글 변경 = MANAGER+ (조회/실행은 일반 인증 사용자) — 상단 배치로 우선 평가 + .requestMatchers(HttpMethod.PUT, "/api/ai/rag/toggles/**").hasAnyRole("ADMIN", "MANAGER") + .requestMatchers(HttpMethod.DELETE, "/api/**").hasAnyRole("ADMIN", "MANAGER") + .requestMatchers(HttpMethod.POST, "/api/**").hasAnyRole("ADMIN", "MANAGER", "USER") + .requestMatchers(HttpMethod.PUT, "/api/**").hasAnyRole("ADMIN", "MANAGER", "USER") + + // 그 외 GET은 인증 사용자 허용 + .anyRequest().authenticated() + ) + .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class); + return http.build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception { + return config.getAuthenticationManager(); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/config/WebConfig.java b/backend/src/main/java/com/zioinfo/signage/config/WebConfig.java new file mode 100644 index 0000000..0d648c3 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/config/WebConfig.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +@Configuration +public class WebConfig { + + @Bean + public CorsFilter corsFilter() { + CorsConfiguration config = new CorsConfiguration(); + config.addAllowedOriginPattern("*"); + config.addAllowedMethod("*"); + config.addAllowedHeader("*"); + config.setAllowCredentials(true); + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", config); + return new CorsFilter(source); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/AdScheduleController.java b/backend/src/main/java/com/zioinfo/signage/controller/AdScheduleController.java new file mode 100644 index 0000000..a4b178e --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/AdScheduleController.java @@ -0,0 +1,44 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.AdScheduleVo; +import com.zioinfo.signage.service.AdScheduleService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/ad-schedules") +@RequiredArgsConstructor +public class AdScheduleController { + private final AdScheduleService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String status, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, status, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody AdScheduleVo v) { + return ApiResponse.ok("광고 스케줄 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody AdScheduleVo v) { + return ApiResponse.ok("광고 스케줄 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("광고 스케줄 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/AiController.java b/backend/src/main/java/com/zioinfo/signage/controller/AiController.java new file mode 100644 index 0000000..6a69763 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/AiController.java @@ -0,0 +1,110 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.ai.service.AiTextRouter; +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.common.ai.TextAiClient.GenResult; +import com.zioinfo.signage.config.OllamaClient; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.Map; + +/** + * SIGNAGE 텍스트 AI 진입점 — 간판 장애 원인분석 · 간판 문구 생성 · 광고 편성 추천. + * + *

provider 라우팅: {@link AiTextRouter} 를 경유해 Claude(외부, 키 설정 시)↔Ollama(온프레미스, + * qwen3/deepseek/glm/기존소형)를 런타임 선택한다. 라우터가 degraded 를 반환하면(키 미설정·전 provider 실패) + * 기존 {@link OllamaClient#chat} 규칙기반 폴백으로 최종 방어 — 응답은 항상 비어있지 않다(무회귀). + * + *

보안 불변: 외부 AI 는 Claude(소유자 승인 예외) 단일 경로. 그 외 외부 호출 금지. 키/스택 미노출. + */ +@RestController +@RequestMapping("/api/ai") +@RequiredArgsConstructor +public class AiController { + + private final AiTextRouter aiRouter; + private final OllamaClient ollama; + + /** + * 간판/게이트웨이 장애 원인분석 — provider 라우팅(Claude↔Ollama), 실패 시 규칙기반 폴백. + */ + @PostMapping("/analyze-alarm") + public ApiResponse> analyzeAlarm(@RequestBody Map body) { + String alarmType = (String) body.getOrDefault("alarmType", "UNKNOWN"); + String message = (String) body.getOrDefault("message", ""); + String severity = (String) body.getOrDefault("severity", "LOW"); + + String system = "당신은 전자간판(e-SignBoard) 중앙관제 전문 AI 엔지니어입니다. 게이트웨이·ESB 태그·디스플레이 장애를 분석하고 실용적 조치를 제안하세요."; + String prompt = String.format( + "전자간판 장애 분석:\n유형: %s\n심각도: %s\n메시지: %s\n\n" + + "원인 분석 및 조치 방안을 3줄 이내로 간결하게 제시하세요.", + alarmType, severity, message + ); + + String result = routeOrFallback(system, prompt); + return ApiResponse.ok(Map.of("analysis", result, "alarmType", alarmType, "severity", severity)); + } + + /** + * 간판 문구 생성 — 상호/업종/톤 기반 간판 문구 후보(provider 라우팅, 실패 시 규칙기반 폴백). + */ + @PostMapping("/generate-sign-text") + public ApiResponse> generateSignText(@RequestBody Map body) { + String bizName = (String) body.getOrDefault("bizName", ""); + String industry = (String) body.getOrDefault("industry", ""); + String tone = (String) body.getOrDefault("tone", "심플하고 고급스럽게"); + + String system = "당신은 전자간판 카피라이터 AI 입니다. 도시 미관과 조화되는 간결한 간판 문구를 제안합니다."; + String prompt = String.format( + "간판 문구 생성:\n상호: %s\n업종: %s\n톤: %s\n\n" + + "표시하기 좋은 간판 문구 후보 3개를 짧게 제시하세요.", + bizName, industry, tone + ); + + String result = routeOrFallback(system, prompt); + return ApiResponse.ok(Map.of("bizName", bizName, "suggestions", result)); + } + + /** + * 광고 편성 추천 — 매장/시간대/업종 기반 주기 광고 편성 추천(provider 라우팅, 실패 시 규칙기반 폴백). + */ + @PostMapping("/recommend-ad") + public ApiResponse> recommendAd(@RequestBody Map body) { + String storeCode = String.valueOf(body.getOrDefault("storeCode", "")); + String context = (String) body.getOrDefault("context", ""); + + String system = "당신은 전자간판 광고 편성 AI 입니다. 매장 특성과 시간대를 고려해 광고 편성을 추천합니다."; + String prompt = String.format( + "광고 편성 추천:\n매장코드: %s\n상황/특성: %s\n\n" + + "시간대별 광고 편성 전략을 3줄 이내로 제시하세요.", + storeCode, context + ); + + String result = routeOrFallback(system, prompt); + return ApiResponse.ok(Map.of("storeCode", storeCode, "recommendation", result)); + } + + /** + * 일반 AI 채팅 — 전자간판 운영 관련 질문(provider 라우팅, 실패 시 규칙기반 폴백). + */ + @PostMapping("/chat") + public ApiResponse> chat(@RequestBody Map body) { + String message = body.getOrDefault("message", ""); + String system = "전자간판(e-SignBoard) 중앙관제 플랫폼 운영 전문가입니다."; + String result = routeOrFallback(system, message); + return ApiResponse.ok(Map.of("response", result)); + } + + /** + * 라우터(Claude↔Ollama) 경유 → degraded 면 기존 OllamaClient.chat 규칙기반 폴백. + * 시스템 지시는 프롬프트 앞에 병합(단일 user 메시지 계약). 응답은 항상 비어있지 않다. + */ + private String routeOrFallback(String system, String prompt) { + String merged = (system == null || system.isBlank()) ? prompt : system + "\n\n" + prompt; + GenResult r = aiRouter.generate(merged); + if (!r.degraded() && r.text() != null && !r.text().isBlank()) { + return r.text(); + } + return ollama.chat(prompt, system); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/AlarmController.java b/backend/src/main/java/com/zioinfo/signage/controller/AlarmController.java new file mode 100644 index 0000000..a2a4f5d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/AlarmController.java @@ -0,0 +1,56 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.AlarmVo; +import com.zioinfo.signage.service.AlarmService; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/alarms") +@RequiredArgsConstructor +public class AlarmController { + private final AlarmService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) Long storeId, + @RequestParam(required = false) String severity, + @RequestParam(required = false) String status) { + return ApiResponse.ok(service.list(tenantCode, storeId, severity, status)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody AlarmVo v) { + return ApiResponse.ok("알람 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody AlarmVo v) { + return ApiResponse.ok("알람 수정 완료", service.update(id, v)); + } + + @PutMapping("/{id}/resolve") + public ApiResponse resolve(@PathVariable Long id, + @RequestBody Map body, + Authentication auth) { + String resolvedBy = auth != null ? auth.getName() : "system"; + service.resolve(id, resolvedBy, body.getOrDefault("resolution", "")); + return ApiResponse.ok("알람 해결 완료", null); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("알람 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/BackupController.java b/backend/src/main/java/com/zioinfo/signage/controller/BackupController.java new file mode 100644 index 0000000..9e31078 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/BackupController.java @@ -0,0 +1,44 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.BackupVo; +import com.zioinfo.signage.service.BackupService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/backups") +@RequiredArgsConstructor +public class BackupController { + private final BackupService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String status, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, status, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody BackupVo v) { + return ApiResponse.ok("백업/복구 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody BackupVo v) { + return ApiResponse.ok("백업/복구 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("백업/복구 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/DashboardController.java b/backend/src/main/java/com/zioinfo/signage/controller/DashboardController.java new file mode 100644 index 0000000..fbc7137 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/DashboardController.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.DashboardVo; +import com.zioinfo.signage.mapper.DashboardMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/dashboard") +@RequiredArgsConstructor +public class DashboardController { + private final DashboardMapper mapper; + + @GetMapping + public ApiResponse summary(@RequestParam(required = false) String tenantCode) { + return ApiResponse.ok(mapper.getSummary(tenantCode)); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/FirmwareController.java b/backend/src/main/java/com/zioinfo/signage/controller/FirmwareController.java new file mode 100644 index 0000000..441e983 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/FirmwareController.java @@ -0,0 +1,55 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.admin.AuditService; +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.FirmwareVo; +import com.zioinfo.signage.service.FirmwareService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/firmware") +@RequiredArgsConstructor +public class FirmwareController { + private final FirmwareService service; + private final AuditService audit; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String deviceType) { + return ApiResponse.ok(service.list(tenantCode, deviceType)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody FirmwareVo v) { + FirmwareVo created = service.create(v); + // ESL 펌웨어 배포 — 추적 가치 높음 + audit.log(created.getTenantCode(), "FIRMWARE_DEPLOY", "FIRMWARE", String.valueOf(created.getId()), + "deviceType=" + created.getDeviceType() + ", version=" + created.getFirmwareVersion() + + ", latest=" + created.isLatest(), true); + return ApiResponse.ok("펌웨어 등록 완료", created); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody FirmwareVo v) { + FirmwareVo updated = service.update(id, v); + audit.log(updated.getTenantCode(), "FIRMWARE_UPDATE", "FIRMWARE", String.valueOf(id), + "deviceType=" + updated.getDeviceType() + ", version=" + updated.getFirmwareVersion() + + ", latest=" + updated.isLatest(), true); + return ApiResponse.ok("펌웨어 수정 완료", updated); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + audit.log(null, "FIRMWARE_DELETE", "FIRMWARE", String.valueOf(id), "펌웨어 삭제", true); + return ApiResponse.ok("펌웨어 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/GatewayController.java b/backend/src/main/java/com/zioinfo/signage/controller/GatewayController.java new file mode 100644 index 0000000..be768e1 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/GatewayController.java @@ -0,0 +1,52 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.GatewayVo; +import com.zioinfo.signage.service.GatewayService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/gateways") +@RequiredArgsConstructor +public class GatewayController { + private final GatewayService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) Long storeId, + @RequestParam(required = false) String deviceType, + @RequestParam(required = false) String status) { + return ApiResponse.ok(service.list(tenantCode, storeId, deviceType, status)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody GatewayVo v) { + return ApiResponse.ok("장치 등록 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody GatewayVo v) { + return ApiResponse.ok("장치 수정 완료", service.update(id, v)); + } + + @PutMapping("/{id}/status") + public ApiResponse updateStatus(@PathVariable Long id, @RequestBody Map body) { + service.updateStatus(id, body.getOrDefault("status", "OFFLINE")); + return ApiResponse.ok("상태 업데이트 완료", null); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("장치 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/PosCvtController.java b/backend/src/main/java/com/zioinfo/signage/controller/PosCvtController.java new file mode 100644 index 0000000..d54f77f --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/PosCvtController.java @@ -0,0 +1,56 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.admin.AuditService; +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.PosCvtVo; +import com.zioinfo.signage.service.PosCvtService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/pos-cvt") +@RequiredArgsConstructor +public class PosCvtController { + private final PosCvtService service; + private final AuditService audit; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) Long storeId, + @RequestParam(required = false) String status, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, storeId, status, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PutMapping("/{id}/process") + public ApiResponse process(@PathVariable Long id) { + PosCvtVo pos = service.get(id); + int queued = service.process(id); + // ESL 가격 변경 전파 — 추적 가치 높음 (가격은 영업정보이나 민감개인정보 아님) + String detail = pos == null ? ("queued=" + queued) + : ("product=" + pos.getProductCode() + ", price=" + pos.getPrice() + ", queued=" + queued); + audit.log(pos != null ? pos.getTenantCode() : null, "POS_PRICE_CHANGE", "POS_CVT", + String.valueOf(id), detail, true); + return ApiResponse.ok("처리 완료 (태그 큐 " + queued + "건)", queued); + } + + @PutMapping("/{id}/ignore") + public ApiResponse ignore(@PathVariable Long id) { + service.ignore(id); + return ApiResponse.ok("무시 처리 완료", null); + } + + @PutMapping("/{id}/error") + public ApiResponse error(@PathVariable Long id, @RequestBody Map body) { + service.markError(id, body.getOrDefault("message", "처리 오류")); + return ApiResponse.ok("오류 처리 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/ProductController.java b/backend/src/main/java/com/zioinfo/signage/controller/ProductController.java new file mode 100644 index 0000000..a59a486 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/ProductController.java @@ -0,0 +1,44 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.ProductVo; +import com.zioinfo.signage.service.ProductService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/products") +@RequiredArgsConstructor +public class ProductController { + private final ProductService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) Long storeId, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, storeId, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody ProductVo v) { + return ApiResponse.ok("상품 등록 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody ProductVo v) { + return ApiResponse.ok("상품 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("상품 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/RegionController.java b/backend/src/main/java/com/zioinfo/signage/controller/RegionController.java new file mode 100644 index 0000000..b8acc11 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/RegionController.java @@ -0,0 +1,43 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.RegionVo; +import com.zioinfo.signage.service.RegionService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/regions") +@RequiredArgsConstructor +public class RegionController { + private final RegionService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody RegionVo v) { + return ApiResponse.ok("지역 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody RegionVo v) { + return ApiResponse.ok("지역 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("지역 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/SignBoardController.java b/backend/src/main/java/com/zioinfo/signage/controller/SignBoardController.java new file mode 100644 index 0000000..46bd12e --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/SignBoardController.java @@ -0,0 +1,57 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.SignBoardVo; +import com.zioinfo.signage.service.SignBoardService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +/** + * e-paper ESL 태그 ↔ 선반 위치 ↔ 상품 바인딩 관리 + * 핵심 플로우: 태그 스캔 → 상품 선택 → 위치 지정 → bind() → 가격 변경 시 자동 큐 + */ +@RestController +@RequestMapping("/api/signboards") +@RequiredArgsConstructor +public class SignBoardController { + private final SignBoardService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) Long storeId, + @RequestParam(required = false) String bindStatus, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, storeId, bindStatus, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @GetMapping("/device/{deviceId}") + public ApiResponse getByDevice(@PathVariable String deviceId) { + return ApiResponse.ok(service.getByDeviceId(deviceId)); + } + + /** 태그에 상품+위치 바인딩 */ + @PostMapping + public ApiResponse bind(@RequestBody SignBoardVo vo) { + return ApiResponse.ok(service.bind(vo)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody SignBoardVo vo) { + vo.setId(id); + return ApiResponse.ok(service.bind(vo)); + } + + /** 태그 언바인딩 (선반에서 태그 제거 시) */ + @PutMapping("/{id}/unbind") + public ApiResponse unbind(@PathVariable Long id) { + service.unbind(id); + return ApiResponse.ok("언바인딩 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/SignDeployController.java b/backend/src/main/java/com/zioinfo/signage/controller/SignDeployController.java new file mode 100644 index 0000000..ad9eb62 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/SignDeployController.java @@ -0,0 +1,70 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.SignDeployVo; +import com.zioinfo.signage.service.SignDeployService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/sign-deploys") +@RequiredArgsConstructor +public class SignDeployController { + private final SignDeployService service; + + /** + * 매장(간판) 단말 30초 폴링 — {header:{token}, body:{type,sub_type,code,path,md5,file_name,file_size}}. + * 사업계획서 슬라이드20 REST 계약. body=null 이면 변경 없음. + */ + @PostMapping("/poll") + public ApiResponse> poll(@RequestBody Map req) { + Object codeVal = req.get("code"); + if (codeVal == null) codeVal = req.get("storeCode"); + String storeCode = codeVal == null ? "" : String.valueOf(codeVal); + String token = ""; + Object h = req.get("header"); + if (h instanceof Map) { + Object t = ((Map) h).get("token"); + if (t != null) token = String.valueOf(t); + } + return ApiResponse.ok(service.poll(storeCode, token)); + } + + /** 단말의 수신·적용 완료 통지. */ + @PostMapping("/{id}/confirm") + public ApiResponse confirm(@PathVariable Long id) { + service.confirm(id); + return ApiResponse.ok("배포 적용 확인 완료", null); + } + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String status, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, status, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody SignDeployVo v) { + return ApiResponse.ok("간판정보 배포 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody SignDeployVo v) { + return ApiResponse.ok("간판정보 배포 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("간판정보 배포 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/SignImageController.java b/backend/src/main/java/com/zioinfo/signage/controller/SignImageController.java new file mode 100644 index 0000000..9318b9d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/SignImageController.java @@ -0,0 +1,44 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.SignImageVo; +import com.zioinfo.signage.service.SignImageService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/sign-images") +@RequiredArgsConstructor +public class SignImageController { + private final SignImageService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String status, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, status, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody SignImageVo v) { + return ApiResponse.ok("간판 이미지 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody SignImageVo v) { + return ApiResponse.ok("간판 이미지 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("간판 이미지 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/StoreController.java b/backend/src/main/java/com/zioinfo/signage/controller/StoreController.java new file mode 100644 index 0000000..01ed9cd --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/StoreController.java @@ -0,0 +1,44 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.StoreVo; +import com.zioinfo.signage.service.StoreService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/stores") +@RequiredArgsConstructor +public class StoreController { + private final StoreService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) Long storeGroupId, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, storeGroupId, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody StoreVo v) { + return ApiResponse.ok("매장 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody StoreVo v) { + return ApiResponse.ok("매장 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("매장 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/StoreGroupController.java b/backend/src/main/java/com/zioinfo/signage/controller/StoreGroupController.java new file mode 100644 index 0000000..60484d7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/StoreGroupController.java @@ -0,0 +1,41 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.StoreGroupVo; +import com.zioinfo.signage.service.StoreGroupService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/store-groups") +@RequiredArgsConstructor +public class StoreGroupController { + private final StoreGroupService service; + + @GetMapping + public ApiResponse> list(@RequestParam(required = false) String tenantCode) { + return ApiResponse.ok(service.list(tenantCode)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody StoreGroupVo v) { + return ApiResponse.ok("매장그룹 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody StoreGroupVo v) { + return ApiResponse.ok("매장그룹 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("매장그룹 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/TemplateController.java b/backend/src/main/java/com/zioinfo/signage/controller/TemplateController.java new file mode 100644 index 0000000..38e7f68 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/TemplateController.java @@ -0,0 +1,43 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.TemplateVo; +import com.zioinfo.signage.service.TemplateService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/templates") +@RequiredArgsConstructor +public class TemplateController { + private final TemplateService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String templateType) { + return ApiResponse.ok(service.list(tenantCode, templateType)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody TemplateVo v) { + return ApiResponse.ok("템플릿 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody TemplateVo v) { + return ApiResponse.ok("템플릿 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("템플릿 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/TemplateGroupController.java b/backend/src/main/java/com/zioinfo/signage/controller/TemplateGroupController.java new file mode 100644 index 0000000..f4e5810 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/TemplateGroupController.java @@ -0,0 +1,43 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.TemplateGroupVo; +import com.zioinfo.signage.service.TemplateGroupService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/template-groups") +@RequiredArgsConstructor +public class TemplateGroupController { + private final TemplateGroupService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String keyword) { + return ApiResponse.ok(service.list(tenantCode, keyword)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody TemplateGroupVo v) { + return ApiResponse.ok("템플릿 그룹 생성 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody TemplateGroupVo v) { + return ApiResponse.ok("템플릿 그룹 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("템플릿 그룹 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/TenantController.java b/backend/src/main/java/com/zioinfo/signage/controller/TenantController.java new file mode 100644 index 0000000..3420271 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/TenantController.java @@ -0,0 +1,50 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.admin.AuditService; +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.TenantVo; +import com.zioinfo.signage.service.TenantService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/tenants") +@RequiredArgsConstructor +public class TenantController { + private final TenantService service; + private final AuditService audit; + + @GetMapping + public ApiResponse> list() { + return ApiResponse.ok(service.list()); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody TenantVo v) { + TenantVo created = service.create(v); + audit.log(created.getTenantCode(), "TENANT_CREATE", "TENANT", String.valueOf(created.getId()), + "name=" + created.getTenantName(), true); + return ApiResponse.ok("테넌트 생성 완료", created); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody TenantVo v) { + TenantVo updated = service.update(id, v); + audit.log(updated.getTenantCode(), "TENANT_UPDATE", "TENANT", String.valueOf(id), + "name=" + updated.getTenantName(), true); + return ApiResponse.ok("테넌트 수정 완료", updated); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + audit.log(null, "TENANT_DELETE", "TENANT", String.valueOf(id), "테넌트 삭제", true); + return ApiResponse.ok("테넌트 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/UpdateQueueController.java b/backend/src/main/java/com/zioinfo/signage/controller/UpdateQueueController.java new file mode 100644 index 0000000..b66510a --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/UpdateQueueController.java @@ -0,0 +1,75 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.UpdateQueueVo; +import com.zioinfo.signage.service.UpdateQueueService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + +/** + * e-paper 태그 가격 업데이트 전파 큐 + * Gateway가 이 API를 주기적으로 폴링 → 태그에 RF 전송 → confirm 호출 + * + * Gateway 연동 흐름: + * GET /api/update-queue/poll?tenantCode=EMART&limit=50 → PENDING 목록 수신 + * PUT /api/update-queue/{id}/sent → RF 전송 완료 + * PUT /api/update-queue/confirm?deviceId=ESL-001 → 태그 ACK 수신 + */ +@RestController +@RequestMapping("/api/update-queue") +@RequiredArgsConstructor +public class UpdateQueueController { + private final UpdateQueueService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) Long storeId, + @RequestParam(required = false) String status) { + return ApiResponse.ok(service.list(tenantCode, storeId, status)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + /** Gateway 폴링 엔드포인트: PENDING → SENDING 전환 후 반환 */ + @GetMapping("/poll") + public ApiResponse> poll( + @RequestParam(required = false) String tenantCode, + @RequestParam(defaultValue = "50") int limit) { + return ApiResponse.ok(service.pollPending(tenantCode, limit)); + } + + /** Gateway가 RF 전송 완료 후 호출 */ + @PutMapping("/{id}/sent") + public ApiResponse sent(@PathVariable Long id) { + service.markSent(id); + return ApiResponse.ok("전송 완료", null); + } + + /** 태그로부터 확인 응답 수신 (device_id 기반 일괄 확인) */ + @PutMapping("/confirm") + public ApiResponse confirm(@RequestParam String deviceId) { + service.confirm(deviceId); + return ApiResponse.ok("확인 완료", null); + } + + /** 전송 실패 처리 */ + @PutMapping("/{id}/failed") + public ApiResponse failed(@PathVariable Long id, + @RequestBody Map body) { + service.markFailed(id, body.getOrDefault("message", "전송 실패")); + return ApiResponse.ok("실패 처리 완료", null); + } + + /** 큐 항목 취소 */ + @PutMapping("/{id}/cancel") + public ApiResponse cancel(@PathVariable Long id) { + service.cancel(id); + return ApiResponse.ok("취소 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/UserController.java b/backend/src/main/java/com/zioinfo/signage/controller/UserController.java new file mode 100644 index 0000000..88a4922 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/UserController.java @@ -0,0 +1,79 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.admin.AuditService; +import com.zioinfo.signage.auth.SignageUser; +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.service.UserService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/users") +@RequiredArgsConstructor +public class UserController { + private final UserService service; + private final AuditService audit; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String role) { + return ApiResponse.ok(service.list(tenantCode, role)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody Map body) { + SignageUser user = new SignageUser(); + user.setUsername((String) body.get("username")); + user.setRole((String) body.getOrDefault("role", "USER")); + user.setTenantCode((String) body.get("tenantCode")); + user.setEmail((String) body.get("email")); + user.setPhone((String) body.get("phone")); + user.setActive(true); + String rawPassword = (String) body.getOrDefault("password", "changeme123"); + SignageUser created = service.create(user, rawPassword); + // 보안: 비밀번호는 감사 detail 에 절대 기록하지 않는다(username/role/tenant 요약만). + audit.log(created.getTenantCode(), "USER_CREATE", "USER", String.valueOf(created.getId()), + "username=" + created.getUsername() + ", role=" + created.getRole(), true); + return ApiResponse.ok("사용자 생성 완료", created); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody SignageUser v) { + SignageUser updated = service.update(id, v); + audit.log(updated.getTenantCode(), "USER_UPDATE", "USER", String.valueOf(id), + "role=" + updated.getRole() + ", active=" + updated.isActive(), true); + return ApiResponse.ok("사용자 수정 완료", updated); + } + + @PutMapping("/{id}/password") + public ApiResponse changePassword(@PathVariable Long id, @RequestBody Map body) { + service.changePassword(id, body.getOrDefault("password", "changeme123")); + // 보안: 새 비밀번호 값은 기록하지 않는다(대상 id 만). + audit.log(null, "USER_PASSWORD_RESET", "USER", String.valueOf(id), "비밀번호 초기화", true); + return ApiResponse.ok("비밀번호 변경 완료", null); + } + + @PutMapping("/{id}/active") + public ApiResponse setActive(@PathVariable Long id, @RequestBody Map body) { + boolean active = Boolean.TRUE.equals(body.get("active")); + SignageUser u = service.setActive(id, active); + audit.log(u != null ? u.getTenantCode() : null, "USER_ACTIVE_TOGGLE", "USER", + String.valueOf(id), "active=" + active, true); + return ApiResponse.ok(active ? "활성화 완료" : "비활성화 완료", u); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + audit.log(null, "USER_DELETE", "USER", String.valueOf(id), "사용자 삭제", true); + return ApiResponse.ok("사용자 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/controller/WorkController.java b/backend/src/main/java/com/zioinfo/signage/controller/WorkController.java new file mode 100644 index 0000000..2b44d35 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/controller/WorkController.java @@ -0,0 +1,45 @@ +package com.zioinfo.signage.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.domain.WorkHistoryVo; +import com.zioinfo.signage.service.WorkService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@RequestMapping("/api/works") +@RequiredArgsConstructor +public class WorkController { + private final WorkService service; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) Long storeId, + @RequestParam(required = false) String status, + @RequestParam(required = false) String workType) { + return ApiResponse.ok(service.list(tenantCode, storeId, status, workType)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable Long id) { + return ApiResponse.ok(service.get(id)); + } + + @PostMapping + public ApiResponse create(@RequestBody WorkHistoryVo v) { + return ApiResponse.ok("작업 등록 완료", service.create(v)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable Long id, @RequestBody WorkHistoryVo v) { + return ApiResponse.ok("작업 수정 완료", service.update(id, v)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable Long id) { + service.delete(id); + return ApiResponse.ok("작업 삭제 완료", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/AdScheduleVo.java b/backend/src/main/java/com/zioinfo/signage/domain/AdScheduleVo.java new file mode 100644 index 0000000..62d7943 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/AdScheduleVo.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class AdScheduleVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeCode; + private String adName; + private String mediaType; + private String mediaPath; + private String templateCode; + private LocalDateTime startAt; + private LocalDateTime endAt; + private String dailyStart; + private String dailyEnd; + private Integer priority; + private String status; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/AlarmVo.java b/backend/src/main/java/com/zioinfo/signage/domain/AlarmVo.java new file mode 100644 index 0000000..bd385dc --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/AlarmVo.java @@ -0,0 +1,21 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class AlarmVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeName; + private String alarmType; // DEVICE, NETWORK, BATTERY, FIRMWARE, SYSTEM + private String alarmCode; + private String severity; // CRITICAL, HIGH, MEDIUM, LOW + private String message; + private String status; // OPEN, ACKNOWLEDGED, RESOLVED + private String resolvedBy; + private String resolution; + private LocalDateTime resolvedAt; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/BackupVo.java b/backend/src/main/java/com/zioinfo/signage/domain/BackupVo.java new file mode 100644 index 0000000..8b61370 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/BackupVo.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class BackupVo { + private Long id; + private String tenantCode; + private String storeCode; + private String backupType; + private String fileName; + private Long fileSize; + private String md5; + private String filePath; + private String status; + private LocalDateTime backupAt; + private LocalDateTime restoredAt; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/DashboardVo.java b/backend/src/main/java/com/zioinfo/signage/domain/DashboardVo.java new file mode 100644 index 0000000..42a3efb --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/DashboardVo.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; + +@Data +public class DashboardVo { + private long totalStores; + private long activeStores; + private long totalAlarms; + private long unresolvedAlarms; + private long criticalAlarms; + private long totalDevices; + private long onlineDevices; + private long offlineDevices; + private long totalWorkToday; + private long completedWorkToday; + private long pendingPosCvt; + private long processedPosCvtToday; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/FirmwareVo.java b/backend/src/main/java/com/zioinfo/signage/domain/FirmwareVo.java new file mode 100644 index 0000000..ff7442d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/FirmwareVo.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class FirmwareVo { + private Long id; + private String tenantCode; + private String firmwareVersion; + private String deviceType; // GATEWAY, HUB, ESL_DEVICE + private String fileName; + private String filePath; + private Long fileSize; + private String checksum; + private String description; + private boolean latest; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/GatewayVo.java b/backend/src/main/java/com/zioinfo/signage/domain/GatewayVo.java new file mode 100644 index 0000000..6f02308 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/GatewayVo.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class GatewayVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeName; + private String deviceType; // GATEWAY, HUB, ESB_TAG + private String gwType; // GEN1, GEN2, GEN2_PLUS_EMS (게이트웨이 세대) + private String deviceId; + private String ipAddress; + private String macAddress; + private String firmwareVersion; + private String status; // ONLINE, OFFLINE, ERROR, UPDATING + private Integer batteryLevel; + private String signalStrength; + private LocalDateTime lastSeenAt; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/PosCvtVo.java b/backend/src/main/java/com/zioinfo/signage/domain/PosCvtVo.java new file mode 100644 index 0000000..fb4e202 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/PosCvtVo.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class PosCvtVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeName; + private String posCode; + private String productCode; + private String productName; + private BigDecimal price; + private BigDecimal salePrice; + private String currency; + private String status; // PENDING, PROCESSED, ERROR, IGNORED + private String errorMessage; + private LocalDateTime processedAt; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/ProductVo.java b/backend/src/main/java/com/zioinfo/signage/domain/ProductVo.java new file mode 100644 index 0000000..ec0c58b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/ProductVo.java @@ -0,0 +1,22 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class ProductVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeName; + private String productCode; + private String productName; + private String category; + private BigDecimal price; + private BigDecimal salePrice; + private String currency; + private boolean active; + private LocalDateTime updatedAt; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/RegionVo.java b/backend/src/main/java/com/zioinfo/signage/domain/RegionVo.java new file mode 100644 index 0000000..91e5d3c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/RegionVo.java @@ -0,0 +1,16 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class RegionVo { + private Long id; + private String tenantCode; + private String regionCode; + private String regionName; + private String dcName; + private String description; + private boolean active; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/SignBoardVo.java b/backend/src/main/java/com/zioinfo/signage/domain/SignBoardVo.java new file mode 100644 index 0000000..340a63a --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/SignBoardVo.java @@ -0,0 +1,27 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class SignBoardVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeName; + private String deviceId; // ESL_DEVICE의 device_id + private String productCode; + private String productName; + private String locationCode; // 선반 위치 (예: A01-03) + private String templateCode; + private String displayData; // 현재 화면 렌더링 데이터 (JSON) + private BigDecimal lastPrice; + private LocalDateTime lastUpdatedAt; + private String bindStatus; // ACTIVE, UNBOUND, ERROR + // HCore 장치 정보 (join) + private String deviceStatus; // ONLINE, OFFLINE 등 + private Integer batteryLevel; + private String signalStrength; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/SignDeployVo.java b/backend/src/main/java/com/zioinfo/signage/domain/SignDeployVo.java new file mode 100644 index 0000000..0d56625 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/SignDeployVo.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class SignDeployVo { + private Long id; + private String tenantCode; + private String storeCode; + private String deployType; + private String subType; + private String code; + private String fileName; + private Long fileSize; + private String md5; + private String filePath; + private String status; + private Integer pollIntervalSec; + private LocalDateTime lastPolledAt; + private LocalDateTime deployedAt; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/SignImageVo.java b/backend/src/main/java/com/zioinfo/signage/domain/SignImageVo.java new file mode 100644 index 0000000..2ff4cc4 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/SignImageVo.java @@ -0,0 +1,22 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class SignImageVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeCode; + private String imageCode; + private String bizName; + private String phone; + private String message; + private String templateCode; + private Integer width; + private Integer height; + private String imagePath; + private String status; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/StoreGroupVo.java b/backend/src/main/java/com/zioinfo/signage/domain/StoreGroupVo.java new file mode 100644 index 0000000..c8eadd7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/StoreGroupVo.java @@ -0,0 +1,15 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class StoreGroupVo { + private Long id; + private String tenantCode; + private String groupCode; + private String groupName; + private String description; + private boolean active; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/StoreVo.java b/backend/src/main/java/com/zioinfo/signage/domain/StoreVo.java new file mode 100644 index 0000000..149eda5 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/StoreVo.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class StoreVo { + private Long id; + private String tenantCode; + private String storeCode; + private String storeName; + private String address; + private String phone; + private Long storeGroupId; + private String storeGroupName; + private String managerName; + private boolean active; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/TemplateGroupVo.java b/backend/src/main/java/com/zioinfo/signage/domain/TemplateGroupVo.java new file mode 100644 index 0000000..6ed62e2 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/TemplateGroupVo.java @@ -0,0 +1,15 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class TemplateGroupVo { + private Long id; + private String tenantCode; + private String groupCode; + private String groupName; + private String description; + private boolean active; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/TemplateVo.java b/backend/src/main/java/com/zioinfo/signage/domain/TemplateVo.java new file mode 100644 index 0000000..a578b8b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/TemplateVo.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class TemplateVo { + private Long id; + private String tenantCode; + private String templateCode; + private String templateName; + private String templateType; // PRICE, INFO, PROMO, CUSTOM + private Integer width; + private Integer height; + private String description; + private String layoutJson; // JSON 레이아웃 정의 + private boolean active; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/TenantVo.java b/backend/src/main/java/com/zioinfo/signage/domain/TenantVo.java new file mode 100644 index 0000000..63af6f5 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/TenantVo.java @@ -0,0 +1,14 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class TenantVo { + private Long id; + private String tenantCode; + private String tenantName; + private String description; + private boolean active; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/UpdateQueueVo.java b/backend/src/main/java/com/zioinfo/signage/domain/UpdateQueueVo.java new file mode 100644 index 0000000..051af2f --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/UpdateQueueVo.java @@ -0,0 +1,31 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class UpdateQueueVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeName; + private Long bindingId; + private String deviceId; + private String locationCode; + private String productCode; + private String productName; + private BigDecimal newPrice; + private BigDecimal newSalePrice; + private String templateCode; + private String renderData; + private Integer priority; // 1(긴급)~10(일반) + private String status; // PENDING, SENDING, SENT, CONFIRMED, FAILED, CANCELLED + private Integer retryCount; + private Integer maxRetry; + private String errorMessage; + private Long posCvtId; + private LocalDateTime sentAt; + private LocalDateTime confirmedAt; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/domain/WorkHistoryVo.java b/backend/src/main/java/com/zioinfo/signage/domain/WorkHistoryVo.java new file mode 100644 index 0000000..4e3a204 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/domain/WorkHistoryVo.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class WorkHistoryVo { + private Long id; + private String tenantCode; + private Long storeId; + private String storeName; + private String workType; // INSTALL, MAINTENANCE, FIRMWARE_UPDATE, REPLACEMENT, INSPECTION + private String workContent; + private String workerName; + private String status; // SCHEDULED, IN_PROGRESS, COMPLETED, CANCELLED + private String remarks; + private LocalDateTime startedAt; + private LocalDateTime completedAt; + private LocalDateTime createdAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/AdScheduleMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/AdScheduleMapper.java new file mode 100644 index 0000000..9b3fb5a --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/AdScheduleMapper.java @@ -0,0 +1,18 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.AdScheduleVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface AdScheduleMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("status") String status, + @Param("keyword") String keyword); + AdScheduleVo findById(@Param("id") Long id); + int insert(AdScheduleVo vo); + int update(AdScheduleVo vo); + int delete(@Param("id") Long id); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/AlarmMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/AlarmMapper.java new file mode 100644 index 0000000..811eab9 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/AlarmMapper.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.AlarmVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface AlarmMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("storeId") Long storeId, + @Param("severity") String severity, + @Param("status") String status); + AlarmVo findById(@Param("id") Long id); + int insert(AlarmVo alarm); + int update(AlarmVo alarm); + int resolve(@Param("id") Long id, @Param("resolvedBy") String resolvedBy, + @Param("resolution") String resolution); + int delete(@Param("id") Long id); + long countUnresolved(@Param("tenantCode") String tenantCode); + long countCritical(@Param("tenantCode") String tenantCode); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/BackupMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/BackupMapper.java new file mode 100644 index 0000000..d7ee3dc --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/BackupMapper.java @@ -0,0 +1,18 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.BackupVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface BackupMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("status") String status, + @Param("keyword") String keyword); + BackupVo findById(@Param("id") Long id); + int insert(BackupVo vo); + int update(BackupVo vo); + int delete(@Param("id") Long id); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/DashboardMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/DashboardMapper.java new file mode 100644 index 0000000..187908d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/DashboardMapper.java @@ -0,0 +1,10 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.DashboardVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface DashboardMapper { + DashboardVo getSummary(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/FirmwareMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/FirmwareMapper.java new file mode 100644 index 0000000..539ec3b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/FirmwareMapper.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.FirmwareVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface FirmwareMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("deviceType") String deviceType); + FirmwareVo findById(@Param("id") Long id); + FirmwareVo findLatest(@Param("deviceType") String deviceType, + @Param("tenantCode") String tenantCode); + int insert(FirmwareVo firmware); + int update(FirmwareVo firmware); + int clearLatest(@Param("deviceType") String deviceType, @Param("tenantCode") String tenantCode); + int delete(@Param("id") Long id); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/GatewayMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/GatewayMapper.java new file mode 100644 index 0000000..56fbb30 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/GatewayMapper.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.GatewayVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface GatewayMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("storeId") Long storeId, + @Param("deviceType") String deviceType, + @Param("status") String status); + GatewayVo findById(@Param("id") Long id); + GatewayVo findByDeviceId(@Param("deviceId") String deviceId); + int insert(GatewayVo hcore); + int update(GatewayVo hcore); + int updateStatus(@Param("id") Long id, @Param("status") String status); + int delete(@Param("id") Long id); + long countOnline(@Param("tenantCode") String tenantCode); + long countOffline(@Param("tenantCode") String tenantCode); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/PosCvtMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/PosCvtMapper.java new file mode 100644 index 0000000..ce51f82 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/PosCvtMapper.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.PosCvtVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface PosCvtMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("storeId") Long storeId, + @Param("status") String status, + @Param("keyword") String keyword); + PosCvtVo findById(@Param("id") Long id); + int insert(PosCvtVo posCvt); + int updateStatus(@Param("id") Long id, @Param("status") String status, + @Param("errorMessage") String errorMessage); + long countPending(@Param("tenantCode") String tenantCode); + long countProcessedToday(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/ProductMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/ProductMapper.java new file mode 100644 index 0000000..0f98f9c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/ProductMapper.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.ProductVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface ProductMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("storeId") Long storeId, + @Param("keyword") String keyword); + ProductVo findById(@Param("id") Long id); + ProductVo findByCode(@Param("productCode") String productCode, + @Param("storeId") Long storeId); + int insert(ProductVo product); + int update(ProductVo product); + int delete(@Param("id") Long id); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/RegionMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/RegionMapper.java new file mode 100644 index 0000000..452c2b5 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/RegionMapper.java @@ -0,0 +1,17 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.RegionVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface RegionMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("keyword") String keyword); + RegionVo findById(@Param("id") Long id); + int insert(RegionVo vo); + int update(RegionVo vo); + int delete(@Param("id") Long id); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/SignBoardMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/SignBoardMapper.java new file mode 100644 index 0000000..de17943 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/SignBoardMapper.java @@ -0,0 +1,25 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.SignBoardVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface SignBoardMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("storeId") Long storeId, + @Param("bindStatus") String bindStatus, + @Param("keyword") String keyword); + SignBoardVo findById(@Param("id") Long id); + SignBoardVo findByDeviceId(@Param("deviceId") String deviceId); + List findByProductCode(@Param("tenantCode") String tenantCode, + @Param("storeId") Long storeId, + @Param("productCode") String productCode); + int insert(SignBoardVo vo); + int update(SignBoardVo vo); + int unbind(@Param("id") Long id); + int delete(@Param("id") Long id); + long countAll(@Param("tenantCode") String tenantCode); + long countActive(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/SignDeployMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/SignDeployMapper.java new file mode 100644 index 0000000..ac7ae7f --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/SignDeployMapper.java @@ -0,0 +1,24 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.SignDeployVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface SignDeployMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("status") String status, + @Param("keyword") String keyword); + SignDeployVo findById(@Param("id") Long id); + /** 매장코드 최신 PENDING/SENT 배포 1건 (30초 폴링 대상). */ + SignDeployVo findLatestForStore(@Param("storeCode") String storeCode); + /** 폴링 확인 시각 갱신(status 미변경). */ + int markPolled(@Param("id") Long id); + /** 배포 적용 완료 처리(status=APPLIED, deployed_at). */ + int markApplied(@Param("id") Long id); + int insert(SignDeployVo vo); + int update(SignDeployVo vo); + int delete(@Param("id") Long id); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/SignImageMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/SignImageMapper.java new file mode 100644 index 0000000..9859938 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/SignImageMapper.java @@ -0,0 +1,18 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.SignImageVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface SignImageMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("status") String status, + @Param("keyword") String keyword); + SignImageVo findById(@Param("id") Long id); + int insert(SignImageVo vo); + int update(SignImageVo vo); + int delete(@Param("id") Long id); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/StoreGroupMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/StoreGroupMapper.java new file mode 100644 index 0000000..d00ce16 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/StoreGroupMapper.java @@ -0,0 +1,15 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.StoreGroupVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface StoreGroupMapper { + List findAll(@Param("tenantCode") String tenantCode); + StoreGroupVo findById(@Param("id") Long id); + int insert(StoreGroupVo group); + int update(StoreGroupVo group); + int delete(@Param("id") Long id); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/StoreMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/StoreMapper.java new file mode 100644 index 0000000..faa786f --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/StoreMapper.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.StoreVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface StoreMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("storeGroupId") Long storeGroupId, + @Param("keyword") String keyword); + StoreVo findById(@Param("id") Long id); + StoreVo findByCode(@Param("storeCode") String storeCode, @Param("tenantCode") String tenantCode); + int insert(StoreVo store); + int update(StoreVo store); + int delete(@Param("id") Long id); + long countActive(@Param("tenantCode") String tenantCode); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/TemplateGroupMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/TemplateGroupMapper.java new file mode 100644 index 0000000..8b4a5b7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/TemplateGroupMapper.java @@ -0,0 +1,17 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.TemplateGroupVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface TemplateGroupMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("keyword") String keyword); + TemplateGroupVo findById(@Param("id") Long id); + int insert(TemplateGroupVo vo); + int update(TemplateGroupVo vo); + int delete(@Param("id") Long id); + long countAll(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/TemplateMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/TemplateMapper.java new file mode 100644 index 0000000..60d093d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/TemplateMapper.java @@ -0,0 +1,16 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.TemplateVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface TemplateMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("templateType") String templateType); + TemplateVo findById(@Param("id") Long id); + int insert(TemplateVo template); + int update(TemplateVo template); + int delete(@Param("id") Long id); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/TenantMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/TenantMapper.java new file mode 100644 index 0000000..a17c784 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/TenantMapper.java @@ -0,0 +1,16 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.TenantVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface TenantMapper { + List findAll(); + TenantVo findById(@Param("id") Long id); + TenantVo findByCode(@Param("tenantCode") String tenantCode); + int insert(TenantVo tenant); + int update(TenantVo tenant); + int delete(@Param("id") Long id); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/UpdateQueueMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/UpdateQueueMapper.java new file mode 100644 index 0000000..94e798d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/UpdateQueueMapper.java @@ -0,0 +1,24 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.UpdateQueueVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface UpdateQueueMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("storeId") Long storeId, + @Param("status") String status); + List findPending(@Param("tenantCode") String tenantCode, + @Param("limit") int limit); + UpdateQueueVo findById(@Param("id") Long id); + int insert(UpdateQueueVo vo); + int updateStatus(@Param("id") Long id, @Param("status") String status, + @Param("errorMessage") String errorMessage); + int confirmByDeviceId(@Param("deviceId") String deviceId); + int incrementRetry(@Param("id") Long id); + long countPending(@Param("tenantCode") String tenantCode); + long countFailed(@Param("tenantCode") String tenantCode); + long countByStatus(@Param("tenantCode") String tenantCode, @Param("status") String status); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/UserMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/UserMapper.java new file mode 100644 index 0000000..e453a84 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/UserMapper.java @@ -0,0 +1,18 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.auth.SignageUser; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface UserMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("role") String role); + SignageUser findById(@Param("id") Long id); + SignageUser findByUsername(@Param("username") String username); + int insert(SignageUser user); + int update(SignageUser user); + int updatePassword(@Param("id") Long id, @Param("passwordHash") String passwordHash); + int delete(@Param("id") Long id); +} diff --git a/backend/src/main/java/com/zioinfo/signage/mapper/WorkMapper.java b/backend/src/main/java/com/zioinfo/signage/mapper/WorkMapper.java new file mode 100644 index 0000000..9a8a330 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/mapper/WorkMapper.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.mapper; + +import com.zioinfo.signage.domain.WorkHistoryVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +@Mapper +public interface WorkMapper { + List findAll(@Param("tenantCode") String tenantCode, + @Param("storeId") Long storeId, + @Param("status") String status, + @Param("workType") String workType); + WorkHistoryVo findById(@Param("id") Long id); + int insert(WorkHistoryVo work); + int update(WorkHistoryVo work); + int delete(@Param("id") Long id); + long countToday(@Param("tenantCode") String tenantCode); + long countCompletedToday(@Param("tenantCode") String tenantCode); +} diff --git a/backend/src/main/java/com/zioinfo/signage/rag/RagAiService.java b/backend/src/main/java/com/zioinfo/signage/rag/RagAiService.java new file mode 100644 index 0000000..2a10a36 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/rag/RagAiService.java @@ -0,0 +1,254 @@ +package com.zioinfo.signage.rag; + +import com.zioinfo.signage.config.OllamaClient; +import com.zioinfo.signage.rag.RagToggleService.RagToggles; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * ESN 대표 AI 기능 RAG 배선 레이어(순증·비파괴, 테넌트 격리). + * + *

기존 {@link OllamaClient}(폴백 내장) 및 {@code AiController} 는 불변. 본 서비스는 + * 중앙 guardia-rag 를 경유하는 별개 레이어로, 두 대표 기능을 전환한다: + *

    + *
  1. 알람 원인분석·우선순위 → {@code /rag/agent}(tool-use 다단계 진단) + * + GraphRAG(retrieval_mode=graph 의존성 추적, graphrag 토글 on 시) + {@code /rag/structured} + * (우선순위 결정론 JSON). 토글 off/미가용 시 기존 {@link OllamaClient#chat} 로 무손실 폴백.
  2. + *
  3. POS 데이터 자동 분류 → {@code /rag/structured}(format:json 결정론). + * confidence 임계 미만이면 {@code needsReview:true}. 미가용 시 OllamaClient 폴백.
  4. + *
+ * + *

모든 응답에 적용 metadata(retrievalMode·rerank·structured·toolUse·degraded)를 표기해 + * 토글 effect 를 관측 가능하게 한다. + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class RagAiService { + + private final SignageRagClient rag; + private final RagToggleService toggles; + private final SignageToolRegistry tools; + private final OllamaClient ollama; // 기존 폴백 재사용(불변) + + /** 알람 우선순위·근본원인 결정론 JSON 스키마. */ + private static final Map ALARM_SCHEMA = Map.of( + "type", "object", + "properties", Map.of( + "rootCauseHypothesis", Map.of("type", "string"), + "priority", Map.of("type", "string"), // P1~P4 + "groupKey", Map.of("type", "string"), + "affectedDeviceCount", Map.of("type", "integer"), + "recommendedActions", Map.of("type", "array", "items", Map.of("type", "string")), + "confidence", Map.of("type", "number") + ), + "required", List.of("priority", "rootCauseHypothesis") + ); + + /** POS 분류 결정론 JSON 스키마. */ + private static final Map POS_SCHEMA = Map.of( + "type", "object", + "properties", Map.of( + "classification", Map.of("type", "string"), // NORMAL|ABNORMAL + "category", Map.of("type", "string"), // PRICE_OK|PRICE_MISMATCH|MISSING|OUTLIER ... + "reason", Map.of("type", "string"), + "confidence", Map.of("type", "number") + ), + "required", List.of("classification", "confidence") + ); + + // ── ① ESL/HCore 알람 원인분석·우선순위 ─────────────────────────────────── + @SuppressWarnings("unchecked") + public Map analyzeAlarm(String tenantCode, Map req, String actor) { + RagToggles t = toggles.current(tenantCode); + String alarmType = str(req.get("alarmType")); + String severity = str(req.getOrDefault("severity", "LOW")); + String message = str(req.get("message")); + String storeCode = str(req.get("storeCode")); + String query = String.format( + "ESL/HCore 알람의 근본원인과 우선순위를 진단하라. 유형=%s, 심각도=%s, 매장=%s, 메시지=%s. " + + "허브 다운이 하위 단말 다중 알람을 유발하는 연쇄(cascading) 가능성을 의존성 그래프로 검토하고, " + + "같은 근본원인의 파생 알람은 하나로 그룹핑하라.", + alarmType, severity, storeCode, message); + + Map out = new LinkedHashMap<>(); + + if (!t.ragEnabled || !rag.available()) { + return alarmFallback(out, t, req); + } + + // tool-use 토글 on → /rag/agent 다단계 진단, off → graph/answer 단발 + Map evidence; + if (t.toolUse) { + evidence = rag.agent(tenantCode, query, tools.alarmDiagnosisTools(), + toggles.effectiveMode(t), t.agentMaxSteps, t.generationModel); + } else { + evidence = rag.answer(tenantCode, query, toggles.effectiveMode(t), + t.rerank, t.topK, t.generationModel, true); + } + if (bool(evidence.get("degraded"))) { + return alarmFallback(out, t, req); + } + + // 우선순위·그룹핑은 결정론 JSON(/structured)으로 수렴 — 파싱 실패 차단 + String evText = str(evidence.getOrDefault("answer", "")); + Map sres = rag.structured(tenantCode, + query + "\n근거:\n" + evText + "\n위 근거로 priority(P1~P4)·rootCause·group·조치를 JSON 으로만 산출.", + ALARM_SCHEMA, t.generationModel, t.temperature); + + Map data = sres.get("data") instanceof Map ? (Map) sres.get("data") : Map.of(); + if (bool(sres.get("degraded")) || data.isEmpty()) { + return alarmFallback(out, t, req); + } + + out.put("rootCauseHypothesis", data.get("rootCauseHypothesis")); + out.put("priority", data.getOrDefault("priority", "P3")); + out.put("groupKey", data.get("groupKey")); + out.put("affectedDeviceCount", data.get("affectedDeviceCount")); + out.put("recommendedActions", data.get("recommendedActions")); + out.put("confidence", data.get("confidence")); + out.put("citations", evidence.get("citations")); + out.put("answerId", evidence.get("answer_id")); + out.put("engine", t.toolUse ? "RAG_AGENT" : "RAG_GRAPH"); + out.put("degraded", false); + out.putAll(meta(t, t.toolUse ? "agent" : "answer", true)); + return out; + } + + private Map alarmFallback(Map out, RagToggles t, Map req) { + // 비파괴 폴백: 기존 OllamaClient 룰/모델 + 규칙 기반 우선순위 + String prompt = String.format("ESL 알람 분석: 유형=%s 심각도=%s 메시지=%s. 원인·조치 3줄.", + str(req.get("alarmType")), str(req.getOrDefault("severity", "LOW")), str(req.get("message"))); + String analysis = ollama.chat(prompt, "ESL 시스템 전문 AI 엔지니어. 실용 조치 제안."); + out.put("rootCauseHypothesis", analysis); + out.put("priority", rulePriority(str(req.getOrDefault("severity", "LOW")))); + out.put("recommendedActions", List.of("디바이스 연결 상태 확인", "허브 통신 점검", "지속 시 현장 엔지니어 파견")); + out.put("engine", "OLLAMA_FALLBACK"); + out.put("degraded", true); + out.put("degraded_reason", t.ragEnabled ? "rag_unavailable" : "rag_disabled"); + out.putAll(meta(t, "fallback", false)); + return out; + } + + private String rulePriority(String severity) { + switch (severity == null ? "" : severity.toUpperCase()) { + case "CRITICAL": return "P1"; + case "HIGH": return "P2"; + case "MEDIUM": return "P3"; + default: return "P4"; + } + } + + // ── ② POS 데이터 자동 분류 (결정론) ───────────────────────────────────── + @SuppressWarnings("unchecked") + public Map classifyPos(String tenantCode, Map req, String actor) { + RagToggles t = toggles.current(tenantCode); + String productCode = str(req.get("productCode")); + String price = str(req.getOrDefault("price", "0")); + String salePrice = str(req.getOrDefault("salePrice", "0")); + Map out = new LinkedHashMap<>(); + + if (!t.ragEnabled || !rag.available() || !t.structured) { + return posFallback(out, t, req); + } + + String prompt = String.format( + "POS 가격 데이터를 NORMAL/ABNORMAL 로 분류하라. 상품코드=%s, 정가=%s, 판매가=%s. " + + "판매가>정가, 음수, 비현실적 값, 누락을 ABNORMAL 로 판정하고 category·reason·confidence(0~1)를 JSON 으로만.", + productCode, price, salePrice); + + Map sres = rag.structured(tenantCode, prompt, POS_SCHEMA, t.generationModel, t.temperature); + Map data = sres.get("data") instanceof Map ? (Map) sres.get("data") : Map.of(); + + if (bool(sres.get("degraded")) || data.isEmpty() || data.get("classification") == null) { + return posFallback(out, t, req); + } + + double conf = num(data.get("confidence"), 0.0); + boolean needsReview = conf < t.faithfulnessThreshold; + out.put("classification", String.valueOf(data.get("classification")).toUpperCase()); + out.put("category", data.get("category")); + out.put("reason", data.get("reason")); + out.put("confidence", conf); + out.put("needsReview", needsReview); // 임계 미만 → 수동 검토 + out.put("productCode", productCode); + out.put("engine", "RAG_STRUCTURED"); + out.put("degraded", false); + out.putAll(meta(t, "structured", true)); + return out; + } + + private Map posFallback(Map out, RagToggles t, Map req) { + String price = str(req.getOrDefault("price", "0")); + String salePrice = str(req.getOrDefault("salePrice", "0")); + // 규칙 우선(결정론) — 판매가>정가 또는 음수면 ABNORMAL + String cls = "NORMAL"; + String reason = "규칙 기반: 가격 범위 정상"; + try { + double p = Double.parseDouble(price), s = Double.parseDouble(salePrice); + if (p < 0 || s < 0 || s > p) { cls = "ABNORMAL"; reason = "규칙 기반: 음수 또는 판매가>정가"; } + } catch (Exception ignore) { + // 숫자 파싱 실패 시 모델 보조 + String r = ollama.chat("POS 가격 검증: 정가=" + price + " 판매가=" + salePrice, "POS 데이터 품질 관리 AI."); + cls = r.toUpperCase().contains("ABNORMAL") ? "ABNORMAL" : "NORMAL"; + reason = "모델 폴백 판정"; + } + out.put("classification", cls); + out.put("reason", reason); + out.put("confidence", 0.0); + out.put("needsReview", true); // 폴백은 항상 검토 권고 + out.put("productCode", str(req.get("productCode"))); + out.put("engine", "RULE_FALLBACK"); + out.put("degraded", true); + out.put("degraded_reason", t.ragEnabled ? "rag_unavailable" : "rag_disabled"); + out.putAll(meta(t, "fallback", false)); + return out; + } + + // ── 피드백 / 토글 ──────────────────────────────────────────────────────── + public Map feedback(String tenantCode, Map req, String actor) { + String userRef = "u_" + Integer.toHexString((actor == null ? "anon" : actor).hashCode()); + return rag.feedback(tenantCode, + str0(req.get("answerId")), str0(req.get("query")), str0(req.get("answer")), + str(req.getOrDefault("verdict", "down")), str0(req.get("correction")), userRef); + } + + public Map currentToggles(String tenantCode) { + Map m = toggles.current(tenantCode).toMap(); + m.put("ragAvailable", rag.available()); + return m; + } + + public Map updateToggle(String tenantCode, String key, String value) { + Map m = toggles.update(tenantCode, key, value).toMap(); + m.put("ragAvailable", rag.available()); + return m; + } + + // ── helpers ───────────────────────────────────────────────────────────── + private Map meta(RagToggles t, String technique, boolean structured) { + Map m = new LinkedHashMap<>(); + Map applied = new LinkedHashMap<>(); + applied.put("tenantCode", t.tenantCode); + applied.put("retrievalMode", toggles.effectiveMode(t)); + applied.put("rerank", t.rerank); + applied.put("graphrag", t.graphrag); + applied.put("toolUse", t.toolUse); + applied.put("structured", structured); + applied.put("technique", technique); + m.put("applied", applied); + return m; + } + + private boolean bool(Object o) { return Boolean.TRUE.equals(o) || "true".equalsIgnoreCase(String.valueOf(o)); } + private double num(Object o, double def) { + try { return Double.parseDouble(String.valueOf(o)); } catch (Exception e) { return def; } + } + private String str(Object o) { return o == null ? "" : String.valueOf(o); } + private String str0(Object o) { return o == null ? null : String.valueOf(o); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/rag/RagController.java b/backend/src/main/java/com/zioinfo/signage/rag/RagController.java new file mode 100644 index 0000000..24887cb --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/rag/RagController.java @@ -0,0 +1,98 @@ +package com.zioinfo.signage.rag; + +import com.zioinfo.signage.common.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * ESN 최신 AI 기법(중앙 guardia-rag) 배선 API — 별개 레이어, 테넌트 격리. + * + *

기존 {@code /api/ai/*}(AiController) 는 불변. 본 컨트롤러는 중앙 경유 신규 경로만 추가한다. + * + *

    + *
  • POST /api/ai/rag/analyze-alarm — ESL/HCore 알람 원인분석·우선순위(/agent+graph+structured)
  • + *
  • POST /api/ai/rag/classify-pos — POS 데이터 자동 분류(/structured, 임계 미만 needsReview)
  • + *
  • POST /api/ai/rag/feedback — 👍/👎 피드백(/rag/feedback, solution=esn 격리)
  • + *
  • GET /api/ai/rag/toggles — 현재 테넌트 기법 토글 스냅샷
  • + *
  • PUT /api/ai/rag/toggles/{key} — 테넌트 토글 변경(MANAGER+, signage_rag_setting 격리)
  • + *
+ * + *

테넌트는 {@code X-Tenant-Code} 헤더 또는 {@code tenantCode} 바디 필드로 식별(없으면 기본). + */ +@RestController +@RequestMapping("/api/ai/rag") +@RequiredArgsConstructor +public class RagController { + + private final RagAiService service; + + @PostMapping("/analyze-alarm") + public ApiResponse> analyzeAlarm( + @RequestBody Map req, + @RequestHeader(value = "X-Tenant-Code", required = false) String tenantHeader, + Authentication auth) { + return ApiResponse.ok(service.analyzeAlarm(tenant(tenantHeader, req), req, name(auth))); + } + + @PostMapping("/classify-pos") + public ApiResponse> classifyPos( + @RequestBody Map req, + @RequestHeader(value = "X-Tenant-Code", required = false) String tenantHeader, + Authentication auth) { + return ApiResponse.ok(service.classifyPos(tenant(tenantHeader, req), req, name(auth))); + } + + @PostMapping("/feedback") + public ApiResponse> feedback( + @RequestBody Map req, + @RequestHeader(value = "X-Tenant-Code", required = false) String tenantHeader, + Authentication auth) { + return ApiResponse.ok(service.feedback(tenant(tenantHeader, req), req, name(auth))); + } + + @GetMapping("/toggles") + public ApiResponse> toggles( + @RequestHeader(value = "X-Tenant-Code", required = false) String tenantHeader, + @RequestParam(value = "tenantCode", required = false) String tenantParam) { + String tc = tenantHeader != null ? tenantHeader : tenantParam; + return ApiResponse.ok(service.currentToggles(tc)); + } + + /** + * 토글 변경 — rag.* 화이트리스트 키만, 테넌트 격리. RBAC(MANAGER+)은 SecurityConfig 통제. + */ + @PutMapping("/toggles/{key}") + public ApiResponse> updateToggle( + @PathVariable String key, + @RequestBody Map req, + @RequestHeader(value = "X-Tenant-Code", required = false) String tenantHeader) { + if (key == null || !key.startsWith("rag.")) { + return ApiResponse.fail("ERR-RAG-400: rag.* 키만 변경 가능"); + } + String tc = tenantHeader != null ? tenantHeader : str(req.get("tenantCode")); + Object v = req.get("value"); + try { + return ApiResponse.ok(service.updateToggle(tc, key, v == null ? "" : String.valueOf(v))); + } catch (IllegalArgumentException e) { + return ApiResponse.fail(e.getMessage()); + } + } + + // ── helpers ────────────────────────────────────────────────────────────── + private String tenant(String header, Map req) { + if (header != null && !header.isBlank()) return header; + Object t = req == null ? null : req.get("tenantCode"); + return t == null ? null : String.valueOf(t); + } + + private String name(Authentication auth) { + return auth == null ? "anon" : auth.getName(); + } + + private String str(Object o) { + return o == null ? null : String.valueOf(o); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/rag/RagProperties.java b/backend/src/main/java/com/zioinfo/signage/rag/RagProperties.java new file mode 100644 index 0000000..68696a8 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/rag/RagProperties.java @@ -0,0 +1,49 @@ +package com.zioinfo.signage.rag; + +import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +/** + * 중앙 guardia-rag 연동 설정 (ESN 전용). + * + *

보안 불변: {@code base-url} 은 온프레미스(중앙 guardia-rag) 전용이다. + * 외부 엔드포인트를 가리키도록 설정해서는 안 된다 — 기본값은 서버 내부 루프백 + * {@code http://127.0.0.1:8020}. + * + *

{@code @Value} 주입 방식(OllamaClient 패턴 일치) — {@code @EnableConfigurationProperties} + * 등록 불필요. application.yml: + *

+ * guardia:
+ *   rag:
+ *     base-url: http://127.0.0.1:8020
+ *     timeout-ms: 120000
+ *     enabled: true
+ *     solution: esn
+ *     max-concurrent-streams: 2
+ * 
+ */ +@Component +@Getter +public class RagProperties { + + /** 중앙 guardia-rag 베이스 URL (서버 내부 루프백 기본). */ + @Value("${guardia.rag.base-url:http://127.0.0.1:8020}") + private String baseUrl; + + /** 호출 타임아웃(ms). 소형모델 생성 콜드로드 고려 120s 기본. */ + @Value("${guardia.rag.timeout-ms:120000}") + private long timeoutMs; + + /** RAG 경유 마스터 스위치. false면 RagClient 가 항상 미가용으로 동작(ESN 로컬 폴백). */ + @Value("${guardia.rag.enabled:true}") + private boolean enabled; + + /** 솔루션 식별자(컬렉션·토글·피드백 격리 키). */ + @Value("${guardia.rag.solution:signage}") + private String solution; + + /** 동시 SSE 스트림 상한 — 서버 RAM 보호. */ + @Value("${guardia.rag.max-concurrent-streams:2}") + private int maxConcurrentStreams; +} diff --git a/backend/src/main/java/com/zioinfo/signage/rag/RagSettingMapper.java b/backend/src/main/java/com/zioinfo/signage/rag/RagSettingMapper.java new file mode 100644 index 0000000..a5e1efe --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/rag/RagSettingMapper.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.rag; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * ESN RAG 기법 토글 매퍼 — 테넌트 격리 {@code signage_rag_setting}. + * + *

{@code @Mapper} 어노테이션 필수 (SignageApplication 의 + * {@code @MapperScan(annotationClass = Mapper.class)} 패턴). + * + *

모든 조회/변경은 {@code tenant_code} 로 격리된다 — 한 테넌트가 다른 테넌트 토글을 + * 읽거나 바꿀 수 없다. + */ +@Mapper +public interface RagSettingMapper { + + /** 한 테넌트의 모든 RAG 토글(key,value). */ + List> findByTenant(@Param("tenantCode") String tenantCode); + + /** 단건 조회. */ + String findValue(@Param("tenantCode") String tenantCode, + @Param("settingKey") String settingKey); + + /** upsert (ON CONFLICT (tenant_code, setting_key) DO UPDATE). */ + int upsert(@Param("tenantCode") String tenantCode, + @Param("settingKey") String settingKey, + @Param("settingValue") String settingValue); +} diff --git a/backend/src/main/java/com/zioinfo/signage/rag/RagToggleService.java b/backend/src/main/java/com/zioinfo/signage/rag/RagToggleService.java new file mode 100644 index 0000000..1c9411b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/rag/RagToggleService.java @@ -0,0 +1,161 @@ +package com.zioinfo.signage.rag; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * ESN RAG 기법 토글 서비스 — 테넌트 격리. + * + *

전용 {@code signage_rag_setting}(tenant_code, key, value) 테이블에서 테넌트별 토글을 읽는다. + * 한 테넌트가 다른 테넌트 설정을 읽거나 바꿀 수 없다. 키 네임스페이스 {@code rag.*}. + * + *

무거운 기법(graphrag·rerank·stream·tool_use)은 서버 RAM 제약상 기본 off, + * retrieval_mode 기본 vector, 소형모델 기본. + */ +@Service +@RequiredArgsConstructor +public class RagToggleService { + + private final RagSettingMapper mapper; + + public static final String K_ENABLED = "rag.enabled"; + public static final String K_MODE = "rag.retrieval_mode"; // vector|hybrid|graph + public static final String K_RERANK = "rag.rerank"; // 무거움→기본 off + public static final String K_GRAPHRAG = "rag.graphrag"; // 무거움→기본 off + public static final String K_TOOL_USE = "rag.tool_use"; // 에이전틱→기본 off + public static final String K_STRUCTURED = "rag.structured"; // 결정론 JSON→기본 on + public static final String K_STREAM = "rag.stream"; // SSE→기본 off + public static final String K_TOP_K = "rag.top_k"; + public static final String K_AGENT_STEPS = "rag.agent_max_steps"; + public static final String K_TEMPERATURE = "rag.temperature"; + public static final String K_FAITHFULNESS = "rag.faithfulness_threshold"; + public static final String K_GEN_MODEL = "rag.generation_model"; + + /** 변경 허용 키 화이트리스트 — rag.* 외 임의 키 주입 차단. */ + private static final java.util.Set ALLOWED = java.util.Set.of( + K_ENABLED, K_MODE, K_RERANK, K_GRAPHRAG, K_TOOL_USE, K_STRUCTURED, K_STREAM, + K_TOP_K, K_AGENT_STEPS, K_TEMPERATURE, K_FAITHFULNESS, K_GEN_MODEL); + + /** 테넌트 토글 전부 조회(DB 누락 키는 안전 기본값 머지). */ + public RagToggles current(String tenantCode) { + String tc = normTenant(tenantCode); + Map m = new LinkedHashMap<>(); + List> rows = mapper.findByTenant(tc); + if (rows != null) { + for (Map r : rows) { + Object k = r.get("settingKey"); + Object v = r.get("settingValue"); + if (k != null) m.put(String.valueOf(k), v == null ? null : String.valueOf(v)); + } + } + + RagToggles t = new RagToggles(); + t.tenantCode = tc; + t.ragEnabled = bool(m.get(K_ENABLED), true); + t.retrievalMode = mode(m.get(K_MODE)); + t.rerank = bool(m.get(K_RERANK), false); + t.graphrag = bool(m.get(K_GRAPHRAG), false); + t.toolUse = bool(m.get(K_TOOL_USE), false); + t.structured = bool(m.get(K_STRUCTURED), true); + t.stream = bool(m.get(K_STREAM), false); + t.topK = clampInt(m.get(K_TOP_K), 5, 1, 20); + t.agentMaxSteps = clampInt(m.get(K_AGENT_STEPS), 4, 1, 8); + t.temperature = clampDouble(m.get(K_TEMPERATURE), 0.1, 0.0, 1.0); + t.faithfulnessThreshold = clampDouble(m.get(K_FAITHFULNESS), 0.5, 0.0, 1.0); + t.generationModel = blankTo(m.get(K_GEN_MODEL), "llama3.2:1b"); + return t; + } + + /** 토글 변경(테넌트 격리, 화이트리스트 키만). 반환=변경 후 전체 스냅샷. */ + public RagToggles update(String tenantCode, String key, String value) { + if (key == null || !ALLOWED.contains(key)) { + throw new IllegalArgumentException("ERR-RAG-400: 허용되지 않은 토글 키"); + } + String tc = normTenant(tenantCode); + mapper.upsert(tc, key, value == null ? "" : value); + return current(tc); + } + + /** retrieval_mode 결정: graphrag 토글 on 이면 graph 우선, 아니면 설정 mode. */ + public String effectiveMode(RagToggles t) { + if (t.graphrag) return "graph"; + return t.retrievalMode; + } + + // ── 정규화/클램프 (상한 강제 — 폭주 차단) ─────────────────────────────── + private String normTenant(String tc) { + if (tc == null || tc.isBlank()) return "ZIOINFO"; // 기본 테넌트 + return tc.trim().toUpperCase(); + } + + private boolean bool(String v, boolean def) { + if (v == null) return def; + String s = v.trim(); + return "true".equalsIgnoreCase(s) || "1".equals(s) || "on".equalsIgnoreCase(s); + } + + private String mode(String v) { + if (v == null) return "vector"; + String s = v.trim().toLowerCase(); + return (s.equals("hybrid") || s.equals("graph") || s.equals("vector")) ? s : "vector"; + } + + private int clampInt(String v, int def, int min, int max) { + try { + return Math.max(min, Math.min(max, Integer.parseInt(v.trim()))); + } catch (Exception e) { + return def; + } + } + + private double clampDouble(String v, double def, double min, double max) { + try { + return Math.max(min, Math.min(max, Double.parseDouble(v.trim()))); + } catch (Exception e) { + return def; + } + } + + private String blankTo(String v, String def) { + return (v == null || v.isBlank()) ? def : v.trim(); + } + + /** 토글 스냅샷 DTO(응답 metadata·화면 공용). */ + public static class RagToggles { + public String tenantCode = "ZIOINFO"; + public boolean ragEnabled = true; + public String retrievalMode = "vector"; + public boolean rerank = false; + public boolean graphrag = false; + public boolean toolUse = false; + public boolean structured = true; + public boolean stream = false; + public int topK = 5; + public int agentMaxSteps = 4; + public double temperature = 0.1; + public double faithfulnessThreshold = 0.5; + public String generationModel = "llama3.2:1b"; + + public Map toMap() { + Map m = new LinkedHashMap<>(); + m.put("tenantCode", tenantCode); + m.put("ragEnabled", ragEnabled); + m.put("retrievalMode", retrievalMode); + m.put("rerank", rerank); + m.put("graphrag", graphrag); + m.put("toolUse", toolUse); + m.put("structured", structured); + m.put("stream", stream); + m.put("topK", topK); + m.put("agentMaxSteps", agentMaxSteps); + m.put("temperature", temperature); + m.put("faithfulnessThreshold", faithfulnessThreshold); + m.put("generationModel", generationModel); + return m; + } + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/rag/SignageRagClient.java b/backend/src/main/java/com/zioinfo/signage/rag/SignageRagClient.java new file mode 100644 index 0000000..6e6a1f6 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/rag/SignageRagClient.java @@ -0,0 +1,248 @@ +package com.zioinfo.signage.rag; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * 얇은 중앙 guardia-rag REST 클라이언트 (ESN 전용). + * + *

핵심 설계: ESN 은 LangChain·벡터 로직을 Java 에 재구현하지 않는다(13벌 재구현 금지). + * 중앙 Python guardia-rag 의 검색·기법·구조화·검증·에이전틱을 REST 로 호출하기만 한다. + * 미가용/타임아웃/RAM 부족 시 절대 예외를 전파하지 않고 {@code degraded:true} 가 표시된 + * 폴백 결과를 돌려준다(서비스 계층이 기존 OllamaClient/룰 폴백 수행). + * + *

WebFlux 미의존 — 기존 {@code OllamaClient} 와 동일하게 {@code java.net.http.HttpClient} 사용. + * + *

보안 불변: 온프레미스 전용(루프백). 응답에서 자격증명/PII/스택트레이스 미노출. + * 오류는 요약 1줄만 로깅. + * + *

테넌트 격리: 모든 호출에 {@code solution=esn} + {@code collection=signage__} 을 + * 실어 테넌트별 컬렉션을 분리한다. + * + *

호출 계약(중앙): + *

    + *
  • POST /rag/answer — 검색(retrieval_mode)+근거생성+인용+guardrail
  • + *
  • POST /rag/verify — 근거검증(faithfulness/grounded)
  • + *
  • POST /rag/structured — format:json 결정론 JSON
  • + *
  • POST /rag/agent — tool-use 에이전틱 루프
  • + *
  • POST /rag/feedback — 👍/👎 피드백 (solution=esn 격리)
  • + *
  • POST /rag/ingest — 색인 (테넌트 컬렉션)
  • + *
+ */ +@Slf4j +@Component +public class SignageRagClient { + + private final RagProperties props; + private final ObjectMapper json = new ObjectMapper(); + private final HttpClient http = HttpClient.newBuilder() + .connectTimeout(Duration.ofSeconds(4)) + .build(); + + public SignageRagClient(RagProperties props) { + this.props = props; + } + + /** 테넌트별 컬렉션 키: {@code signage__LGINNOTEK} 등. null/blank → 솔루션 공용. */ + public String collectionFor(String tenantCode) { + if (tenantCode == null || tenantCode.isBlank()) return props.getSolution(); + return props.getSolution() + "__" + tenantCode.trim().toUpperCase(); + } + + /** 중앙 RAG 사용 가능 여부(설정 enabled + trust/settings 도달). */ + public boolean available() { + if (!props.isEnabled()) return false; + try { + HttpRequest req = HttpRequest.newBuilder() + .uri(URI.create(props.getBaseUrl() + "/rag/trust/settings?solution=" + props.getSolution())) + .GET() + .timeout(Duration.ofSeconds(3)) + .build(); + HttpResponse resp = http.send(req, HttpResponse.BodyHandlers.ofString()); + return resp.statusCode() >= 200 && resp.statusCode() < 500; + } catch (Exception e) { + return false; + } + } + + /** + * POST /rag/answer — 검색(retrieval_mode: vector|hybrid|graph)+생성+검증+guardrail. + * + * @return {@code {answer, grounded, faithfulness, citations[], sources[], guardrail{...}, answer_id, degraded}}. + * 미가용 시 {@code degraded:true}. + */ + public Map answer(String tenantCode, String query, String retrievalMode, + boolean rerank, int topK, String model, boolean verify) { + if (!props.isEnabled()) return degraded("rag_disabled"); + try { + Map options = new LinkedHashMap<>(); + options.put("rerank", rerank); + options.put("stream", false); + options.put("verify", verify); + if (model != null) options.put("model", model); + + Map body = base(tenantCode); + body.put("query", query); + body.put("retrieval_mode", retrievalMode == null ? "vector" : retrievalMode); + body.put("top_k", topK <= 0 ? 5 : topK); + body.put("options", options); + Map res = post("/rag/answer", body); + return res != null ? res : degraded("rag_no_response"); + } catch (Exception e) { + log.warn("RAG /answer 일시 불가 — ESN 폴백: {}", summarize(e)); + return degraded("rag_unavailable"); + } + } + + /** + * POST /rag/structured — 스키마 강제 결정론 JSON. + * + * @return {@code {data:{...}, valid, fallback_used, degraded}}. 미가용 시 {@code degraded:true}. + */ + public Map structured(String tenantCode, String prompt, Map schema, + String model, double temperature) { + if (!props.isEnabled()) return degraded("rag_disabled"); + try { + Map body = base(tenantCode); + body.put("prompt", prompt); + if (schema != null) body.put("schema", schema); + body.put("format", "json"); + if (model != null) body.put("model", model); + body.put("temperature", temperature); + body.put("max_retries", 1); + Map res = post("/rag/structured", body); + return res != null ? res : degraded("rag_no_response"); + } catch (Exception e) { + log.warn("RAG /structured 일시 불가 — ESN 폴백: {}", summarize(e)); + return degraded("rag_unavailable"); + } + } + + /** + * POST /rag/agent — 에이전틱 tool-use 루프(다단계 진단). + * + * @param tools ESN 도구 디스크립터 목록(이름·설명·파라미터 스키마). + * @param maxSteps 루프 상한(서버 RAM/시간 보호). + * @return {@code {answer, steps[], tool_calls[], citations[], answer_id, degraded}}. + */ + public Map agent(String tenantCode, String query, Object tools, + String retrievalMode, int maxSteps, String model) { + if (!props.isEnabled()) return degraded("rag_disabled"); + try { + Map body = base(tenantCode); + body.put("query", query); + if (tools != null) body.put("tools", tools); + body.put("retrieval_mode", retrievalMode == null ? "vector" : retrievalMode); + body.put("max_steps", maxSteps <= 0 ? 4 : Math.min(maxSteps, 8)); + if (model != null) body.put("model", model); + Map res = post("/rag/agent", body); + return res != null ? res : degraded("rag_no_response"); + } catch (Exception e) { + log.warn("RAG /agent 일시 불가 — ESN 폴백: {}", summarize(e)); + return degraded("rag_unavailable"); + } + } + + /** POST /rag/verify — 근거검증(grounded/faithfulness). */ + public Map verify(String tenantCode, String answer, String context) { + if (!props.isEnabled()) return degraded("rag_disabled"); + try { + Map body = base(tenantCode); + body.put("answer", answer); + if (context != null) body.put("context", context); + Map res = post("/rag/verify", body); + return res != null ? res : degraded("rag_no_response"); + } catch (Exception e) { + log.warn("RAG /verify 일시 불가: {}", summarize(e)); + return degraded("rag_unavailable"); + } + } + + /** POST /rag/feedback — 👍/👎 피드백(solution=esn 격리). */ + public Map feedback(String tenantCode, String answerId, String query, String answer, + String verdict, String correction, String userRef) { + if (!props.isEnabled()) return Map.of("stored", false, "degraded", true); + try { + Map body = base(tenantCode); + if (answerId != null) body.put("answer_id", answerId); + if (query != null) body.put("query", query); + if (answer != null) body.put("answer", answer); + body.put("verdict", verdict); + if (correction != null) body.put("correction", correction); + if (userRef != null) body.put("user_ref", userRef); + Map res = post("/rag/feedback", body); + return res != null ? res : Map.of("stored", false, "degraded", true); + } catch (Exception e) { + log.warn("RAG /feedback 일시 불가: {}", summarize(e)); + return Map.of("stored", false, "degraded", true); + } + } + + /** POST /rag/ingest — 테넌트 컬렉션 색인. 색인 스크립트/훅에서 사용. */ + public Map ingest(String tenantCode, Object documents) { + if (!props.isEnabled()) return degraded("rag_disabled"); + try { + Map body = base(tenantCode); + body.put("documents", documents); + Map res = post("/rag/ingest", body); + return res != null ? res : degraded("rag_no_response"); + } catch (Exception e) { + log.warn("RAG /ingest 일시 불가: {}", summarize(e)); + return degraded("rag_unavailable"); + } + } + + // ── helpers ─────────────────────────────────────────────────────────── + private Map base(String tenantCode) { + Map m = new LinkedHashMap<>(); + m.put("solution", props.getSolution()); + m.put("collection", collectionFor(tenantCode)); + if (tenantCode != null && !tenantCode.isBlank()) { + m.put("tenant_code", tenantCode.trim().toUpperCase()); + } + return m; + } + + @SuppressWarnings("unchecked") + private Map post(String path, Map body) throws Exception { + String payload = json.writeValueAsString(body); + HttpRequest req = HttpRequest.newBuilder() + .uri(URI.create(props.getBaseUrl() + path)) + .header("Content-Type", "application/json") + .header("X-Solution-Key", props.getSolution()) + .POST(HttpRequest.BodyPublishers.ofString(payload)) + .timeout(Duration.ofMillis(props.getTimeoutMs())) + .build(); + HttpResponse resp = http.send(req, HttpResponse.BodyHandlers.ofString()); + if (resp.statusCode() < 200 || resp.statusCode() >= 300) { + log.warn("RAG {} 비정상 status={} — 폴백", path, resp.statusCode()); + return null; + } + String b = resp.body(); + if (b == null || b.isBlank()) return null; + return json.readValue(b, Map.class); + } + + private Map degraded(String reason) { + Map out = new LinkedHashMap<>(); + out.put("degraded", true); + out.put("degraded_reason", reason); + return out; + } + + /** 스택트레이스 미노출: 메시지 1줄만 요약. */ + private String summarize(Exception e) { + String m = e.getMessage(); + if (m == null) return e.getClass().getSimpleName(); + return m.length() > 160 ? m.substring(0, 160) : m; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/rag/SignageToolRegistry.java b/backend/src/main/java/com/zioinfo/signage/rag/SignageToolRegistry.java new file mode 100644 index 0000000..7a8871f --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/rag/SignageToolRegistry.java @@ -0,0 +1,71 @@ +package com.zioinfo.signage.rag; + +import org.springframework.stereotype.Component; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * 에이전틱 tool-use 용 ESN 고유 도구 디스크립터 레지스트리. + * + *

중앙 {@code /rag/agent} 에 "AI 가 호출 가능한 도구 목록"으로 전달된다(이름·설명·파라미터 + * 스키마). 실제 실행은 중앙이 ESN 콜백/MCP 로 위임하거나, 본 디스크립터를 컨텍스트 힌트로만 + * 사용한다(서버 구현에 따름). 어느 쪽이든 ESN 은 읽기 전용 조회 도구만 노출하며, + * 자격증명/PII/SSH 노출 도구는 등록하지 않는다. + * + *

알람 도메인(esn-ai-alarm-agent)이 다단계 진단 루프(증상→연관조회→가설→검증)를 + * 완주하도록 알람·HCore·의존성·작업이력 조회 도구를 제공한다. + */ +@Component +public class SignageToolRegistry { + + /** 알람 원인분석용 도구 셋(읽기전용). tenantCode 는 호출 시 컨텍스트로 고정. */ + public List> alarmDiagnosisTools() { + return List.of( + tool("signage_get_alarm", + "알람 ID로 단일 알람 상세(유형·심각도·메시지·발생시각·디바이스)를 조회한다.", + param("alarmId", "string", "조회할 알람 ID")), + tool("signage_list_related_alarms", + "동일 매장/허브/시간창의 연관 알람 목록을 조회한다(연쇄 장애 식별용).", + param("storeCode", "string", "매장 코드"), + param("windowMinutes", "integer", "시간창(분), 기본 30")), + tool("signage_get_hcore_status", + "HCore 게이트웨이/허브의 현재 상태(온라인·하위 단말 수·마지막 통신)를 조회한다.", + param("hcoreId", "string", "HCore 장치 ID")), + tool("signage_get_dependency", + "HCore↔매장↔ESL 단말↔태그바인딩 의존성 그래프를 조회한다(근본원인 수렴용).", + param("rootType", "string", "시작 노드 유형: HCORE|STORE|DEVICE"), + param("rootId", "string", "시작 노드 ID")), + tool("signage_get_work_history", + "디바이스/매장의 최근 작업 이력(펌웨어·교체·점검)을 조회한다(변경 연관 분석용).", + param("targetType", "string", "대상 유형: STORE|DEVICE|HCORE"), + param("targetId", "string", "대상 ID")) + ); + } + + private Map tool(String name, String desc, Map... params) { + Map properties = new LinkedHashMap<>(); + for (Map p : params) { + String pn = (String) p.remove("__name"); + properties.put(pn, p); + } + Map schema = new LinkedHashMap<>(); + schema.put("type", "object"); + schema.put("properties", properties); + + Map t = new LinkedHashMap<>(); + t.put("name", name); + t.put("description", desc); + t.put("parameters", schema); + return t; + } + + private Map param(String name, String type, String desc) { + Map p = new LinkedHashMap<>(); + p.put("__name", name); + p.put("type", type); + p.put("description", desc); + return p; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/AdScheduleService.java b/backend/src/main/java/com/zioinfo/signage/service/AdScheduleService.java new file mode 100644 index 0000000..cc1cab2 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/AdScheduleService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.AdScheduleVo; +import com.zioinfo.signage.mapper.AdScheduleMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class AdScheduleService { + private final AdScheduleMapper mapper; + + public List list(String tenantCode, String status, String keyword) { + return mapper.findAll(tenantCode, status, keyword); + } + + public AdScheduleVo get(Long id) { return mapper.findById(id); } + + public AdScheduleVo create(AdScheduleVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public AdScheduleVo update(Long id, AdScheduleVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/AlarmService.java b/backend/src/main/java/com/zioinfo/signage/service/AlarmService.java new file mode 100644 index 0000000..eb936ba --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/AlarmService.java @@ -0,0 +1,36 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.AlarmVo; +import com.zioinfo.signage.mapper.AlarmMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class AlarmService { + private final AlarmMapper mapper; + + public List list(String tenantCode, Long storeId, String severity, String status) { + return mapper.findAll(tenantCode, storeId, severity, status); + } + + public AlarmVo get(Long id) { return mapper.findById(id); } + + public AlarmVo create(AlarmVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public AlarmVo update(Long id, AlarmVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void resolve(Long id, String resolvedBy, String resolution) { + mapper.resolve(id, resolvedBy, resolution); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/BackupService.java b/backend/src/main/java/com/zioinfo/signage/service/BackupService.java new file mode 100644 index 0000000..db7ad84 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/BackupService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.BackupVo; +import com.zioinfo.signage.mapper.BackupMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class BackupService { + private final BackupMapper mapper; + + public List list(String tenantCode, String status, String keyword) { + return mapper.findAll(tenantCode, status, keyword); + } + + public BackupVo get(Long id) { return mapper.findById(id); } + + public BackupVo create(BackupVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public BackupVo update(Long id, BackupVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/FirmwareService.java b/backend/src/main/java/com/zioinfo/signage/service/FirmwareService.java new file mode 100644 index 0000000..b7a6a75 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/FirmwareService.java @@ -0,0 +1,38 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.FirmwareVo; +import com.zioinfo.signage.mapper.FirmwareMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class FirmwareService { + private final FirmwareMapper mapper; + + public List list(String tenantCode, String deviceType) { + return mapper.findAll(tenantCode, deviceType); + } + + public FirmwareVo get(Long id) { return mapper.findById(id); } + + public FirmwareVo create(FirmwareVo v) { + if (v.isLatest()) { + mapper.clearLatest(v.getDeviceType(), v.getTenantCode()); + } + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public FirmwareVo update(Long id, FirmwareVo v) { + v.setId(id); + if (v.isLatest()) { + mapper.clearLatest(v.getDeviceType(), v.getTenantCode()); + } + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/GatewayService.java b/backend/src/main/java/com/zioinfo/signage/service/GatewayService.java new file mode 100644 index 0000000..f31036c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/GatewayService.java @@ -0,0 +1,36 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.GatewayVo; +import com.zioinfo.signage.mapper.GatewayMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class GatewayService { + private final GatewayMapper mapper; + + public List list(String tenantCode, Long storeId, String deviceType, String status) { + return mapper.findAll(tenantCode, storeId, deviceType, status); + } + + public GatewayVo get(Long id) { return mapper.findById(id); } + + public GatewayVo create(GatewayVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public GatewayVo update(Long id, GatewayVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void updateStatus(Long id, String status) { + mapper.updateStatus(id, status); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/PosCvtService.java b/backend/src/main/java/com/zioinfo/signage/service/PosCvtService.java new file mode 100644 index 0000000..b8e9aed --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/PosCvtService.java @@ -0,0 +1,51 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.PosCvtVo; +import com.zioinfo.signage.mapper.PosCvtMapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor +public class PosCvtService { + private final PosCvtMapper mapper; + private final SignBoardService signBoardService; + + public List list(String tenantCode, Long storeId, String status, String keyword) { + return mapper.findAll(tenantCode, storeId, status, keyword); + } + + public PosCvtVo get(Long id) { return mapper.findById(id); } + + /** + * POS 가격변경 처리 → 바인딩된 e-paper 태그에 업데이트 큐 자동 생성 + */ + @Transactional + public int process(Long id) { + PosCvtVo pos = mapper.findById(id); + if (pos == null) return 0; + + mapper.updateStatus(id, "PROCESSED", null); + + // 이 상품에 바인딩된 e-paper 태그들에 가격 업데이트 큐 생성 + int queued = signBoardService.enqueueByProductCode( + pos.getTenantCode(), pos.getStoreId(), + pos.getProductCode(), pos.getPrice(), pos.getSalePrice(), id); + + log.info("POS 처리 완료: posCvtId={}, product={}, 큐생성={}개", + id, pos.getProductCode(), queued); + return queued; + } + + public void markError(Long id, String errorMessage) { + mapper.updateStatus(id, "ERROR", errorMessage); + } + + public void ignore(Long id) { + mapper.updateStatus(id, "IGNORED", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/ProductService.java b/backend/src/main/java/com/zioinfo/signage/service/ProductService.java new file mode 100644 index 0000000..b250aed --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/ProductService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.ProductVo; +import com.zioinfo.signage.mapper.ProductMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ProductService { + private final ProductMapper mapper; + + public List list(String tenantCode, Long storeId, String keyword) { + return mapper.findAll(tenantCode, storeId, keyword); + } + + public ProductVo get(Long id) { return mapper.findById(id); } + + public ProductVo create(ProductVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public ProductVo update(Long id, ProductVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/RegionService.java b/backend/src/main/java/com/zioinfo/signage/service/RegionService.java new file mode 100644 index 0000000..ff5f32e --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/RegionService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.RegionVo; +import com.zioinfo.signage.mapper.RegionMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class RegionService { + private final RegionMapper mapper; + + public List list(String tenantCode, String keyword) { + return mapper.findAll(tenantCode, keyword); + } + + public RegionVo get(Long id) { return mapper.findById(id); } + + public RegionVo create(RegionVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public RegionVo update(Long id, RegionVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/SignBoardService.java b/backend/src/main/java/com/zioinfo/signage/service/SignBoardService.java new file mode 100644 index 0000000..d157ab0 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/SignBoardService.java @@ -0,0 +1,70 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.SignBoardVo; +import com.zioinfo.signage.domain.UpdateQueueVo; +import com.zioinfo.signage.mapper.SignBoardMapper; +import com.zioinfo.signage.mapper.UpdateQueueMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class SignBoardService { + private final SignBoardMapper bindingMapper; + private final UpdateQueueMapper queueMapper; + + public List list(String tenantCode, Long storeId, + String bindStatus, String keyword) { + return bindingMapper.findAll(tenantCode, storeId, bindStatus, keyword); + } + + public SignBoardVo get(Long id) { return bindingMapper.findById(id); } + + public SignBoardVo getByDeviceId(String deviceId) { + return bindingMapper.findByDeviceId(deviceId); + } + + @Transactional + public SignBoardVo bind(SignBoardVo vo) { + // 기존 바인딩이 있으면 해제 후 재바인딩 + SignBoardVo existing = bindingMapper.findByDeviceId(vo.getDeviceId()); + if (existing != null) { + bindingMapper.unbind(existing.getId()); + } + bindingMapper.insert(vo); + return bindingMapper.findById(vo.getId()); + } + + @Transactional + public void unbind(Long id) { + bindingMapper.unbind(id); + } + + /** + * 가격 변경 시 해당 상품에 바인딩된 모든 태그에 업데이트 큐 생성 + * POS 가격변경 → 이 메서드 → e-paper 태그들에게 전파 + */ + @Transactional + public int enqueueByProductCode(String tenantCode, Long storeId, + String productCode, java.math.BigDecimal newPrice, + java.math.BigDecimal newSalePrice, Long posCvtId) { + List bindings = bindingMapper.findByProductCode(tenantCode, storeId, productCode); + for (SignBoardVo b : bindings) { + UpdateQueueVo q = new UpdateQueueVo(); + q.setTenantCode(tenantCode); + q.setStoreId(storeId); + q.setBindingId(b.getId()); + q.setDeviceId(b.getDeviceId()); + q.setProductCode(productCode); + q.setNewPrice(newPrice); + q.setNewSalePrice(newSalePrice); + q.setTemplateCode(b.getTemplateCode()); + q.setPriority(5); + q.setPosCvtId(posCvtId); + queueMapper.insert(q); + } + return bindings.size(); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/SignDeployService.java b/backend/src/main/java/com/zioinfo/signage/service/SignDeployService.java new file mode 100644 index 0000000..6abfa56 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/SignDeployService.java @@ -0,0 +1,65 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.SignDeployVo; +import com.zioinfo.signage.mapper.SignDeployMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +@Service +@RequiredArgsConstructor +public class SignDeployService { + private final SignDeployMapper mapper; + + public List list(String tenantCode, String status, String keyword) { + return mapper.findAll(tenantCode, status, keyword); + } + + public SignDeployVo get(Long id) { return mapper.findById(id); } + + /** + * 매장(간판) 단말이 30초 주기로 호출하는 간판정보 폴링. + * 사업계획서 슬라이드20 계약 형식으로 최신 배포 파일 메타를 반환한다. + * 대기 파일이 없으면 body=null(변경 없음). token 은 에코만(자격증명 미저장/미노출). + */ + public Map poll(String storeCode, String token) { + SignDeployVo v = mapper.findLatestForStore(storeCode); + Map header = new LinkedHashMap<>(); + header.put("token", token == null ? "" : token); + Map resp = new LinkedHashMap<>(); + resp.put("header", header); + if (v == null) { + resp.put("body", null); + return resp; + } + mapper.markPolled(v.getId()); + Map body = new LinkedHashMap<>(); + body.put("type", v.getDeployType()); + body.put("sub_type", v.getSubType()); + body.put("code", v.getCode()); + body.put("path", v.getFilePath()); + body.put("md5", v.getMd5()); + body.put("file_name", v.getFileName()); + body.put("file_size", v.getFileSize() == null ? null : String.valueOf(v.getFileSize())); + resp.put("body", body); + return resp; + } + + /** 단말이 파일 수신·적용 완료를 통지. */ + public void confirm(Long id) { mapper.markApplied(id); } + + public SignDeployVo create(SignDeployVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public SignDeployVo update(Long id, SignDeployVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/SignImageService.java b/backend/src/main/java/com/zioinfo/signage/service/SignImageService.java new file mode 100644 index 0000000..f930315 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/SignImageService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.SignImageVo; +import com.zioinfo.signage.mapper.SignImageMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class SignImageService { + private final SignImageMapper mapper; + + public List list(String tenantCode, String status, String keyword) { + return mapper.findAll(tenantCode, status, keyword); + } + + public SignImageVo get(Long id) { return mapper.findById(id); } + + public SignImageVo create(SignImageVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public SignImageVo update(Long id, SignImageVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/StoreGroupService.java b/backend/src/main/java/com/zioinfo/signage/service/StoreGroupService.java new file mode 100644 index 0000000..22006b7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/StoreGroupService.java @@ -0,0 +1,29 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.StoreGroupVo; +import com.zioinfo.signage.mapper.StoreGroupMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class StoreGroupService { + private final StoreGroupMapper mapper; + + public List list(String tenantCode) { return mapper.findAll(tenantCode); } + public StoreGroupVo get(Long id) { return mapper.findById(id); } + + public StoreGroupVo create(StoreGroupVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public StoreGroupVo update(Long id, StoreGroupVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/StoreService.java b/backend/src/main/java/com/zioinfo/signage/service/StoreService.java new file mode 100644 index 0000000..d298101 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/StoreService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.StoreVo; +import com.zioinfo.signage.mapper.StoreMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class StoreService { + private final StoreMapper mapper; + + public List list(String tenantCode, Long storeGroupId, String keyword) { + return mapper.findAll(tenantCode, storeGroupId, keyword); + } + + public StoreVo get(Long id) { return mapper.findById(id); } + + public StoreVo create(StoreVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public StoreVo update(Long id, StoreVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/TemplateGroupService.java b/backend/src/main/java/com/zioinfo/signage/service/TemplateGroupService.java new file mode 100644 index 0000000..f60a5d7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/TemplateGroupService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.TemplateGroupVo; +import com.zioinfo.signage.mapper.TemplateGroupMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class TemplateGroupService { + private final TemplateGroupMapper mapper; + + public List list(String tenantCode, String keyword) { + return mapper.findAll(tenantCode, keyword); + } + + public TemplateGroupVo get(Long id) { return mapper.findById(id); } + + public TemplateGroupVo create(TemplateGroupVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public TemplateGroupVo update(Long id, TemplateGroupVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/TemplateService.java b/backend/src/main/java/com/zioinfo/signage/service/TemplateService.java new file mode 100644 index 0000000..24cf284 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/TemplateService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.TemplateVo; +import com.zioinfo.signage.mapper.TemplateMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class TemplateService { + private final TemplateMapper mapper; + + public List list(String tenantCode, String templateType) { + return mapper.findAll(tenantCode, templateType); + } + + public TemplateVo get(Long id) { return mapper.findById(id); } + + public TemplateVo create(TemplateVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public TemplateVo update(Long id, TemplateVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/TenantService.java b/backend/src/main/java/com/zioinfo/signage/service/TenantService.java new file mode 100644 index 0000000..a713f6c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/TenantService.java @@ -0,0 +1,29 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.TenantVo; +import com.zioinfo.signage.mapper.TenantMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class TenantService { + private final TenantMapper mapper; + + public List list() { return mapper.findAll(); } + public TenantVo get(Long id) { return mapper.findById(id); } + + public TenantVo create(TenantVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public TenantVo update(Long id, TenantVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/UpdateQueueService.java b/backend/src/main/java/com/zioinfo/signage/service/UpdateQueueService.java new file mode 100644 index 0000000..7fa0f79 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/UpdateQueueService.java @@ -0,0 +1,60 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.UpdateQueueVo; +import com.zioinfo.signage.mapper.UpdateQueueMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class UpdateQueueService { + private final UpdateQueueMapper mapper; + + public List list(String tenantCode, Long storeId, String status) { + return mapper.findAll(tenantCode, storeId, status); + } + + public UpdateQueueVo get(Long id) { return mapper.findById(id); } + + /** Gateway 폴링: PENDING 큐 N건 반환 후 SENDING으로 전환 */ + @Transactional + public List pollPending(String tenantCode, int limit) { + List items = mapper.findPending(tenantCode, limit); + for (UpdateQueueVo q : items) { + mapper.updateStatus(q.getId(), "SENDING", null); + } + return items; + } + + /** Gateway → 태그 전송 완료 */ + @Transactional + public void markSent(Long id) { + mapper.updateStatus(id, "SENT", null); + } + + /** 태그 확인 응답 수신 (device_id 기반) */ + @Transactional + public void confirm(String deviceId) { + mapper.confirmByDeviceId(deviceId); + } + + /** 전송 실패 처리 — max_retry 초과 시 FAILED */ + @Transactional + public void markFailed(Long id, String errorMessage) { + UpdateQueueVo q = mapper.findById(id); + if (q == null) return; + mapper.incrementRetry(id); + if (q.getRetryCount() + 1 >= q.getMaxRetry()) { + mapper.updateStatus(id, "FAILED", errorMessage); + } else { + mapper.updateStatus(id, "PENDING", errorMessage); + } + } + + @Transactional + public void cancel(Long id) { + mapper.updateStatus(id, "CANCELLED", null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/UserService.java b/backend/src/main/java/com/zioinfo/signage/service/UserService.java new file mode 100644 index 0000000..442e204 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/UserService.java @@ -0,0 +1,47 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.auth.SignageUser; +import com.zioinfo.signage.mapper.UserMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class UserService { + private final UserMapper mapper; + private final PasswordEncoder passwordEncoder; + + public List list(String tenantCode, String role) { + return mapper.findAll(tenantCode, role); + } + + public SignageUser get(Long id) { return mapper.findById(id); } + + public SignageUser create(SignageUser v, String rawPassword) { + v.setPasswordHash(passwordEncoder.encode(rawPassword)); + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public SignageUser update(Long id, SignageUser v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void changePassword(Long id, String rawPassword) { + mapper.updatePassword(id, passwordEncoder.encode(rawPassword)); + } + + public SignageUser setActive(Long id, boolean active) { + SignageUser u = mapper.findById(id); + if (u == null) return null; + u.setActive(active); + mapper.update(u); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/service/WorkService.java b/backend/src/main/java/com/zioinfo/signage/service/WorkService.java new file mode 100644 index 0000000..9e69704 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/service/WorkService.java @@ -0,0 +1,32 @@ +package com.zioinfo.signage.service; + +import com.zioinfo.signage.domain.WorkHistoryVo; +import com.zioinfo.signage.mapper.WorkMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class WorkService { + private final WorkMapper mapper; + + public List list(String tenantCode, Long storeId, String status, String workType) { + return mapper.findAll(tenantCode, storeId, status, workType); + } + + public WorkHistoryVo get(Long id) { return mapper.findById(id); } + + public WorkHistoryVo create(WorkHistoryVo v) { + mapper.insert(v); + return mapper.findById(v.getId()); + } + + public WorkHistoryVo update(Long id, WorkHistoryVo v) { + v.setId(id); + mapper.update(v); + return mapper.findById(id); + } + + public void delete(Long id) { mapper.delete(id); } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/auth/LoginVerifyMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/auth/LoginVerifyMapper.java new file mode 100644 index 0000000..e0d300e --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/auth/LoginVerifyMapper.java @@ -0,0 +1,26 @@ +package com.zioinfo.signage.uiws.auth; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Update; + +/** + * 2FA 로그인 검증 이력 매퍼 (tb_uiws_login_verify). 발급/검증 감사 기록. + * verify_code 는 감사 이력에만 남고 API 응답에는 절대 노출하지 않는다. + */ +@Mapper +public interface LoginVerifyMapper { + + int insert(UiwsLoginVerify v); + + /** 동일 user 의 미검증 EMAIL 이력 중 최신 1건을 검증완료(Y) 처리. */ + @Update(""" + UPDATE tb_uiws_login_verify + SET verified_yn = 'Y', updated_by = #{userId}, updated_at = now() + WHERE verify_id = ( + SELECT verify_id FROM tb_uiws_login_verify + WHERE user_id = #{userId} AND verify_method = 'EMAIL' AND verified_yn = 'N' + ORDER BY verify_id DESC LIMIT 1 + ) + """) + int markLatestVerified(String userId); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/auth/TwoFactorService.java b/backend/src/main/java/com/zioinfo/signage/uiws/auth/TwoFactorService.java new file mode 100644 index 0000000..76b88fd --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/auth/TwoFactorService.java @@ -0,0 +1,161 @@ +package com.zioinfo.signage.uiws.auth; + +import com.zioinfo.signage.auth.SignageUser; +import com.zioinfo.signage.auth.JwtUtil; +import com.zioinfo.signage.auth.mapper.UserAuthMapper; +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.common.mail.MailSender; +import com.zioinfo.signage.uiws.config.UiwsProperties; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.security.SecureRandom; +import java.time.LocalDateTime; +import java.util.Map; + +/** + * UIWS 2FA(이메일 코드) 레이어. ESN 기존 단일 로그인을 보존하면서 2단계 인증을 추가한다. + * + * 흐름: + * 1) 1차 로그인 성공 → {@link #beginTwoFactor}: verify-token 발급 + 이메일 인증코드 발송(LogMailSender 폴백) + 감사 기록. + * 2) {@code POST /api/auth/verify}(verifyToken + code) → {@link #verify}: 코드 검증 후 access 발급. + * 3) 로그인 실패 누적 max-login-fail 회 → 계정 잠금({@link #recordLoginFailure}). + * + * 보안: + * - 인증코드는 메일/감사 채널로만 전달. API 응답·로그 메시지에 코드/비밀번호/자격증명 절대 미노출(불변규칙). + * - 외부 API 호출 없음(MailSender 폴백은 로그). Ollama 외 외부 통신 금지 준수. + * - access 토큰은 ESN JwtUtil(username/role/tenantCode 3-클레임) 정책을 그대로 재사용한다. + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class TwoFactorService { + + private static final SecureRandom RANDOM = new SecureRandom(); + private static final String SYSTEM = "SYSTEM"; + + private final UserAuthMapper userMapper; + private final LoginVerifyMapper loginVerifyMapper; + private final JwtUtil jwtUtil; + private final MailSender mailSender; + private final UiwsProperties properties; + + public boolean isEnabled() { + return properties.getAuth().isTwofaEnabled(); + } + + /** 잠금 여부(1차 로그인 전 차단용). */ + public boolean isLocked(SignageUser user) { + return Boolean.TRUE.equals(user.getLocked()); + } + + /** + * 1차 로그인 성공 후 2차 인증 시작: verify-token 발급 + 이메일코드 발송 + 감사 기록 + 실패카운트 초기화. + * @return { verifyToken, step:"EMAIL", maskedEmail } + */ + @Transactional + public Map beginTwoFactor(SignageUser user) { + long codeValidity = properties.getAuth().getEmailCodeValiditySeconds(); + long tokenValidity = properties.getAuth().getVerifyTokenValiditySeconds(); + + String code = String.format("%06d", RANDOM.nextInt(1_000_000)); + LocalDateTime expire = LocalDateTime.now().plusSeconds(codeValidity); + + // user 테이블에 코드/만료 저장(실패카운트 초기화) + 감사 이력 기록 + userMapper.saveEmailCode(user.getUsername(), code, expire); + recordVerifyAttempt(user.getUsername(), code, expire); + + // 이메일 발송(미설정 환경은 LogMailSender 폴백). 코드는 메일 본문에만. + String subject = "[GUARDiA SIGNAGE] 로그인 2차 인증 코드"; + String body = String.format( + "안녕하세요 %s 님,\n로그인 2차 인증 코드는 [%s] 입니다.\n유효시간: %d초", + user.getUsername(), code, codeValidity); + if (user.getEmail() != null && !user.getEmail().isBlank()) { + mailSender.send(user.getEmail(), subject, body); + } else { + log.warn("[2FA] no email for user={} — code logged only", user.getUsername()); + } + + String verifyToken = jwtUtil.generateVerifyToken(user.getUsername(), tokenValidity); + // 응답에는 코드 미포함 — verifyToken/step/maskedEmail 만. + return Map.of( + "verifyToken", verifyToken, + "step", "EMAIL", + "maskedEmail", maskEmail(user.getEmail())); + } + + /** + * 2차 검증: verify-token + code 검증 → access 발급. 코드 폐기 + 감사 이력 검증완료. + * @return { token, type, username, role, tenant } + */ + @Transactional + public Map verify(String verifyToken, String code) { + String username = jwtUtil.parseVerifyTokenUsername(verifyToken); + if (username == null) { + throw new UiwsApiException(UiwsErrorCode.VERIFY_TOKEN_INVALID); + } + SignageUser user = userMapper.findByUsername(username); + if (user == null) { + throw new UiwsApiException(UiwsErrorCode.VERIFY_TOKEN_INVALID); + } + if (Boolean.TRUE.equals(user.getLocked())) { + throw new UiwsApiException(UiwsErrorCode.ACCOUNT_LOCKED); + } + + boolean codeOk = user.getEmailVerifyCode() != null + && user.getEmailVerifyCode().equals(code) + && user.getEmailVerifyExpire() != null + && user.getEmailVerifyExpire().isAfter(LocalDateTime.now()); + if (!codeOk) { + throw new UiwsApiException(UiwsErrorCode.VERIFY_CODE_INVALID); + } + + // 코드 폐기 + 감사 검증완료 + 마지막 로그인 갱신 + userMapper.clearEmailCode(username); + loginVerifyMapper.markLatestVerified(username); + userMapper.updateLastLogin(username); + + String access = jwtUtil.generate(user.getUsername(), user.getRole(), user.getTenantCode()); + return Map.of( + "token", access, + "type", "Bearer", + "username", user.getUsername(), + "role", user.getRole() == null ? "" : user.getRole(), + "tenant", user.getTenantCode() == null ? "" : user.getTenantCode()); + } + + /** 로그인 비밀번호 실패 시 누적/잠금 처리. */ + @Transactional + public void recordLoginFailure(String username) { + userMapper.incrementLoginFail(username, properties.getAuth().getMaxLoginFail()); + } + + private void recordVerifyAttempt(String username, String code, LocalDateTime expire) { + UiwsLoginVerify v = new UiwsLoginVerify(); + v.setUserId(username); + v.setVerifyMethod("EMAIL"); + v.setVerifyCode(code); + v.setExpireAt(expire); + v.setVerifiedYn("N"); + v.setCreatedBy(SYSTEM); + v.setCreatedAt(LocalDateTime.now()); + loginVerifyMapper.insert(v); + } + + /** 이메일 마스킹(자격증명 보호): ab****@domain. */ + private static String maskEmail(String email) { + if (email == null || email.isBlank() || !email.contains("@")) { + return ""; + } + int at = email.indexOf('@'); + String local = email.substring(0, at); + String domain = email.substring(at); + if (local.length() <= 2) { + return local.charAt(0) + "*" + domain; + } + return local.substring(0, 2) + "*".repeat(Math.max(1, local.length() - 2)) + domain; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/auth/UiwsLoginVerify.java b/backend/src/main/java/com/zioinfo/signage/uiws/auth/UiwsLoginVerify.java new file mode 100644 index 0000000..613a048 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/auth/UiwsLoginVerify.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.uiws.auth; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 2FA 로그인 검증 이력 (tb_uiws_login_verify). 원본 com.urp.uiws.domain.LoginVerify 이식. */ +@Data +public class UiwsLoginVerify { + private Long verifyId; + private String userId; // ERP username 논리참조 + private String verifyMethod; // EMAIL | OTP + private String verifyCode; + private LocalDateTime expireAt; + private String verifiedYn; // Y | N + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsApiException.java b/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsApiException.java new file mode 100644 index 0000000..0cb2ced --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsApiException.java @@ -0,0 +1,24 @@ +package com.zioinfo.signage.uiws.common; + +import lombok.Getter; + +/** + * UIWS 이식 모듈 업무 예외. RuntimeException 을 상속하여 ERP 기존 GlobalExceptionHandler + * (RuntimeException → 400 + message, 스택트레이스 미노출)에 그대로 포착된다. + * 추가 인프라/빈 없이 ERP 공통 에러 처리와 정합한다. + */ +@Getter +public class UiwsApiException extends RuntimeException { + + private final UiwsErrorCode errorCode; + + public UiwsApiException(UiwsErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } + + public UiwsApiException(UiwsErrorCode errorCode, String detail) { + super(detail); + this.errorCode = errorCode; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsCurrentUser.java b/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsCurrentUser.java new file mode 100644 index 0000000..d4e375b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsCurrentUser.java @@ -0,0 +1,48 @@ +package com.zioinfo.signage.uiws.common; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; + +/** + * 현재 인증 사용자 식별자(=ERP username) 추출 헬퍼. 감사 컬럼(created_by/updated_by) 및 + * 소유자(writer_id/owner_id/sender_id) 기록에 사용한다. + * + * ERP JwtFilter 는 인증 principal 로 username(String)을 세팅하므로 그 값을 그대로 사용한다. + * (UIWS 원본의 CurrentUser/UserPrincipal 패턴을 ERP 인증 모델에 맞게 단순화 이식.) + */ +public final class UiwsCurrentUser { + + private static final String SYSTEM = "SYSTEM"; + + private UiwsCurrentUser() { + } + + /** 현재 사용자 ID(username). 미인증/시스템 컨텍스트는 "SYSTEM". */ + public static String id() { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + if (auth != null && auth.isAuthenticated() && auth.getPrincipal() instanceof String username + && !"anonymousUser".equals(username)) { + return username; + } + return SYSTEM; + } + + /** ADMIN 권한 보유 여부(데이터 가시범위 판정용 — ADMIN=전체). */ + public static boolean isAdmin() { + return hasRole("ADMIN"); + } + + /** MANAGER 이상(MANAGER/ADMIN) 여부 — 업무일지 댓글 권한 등에 사용. */ + public static boolean isManagerOrAbove() { + return hasRole("ADMIN") || hasRole("MANAGER") || hasRole("CFO"); + } + + private static boolean hasRole(String role) { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + if (auth == null) { + return false; + } + return auth.getAuthorities().stream() + .anyMatch(a -> ("ROLE_" + role).equals(a.getAuthority())); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsDataScope.java b/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsDataScope.java new file mode 100644 index 0000000..562af55 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsDataScope.java @@ -0,0 +1,29 @@ +package com.zioinfo.signage.uiws.common; + +import java.util.List; + +/** + * 데이터 가시범위(스코프) — UIWS DataScopeService 의 silo 단순화 이식. + * 원본은 부서계층(TB_DEPT) 기반 팀 스코프를 산출하나, ERP 이식본은 코어 dept 테이블을 이식하지 않으므로 + * 역할만으로 판정한다: + * - ADMIN → 전체(all=true) + * - 그 외 → 본인 데이터만(ownerIds = [본인]) + * (부서계층 스코프가 필요해지면 ERP tb_department 연계로 확장 — 후속 트랙.) + */ +public final class UiwsDataScope { + + private UiwsDataScope() { + } + + /** all=true 면 전체 조회(ownerIds 무시). ownerIds 는 항상 본인 포함(빈 IN 회피). */ + public record Scope(boolean all, List ownerIds) { + } + + public static Scope current() { + String me = UiwsCurrentUser.id(); + if (UiwsCurrentUser.isAdmin()) { + return new Scope(true, List.of(me)); + } + return new Scope(false, List.of(me)); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsErrorCode.java b/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsErrorCode.java new file mode 100644 index 0000000..97e0ec0 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/common/UiwsErrorCode.java @@ -0,0 +1,60 @@ +package com.zioinfo.signage.uiws.common; + +import lombok.Getter; + +/** + * UIWS 이식 모듈 도메인 오류 코드. + * 원본 com.urp.uiws.common.exception.ErrorCode 의 worklog/schedule/message/auth(2FA) 영역 발췌·이식. + * 메시지는 사용자 노출용 — 스택트레이스/SQL 등 민감정보는 절대 포함하지 않는다(보안 불변규칙). + */ +@Getter +public enum UiwsErrorCode { + + // 공통 + INVALID_REQUEST("ERR-UIWS-400", "요청이 올바르지 않습니다."), + FORBIDDEN("ERR-UIWS-403", "접근 권한이 없습니다."), + NOT_FOUND("ERR-UIWS-404", "대상을 찾을 수 없습니다."), + + // worklog + WORKLOG_NOT_FOUND("ERR-UIWS-WL-404", "업무일지를 찾을 수 없습니다."), + WORKLOG_TIME_OVERLAP("ERR-UIWS-WL-409", "동일 일지 내 시간대가 중복됩니다."), + WORKLOG_TIME_INVALID("ERR-UIWS-WL-422", "근무 시작/종료 시간이 올바르지 않습니다."), + + // schedule + SCHEDULE_NOT_FOUND("ERR-UIWS-SC-404", "일정을 찾을 수 없습니다."), + SCHEDULE_DT_INVALID("ERR-UIWS-SC-422", "일정 시작/종료 일시가 올바르지 않습니다."), + DIARY_NOT_FOUND("ERR-UIWS-DI-404", "일지를 찾을 수 없습니다."), + ATTACH_NOT_FOUND("ERR-UIWS-AT-404", "첨부파일을 찾을 수 없습니다."), + ATTACH_REF_TYPE_INVALID("ERR-UIWS-AT-422", "첨부 대상 유형은 SCHEDULE 또는 DIARY 여야 합니다."), + FILE_EMPTY("ERR-UIWS-FILE-400", "업로드할 파일이 비어 있습니다."), + FILE_STORAGE_ERROR("ERR-UIWS-FILE-500", "파일 저장 중 오류가 발생했습니다."), + + // message + MESSAGE_NOT_FOUND("ERR-UIWS-MSG-404", "쪽지를 찾을 수 없습니다."), + MESSAGE_RCV_TYPE_INVALID("ERR-UIWS-MSG-422", "수신구분은 RECV(수신) 또는 REF(참조) 여야 합니다."), + + // auth (2FA) + VERIFY_TOKEN_INVALID("ERR-UIWS-2FA-401", "2차 검증 토큰이 유효하지 않거나 만료되었습니다."), + VERIFY_CODE_INVALID("ERR-UIWS-2FA-401C", "인증 코드가 올바르지 않거나 만료되었습니다."), + ACCOUNT_LOCKED("ERR-UIWS-2FA-LOCK", "로그인 실패 횟수 초과로 계정이 잠겼습니다. 관리자에게 문의하세요."), + + // system(권한관리) — UIWS system 모듈 이식 + DUPLICATE_KEY("ERR-UIWS-SYS-409D", "이미 존재하는 항목입니다."), + RESOURCE_IN_USE("ERR-UIWS-SYS-409U", "참조 중인 항목이 있어 처리할 수 없습니다."), + ROLE_NOT_FOUND("ERR-UIWS-SYS-RL404", "권한을 찾을 수 없습니다."), + USER_NOT_FOUND("ERR-UIWS-SYS-US404", "사용자를 찾을 수 없습니다."), + USER_ID_DUPLICATED("ERR-UIWS-SYS-US409", "이미 사용 중인 사용자 ID입니다."), + DEPT_NOT_FOUND("ERR-UIWS-SYS-DP404", "부서를 찾을 수 없습니다."), + COMPANY_NOT_FOUND("ERR-UIWS-SYS-CO404", "거래처를 찾을 수 없습니다."), + MENU_NOT_FOUND("ERR-UIWS-SYS-MN404", "메뉴를 찾을 수 없습니다."), + PROGRAM_NOT_FOUND("ERR-UIWS-SYS-PG404", "프로그램을 찾을 수 없습니다."), + CODE_GRP_NOT_FOUND("ERR-UIWS-SYS-CG404", "코드그룹을 찾을 수 없습니다."); + + private final String code; + private final String message; + + UiwsErrorCode(String code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/common/mail/LogMailSender.java b/backend/src/main/java/com/zioinfo/signage/uiws/common/mail/LogMailSender.java new file mode 100644 index 0000000..314d013 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/common/mail/LogMailSender.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.uiws.common.mail; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +/** + * 로컬/개발/미설정용 메일 발송 폴백. 실제 전송 없이 로그로만 기록한다(외부 호출 0). + * esn.uiws.mail.mode=log (기본) 일 때 활성. SMTP 운영 시 mode=smtp 로 별도 구현 빈 활성화. + * + * 보안: 본문에 인증코드/임시비밀번호가 포함되므로 로그 레벨은 운영에서 조정. + * (인증코드는 API 응답으로는 절대 반환하지 않는다 — 메일/로그 채널로만 전달.) + */ +@Slf4j +@Component +@ConditionalOnProperty(name = "esn.uiws.mail.mode", havingValue = "log", matchIfMissing = true) +public class LogMailSender implements MailSender { + + @Override + public void send(String to, String subject, String body) { + log.info("[UIWS-MAIL:LOG] to={} subject={}\n{}", to, subject, body); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/common/mail/MailSender.java b/backend/src/main/java/com/zioinfo/signage/uiws/common/mail/MailSender.java new file mode 100644 index 0000000..acb9aaa --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/common/mail/MailSender.java @@ -0,0 +1,10 @@ +package com.zioinfo.signage.uiws.common.mail; + +/** + * 메일 발송 추상화(UIWS 이식). 로컬/미설정 환경은 LogMailSender(로그만), 운영은 SMTP 구현으로 교체. + * 외부 API 호출은 하지 않는다(보안 불변규칙 — Ollama 외 외부 호출 금지). + */ +public interface MailSender { + + void send(String to, String subject, String body); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/config/UiwsProperties.java b/backend/src/main/java/com/zioinfo/signage/uiws/config/UiwsProperties.java new file mode 100644 index 0000000..177cd6d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/config/UiwsProperties.java @@ -0,0 +1,41 @@ +package com.zioinfo.signage.uiws.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * UIWS 이식 모듈 설정. application.yml 의 esn.uiws.* 바인딩. + * 계획서 2FA 설정키(verify-token-validity / max-login-fail / email-code-validity) + + * 첨부 업로드 디렉터리. 모두 안전 기본값 보유(미설정이어도 동작). + */ +@Getter +@Setter +@Component +@ConfigurationProperties(prefix = "esn.uiws") +public class UiwsProperties { + + private final Auth auth = new Auth(); + private final Upload upload = new Upload(); + + @Getter + @Setter + public static class Auth { + /** 2FA 레이어 on/off. 기본 on(켜짐). off 시 기존 단일 JWT 로그인 흐름 유지(회귀 0). */ + private boolean twofaEnabled = true; + /** 1차 통과 후 verify-token 유효시간(초). 계획서 300(5분). */ + private long verifyTokenValiditySeconds = 300; + /** 이메일 인증코드 유효시간(초). 계획서 300(5분). */ + private long emailCodeValiditySeconds = 300; + /** 로그인 실패 누적 N회 시 계정 잠금. 계획서 5. */ + private int maxLoginFail = 5; + } + + @Getter + @Setter + public static class Upload { + /** 첨부파일 저장 루트. 기본 ./uploads/uiws. */ + private String uploadDir = "./uploads/uiws"; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/message/controller/MessageController.java b/backend/src/main/java/com/zioinfo/signage/uiws/message/controller/MessageController.java new file mode 100644 index 0000000..0e67ca0 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/message/controller/MessageController.java @@ -0,0 +1,75 @@ +package com.zioinfo.signage.uiws.message.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.message.dto.MessageDtos.*; +import com.zioinfo.signage.uiws.message.service.MessageService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDate; + +/** + * UIWS 이식 — 쪽지(모듈 03). 인증 필수(/api/messages). 원본 prefix·엔드포인트 보존. + * Spring Data Pageable 의존 회피: page/size 단순 파라미터로 이식(ERP는 spring-data-web 미사용). + */ +@RestController +@RequestMapping("/api/messages") +@RequiredArgsConstructor +public class MessageController { + + private final MessageService messageService; + + @PostMapping + public ApiResponse send(@Valid @RequestBody MessageSendDto dto) { + return ApiResponse.ok(messageService.send(dto)); + } + + @GetMapping("/sent") + public ApiResponse sent( + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate, + @RequestParam(required = false) String titleKeyword, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(messageService.listSent(fromDate, toDate, titleKeyword, page, size)); + } + + @GetMapping("/sent/{id}") + public ApiResponse sentDetail(@PathVariable("id") Long id) { + return ApiResponse.ok(messageService.sentDetail(id)); + } + + @DeleteMapping("/sent") + public ApiResponse deleteSent(@Valid @RequestBody MessageIdsRequest req) { + messageService.deleteSent(req.ids()); + return ApiResponse.ok(null); + } + + @GetMapping("/unread-count") + public ApiResponse unreadCount() { + return ApiResponse.ok(messageService.unreadCount()); + } + + @GetMapping("/received") + public ApiResponse received( + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate, + @RequestParam(required = false) String titleKeyword, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(messageService.listReceived(fromDate, toDate, titleKeyword, page, size)); + } + + @GetMapping("/received/{id}") + public ApiResponse receivedDetail(@PathVariable("id") Long id) { + return ApiResponse.ok(messageService.receivedDetail(id)); + } + + @DeleteMapping("/received") + public ApiResponse deleteReceived(@Valid @RequestBody MessageIdsRequest req) { + messageService.deleteReceived(req.ids()); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/message/dto/MessageDtos.java b/backend/src/main/java/com/zioinfo/signage/uiws/message/dto/MessageDtos.java new file mode 100644 index 0000000..f636794 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/message/dto/MessageDtos.java @@ -0,0 +1,100 @@ +package com.zioinfo.signage.uiws.message.dto; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; + +import java.util.List; + +/** + * 쪽지(모듈 03) 요청/응답 DTO 모음. 원본 com.urp.uiws.message.dto.* 이식(필드·shape 동일). + * 프론트 경계면 계약 유지: API 응답 필드명 그대로 보존. + */ +public final class MessageDtos { + + private MessageDtos() { + } + + /** 전송/답장 요청. */ + public record MessageSendDto( + @NotBlank String title, + @NotBlank String content, + Long refWorklogId, + Long replyToId, + @Valid @NotEmpty(message = "수신자는 1명 이상이어야 합니다.") List receivers + ) { + } + + /** 수신자 1건. rcvType: RECV(수신) | REF(참조). */ + public record MessageReceiverDto( + @NotBlank String receiverId, + @NotBlank String rcvType + ) { + } + + /** 전송 응답. */ + public record MessageSendResponse(Long messageId) { + } + + /** 보낸쪽지함 행. */ + public record SentMessageDto( + Long messageId, + String title, + String receiverSummary, + long openCount, + long totalCount, + String sentAt + ) { + } + + /** 보낸쪽지 상세(수신자 개봉현황). */ + public record SentMessageDetailDto( + Long messageId, + String title, + String content, + Long refWorklogId, + String sentAt, + List receivers, + long totalCount, + long openCount, + long unopenCount + ) { + } + + /** 수신자별 개봉현황. */ + public record ReceiverStatusDto( + String receiverNm, + String rcvType, + String readYn, + String readAt + ) { + } + + /** 받은쪽지함 행. */ + public record ReceivedMessageDto( + Long messageId, + String title, + String senderNm, + String sentAt, + String readYn + ) { + } + + /** 받은쪽지 상세(조회 시 개봉처리). */ + public record ReceivedMessageDetailDto( + Long messageId, + String title, + String content, + String senderNm, + String sentAt, + String receivedAt, + Long refWorklogId + ) { + } + + /** 다중삭제 본문. */ + public record MessageIdsRequest( + @NotEmpty(message = "ids는 필수입니다.") List ids + ) { + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/message/mapper/MessageMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/message/mapper/MessageMapper.java new file mode 100644 index 0000000..faa65a5 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/message/mapper/MessageMapper.java @@ -0,0 +1,78 @@ +package com.zioinfo.signage.uiws.message.mapper; + +import com.zioinfo.signage.uiws.message.model.UiwsMessage; +import com.zioinfo.signage.uiws.message.model.UiwsMessageRcv; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +/** + * 쪽지 MyBatis 매퍼. 원본 JPA MessageRepository/MessageRcvRepository → MyBatis 변환 이식. + * 사용자명은 signage_user(username 라벨) 조인으로 라벨화(코어 user 재사용, 별도 user 테이블 미이식). + */ +@Mapper +public interface MessageMapper { + + // ── message 헤더 + int insertMessage(UiwsMessage m); + + UiwsMessage findMessageById(@Param("messageId") Long messageId); + + boolean existsMessageById(@Param("messageId") Long messageId); + + /** 보낸쪽지 페이징(SENDER_DEL_YN='N' 제외). */ + List searchSent(@Param("senderId") String senderId, + @Param("from") LocalDateTime from, + @Param("to") LocalDateTime to, + @Param("titleKeyword") String titleKeyword, + @Param("limit") int limit, + @Param("offset") int offset); + + long countSent(@Param("senderId") String senderId, + @Param("from") LocalDateTime from, + @Param("to") LocalDateTime to, + @Param("titleKeyword") String titleKeyword); + + /** 보낸쪽지 다중 소프트삭제(본인 것만). */ + int softDeleteSent(@Param("senderId") String senderId, + @Param("ids") List ids, + @Param("actor") String actor); + + // ── 수신자 + int insertRcv(UiwsMessageRcv rcv); + + List findRcvByMessageId(@Param("messageId") Long messageId); + + List findRcvByMessageIds(@Param("ids") List ids); + + UiwsMessageRcv findRcvByMessageAndReceiver(@Param("messageId") Long messageId, + @Param("receiverId") String receiverId); + + long countUnread(@Param("receiverId") String receiverId); + + /** 받은쪽지 개봉처리(READ_YN='Y', READ_AT). */ + int markRead(@Param("rcvId") Long rcvId, @Param("actor") String actor, @Param("readAt") LocalDateTime readAt); + + int softDeleteReceived(@Param("receiverId") String receiverId, + @Param("ids") List ids, + @Param("actor") String actor); + + /** 받은쪽지 목록(조인: message + rcv). 행: messageId,title,senderId,sentAt,readYn. */ + List> searchReceived(@Param("receiverId") String receiverId, + @Param("from") LocalDateTime from, + @Param("to") LocalDateTime to, + @Param("titleKeyword") String titleKeyword, + @Param("limit") int limit, + @Param("offset") int offset); + + long countReceived(@Param("receiverId") String receiverId, + @Param("from") LocalDateTime from, + @Param("to") LocalDateTime to, + @Param("titleKeyword") String titleKeyword); + + // ── 사용자명 라벨(코어 user 재사용) + List> findUserNames(@Param("ids") List ids); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/message/model/UiwsMessage.java b/backend/src/main/java/com/zioinfo/signage/uiws/message/model/UiwsMessage.java new file mode 100644 index 0000000..ed69632 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/message/model/UiwsMessage.java @@ -0,0 +1,24 @@ +package com.zioinfo.signage.uiws.message.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** + * 쪽지 헤더 (tb_uiws_message). 원본 com.urp.uiws.domain.Message 이식. + * MyBatis map-underscore-to-camel-case 로 컬럼↔필드 자동 매핑. + */ +@Data +public class UiwsMessage { + private Long messageId; + private String senderId; + private String title; + private String content; + private Long refWorklogId; + private Long replyToId; + private LocalDateTime sentAt; + private String senderDelYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/message/model/UiwsMessageRcv.java b/backend/src/main/java/com/zioinfo/signage/uiws/message/model/UiwsMessageRcv.java new file mode 100644 index 0000000..33b55e5 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/message/model/UiwsMessageRcv.java @@ -0,0 +1,22 @@ +package com.zioinfo.signage.uiws.message.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** + * 쪽지 수신자 (tb_uiws_message_rcv). 원본 com.urp.uiws.domain.MessageRcv 이식. + */ +@Data +public class UiwsMessageRcv { + private Long rcvId; + private Long messageId; + private String receiverId; + private String rcvType; // RECV | REF + private String readYn; // Y | N + private LocalDateTime readAt; + private String receiverDelYn; // Y | N + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/message/service/MessageService.java b/backend/src/main/java/com/zioinfo/signage/uiws/message/service/MessageService.java new file mode 100644 index 0000000..25965f1 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/message/service/MessageService.java @@ -0,0 +1,271 @@ +package com.zioinfo.signage.uiws.message.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsCurrentUser; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.message.dto.MessageDtos.*; +import com.zioinfo.signage.uiws.message.mapper.MessageMapper; +import com.zioinfo.signage.uiws.message.model.UiwsMessage; +import com.zioinfo.signage.uiws.message.model.UiwsMessageRcv; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 쪽지(모듈 03) 서비스 — 원본 com.urp.uiws.message.service.MessageService 를 MyBatis 로 변환 이식. + * 로직(전송/답장, 보낸함, 개봉현황, 받은함, 개봉처리, 다중삭제, 미열람 배지)을 동등하게 보존한다. + * 기본 조회기간 = 최근 1주일. + */ +@Service +@RequiredArgsConstructor +public class MessageService { + + private static final Set VALID_RCV_TYPES = Set.of("RECV", "REF"); + private static final DateTimeFormatter DT = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"); + + private final MessageMapper mapper; + + // ------------------------------------------------------------------ 전송/답장 + @Transactional + public MessageSendResponse send(MessageSendDto dto) { + String actor = UiwsCurrentUser.id(); + LocalDateTime now = LocalDateTime.now(); + + if (dto.replyToId() != null && !mapper.existsMessageById(dto.replyToId())) { + throw new UiwsApiException(UiwsErrorCode.MESSAGE_NOT_FOUND, "답장 원본 쪽지를 찾을 수 없습니다."); + } + + UiwsMessage m = new UiwsMessage(); + m.setSenderId(actor); + m.setTitle(dto.title()); + m.setContent(dto.content()); + m.setRefWorklogId(dto.refWorklogId()); + m.setReplyToId(dto.replyToId()); + m.setSentAt(now); + m.setSenderDelYn("N"); + m.setCreatedBy(actor); + m.setCreatedAt(now); + mapper.insertMessage(m); // useGeneratedKeys → m.messageId + + // 수신자: 동일 수신자 중복 제거(UNIQUE(message_id,receiver_id) 보호). 첫 등장 rcvType 채택. + Set seen = new LinkedHashSet<>(); + for (MessageReceiverDto r : dto.receivers()) { + String receiverId = (r.receiverId() == null) ? null : r.receiverId().trim(); + String rcvType = (r.rcvType() == null) ? null : r.rcvType().trim().toUpperCase(); + if (receiverId == null || receiverId.isBlank()) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "수신자 ID가 비어 있습니다."); + } + if (!VALID_RCV_TYPES.contains(rcvType)) { + throw new UiwsApiException(UiwsErrorCode.MESSAGE_RCV_TYPE_INVALID); + } + if (!seen.add(receiverId)) { + continue; + } + UiwsMessageRcv rcv = new UiwsMessageRcv(); + rcv.setMessageId(m.getMessageId()); + rcv.setReceiverId(receiverId); + rcv.setRcvType(rcvType); + rcv.setReadYn("N"); + rcv.setReceiverDelYn("N"); + rcv.setCreatedBy(actor); + rcv.setCreatedAt(now); + mapper.insertRcv(rcv); + } + return new MessageSendResponse(m.getMessageId()); + } + + // ------------------------------------------------------------------ 보낸쪽지함 + @Transactional(readOnly = true) + public SentPage listSent(LocalDate fromDate, LocalDate toDate, String titleKeyword, int page, int size) { + LocalDateTime[] range = range(fromDate, toDate); + String me = UiwsCurrentUser.id(); + String kw = blankToNull(titleKeyword); + long total = mapper.countSent(me, range[0], range[1], kw); + List rows = mapper.searchSent(me, range[0], range[1], kw, size, page * size); + + List ids = rows.stream().map(UiwsMessage::getMessageId).toList(); + List rcvs = ids.isEmpty() ? List.of() : mapper.findRcvByMessageIds(ids); + Map> byMsg = rcvs.stream().collect(Collectors.groupingBy(UiwsMessageRcv::getMessageId)); + Map names = userNames(rcvs.stream().map(UiwsMessageRcv::getReceiverId).toList()); + + List content = rows.stream().map(m -> { + List list = byMsg.getOrDefault(m.getMessageId(), List.of()); + long openCount = list.stream().filter(r -> "Y".equals(r.getReadYn())).count(); + return new SentMessageDto(m.getMessageId(), m.getTitle(), + receiverSummary(list, names), openCount, list.size(), fmt(m.getSentAt())); + }).toList(); + return new SentPage(content, total, page, size, totalPages(total, size)); + } + + // ------------------------------------------------------------------ 보낸쪽지 상세 + @Transactional(readOnly = true) + public SentMessageDetailDto sentDetail(Long messageId) { + String me = UiwsCurrentUser.id(); + UiwsMessage m = mapper.findMessageById(messageId); + if (m == null) { + throw new UiwsApiException(UiwsErrorCode.MESSAGE_NOT_FOUND); + } + if (!me.equals(m.getSenderId())) { + throw new UiwsApiException(UiwsErrorCode.FORBIDDEN, "본인이 보낸 쪽지만 조회할 수 있습니다."); + } + List list = mapper.findRcvByMessageId(messageId); + Map names = userNames(list.stream().map(UiwsMessageRcv::getReceiverId).toList()); + + List receivers = list.stream() + .map(r -> new ReceiverStatusDto( + names.getOrDefault(r.getReceiverId(), r.getReceiverId()), + r.getRcvType(), r.getReadYn(), fmt(r.getReadAt()))) + .toList(); + long total = receivers.size(); + long open = list.stream().filter(r -> "Y".equals(r.getReadYn())).count(); + return new SentMessageDetailDto(m.getMessageId(), m.getTitle(), m.getContent(), m.getRefWorklogId(), + fmt(m.getSentAt()), receivers, total, open, total - open); + } + + // ------------------------------------------------------------------ 보낸쪽지 다중삭제 + @Transactional + public void deleteSent(List ids) { + if (ids == null || ids.isEmpty()) { + return; + } + String me = UiwsCurrentUser.id(); + mapper.softDeleteSent(me, ids, me); + } + + // ------------------------------------------------------------------ 미열람 수(배지) + @Transactional(readOnly = true) + public long unreadCount() { + return mapper.countUnread(UiwsCurrentUser.id()); + } + + // ------------------------------------------------------------------ 받은쪽지함 + @Transactional(readOnly = true) + public ReceivedPage listReceived(LocalDate fromDate, LocalDate toDate, String titleKeyword, int page, int size) { + LocalDateTime[] range = range(fromDate, toDate); + String me = UiwsCurrentUser.id(); + String kw = blankToNull(titleKeyword); + long total = mapper.countReceived(me, range[0], range[1], kw); + List> rows = mapper.searchReceived(me, range[0], range[1], kw, size, page * size); + Map names = userNames(rows.stream().map(r -> str(r.get("senderId"))).toList()); + + List content = rows.stream() + .map(r -> new ReceivedMessageDto( + toLongObj(r.get("messageId")), + str(r.get("title")), + names.getOrDefault(str(r.get("senderId")), str(r.get("senderId"))), + fmt(toDt(r.get("sentAt"))), + str(r.get("readYn")))) + .toList(); + return new ReceivedPage(content, total, page, size, totalPages(total, size)); + } + + // ------------------------------------------------------------------ 받은쪽지 상세(개봉처리) + @Transactional + public ReceivedMessageDetailDto receivedDetail(Long messageId) { + String me = UiwsCurrentUser.id(); + UiwsMessageRcv rcv = mapper.findRcvByMessageAndReceiver(messageId, me); + if (rcv == null || "Y".equals(rcv.getReceiverDelYn())) { + throw new UiwsApiException(UiwsErrorCode.MESSAGE_NOT_FOUND, "받은 쪽지를 찾을 수 없습니다."); + } + UiwsMessage m = mapper.findMessageById(messageId); + if (m == null) { + throw new UiwsApiException(UiwsErrorCode.MESSAGE_NOT_FOUND); + } + LocalDateTime readAt = rcv.getReadAt(); + if (!"Y".equals(rcv.getReadYn())) { + readAt = LocalDateTime.now(); + mapper.markRead(rcv.getRcvId(), me, readAt); + } + String senderNm = userNames(List.of(m.getSenderId())).getOrDefault(m.getSenderId(), m.getSenderId()); + return new ReceivedMessageDetailDto(m.getMessageId(), m.getTitle(), m.getContent(), + senderNm, fmt(m.getSentAt()), fmt(readAt), m.getRefWorklogId()); + } + + // ------------------------------------------------------------------ 받은쪽지 다중삭제 + @Transactional + public void deleteReceived(List ids) { + if (ids == null || ids.isEmpty()) { + return; + } + String me = UiwsCurrentUser.id(); + mapper.softDeleteReceived(me, ids, me); + } + + // ================================================================== helpers + + private LocalDateTime[] range(LocalDate fromDate, LocalDate toDate) { + LocalDate to = (toDate != null) ? toDate : LocalDate.now(); + LocalDate from = (fromDate != null) ? fromDate : to.minusWeeks(1); + return new LocalDateTime[]{from.atStartOfDay(), to.atTime(LocalTime.MAX)}; + } + + private String receiverSummary(List list, Map names) { + if (list.isEmpty()) { + return ""; + } + String first = names.getOrDefault(list.get(0).getReceiverId(), list.get(0).getReceiverId()); + return list.size() == 1 ? first : first + " 외 " + (list.size() - 1) + "명"; + } + + private Map userNames(List userIds) { + List ids = userIds.stream().filter(s -> s != null && !s.isBlank()).distinct().toList(); + if (ids.isEmpty()) { + return Map.of(); + } + return mapper.findUserNames(ids).stream() + .collect(Collectors.toMap(r -> r.get("username"), r -> r.get("fullName"), (a, b) -> a)); + } + + private static int totalPages(long total, int size) { + return size <= 0 ? 0 : (int) ((total + size - 1) / size); + } + + private static String blankToNull(String s) { + return (s == null || s.isBlank()) ? null : s; + } + + private static String str(Object o) { + return o == null ? "" : o.toString(); + } + + private static Long toLongObj(Object o) { + if (o == null) { + return null; + } + return (o instanceof Number n) ? n.longValue() : Long.parseLong(o.toString()); + } + + private static LocalDateTime toDt(Object o) { + if (o == null) { + return null; + } + if (o instanceof LocalDateTime dt) { + return dt; + } + if (o instanceof java.sql.Timestamp ts) { + return ts.toLocalDateTime(); + } + return null; + } + + private static String fmt(LocalDateTime dt) { + return dt != null ? dt.format(DT) : null; + } + + // 페이지 응답(ERP ApiResponse 안에 그대로 직렬화 — content/totalElements/page/size/totalPages 보존) + public record SentPage(List content, long totalElements, int page, int size, int totalPages) { + } + + public record ReceivedPage(List content, long totalElements, int page, int size, int totalPages) { + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/AttachmentController.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/AttachmentController.java new file mode 100644 index 0000000..12d6dbd --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/AttachmentController.java @@ -0,0 +1,68 @@ +package com.zioinfo.signage.uiws.schedule.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.schedule.dto.ScheduleDtos.AttachmentDto; +import com.zioinfo.signage.uiws.schedule.service.AttachmentService; +import lombok.RequiredArgsConstructor; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.Resource; +import org.springframework.http.ContentDisposition; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; + +/** + * UIWS 이식 — 첨부파일(모듈 02, 폴리모픽 SCHEDULE/DIARY). 인증 필수(/api/attachments). + */ +@RestController +@RequestMapping("/api/attachments") +@RequiredArgsConstructor +public class AttachmentController { + + private final AttachmentService attachmentService; + + @PostMapping + public ApiResponse upload( + @RequestParam("refType") String refType, + @RequestParam("refId") Long refId, + @RequestParam("file") MultipartFile file) { + return ApiResponse.ok(attachmentService.upload(refType, refId, file)); + } + + @GetMapping("/{id}/download") + public ResponseEntity download(@PathVariable("id") Long id) { + AttachmentService.DownloadFile f = attachmentService.download(id); + Resource resource = new FileSystemResource(f.path()); + String contentType; + try { + contentType = Files.probeContentType(f.path()); + } catch (IOException e) { + contentType = null; + } + ContentDisposition cd = ContentDisposition.attachment() + .filename(f.fileNm(), StandardCharsets.UTF_8) + .build(); + HttpHeaders headers = new HttpHeaders(); + headers.setContentDisposition(cd); + long len = f.path().toFile().length(); + if (len > 0) { + headers.setContentLength(len); + } + return ResponseEntity.ok() + .headers(headers) + .contentType(contentType != null ? MediaType.parseMediaType(contentType) : MediaType.APPLICATION_OCTET_STREAM) + .body(resource); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable("id") Long id) { + attachmentService.delete(id); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/DiaryController.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/DiaryController.java new file mode 100644 index 0000000..b0d9698 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/DiaryController.java @@ -0,0 +1,52 @@ +package com.zioinfo.signage.uiws.schedule.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.schedule.dto.ScheduleDtos.*; +import com.zioinfo.signage.uiws.schedule.service.DiaryService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDate; + +/** + * UIWS 이식 — 일지(모듈 02). 인증 필수(/api/diaries). + */ +@RestController +@RequestMapping("/api/diaries") +@RequiredArgsConstructor +public class DiaryController { + + private final DiaryService diaryService; + + @GetMapping + public ApiResponse list( + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(diaryService.list(fromDate, toDate, page, size)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody DiarySaveDto dto) { + return ApiResponse.ok(diaryService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse detail(@PathVariable("id") Long id) { + return ApiResponse.ok(diaryService.detail(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") Long id, @Valid @RequestBody DiarySaveDto dto) { + return ApiResponse.ok(diaryService.update(id, dto)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable("id") Long id) { + diaryService.delete(id); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/ScheduleController.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/ScheduleController.java new file mode 100644 index 0000000..16528b9 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/controller/ScheduleController.java @@ -0,0 +1,68 @@ +package com.zioinfo.signage.uiws.schedule.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.schedule.dto.ScheduleDtos.*; +import com.zioinfo.signage.uiws.schedule.service.ScheduleService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDate; +import java.util.List; + +/** + * UIWS 이식 — 일정(모듈 02). 인증 필수(/api/schedules). 원본 엔드포인트 보존. + */ +@RestController +@RequestMapping("/api/schedules") +@RequiredArgsConstructor +public class ScheduleController { + + private final ScheduleService scheduleService; + + @GetMapping + public ApiResponse> calendar( + @RequestParam(defaultValue = "PERSONAL") String type, + @RequestParam(defaultValue = "month") String view, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate baseDate, + @RequestParam(required = false) String deptId) { + return ApiResponse.ok(scheduleService.calendar(type, view, baseDate, deptId)); + } + + @GetMapping("/all") + public ApiResponse all( + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate, + @RequestParam(required = false) String type, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(scheduleService.all(fromDate, toDate, type, page, size)); + } + + @GetMapping("/search") + public ApiResponse> search(@RequestParam(required = false) String keyword) { + return ApiResponse.ok(scheduleService.search(keyword)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody ScheduleSaveDto dto) { + return ApiResponse.ok(scheduleService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse detail(@PathVariable("id") Long id) { + return ApiResponse.ok(scheduleService.detail(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") Long id, @Valid @RequestBody ScheduleSaveDto dto) { + return ApiResponse.ok(scheduleService.update(id, dto)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable("id") Long id) { + scheduleService.delete(id); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/dto/ScheduleDtos.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/dto/ScheduleDtos.java new file mode 100644 index 0000000..0a4be14 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/dto/ScheduleDtos.java @@ -0,0 +1,109 @@ +package com.zioinfo.signage.uiws.schedule.dto; + +import com.zioinfo.signage.uiws.schedule.model.UiwsAttach; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; + +import java.util.List; + +/** + * 일정·일지·첨부(모듈 02) DTO. 원본 com.urp.uiws.schedule.dto.* 이식(shape 동일). + */ +public final class ScheduleDtos { + + private ScheduleDtos() { + } + + public record ScheduleDto( + Long scheduleId, + String scheType, + String title, + String scheGubunCd, + String importanceCd, + String startDt, + String endDt, + String ownerId, + String deptId + ) { + } + + public record ScheduleDetailDto( + Long scheduleId, + String scheType, + String title, + String scheGubunCd, + String importanceCd, + String startDt, + String endDt, + String ownerId, + String deptId, + String content, + String chargerId, + String chargerNm, + List attachments + ) { + } + + public record ScheduleSaveDto( + @NotBlank @Pattern(regexp = "PERSONAL|DEPT") String scheType, + @NotBlank String title, + String scheGubunCd, + String importanceCd, + @NotNull String startDt, + @NotNull String endDt, + String content, + String deptId, + String chargerId, + List attachmentIds + ) { + } + + public record DiaryDto( + Long diaryId, + String title, + String writerNm, + String diaryDate, + Long scheduleId + ) { + } + + public record DiaryDetailDto( + Long diaryId, + String title, + String writerNm, + String diaryDate, + Long scheduleId, + String content, + List attachments + ) { + } + + public record DiarySaveDto( + @NotBlank String title, + String content, + Long scheduleId, + String diaryDate, + List attachmentIds + ) { + } + + public record AttachmentDto( + Long attachId, + String refType, + Long refId, + String fileNm, + Long fileSize + ) { + public static AttachmentDto from(UiwsAttach a) { + return new AttachmentDto(a.getAttachId(), a.getRefType(), a.getRefId(), a.getFileNm(), a.getFileSize()); + } + } + + /** 페이지 래퍼(content/totalElements/page/size/totalPages). */ + public record DiaryPage(List content, long totalElements, int page, int size, int totalPages) { + } + + public record SchedulePage(List content, long totalElements, int page, int size, int totalPages) { + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/mapper/ScheduleMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/mapper/ScheduleMapper.java new file mode 100644 index 0000000..cd59f7c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/mapper/ScheduleMapper.java @@ -0,0 +1,93 @@ +package com.zioinfo.signage.uiws.schedule.mapper; + +import com.zioinfo.signage.uiws.schedule.model.UiwsAttach; +import com.zioinfo.signage.uiws.schedule.model.UiwsDiary; +import com.zioinfo.signage.uiws.schedule.model.UiwsSchedule; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +/** + * 일정·일지·첨부 MyBatis 매퍼. 원본 JPA ScheduleRepository/DiaryRepository/AttachRepository 변환 이식. + * 데이터 가시범위: scopeAll(true=ADMIN 전체) OR owner IN (ownerIds). ownerIds 는 항상 본인 포함(빈 IN 회피). + */ +@Mapper +public interface ScheduleMapper { + + // ── schedule + int insertSchedule(UiwsSchedule s); + + int updateSchedule(UiwsSchedule s); + + UiwsSchedule findScheduleById(@Param("scheduleId") Long scheduleId); + + boolean existsScheduleById(@Param("scheduleId") Long scheduleId); + + int deleteScheduleById(@Param("scheduleId") Long scheduleId); + + /** 달력: 기간 겹침([from,to) 배타 상한) + type + 개인소유/부서필터. */ + List findInRange(@Param("from") LocalDateTime from, + @Param("to") LocalDateTime to, + @Param("scheType") String scheType, + @Param("ownerId") String ownerId, + @Param("deptId") String deptId); + + List searchAll(@Param("from") LocalDateTime from, + @Param("to") LocalDateTime to, + @Param("scheType") String scheType, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds, + @Param("limit") int limit, + @Param("offset") int offset); + + long countAll(@Param("from") LocalDateTime from, + @Param("to") LocalDateTime to, + @Param("scheType") String scheType, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds); + + List searchPopup(@Param("keyword") String keyword, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds); + + // ── diary + int insertDiary(UiwsDiary d); + + int updateDiary(UiwsDiary d); + + UiwsDiary findDiaryById(@Param("diaryId") Long diaryId); + + boolean existsDiaryById(@Param("diaryId") Long diaryId); + + int deleteDiaryById(@Param("diaryId") Long diaryId); + + List searchDiary(@Param("from") LocalDate from, + @Param("to") LocalDate to, + @Param("limit") int limit, + @Param("offset") int offset); + + long countDiary(@Param("from") LocalDate from, @Param("to") LocalDate to); + + // ── attach + int insertAttach(UiwsAttach a); + + UiwsAttach findAttachById(@Param("attachId") Long attachId); + + int updateAttachRef(@Param("attachId") Long attachId, + @Param("refType") String refType, + @Param("refId") Long refId, + @Param("actor") String actor); + + List findAttachByRef(@Param("refType") String refType, @Param("refId") Long refId); + + int deleteAttachById(@Param("attachId") Long attachId); + + int deleteAttachByRef(@Param("refType") String refType, @Param("refId") Long refId); + + // ── 사용자명 라벨(코어 user 재사용) + List> findUserNames(@Param("ids") List ids); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsAttach.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsAttach.java new file mode 100644 index 0000000..a99a236 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsAttach.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.uiws.schedule.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 첨부파일 폴리모픽 (tb_uiws_attach, ref_type=SCHEDULE|DIARY). 원본 com.urp.uiws.domain.Attach 이식. */ +@Data +public class UiwsAttach { + private Long attachId; + private String refType; + private Long refId; + private String fileNm; + private String filePath; + private Long fileSize; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsDiary.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsDiary.java new file mode 100644 index 0000000..f61d530 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsDiary.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.uiws.schedule.model; + +import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** 일지 (tb_uiws_diary). 원본 com.urp.uiws.domain.Diary 이식. */ +@Data +public class UiwsDiary { + private Long diaryId; + private String title; + private String content; + private Long scheduleId; + private String writerId; + private LocalDate diaryDate; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsSchedule.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsSchedule.java new file mode 100644 index 0000000..a94f972 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/model/UiwsSchedule.java @@ -0,0 +1,24 @@ +package com.zioinfo.signage.uiws.schedule.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 일정 (tb_uiws_schedule). 원본 com.urp.uiws.domain.Schedule 이식. */ +@Data +public class UiwsSchedule { + private Long scheduleId; + private String scheType; // PERSONAL | DEPT + private String title; + private String scheGubunCd; + private String importanceCd; + private LocalDateTime startDt; + private LocalDateTime endDt; + private String content; + private String ownerId; + private String deptId; + private String chargerId; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/AttachmentService.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/AttachmentService.java new file mode 100644 index 0000000..c3fa1d0 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/AttachmentService.java @@ -0,0 +1,121 @@ +package com.zioinfo.signage.uiws.schedule.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsCurrentUser; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.schedule.dto.ScheduleDtos.AttachmentDto; +import com.zioinfo.signage.uiws.schedule.mapper.ScheduleMapper; +import com.zioinfo.signage.uiws.schedule.model.UiwsAttach; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; + +/** + * 첨부파일(폴리모픽 SCHEDULE/DIARY) 업로드·삭제·연결. 원본 com.urp.uiws.schedule.service.AttachmentService 이식. + */ +@Service +@RequiredArgsConstructor +public class AttachmentService { + + public static final String REF_SCHEDULE = "SCHEDULE"; + public static final String REF_DIARY = "DIARY"; + private static final Set VALID_REF_TYPES = Set.of(REF_SCHEDULE, REF_DIARY); + + private final ScheduleMapper mapper; + private final FileStorageService fileStorageService; + + @Transactional + public AttachmentDto upload(String refType, Long refId, MultipartFile file) { + String type = normalizeRefType(refType); + if (refId == null) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "refId 는 필수입니다."); + } + FileStorageService.StoredFile stored = fileStorageService.store(file); + + String actor = UiwsCurrentUser.id(); + UiwsAttach a = new UiwsAttach(); + a.setRefType(type); + a.setRefId(refId); + a.setFileNm(stored.originalName()); + a.setFilePath(stored.relativePath()); + a.setFileSize(stored.size()); + a.setCreatedBy(actor); + a.setCreatedAt(LocalDateTime.now()); + mapper.insertAttach(a); + return AttachmentDto.from(a); + } + + public record DownloadFile(String fileNm, Path path) { + } + + @Transactional(readOnly = true) + public DownloadFile download(Long attachId) { + UiwsAttach a = mapper.findAttachById(attachId); + if (a == null) { + throw new UiwsApiException(UiwsErrorCode.ATTACH_NOT_FOUND); + } + Path path = fileStorageService.resolve(a.getFilePath()); + if (!Files.exists(path)) { + throw new UiwsApiException(UiwsErrorCode.ATTACH_NOT_FOUND, "파일이 존재하지 않습니다."); + } + return new DownloadFile(a.getFileNm(), path); + } + + @Transactional + public void delete(Long attachId) { + UiwsAttach a = mapper.findAttachById(attachId); + if (a == null) { + throw new UiwsApiException(UiwsErrorCode.ATTACH_NOT_FOUND); + } + fileStorageService.delete(a.getFilePath()); + mapper.deleteAttachById(attachId); + } + + /** 일정/일지 저장 시 attachmentIds 의 첨부들을 해당 대상으로 귀속(확정). */ + @Transactional + public void link(String refType, Long refId, List attachmentIds) { + String type = normalizeRefType(refType); + if (attachmentIds == null || attachmentIds.isEmpty()) { + return; + } + String actor = UiwsCurrentUser.id(); + for (Long id : attachmentIds) { + if (id == null) { + continue; + } + mapper.updateAttachRef(id, type, refId, actor); + } + } + + @Transactional(readOnly = true) + public List list(String refType, Long refId) { + return mapper.findAttachByRef(normalizeRefType(refType), refId) + .stream().map(AttachmentDto::from).toList(); + } + + /** 대상 삭제 시 귀속 첨부 일괄 제거(물리파일 포함). */ + @Transactional + public void deleteByRef(String refType, Long refId) { + String type = normalizeRefType(refType); + List rows = mapper.findAttachByRef(type, refId); + for (UiwsAttach a : rows) { + fileStorageService.delete(a.getFilePath()); + } + mapper.deleteAttachByRef(type, refId); + } + + private String normalizeRefType(String refType) { + String type = refType == null ? "" : refType.trim().toUpperCase(); + if (!VALID_REF_TYPES.contains(type)) { + throw new UiwsApiException(UiwsErrorCode.ATTACH_REF_TYPE_INVALID); + } + return type; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/DiaryService.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/DiaryService.java new file mode 100644 index 0000000..36f22b8 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/DiaryService.java @@ -0,0 +1,133 @@ +package com.zioinfo.signage.uiws.schedule.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsCurrentUser; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.schedule.dto.ScheduleDtos.*; +import com.zioinfo.signage.uiws.schedule.mapper.ScheduleMapper; +import com.zioinfo.signage.uiws.schedule.model.UiwsDiary; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 일지(모듈 02) 서비스 — 원본 com.urp.uiws.schedule.service.DiaryService MyBatis 변환 이식. + * 목록(페이징)·CRUD·첨부 연계. + */ +@Service +@RequiredArgsConstructor +public class DiaryService { + + private final ScheduleMapper mapper; + private final AttachmentService attachmentService; + + @Transactional(readOnly = true) + public DiaryPage list(LocalDate fromDate, LocalDate toDate, int page, int size) { + LocalDate to = (toDate != null) ? toDate : LocalDate.now(); + LocalDate from = (fromDate != null) ? fromDate : to.minusMonths(1); + long total = mapper.countDiary(from, to); + List rows = mapper.searchDiary(from, to, size, page * size); + Map names = userNames(rows.stream().map(UiwsDiary::getWriterId).toList()); + List content = rows.stream() + .map(d -> new DiaryDto(d.getDiaryId(), d.getTitle(), + names.getOrDefault(d.getWriterId(), d.getWriterId()), + d.getDiaryDate() != null ? d.getDiaryDate().toString() : null, + d.getScheduleId())) + .toList(); + return new DiaryPage(content, total, page, size, totalPages(total, size)); + } + + @Transactional + public DiaryDetailDto create(DiarySaveDto dto) { + String actor = UiwsCurrentUser.id(); + UiwsDiary d = new UiwsDiary(); + applySave(d, dto); + d.setWriterId(actor); + d.setCreatedBy(actor); + d.setCreatedAt(LocalDateTime.now()); + mapper.insertDiary(d); + attachmentService.link(AttachmentService.REF_DIARY, d.getDiaryId(), dto.attachmentIds()); + return toDetail(d); + } + + @Transactional(readOnly = true) + public DiaryDetailDto detail(Long id) { + return toDetail(find(id)); + } + + @Transactional + public DiaryDetailDto update(Long id, DiarySaveDto dto) { + String actor = UiwsCurrentUser.id(); + UiwsDiary d = find(id); + applySave(d, dto); + d.setUpdatedBy(actor); + d.setUpdatedAt(LocalDateTime.now()); + mapper.updateDiary(d); + attachmentService.link(AttachmentService.REF_DIARY, d.getDiaryId(), dto.attachmentIds()); + return toDetail(d); + } + + @Transactional + public void delete(Long id) { + if (!mapper.existsDiaryById(id)) { + throw new UiwsApiException(UiwsErrorCode.DIARY_NOT_FOUND); + } + attachmentService.deleteByRef(AttachmentService.REF_DIARY, id); + mapper.deleteDiaryById(id); + } + + // ================================================================== helpers + + private void applySave(UiwsDiary d, DiarySaveDto dto) { + d.setTitle(dto.title()); + d.setContent(dto.content()); + d.setScheduleId(dto.scheduleId()); + d.setDiaryDate(parseDateNullable(dto.diaryDate())); + } + + private DiaryDetailDto toDetail(UiwsDiary d) { + String writerNm = userNames(List.of(d.getWriterId())).getOrDefault(d.getWriterId(), d.getWriterId()); + List attachments = attachmentService.list(AttachmentService.REF_DIARY, d.getDiaryId()); + return new DiaryDetailDto(d.getDiaryId(), d.getTitle(), writerNm, + d.getDiaryDate() != null ? d.getDiaryDate().toString() : null, + d.getScheduleId(), d.getContent(), attachments); + } + + private UiwsDiary find(Long id) { + UiwsDiary d = mapper.findDiaryById(id); + if (d == null) { + throw new UiwsApiException(UiwsErrorCode.DIARY_NOT_FOUND); + } + return d; + } + + private Map userNames(List ids) { + List clean = ids.stream().filter(s -> s != null && !s.isBlank()).distinct().toList(); + if (clean.isEmpty()) { + return Map.of(); + } + return mapper.findUserNames(clean).stream() + .collect(Collectors.toMap(r -> r.get("username"), r -> r.get("fullName"), (a, b) -> a)); + } + + private static int totalPages(long total, int size) { + return size <= 0 ? 0 : (int) ((total + size - 1) / size); + } + + private static LocalDate parseDateNullable(String s) { + if (s == null || s.isBlank()) { + return null; + } + try { + return LocalDate.parse(s); + } catch (Exception e) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "날짜 형식이 올바르지 않습니다(yyyy-MM-dd)."); + } + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/FileStorageService.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/FileStorageService.java new file mode 100644 index 0000000..ff428d2 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/FileStorageService.java @@ -0,0 +1,93 @@ +package com.zioinfo.signage.uiws.schedule.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.config.UiwsProperties; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.UUID; + +/** + * 첨부파일 로컬 스토리지(UIWS 이식). 경로순회 방지(파일명 정규화 + UUID 저장명), 일자별 디렉터리 분리. + * 저장 결과로 상대경로(file_path)를 반환한다. + */ +@Service +@RequiredArgsConstructor +public class FileStorageService { + + private static final DateTimeFormatter DAY = DateTimeFormatter.ofPattern("yyyy/MM/dd"); + + private final UiwsProperties properties; + + public record StoredFile(String originalName, String relativePath, long size) { + } + + public StoredFile store(MultipartFile file) { + if (file == null || file.isEmpty()) { + throw new UiwsApiException(UiwsErrorCode.FILE_EMPTY); + } + String original = StringUtils.cleanPath( + file.getOriginalFilename() != null ? file.getOriginalFilename() : "file"); + original = original.replace("\\", "_").replace("/", "_"); + if (original.contains("..")) { + original = original.replace("..", "_"); + } + String ext = ""; + int dot = original.lastIndexOf('.'); + if (dot >= 0) { + ext = original.substring(dot); + } + String subDir = LocalDate.now().format(DAY); + String storedName = UUID.randomUUID().toString().replace("-", "") + ext; + String relativePath = subDir + "/" + storedName; + + try { + Path root = Paths.get(properties.getUpload().getUploadDir()).toAbsolutePath().normalize(); + Path target = root.resolve(relativePath).normalize(); + if (!target.startsWith(root)) { + throw new UiwsApiException(UiwsErrorCode.FILE_STORAGE_ERROR, "허용되지 않은 저장 경로입니다."); + } + Files.createDirectories(target.getParent()); + file.transferTo(target.toFile()); + } catch (IOException e) { + throw new UiwsApiException(UiwsErrorCode.FILE_STORAGE_ERROR); + } + return new StoredFile(original, relativePath, file.getSize()); + } + + public Path resolve(String relativePath) { + if (relativePath == null || relativePath.isBlank()) { + throw new UiwsApiException(UiwsErrorCode.ATTACH_NOT_FOUND); + } + Path root = Paths.get(properties.getUpload().getUploadDir()).toAbsolutePath().normalize(); + Path target = root.resolve(relativePath).normalize(); + if (!target.startsWith(root)) { + throw new UiwsApiException(UiwsErrorCode.FILE_STORAGE_ERROR, "허용되지 않은 경로입니다."); + } + return target; + } + + public void delete(String relativePath) { + if (relativePath == null || relativePath.isBlank()) { + return; + } + try { + Path root = Paths.get(properties.getUpload().getUploadDir()).toAbsolutePath().normalize(); + Path target = root.resolve(relativePath).normalize(); + if (target.startsWith(root)) { + Files.deleteIfExists(target); + } + } catch (IOException ignore) { + // 물리파일 삭제 실패는 무시(메타 일관성 우선) + } + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/ScheduleService.java b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/ScheduleService.java new file mode 100644 index 0000000..b6c001e --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/schedule/service/ScheduleService.java @@ -0,0 +1,216 @@ +package com.zioinfo.signage.uiws.schedule.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsCurrentUser; +import com.zioinfo.signage.uiws.common.UiwsDataScope; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.schedule.dto.ScheduleDtos.*; +import com.zioinfo.signage.uiws.schedule.mapper.ScheduleMapper; +import com.zioinfo.signage.uiws.schedule.model.UiwsSchedule; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.DayOfWeek; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 일정(모듈 02) 서비스 — 원본 com.urp.uiws.schedule.service.ScheduleService 를 MyBatis 변환 이식. + * 달력(month/week/day)·전체목록·검색팝업·CRUD. 첨부 연계(attachmentIds). + */ +@Service +@RequiredArgsConstructor +public class ScheduleService { + + private static final String TYPE_PERSONAL = "PERSONAL"; + private static final String TYPE_DEPT = "DEPT"; + private static final DateTimeFormatter DT = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"); + + private final ScheduleMapper mapper; + private final AttachmentService attachmentService; + + @Transactional(readOnly = true) + public List calendar(String type, String view, LocalDate baseDate, String deptId) { + String t = normalizeType(type); + LocalDate base = (baseDate != null) ? baseDate : LocalDate.now(); + LocalDate[] range = computeRange(view, base); + LocalDateTime from = range[0].atStartOfDay(); + LocalDateTime to = range[1].atStartOfDay(); // 배타 상한 + + String ownerId = TYPE_PERSONAL.equals(t) ? UiwsCurrentUser.id() : null; + String deptFilter = TYPE_DEPT.equals(t) ? blankToNull(deptId) : null; + + return mapper.findInRange(from, to, t, ownerId, deptFilter).stream().map(this::toDto).toList(); + } + + @Transactional(readOnly = true) + public SchedulePage all(LocalDate fromDate, LocalDate toDate, String type, int page, int size) { + LocalDate to = (toDate != null) ? toDate : LocalDate.now(); + LocalDate from = (fromDate != null) ? fromDate : to.minusMonths(1); + String t = (type == null || type.isBlank()) ? null : normalizeType(type); + UiwsDataScope.Scope scope = UiwsDataScope.current(); + LocalDateTime f = from.atStartOfDay(); + LocalDateTime tt = to.plusDays(1).atStartOfDay(); + long total = mapper.countAll(f, tt, t, scope.all(), scope.ownerIds()); + List content = mapper.searchAll(f, tt, t, scope.all(), scope.ownerIds(), size, page * size) + .stream().map(this::toDto).toList(); + return new SchedulePage(content, total, page, size, totalPages(total, size)); + } + + @Transactional(readOnly = true) + public List search(String keyword) { + UiwsDataScope.Scope scope = UiwsDataScope.current(); + return mapper.searchPopup(blankToNull(keyword), scope.all(), scope.ownerIds()) + .stream().map(this::toDto).toList(); + } + + @Transactional + public ScheduleDto create(ScheduleSaveDto dto) { + String actor = UiwsCurrentUser.id(); + UiwsSchedule s = new UiwsSchedule(); + applySave(s, dto); + s.setOwnerId(actor); + s.setCreatedBy(actor); + s.setCreatedAt(LocalDateTime.now()); + mapper.insertSchedule(s); + attachmentService.link(AttachmentService.REF_SCHEDULE, s.getScheduleId(), dto.attachmentIds()); + return toDto(s); + } + + @Transactional(readOnly = true) + public ScheduleDetailDto detail(Long id) { + return toDetail(find(id)); + } + + @Transactional + public ScheduleDetailDto update(Long id, ScheduleSaveDto dto) { + String actor = UiwsCurrentUser.id(); + UiwsSchedule s = find(id); + applySave(s, dto); + s.setUpdatedBy(actor); + s.setUpdatedAt(LocalDateTime.now()); + mapper.updateSchedule(s); + attachmentService.link(AttachmentService.REF_SCHEDULE, s.getScheduleId(), dto.attachmentIds()); + return toDetail(s); + } + + @Transactional + public void delete(Long id) { + if (!mapper.existsScheduleById(id)) { + throw new UiwsApiException(UiwsErrorCode.SCHEDULE_NOT_FOUND); + } + attachmentService.deleteByRef(AttachmentService.REF_SCHEDULE, id); + mapper.deleteScheduleById(id); + } + + // ================================================================== helpers + + private void applySave(UiwsSchedule s, ScheduleSaveDto dto) { + LocalDateTime start = parseDateTime(dto.startDt()); + LocalDateTime end = parseDateTime(dto.endDt()); + if (end.isBefore(start)) { + throw new UiwsApiException(UiwsErrorCode.SCHEDULE_DT_INVALID, "종료 일시가 시작 일시보다 빠릅니다."); + } + s.setScheType(normalizeType(dto.scheType())); + s.setTitle(dto.title()); + s.setScheGubunCd(blankToNull(dto.scheGubunCd())); + s.setImportanceCd(blankToNull(dto.importanceCd())); + s.setStartDt(start); + s.setEndDt(end); + s.setContent(dto.content()); + s.setDeptId(blankToNull(dto.deptId())); + s.setChargerId(blankToNull(dto.chargerId())); + } + + private ScheduleDto toDto(UiwsSchedule s) { + return new ScheduleDto(s.getScheduleId(), s.getScheType(), s.getTitle(), + s.getScheGubunCd(), s.getImportanceCd(), fmt(s.getStartDt()), fmt(s.getEndDt()), + s.getOwnerId(), s.getDeptId()); + } + + private ScheduleDetailDto toDetail(UiwsSchedule s) { + String chargerNm = null; + if (s.getChargerId() != null) { + chargerNm = userNames(List.of(s.getChargerId())).getOrDefault(s.getChargerId(), s.getChargerId()); + } + List attachments = attachmentService.list(AttachmentService.REF_SCHEDULE, s.getScheduleId()); + return new ScheduleDetailDto(s.getScheduleId(), s.getScheType(), s.getTitle(), + s.getScheGubunCd(), s.getImportanceCd(), fmt(s.getStartDt()), fmt(s.getEndDt()), + s.getOwnerId(), s.getDeptId(), s.getContent(), s.getChargerId(), chargerNm, attachments); + } + + private UiwsSchedule find(Long id) { + UiwsSchedule s = mapper.findScheduleById(id); + if (s == null) { + throw new UiwsApiException(UiwsErrorCode.SCHEDULE_NOT_FOUND); + } + return s; + } + + private Map userNames(List ids) { + List clean = ids.stream().filter(s -> s != null && !s.isBlank()).distinct().toList(); + if (clean.isEmpty()) { + return Map.of(); + } + return mapper.findUserNames(clean).stream() + .collect(Collectors.toMap(r -> r.get("username"), r -> r.get("fullName"), (a, b) -> a)); + } + + private LocalDate[] computeRange(String view, LocalDate base) { + String v = (view == null || view.isBlank()) ? "month" : view.trim().toLowerCase(); + return switch (v) { + case "day" -> new LocalDate[]{base, base.plusDays(1)}; + case "week" -> { + LocalDate start = base.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + yield new LocalDate[]{start, start.plusWeeks(1)}; + } + case "month" -> { + LocalDate start = base.withDayOfMonth(1); + yield new LocalDate[]{start, start.plusMonths(1)}; + } + default -> throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, + "view 는 month/week/day 중 하나여야 합니다."); + }; + } + + private String normalizeType(String type) { + String t = (type == null) ? "" : type.trim().toUpperCase(); + if (!TYPE_PERSONAL.equals(t) && !TYPE_DEPT.equals(t)) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "type 은 PERSONAL/DEPT 중 하나여야 합니다."); + } + return t; + } + + private static int totalPages(long total, int size) { + return size <= 0 ? 0 : (int) ((total + size - 1) / size); + } + + private static String blankToNull(String s) { + return (s == null || s.isBlank()) ? null : s; + } + + private static String fmt(LocalDateTime dt) { + return dt != null ? dt.format(DT) : null; + } + + private static LocalDateTime parseDateTime(String s) { + if (s == null || s.isBlank()) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "일시 값이 비어 있습니다."); + } + try { + if (s.length() <= 10) { + return LocalDate.parse(s).atStartOfDay(); + } + return LocalDateTime.parse(s); + } catch (Exception e) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, + "일시 형식이 올바르지 않습니다(yyyy-MM-ddTHH:mm:ss)."); + } + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/stats/controller/StatsController.java b/backend/src/main/java/com/zioinfo/signage/uiws/stats/controller/StatsController.java new file mode 100644 index 0000000..6918099 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/stats/controller/StatsController.java @@ -0,0 +1,43 @@ +package com.zioinfo.signage.uiws.stats.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.stats.dto.StatsDtos.PivotResponse; +import com.zioinfo.signage.uiws.stats.service.StatsService; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDate; + +/** + * UIWS 이식 — 업무통계(모듈 04, 동적 컬럼 피벗). 인증 필수(/api/stats). + * prefix /api/stats 는 ERP 기존 라우트와 미충돌(확인). 원본 엔드포인트 보존. + */ +@RestController +@RequestMapping("/api/stats") +@RequiredArgsConstructor +public class StatsController { + + private final StatsService statsService; + + @GetMapping("/personal-work") + public ApiResponse personalWork( + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate, + @RequestParam(required = false) String deptId, + @RequestParam(required = false) String userId, + @RequestParam(required = false) Boolean showStatus, + @RequestParam(required = false) Boolean showType) { + return ApiResponse.ok(statsService.personalWork(fromDate, toDate, deptId, userId, showStatus, showType)); + } + + @GetMapping("/company-work") + public ApiResponse companyWork( + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate, + @RequestParam(required = false) String companyId, + @RequestParam(required = false) String userId, + @RequestParam(required = false) Boolean showType) { + return ApiResponse.ok(statsService.companyWork(fromDate, toDate, companyId, userId, showType)); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/stats/dto/StatsDtos.java b/backend/src/main/java/com/zioinfo/signage/uiws/stats/dto/StatsDtos.java new file mode 100644 index 0000000..6093346 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/stats/dto/StatsDtos.java @@ -0,0 +1,25 @@ +package com.zioinfo.signage.uiws.stats.dto; + +import java.util.List; +import java.util.Map; + +/** + * 근무현황 통계(모듈 04) 동적 컬럼 피벗 DTO. 원본 com.urp.uiws.stats.dto.* 이식. + */ +public final class StatsDtos { + + private StatsDtos() { + } + + /** 피벗 열 메타. 고정열 예 {key:"worker",label:"근무자"}; 동적열 예 {key:"company_본사",label:"본사"}. */ + public record PivotColumn(String key, String label) { + } + + /** 동적 컬럼 피벗 응답. { fixedColumns, dynamicColumns, rows } */ + public record PivotResponse( + List fixedColumns, + List dynamicColumns, + List> rows + ) { + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/stats/mapper/StatsMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/stats/mapper/StatsMapper.java new file mode 100644 index 0000000..9a2e962 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/stats/mapper/StatsMapper.java @@ -0,0 +1,36 @@ +package com.zioinfo.signage.uiws.stats.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.util.List; +import java.util.Map; + +/** + * 근무현황 피벗 집계 매퍼. 원본 StatsRepository(JdbcTemplate 네이티브) → MyBatis 변환 이식. + * + * silo 정합(코어 TB_USER/TB_COMPANY/TB_CODE 미이식): + * - 근무자 라벨: signage_user (writer_id=username 라벨). 미존재 시 writer_id 노출(COALESCE). + * - 근무처(company) 라벨: company_id 직접 사용(거래처 테이블 미이식). + * - 근무상태/근무유형 라벨: 코드값 직접 사용(공통코드 미이식). + * 결과는 long-form(그룹키 + cnt). 서비스가 동적 컬럼으로 피벗한다. + */ +@Mapper +public interface StatsMapper { + + /** 개인별: 행=근무자×근무상태×근무유형, 동적열 차원=근무처. 컬럼: worker, work_status, work_type, dyn, cnt. */ + List> personalWork(@Param("from") LocalDate from, + @Param("to") LocalDate to, + @Param("userId") String userId, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds); + + /** 업체별: 행=근무처×근무유형, 동적열 차원=근무자. 컬럼: company, work_type, dyn, cnt. */ + List> companyWork(@Param("from") LocalDate from, + @Param("to") LocalDate to, + @Param("companyId") String companyId, + @Param("userId") String userId, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/stats/service/StatsService.java b/backend/src/main/java/com/zioinfo/signage/uiws/stats/service/StatsService.java new file mode 100644 index 0000000..72b0384 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/stats/service/StatsService.java @@ -0,0 +1,165 @@ +package com.zioinfo.signage.uiws.stats.service; + +import com.zioinfo.signage.uiws.common.UiwsDataScope; +import com.zioinfo.signage.uiws.stats.dto.StatsDtos.PivotColumn; +import com.zioinfo.signage.uiws.stats.dto.StatsDtos.PivotResponse; +import com.zioinfo.signage.uiws.stats.mapper.StatsMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * 근무현황 통계(모듈 04) — 동적 컬럼 피벗 서비스. 원본 com.urp.uiws.stats.service.StatsService 이식. + * long-form 집계를 wide-form 으로 피벗. showStatus/showType 토글. 기본 조회기간 = 최근 1주일. + * 데이터 스코프(ADMIN=전체/그 외=본인)는 UiwsDataScope 로 silo 판정. + */ +@Service +@RequiredArgsConstructor +public class StatsService { + + /** 행 식별 키 구분자(데이터에 등장하지 않는 제어문자). */ + private static final char SEP = ''; + + private final StatsMapper mapper; + + @Transactional(readOnly = true) + public PivotResponse personalWork(LocalDate fromDate, LocalDate toDate, + String deptId, String userId, + Boolean showStatus, Boolean showType) { + LocalDate[] range = range(fromDate, toDate); + UiwsDataScope.Scope scope = UiwsDataScope.current(); + // deptId 는 코어 dept 미이식으로 silo 에서 무시(파라미터 호환만 유지). + List> agg = mapper.personalWork( + range[0], range[1], emptyToNull(userId), scope.all(), scope.ownerIds()); + + boolean status = !Boolean.FALSE.equals(showStatus); + boolean type = !Boolean.FALSE.equals(showType); + + List fixed = new ArrayList<>(); + fixed.add(new PivotColumn("worker", "근무자")); + if (status) { + fixed.add(new PivotColumn("workStatus", "근무상태")); + } + if (type) { + fixed.add(new PivotColumn("workType", "근무유형")); + } + + return pivot(agg, fixed, "company", + row -> rowKey(row, status, type), + row -> { + Map base = new LinkedHashMap<>(); + base.put("worker", str(row.get("worker"))); + if (status) { + base.put("workStatus", str(row.get("work_status"))); + } + if (type) { + base.put("workType", str(row.get("work_type"))); + } + return base; + }); + } + + @Transactional(readOnly = true) + public PivotResponse companyWork(LocalDate fromDate, LocalDate toDate, + String companyId, String userId, + Boolean showType) { + LocalDate[] range = range(fromDate, toDate); + UiwsDataScope.Scope scope = UiwsDataScope.current(); + List> agg = mapper.companyWork( + range[0], range[1], emptyToNull(companyId), emptyToNull(userId), scope.all(), scope.ownerIds()); + + boolean type = !Boolean.FALSE.equals(showType); + + List fixed = new ArrayList<>(); + fixed.add(new PivotColumn("company", "근무처")); + if (type) { + fixed.add(new PivotColumn("workType", "근무유형")); + } + + return pivot(agg, fixed, "worker", + row -> str(row.get("company")) + SEP + (type ? str(row.get("work_type")) : ""), + row -> { + Map base = new LinkedHashMap<>(); + base.put("company", str(row.get("company"))); + if (type) { + base.put("workType", str(row.get("work_type"))); + } + return base; + }); + } + + // ================================================================== 피벗 공통 + + private interface RowKeyFn { + String key(Map row); + } + + private interface BaseFn { + Map base(Map row); + } + + private PivotResponse pivot(List> agg, List fixed, + String dynPrefix, RowKeyFn keyFn, BaseFn baseFn) { + Map dynCols = new LinkedHashMap<>(); + Map> rowMap = new LinkedHashMap<>(); + + for (Map r : agg) { + String dynLabel = str(r.get("dyn")); + String dynKey = dynPrefix + "_" + dynLabel; + dynCols.putIfAbsent(dynKey, new PivotColumn(dynKey, dynLabel)); + + String rk = keyFn.key(r); + Map row = rowMap.computeIfAbsent(rk, k -> baseFn.base(r)); + long cnt = toLong(r.get("cnt")); + row.merge(dynKey, cnt, (a, b) -> toLong(a) + toLong(b)); + } + + List dynamic = new ArrayList<>(dynCols.values()); + List> rows = new ArrayList<>(); + for (Map row : rowMap.values()) { + for (PivotColumn dc : dynamic) { + row.putIfAbsent(dc.key(), 0L); + } + rows.add(row); + } + return new PivotResponse(fixed, dynamic, rows); + } + + private String rowKey(Map row, boolean status, boolean type) { + StringBuilder sb = new StringBuilder(str(row.get("worker"))); + if (status) { + sb.append(SEP).append(str(row.get("work_status"))); + } + if (type) { + sb.append(SEP).append(str(row.get("work_type"))); + } + return sb.toString(); + } + + private LocalDate[] range(LocalDate fromDate, LocalDate toDate) { + LocalDate to = (toDate != null) ? toDate : LocalDate.now(); + LocalDate from = (fromDate != null) ? fromDate : to.minusWeeks(1); + return new LocalDate[]{from, to}; + } + + private static String emptyToNull(String s) { + return (s == null || s.isBlank()) ? null : s; + } + + private static String str(Object o) { + return o == null ? "" : o.toString(); + } + + private static long toLong(Object o) { + if (o == null) { + return 0L; + } + return (o instanceof Number n) ? n.longValue() : Long.parseLong(o.toString()); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/CodeController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/CodeController.java new file mode 100644 index 0000000..8da8bde --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/CodeController.java @@ -0,0 +1,58 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.CodeGrpDetailDto; +import com.zioinfo.signage.uiws.system.dto.CodeGrpDto; +import com.zioinfo.signage.uiws.system.dto.CodeGrpSaveDto; +import com.zioinfo.signage.uiws.system.dto.CodeValueDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.service.CodeService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** 2.7 코드(codes) — 그룹목록/상세/CRUD/드롭다운값. base: /api/system/codes */ +@RestController +@RequestMapping("/api/system/codes") +@RequiredArgsConstructor +public class CodeController { + + private final CodeService codeService; + + @GetMapping + public ApiResponse> listGroups( + @RequestParam(required = false) String keyword, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(codeService.listGroups(keyword, page, size)); + } + + /** 드롭다운 공용 코드값 조회(정적 경로 우선). */ + @GetMapping("/group/{grpCd}/values") + public ApiResponse> getValues(@PathVariable("grpCd") String grpCd) { + return ApiResponse.ok(codeService.getValues(grpCd)); + } + + @GetMapping("/{grpCd}") + public ApiResponse getGroup(@PathVariable("grpCd") String grpCd) { + return ApiResponse.ok(codeService.getGroup(grpCd)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody CodeGrpSaveDto dto) { + return ApiResponse.ok(codeService.create(dto)); + } + + @PutMapping("/{grpCd}") + public ApiResponse update(@PathVariable("grpCd") String grpCd, @Valid @RequestBody CodeGrpSaveDto dto) { + return ApiResponse.ok(codeService.update(grpCd, dto)); + } + + @DeleteMapping("/{grpCd}") + public ApiResponse delete(@PathVariable("grpCd") String grpCd) { + codeService.delete(grpCd); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/CompanyController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/CompanyController.java new file mode 100644 index 0000000..10f05c8 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/CompanyController.java @@ -0,0 +1,56 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.CompanyDto; +import com.zioinfo.signage.uiws.system.dto.CompanySaveDto; +import com.zioinfo.signage.uiws.system.dto.IdsRequest; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.service.CompanyService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** 2.4 거래처(companies) — 목록/검색팝업/CRUD/다중삭제. base: /api/system/companies */ +@RestController +@RequestMapping("/api/system/companies") +@RequiredArgsConstructor +public class CompanyController { + + private final CompanyService companyService; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String keyword, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(companyService.list(keyword, page, size)); + } + + @GetMapping("/search") + public ApiResponse> search(@RequestParam(required = false) String keyword) { + return ApiResponse.ok(companyService.searchPopup(keyword)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody CompanySaveDto dto) { + return ApiResponse.ok(companyService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable("id") String id) { + return ApiResponse.ok(companyService.get(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") String id, @Valid @RequestBody CompanySaveDto dto) { + return ApiResponse.ok(companyService.update(id, dto)); + } + + @DeleteMapping + public ApiResponse delete(@Valid @RequestBody IdsRequest req) { + companyService.delete(req.ids()); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/DeptController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/DeptController.java new file mode 100644 index 0000000..356b416 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/DeptController.java @@ -0,0 +1,61 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.DeptDto; +import com.zioinfo.signage.uiws.system.dto.DeptSaveDto; +import com.zioinfo.signage.uiws.system.dto.DeptTreeDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.service.DeptService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** 2.3 부서(depts) — 목록/검색팝업/트리/CRUD. base: /api/system/depts */ +@RestController +@RequestMapping("/api/system/depts") +@RequiredArgsConstructor +public class DeptController { + + private final DeptService deptService; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String keyword, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(deptService.list(keyword, page, size)); + } + + @GetMapping("/search") + public ApiResponse> search(@RequestParam(required = false) String keyword) { + return ApiResponse.ok(deptService.searchPopup(keyword)); + } + + @GetMapping("/tree") + public ApiResponse> tree() { + return ApiResponse.ok(deptService.tree()); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody DeptSaveDto dto) { + return ApiResponse.ok(deptService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable("id") String id) { + return ApiResponse.ok(deptService.get(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") String id, @Valid @RequestBody DeptSaveDto dto) { + return ApiResponse.ok(deptService.update(id, dto)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable("id") String id) { + deptService.delete(id); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/DeptRoleController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/DeptRoleController.java new file mode 100644 index 0000000..1aa56c6 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/DeptRoleController.java @@ -0,0 +1,39 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.DeptUserRoleDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.RoleIdsRequest; +import com.zioinfo.signage.uiws.system.service.DeptRoleService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** 2.2 부서권한(dept-role) — 부서 사용자+권한 조회 / 부여 / 삭제. base: /api/system/depts/{deptId}/roles */ +@RestController +@RequestMapping("/api/system/depts/{deptId}/roles") +@RequiredArgsConstructor +public class DeptRoleController { + + private final DeptRoleService deptRoleService; + + @GetMapping + public ApiResponse> list( + @PathVariable("deptId") String deptId, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(deptRoleService.listDeptUsers(deptId, page, size)); + } + + @PostMapping + public ApiResponse grant(@PathVariable("deptId") String deptId, @Valid @RequestBody RoleIdsRequest req) { + deptRoleService.grant(deptId, req.roleIds()); + return ApiResponse.ok(null); + } + + @DeleteMapping + public ApiResponse revoke(@PathVariable("deptId") String deptId, @Valid @RequestBody RoleIdsRequest req) { + deptRoleService.revoke(deptId, req.roleIds()); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/MenuController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/MenuController.java new file mode 100644 index 0000000..a77774a --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/MenuController.java @@ -0,0 +1,55 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.IdsRequest; +import com.zioinfo.signage.uiws.system.dto.MenuDto; +import com.zioinfo.signage.uiws.system.dto.MenuSaveDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.service.MenuService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** 2.9 메뉴(menus) — 트리목록/검색/CRUD/다중삭제. base: /api/system/menus */ +@RestController +@RequestMapping("/api/system/menus") +@RequiredArgsConstructor +public class MenuController { + + private final MenuService menuService; + + @GetMapping + public ApiResponse> list( + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "100") int size) { + return ApiResponse.ok(menuService.list(page, size)); + } + + @GetMapping("/search") + public ApiResponse> search(@RequestParam(required = false) String keyword) { + return ApiResponse.ok(menuService.searchPopup(keyword)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody MenuSaveDto dto) { + return ApiResponse.ok(menuService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable("id") String id) { + return ApiResponse.ok(menuService.get(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") String id, @Valid @RequestBody MenuSaveDto dto) { + return ApiResponse.ok(menuService.update(id, dto)); + } + + @DeleteMapping + public ApiResponse delete(@Valid @RequestBody IdsRequest req) { + menuService.delete(req.ids()); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/ProgramController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/ProgramController.java new file mode 100644 index 0000000..1fa5583 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/ProgramController.java @@ -0,0 +1,57 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.IdsRequest; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.ProgramDto; +import com.zioinfo.signage.uiws.system.dto.ProgramSaveDto; +import com.zioinfo.signage.uiws.system.service.ProgramService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** 2.8 프로그램(programs) — 목록/검색/CRUD/다중삭제. base: /api/system/programs */ +@RestController +@RequestMapping("/api/system/programs") +@RequiredArgsConstructor +public class ProgramController { + + private final ProgramService programService; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String keyword, + @RequestParam(required = false) String programType, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(programService.list(keyword, programType, page, size)); + } + + @GetMapping("/search") + public ApiResponse> search(@RequestParam(required = false) String keyword) { + return ApiResponse.ok(programService.searchPopup(keyword)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody ProgramSaveDto dto) { + return ApiResponse.ok(programService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable("id") String id) { + return ApiResponse.ok(programService.get(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") String id, @Valid @RequestBody ProgramSaveDto dto) { + return ApiResponse.ok(programService.update(id, dto)); + } + + @DeleteMapping + public ApiResponse delete(@Valid @RequestBody IdsRequest req) { + programService.delete(req.ids()); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/PublicLookupController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/PublicLookupController.java new file mode 100644 index 0000000..456dff3 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/PublicLookupController.java @@ -0,0 +1,29 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.PublicCompanyDto; +import com.zioinfo.signage.uiws.system.dto.PublicDeptDto; +import com.zioinfo.signage.uiws.system.service.PublicLookupService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** 가입 화면(비인증) 공개 조회. base: /api/public/{depts,companies} */ +@RestController +@RequestMapping("/api/public") +@RequiredArgsConstructor +public class PublicLookupController { + + private final PublicLookupService publicLookupService; + + @GetMapping("/depts") + public ApiResponse> depts() { + return ApiResponse.ok(publicLookupService.depts()); + } + + @GetMapping("/companies") + public ApiResponse> companies() { + return ApiResponse.ok(publicLookupService.companies()); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/RoleController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/RoleController.java new file mode 100644 index 0000000..9e2409c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/RoleController.java @@ -0,0 +1,49 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.IdsRequest; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.RoleDto; +import com.zioinfo.signage.uiws.system.dto.RoleSaveDto; +import com.zioinfo.signage.uiws.system.service.RoleService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** 2.1 권한(roles) — 목록/등록/상세/수정/다중삭제. base: /api/system/roles */ +@RestController +@RequestMapping("/api/system/roles") +@RequiredArgsConstructor +public class RoleController { + + private final RoleService roleService; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String keyword, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(roleService.list(keyword, page, size)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody RoleSaveDto dto) { + return ApiResponse.ok(roleService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable("id") String id) { + return ApiResponse.ok(roleService.get(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") String id, @Valid @RequestBody RoleSaveDto dto) { + return ApiResponse.ok(roleService.update(id, dto)); + } + + @DeleteMapping + public ApiResponse delete(@Valid @RequestBody IdsRequest req) { + roleService.delete(req.ids()); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/RoleMenuController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/RoleMenuController.java new file mode 100644 index 0000000..dd2b860 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/RoleMenuController.java @@ -0,0 +1,39 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.RoleDto; +import com.zioinfo.signage.uiws.system.dto.RoleMenuDto; +import com.zioinfo.signage.uiws.system.dto.RoleMenuSaveRequest; +import com.zioinfo.signage.uiws.system.service.RoleMenuService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** 2.5 메뉴생성(role-menus) — 권한목록 / 권한별 메뉴매핑 조회·저장. */ +@RestController +@RequiredArgsConstructor +public class RoleMenuController { + + private final RoleMenuService roleMenuService; + + @GetMapping("/api/system/role-menus") + public ApiResponse> listRoles( + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(roleMenuService.listRoles(page, size)); + } + + @GetMapping("/api/system/roles/{roleId}/menus") + public ApiResponse> getRoleMenus(@PathVariable("roleId") String roleId) { + return ApiResponse.ok(roleMenuService.getRoleMenus(roleId)); + } + + @PutMapping("/api/system/roles/{roleId}/menus") + public ApiResponse saveRoleMenus(@PathVariable("roleId") String roleId, @Valid @RequestBody RoleMenuSaveRequest req) { + roleMenuService.saveRoleMenus(roleId, req.menus()); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/UserController.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/UserController.java new file mode 100644 index 0000000..1ea59a7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/controller/UserController.java @@ -0,0 +1,89 @@ +package com.zioinfo.signage.uiws.system.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.system.dto.CheckIdResponse; +import com.zioinfo.signage.uiws.system.dto.IdsRequest; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.UserDto; +import com.zioinfo.signage.uiws.system.dto.UserSaveDto; +import com.zioinfo.signage.uiws.system.service.UserService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** 2.6 사용자(users) — 목록/검색/중복ID확인/CRUD/다중삭제/비번초기화/잠금해제/승인. base: /api/system/users */ +@RestController +@RequestMapping("/api/system/users") +@RequiredArgsConstructor +public class UserController { + + private final UserService userService; + + @GetMapping + public ApiResponse> list( + @RequestParam(required = false) String keyword, + @RequestParam(required = false) String deptId, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(userService.list(keyword, deptId, page, size)); + } + + @GetMapping("/search") + public ApiResponse> search( + @RequestParam(required = false) String keyword, + @RequestParam(required = false) String deptId) { + return ApiResponse.ok(userService.searchPopup(keyword, deptId)); + } + + @GetMapping("/check-id") + public ApiResponse checkId(@RequestParam String userId) { + return ApiResponse.ok(userService.checkId(userId)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody UserSaveDto dto) { + return ApiResponse.ok(userService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse get(@PathVariable("id") String id) { + return ApiResponse.ok(userService.get(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") String id, @Valid @RequestBody UserSaveDto dto) { + return ApiResponse.ok(userService.update(id, dto)); + } + + @DeleteMapping + public ApiResponse delete(@Valid @RequestBody IdsRequest req) { + userService.delete(req.ids()); + return ApiResponse.ok(null); + } + + @PostMapping("/{id}/reset-pw") + public ApiResponse resetPassword(@PathVariable("id") String id) { + userService.resetPassword(id); + return ApiResponse.ok(null); + } + + @PostMapping("/{id}/unlock") + public ApiResponse unlock(@PathVariable("id") String id) { + userService.unlock(id); + return ApiResponse.ok(null); + } + + @PostMapping("/{id}/approve") + public ApiResponse approve(@PathVariable("id") String id) { + userService.approve(id); + return ApiResponse.ok(null); + } + + @PostMapping("/{id}/revoke-approval") + public ApiResponse revokeApproval(@PathVariable("id") String id) { + userService.revokeApproval(id); + return ApiResponse.ok(null); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CheckIdResponse.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CheckIdResponse.java new file mode 100644 index 0000000..3902ac5 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CheckIdResponse.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { available: boolean } */ +public record CheckIdResponse(boolean available) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpDetailDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpDetailDto.java new file mode 100644 index 0000000..078f0fd --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpDetailDto.java @@ -0,0 +1,6 @@ +package com.zioinfo.signage.uiws.system.dto; + +import java.util.List; + +/** { grpCd, grpNm, useYn, values: CodeValueDto[] } */ +public record CodeGrpDetailDto(String grpCd, String grpNm, String useYn, List values) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpDto.java new file mode 100644 index 0000000..1f89a18 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpDto.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { grpCd, grpNm, useYn } */ +public record CodeGrpDto(String grpCd, String grpNm, String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpSaveDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpSaveDto.java new file mode 100644 index 0000000..9a65fc8 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeGrpSaveDto.java @@ -0,0 +1,11 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.NotBlank; +import java.util.List; + +/** { grpCd, grpNm, useYn, values: CodeValueDto[] } */ +public record CodeGrpSaveDto( + @NotBlank(message = "grpCd는 필수입니다.") String grpCd, + @NotBlank(message = "grpNm은 필수입니다.") String grpNm, + @NotBlank(message = "useYn은 필수입니다.") String useYn, + List values) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeValueDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeValueDto.java new file mode 100644 index 0000000..8c59efa --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CodeValueDto.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { grpCd, codeVal, codeNm, sortOrd, useYn } */ +public record CodeValueDto(String grpCd, String codeVal, String codeNm, Integer sortOrd, String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CompanyDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CompanyDto.java new file mode 100644 index 0000000..a416b55 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CompanyDto.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { companyId, companyNm, bizNo, useYn } */ +public record CompanyDto(String companyId, String companyNm, String bizNo, String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CompanySaveDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CompanySaveDto.java new file mode 100644 index 0000000..68ca839 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/CompanySaveDto.java @@ -0,0 +1,10 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.NotBlank; + +/** { companyId, companyNm, bizNo, useYn } */ +public record CompanySaveDto( + String companyId, + @NotBlank(message = "companyNm은 필수입니다.") String companyNm, + String bizNo, + @NotBlank(message = "useYn은 필수입니다.") String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptDto.java new file mode 100644 index 0000000..cd93520 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptDto.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { deptId, deptNm, parentDeptId, sortOrd, useYn } */ +public record DeptDto(String deptId, String deptNm, String parentDeptId, Integer sortOrd, String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptSaveDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptSaveDto.java new file mode 100644 index 0000000..479437c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptSaveDto.java @@ -0,0 +1,11 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.NotBlank; + +/** { deptId, deptNm, parentDeptId, sortOrd, useYn } */ +public record DeptSaveDto( + String deptId, + @NotBlank(message = "deptNm은 필수입니다.") String deptNm, + String parentDeptId, + Integer sortOrd, + @NotBlank(message = "useYn은 필수입니다.") String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptTreeDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptTreeDto.java new file mode 100644 index 0000000..3837101 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptTreeDto.java @@ -0,0 +1,8 @@ +package com.zioinfo.signage.uiws.system.dto; + +import java.util.List; + +/** 부서 계층 트리 노드. children 은 sortOrd→deptId 순. */ +public record DeptTreeDto( + String deptId, String deptNm, String parentDeptId, + Integer sortOrd, String useYn, List children) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptUserRoleDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptUserRoleDto.java new file mode 100644 index 0000000..dbc2afb --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/DeptUserRoleDto.java @@ -0,0 +1,6 @@ +package com.zioinfo.signage.uiws.system.dto; + +import java.util.List; + +/** { userId, userNm, roleIds } — 부서 사용자별 부여 권한. */ +public record DeptUserRoleDto(String userId, String userNm, List roleIds) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/IdsRequest.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/IdsRequest.java new file mode 100644 index 0000000..297656c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/IdsRequest.java @@ -0,0 +1,7 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.NotEmpty; +import java.util.List; + +/** 다중삭제 공통 본문: { ids: string[] } */ +public record IdsRequest(@NotEmpty(message = "ids는 필수입니다.") List ids) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/MenuDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/MenuDto.java new file mode 100644 index 0000000..3c19781 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/MenuDto.java @@ -0,0 +1,6 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { menuId, menuNm, parentMenuId, programId, menuUrl, sortOrd, useYn } */ +public record MenuDto( + String menuId, String menuNm, String parentMenuId, String programId, + String menuUrl, Integer sortOrd, String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/MenuSaveDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/MenuSaveDto.java new file mode 100644 index 0000000..b6ae1c9 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/MenuSaveDto.java @@ -0,0 +1,10 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.NotBlank; + +/** { menuId, menuNm, parentMenuId, programId, menuUrl, sortOrd, useYn } */ +public record MenuSaveDto( + String menuId, + @NotBlank(message = "menuNm은 필수입니다.") String menuNm, + String parentMenuId, String programId, String menuUrl, Integer sortOrd, + @NotBlank(message = "useYn은 필수입니다.") String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PageResponse.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PageResponse.java new file mode 100644 index 0000000..f30930b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PageResponse.java @@ -0,0 +1,18 @@ +package com.zioinfo.signage.uiws.system.dto; + +import java.util.List; + +/** + * UIWS system 이식용 페이지 응답 봉투. 원본 com.urp.uiws.common.response.PageResponse 대체. + * MyBatis 기반(Spring Data Page 부재)이므로 content + total + page + size 를 직접 담는다. + */ +public record PageResponse( + List content, + long total, + int page, + int size +) { + public static PageResponse of(List content, long total, int page, int size) { + return new PageResponse<>(content, total, page, size); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/ProgramDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/ProgramDto.java new file mode 100644 index 0000000..0187a7d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/ProgramDto.java @@ -0,0 +1,6 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { programId, programNm, programType, programUrl, category, useYn } */ +public record ProgramDto( + String programId, String programNm, String programType, + String programUrl, String category, String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/ProgramSaveDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/ProgramSaveDto.java new file mode 100644 index 0000000..6543baa --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/ProgramSaveDto.java @@ -0,0 +1,11 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.NotBlank; + +/** { programId, programNm, programType, programUrl, category, useYn } */ +public record ProgramSaveDto( + @NotBlank(message = "programId는 필수입니다.") String programId, + @NotBlank(message = "programNm은 필수입니다.") String programNm, + @NotBlank(message = "programType은 필수입니다.") String programType, + String programUrl, String category, + @NotBlank(message = "useYn은 필수입니다.") String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PublicCompanyDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PublicCompanyDto.java new file mode 100644 index 0000000..58c1ed7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PublicCompanyDto.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** 가입 화면 공개 조회용 거래처: { companyId, companyNm } */ +public record PublicCompanyDto(String companyId, String companyNm) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PublicDeptDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PublicDeptDto.java new file mode 100644 index 0000000..64de1b1 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/PublicDeptDto.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** 가입 화면 공개 조회용 부서: { deptId, deptNm } */ +public record PublicDeptDto(String deptId, String deptNm) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleDto.java new file mode 100644 index 0000000..ee95895 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleDto.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { roleId, roleNm, roleDesc, useYn } */ +public record RoleDto(String roleId, String roleNm, String roleDesc, String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleIdsRequest.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleIdsRequest.java new file mode 100644 index 0000000..03dd12b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleIdsRequest.java @@ -0,0 +1,7 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.NotEmpty; +import java.util.List; + +/** 부서권한 부여/삭제 본문: { roleIds: string[] } */ +public record RoleIdsRequest(@NotEmpty(message = "roleIds는 필수입니다.") List roleIds) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleMenuDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleMenuDto.java new file mode 100644 index 0000000..d4940af --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleMenuDto.java @@ -0,0 +1,4 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** { menuId, menuNm, readYn, writeYn } */ +public record RoleMenuDto(String menuId, String menuNm, String readYn, String writeYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleMenuSaveRequest.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleMenuSaveRequest.java new file mode 100644 index 0000000..668f0bb --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleMenuSaveRequest.java @@ -0,0 +1,6 @@ +package com.zioinfo.signage.uiws.system.dto; + +import java.util.List; + +/** 권한별 메뉴 매핑 저장 본문: { menus: RoleMenuDto[] } */ +public record RoleMenuSaveRequest(List menus) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleSaveDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleSaveDto.java new file mode 100644 index 0000000..e032116 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/RoleSaveDto.java @@ -0,0 +1,10 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.NotBlank; + +/** { roleId, roleNm, roleDesc, useYn } */ +public record RoleSaveDto( + String roleId, + @NotBlank(message = "roleNm은 필수입니다.") String roleNm, + String roleDesc, + @NotBlank(message = "useYn은 필수입니다.") String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/UserDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/UserDto.java new file mode 100644 index 0000000..e3f7cd4 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/UserDto.java @@ -0,0 +1,7 @@ +package com.zioinfo.signage.uiws.system.dto; + +/** 사용자 조회 DTO(비밀번호 제외 — 절대 노출 금지). */ +public record UserDto( + String userId, String userNm, String email, String gradeCd, + String deptId, String deptNm, String companyId, String companyNm, + String roleCd, String naverworksId, String lockYn, String useYn, String approvalYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/UserSaveDto.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/UserSaveDto.java new file mode 100644 index 0000000..ff0eb3e --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/dto/UserSaveDto.java @@ -0,0 +1,13 @@ +package com.zioinfo.signage.uiws.system.dto; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; + +/** roleCd = USER/MANAGER/ADMIN (null → USER). 시스템관리(ADMIN 전용)에서만 설정. */ +public record UserSaveDto( + @NotBlank(message = "userId는 필수입니다.") String userId, + @NotBlank(message = "userNm은 필수입니다.") String userNm, + String password, + @NotBlank(message = "email은 필수입니다.") @Email(message = "email 형식이 올바르지 않습니다.") String email, + String gradeCd, String deptId, String companyId, String roleCd, String naverworksId, + @NotBlank(message = "useYn은 필수입니다.") String useYn) {} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/CodeMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/CodeMapper.java new file mode 100644 index 0000000..369b7d9 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/CodeMapper.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 공통코드 그룹/값(tb_uiws_code_grp, tb_uiws_code) 매퍼. 원본 CodeGrpRepository/CodeRepository 변환. */ +@Mapper +public interface CodeMapper { + List searchGroups(@Param("keyword") String keyword, + @Param("offset") int offset, @Param("size") int size); + long countGroups(@Param("keyword") String keyword); + SysCodeGrp findGroupById(@Param("grpCd") String grpCd); + boolean groupExists(@Param("grpCd") String grpCd); + int insertGroup(SysCodeGrp grp); + int updateGroup(SysCodeGrp grp); + int deleteGroup(@Param("grpCd") String grpCd); + List findValuesByGrp(@Param("grpCd") String grpCd); + List findActiveValuesByGrp(@Param("grpCd") String grpCd); + int insertValue(SysCode code); + int deleteValuesByGrp(@Param("grpCd") String grpCd); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/CompanyMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/CompanyMapper.java new file mode 100644 index 0000000..294d574 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/CompanyMapper.java @@ -0,0 +1,22 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 거래처(tb_uiws_company) 매퍼. 원본 CompanyRepository 변환. */ +@Mapper +public interface CompanyMapper { + List search(@Param("keyword") String keyword, + @Param("offset") int offset, @Param("size") int size); + long countSearch(@Param("keyword") String keyword); + List searchActive(@Param("keyword") String keyword); + List findActiveOrdered(); + List findAll(); + SysCompany findById(@Param("companyId") String companyId); + boolean existsById(@Param("companyId") String companyId); + int insert(SysCompany company); + int update(SysCompany company); + int deleteById(@Param("companyId") String companyId); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/DeptMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/DeptMapper.java new file mode 100644 index 0000000..96ec0dd --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/DeptMapper.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 부서(tb_uiws_dept) 매퍼. 원본 DeptRepository 변환. */ +@Mapper +public interface DeptMapper { + List search(@Param("keyword") String keyword, + @Param("offset") int offset, @Param("size") int size); + long countSearch(@Param("keyword") String keyword); + List searchActive(@Param("keyword") String keyword); + List findActiveOrdered(); + List findAll(); + SysDept findById(@Param("deptId") String deptId); + boolean existsById(@Param("deptId") String deptId); + boolean existsByParentDeptId(@Param("parentDeptId") String parentDeptId); + int insert(SysDept dept); + int update(SysDept dept); + int deleteById(@Param("deptId") String deptId); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/DeptRoleMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/DeptRoleMapper.java new file mode 100644 index 0000000..946ef6d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/DeptRoleMapper.java @@ -0,0 +1,16 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 부서-권한 매핑(tb_uiws_dept_role) 매퍼. 원본 DeptRoleRepository 변환. */ +@Mapper +public interface DeptRoleMapper { + List findRoleIdsByDeptId(@Param("deptId") String deptId); + boolean exists(@Param("deptId") String deptId, @Param("roleId") String roleId); + boolean existsByRoleId(@Param("roleId") String roleId); + int insert(@Param("deptId") String deptId, @Param("roleId") String roleId, @Param("actor") String actor); + int delete(@Param("deptId") String deptId, @Param("roleId") String roleId); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/MenuMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/MenuMapper.java new file mode 100644 index 0000000..71989ac --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/MenuMapper.java @@ -0,0 +1,22 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 메뉴(tb_uiws_menu) 매퍼. 원본 SysMenuRepository 변환. */ +@Mapper +public interface MenuMapper { + List searchAll(@Param("offset") int offset, @Param("size") int size); + long countAll(); + List search(@Param("keyword") String keyword); + List findAllOrdered(); + SysMenu findById(@Param("menuId") String menuId); + boolean existsById(@Param("menuId") String menuId); + boolean existsByParentMenuId(@Param("parentMenuId") String parentMenuId); + boolean existsByProgramId(@Param("programId") String programId); + int insert(SysMenu menu); + int update(SysMenu menu); + int deleteById(@Param("menuId") String menuId); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/ProgramMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/ProgramMapper.java new file mode 100644 index 0000000..662c444 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/ProgramMapper.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 프로그램(tb_uiws_program) 매퍼. 원본 ProgramRepository 변환. */ +@Mapper +public interface ProgramMapper { + List search(@Param("keyword") String keyword, @Param("programType") String programType, + @Param("offset") int offset, @Param("size") int size); + long countSearch(@Param("keyword") String keyword, @Param("programType") String programType); + List searchActive(@Param("keyword") String keyword); + SysProgram findById(@Param("programId") String programId); + boolean existsById(@Param("programId") String programId); + int insert(SysProgram program); + int update(SysProgram program); + int deleteById(@Param("programId") String programId); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/RoleMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/RoleMapper.java new file mode 100644 index 0000000..3d96fc4 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/RoleMapper.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 권한(tb_uiws_role) 매퍼. 원본 RoleRepository 변환. */ +@Mapper +public interface RoleMapper { + List search(@Param("keyword") String keyword, + @Param("offset") int offset, @Param("size") int size); + long countSearch(@Param("keyword") String keyword); + SysRole findById(@Param("roleId") String roleId); + boolean existsById(@Param("roleId") String roleId); + int insert(SysRole role); + int update(SysRole role); + int deleteById(@Param("roleId") String roleId); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/RoleMenuMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/RoleMenuMapper.java new file mode 100644 index 0000000..66d67b9 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/RoleMenuMapper.java @@ -0,0 +1,15 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 권한-메뉴 매핑(tb_uiws_role_menu) 매퍼. 원본 RoleMenuRepository 변환. */ +@Mapper +public interface RoleMenuMapper { + List findByRoleId(@Param("roleId") String roleId); + boolean existsByMenuId(@Param("menuId") String menuId); + int insert(SysRoleMenu rm); + int deleteByRoleId(@Param("roleId") String roleId); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/SysUserMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/SysUserMapper.java new file mode 100644 index 0000000..36bab00 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/mapper/SysUserMapper.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.uiws.system.mapper; + +import com.zioinfo.signage.uiws.system.model.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** 업무 사용자(tb_uiws_sys_user) 매퍼. 원본 SysUserRepository 변환. */ +@Mapper +public interface SysUserMapper { + List search(@Param("keyword") String keyword, @Param("deptId") String deptId, + @Param("offset") int offset, @Param("size") int size); + long countSearch(@Param("keyword") String keyword, @Param("deptId") String deptId); + List searchActive(@Param("keyword") String keyword, @Param("deptId") String deptId); + List findByDeptId(@Param("deptId") String deptId); + SysUser findById(@Param("userId") String userId); + boolean existsById(@Param("userId") String userId); + int insert(SysUser user); + int update(SysUser user); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCode.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCode.java new file mode 100644 index 0000000..ff0518c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCode.java @@ -0,0 +1,18 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 공통코드 값 (tb_uiws_code, 복합 PK grp_cd+code_val). 원본 com.urp.uiws.domain.Code 이식. */ +@Data +public class SysCode { + private String grpCd; + private String codeVal; + private String codeNm; + private Integer sortOrd; + private String useYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCodeGrp.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCodeGrp.java new file mode 100644 index 0000000..59b59cf --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCodeGrp.java @@ -0,0 +1,16 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 공통코드 그룹 (tb_uiws_code_grp). 원본 com.urp.uiws.domain.CodeGrp 이식. */ +@Data +public class SysCodeGrp { + private String grpCd; + private String grpNm; + private String useYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCompany.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCompany.java new file mode 100644 index 0000000..258e2d7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysCompany.java @@ -0,0 +1,17 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 거래처(=근무처) (tb_uiws_company). 원본 com.urp.uiws.domain.Company 이식. */ +@Data +public class SysCompany { + private String companyId; + private String companyNm; + private String bizNo; + private String useYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysDept.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysDept.java new file mode 100644 index 0000000..8426fc4 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysDept.java @@ -0,0 +1,18 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 부서 (tb_uiws_dept). 원본 com.urp.uiws.domain.Dept 이식. */ +@Data +public class SysDept { + private String deptId; + private String deptNm; + private String parentDeptId; + private Integer sortOrd; + private String useYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysMenu.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysMenu.java new file mode 100644 index 0000000..7450524 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysMenu.java @@ -0,0 +1,20 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 메뉴 (tb_uiws_menu, 2-depth 자기참조). 원본 com.urp.uiws.domain.Menu 이식. */ +@Data +public class SysMenu { + private String menuId; + private String menuNm; + private String parentMenuId; + private String programId; + private String menuUrl; + private Integer sortOrd; + private String useYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysProgram.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysProgram.java new file mode 100644 index 0000000..ad8649e --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysProgram.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 프로그램(화면) (tb_uiws_program). 원본 com.urp.uiws.domain.Program 이식. */ +@Data +public class SysProgram { + private String programId; + private String programNm; + private String programType; // FORM | POPUP + private String programUrl; + private String category; + private String useYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysRole.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysRole.java new file mode 100644 index 0000000..6b293ac --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysRole.java @@ -0,0 +1,17 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 권한(역할) (tb_uiws_role). 원본 com.urp.uiws.domain.Role 이식. */ +@Data +public class SysRole { + private String roleId; + private String roleNm; + private String roleDesc; + private String useYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysRoleMenu.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysRoleMenu.java new file mode 100644 index 0000000..7508d48 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysRoleMenu.java @@ -0,0 +1,17 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 권한-메뉴 매핑 (tb_uiws_role_menu, 복합 PK). 원본 com.urp.uiws.domain.RoleMenu 이식. */ +@Data +public class SysRoleMenu { + private String roleId; + private String menuId; + private String readYn; + private String writeYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysUser.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysUser.java new file mode 100644 index 0000000..98eaa2c --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/model/SysUser.java @@ -0,0 +1,29 @@ +package com.zioinfo.signage.uiws.system.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 업무 사용자 (tb_uiws_sys_user). 원본 com.urp.uiws.domain.User 이식. password 는 BCrypt. */ +@Data +public class SysUser { + private String userId; + private String userNm; + private String password; + private String email; + private String gradeCd; + private String deptId; + private String companyId; + private String roleCd; // USER | MANAGER | ADMIN + private String naverworksId; + private Integer loginFailCnt; + private String lockYn; + private String useYn; + private String approvalYn; + private String verifyMethod; + private String otpSecret; + private String pwChangeYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/CodeService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/CodeService.java new file mode 100644 index 0000000..ad489d3 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/CodeService.java @@ -0,0 +1,119 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.system.dto.CodeGrpDetailDto; +import com.zioinfo.signage.uiws.system.dto.CodeGrpDto; +import com.zioinfo.signage.uiws.system.dto.CodeGrpSaveDto; +import com.zioinfo.signage.uiws.system.dto.CodeValueDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.mapper.CodeMapper; +import com.zioinfo.signage.uiws.system.model.SysCode; +import com.zioinfo.signage.uiws.system.model.SysCodeGrp; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 2.7 코드(codes). 그룹 + 값 복합 관리. 그룹 수정/등록 시 값 목록 전체 치환. + * 사용중(use_yn='Y') 코드값이 있으면 그룹 삭제 차단. + */ +@Service +@RequiredArgsConstructor +public class CodeService { + + private final CodeMapper codeMapper; + + @Transactional(readOnly = true) + public PageResponse listGroups(String keyword, int page, int size) { + List content = codeMapper.searchGroups(keyword, page * size, size).stream() + .map(g -> new CodeGrpDto(g.getGrpCd(), g.getGrpNm(), g.getUseYn())).toList(); + return PageResponse.of(content, codeMapper.countGroups(keyword), page, size); + } + + @Transactional(readOnly = true) + public CodeGrpDetailDto getGroup(String grpCd) { + return toDetail(findGrp(grpCd)); + } + + @Transactional(readOnly = true) + public List getValues(String grpCd) { + return codeMapper.findActiveValuesByGrp(grpCd).stream().map(this::toValue).toList(); + } + + @Transactional + public CodeGrpDetailDto create(CodeGrpSaveDto dto) { + if (codeMapper.groupExists(dto.grpCd())) { + throw new UiwsApiException(UiwsErrorCode.DUPLICATE_KEY, "이미 존재하는 코드그룹입니다."); + } + SysCodeGrp grp = new SysCodeGrp(); + grp.setGrpCd(dto.grpCd()); + grp.setGrpNm(dto.grpNm()); + grp.setUseYn(dto.useYn()); + grp.setCreatedBy(SysActor.id()); + codeMapper.insertGroup(grp); + replaceValues(dto.grpCd(), dto.values()); + return toDetail(findGrp(dto.grpCd())); + } + + @Transactional + public CodeGrpDetailDto update(String grpCd, CodeGrpSaveDto dto) { + SysCodeGrp grp = findGrp(grpCd); + grp.setGrpNm(dto.grpNm()); + grp.setUseYn(dto.useYn()); + grp.setUpdatedBy(SysActor.id()); + codeMapper.updateGroup(grp); + codeMapper.deleteValuesByGrp(grpCd); + replaceValues(grpCd, dto.values()); + return toDetail(findGrp(grpCd)); + } + + @Transactional + public void delete(String grpCd) { + findGrp(grpCd); + boolean inUse = codeMapper.findValuesByGrp(grpCd).stream().anyMatch(c -> "Y".equals(c.getUseYn())); + if (inUse) { + throw new UiwsApiException(UiwsErrorCode.RESOURCE_IN_USE, + "사용중인 코드값이 존재하여 코드그룹을 삭제할 수 없습니다."); + } + codeMapper.deleteValuesByGrp(grpCd); + codeMapper.deleteGroup(grpCd); + } + + private void replaceValues(String grpCd, List values) { + if (values == null) { + return; + } + String actor = SysActor.id(); + for (CodeValueDto v : values) { + SysCode code = new SysCode(); + code.setGrpCd(grpCd); + code.setCodeVal(v.codeVal()); + code.setCodeNm(v.codeNm()); + code.setSortOrd(v.sortOrd() == null ? 0 : v.sortOrd()); + code.setUseYn(v.useYn() == null ? "Y" : v.useYn()); + code.setCreatedBy(actor); + codeMapper.insertValue(code); + } + } + + private CodeGrpDetailDto toDetail(SysCodeGrp grp) { + List values = codeMapper.findValuesByGrp(grp.getGrpCd()).stream().map(this::toValue).toList(); + return new CodeGrpDetailDto(grp.getGrpCd(), grp.getGrpNm(), grp.getUseYn(), values); + } + + private CodeValueDto toValue(SysCode c) { + return new CodeValueDto(c.getGrpCd(), c.getCodeVal(), c.getCodeNm(), + c.getSortOrd() == null ? 0 : c.getSortOrd(), c.getUseYn()); + } + + private SysCodeGrp findGrp(String grpCd) { + SysCodeGrp g = codeMapper.findGroupById(grpCd); + if (g == null) { + throw new UiwsApiException(UiwsErrorCode.CODE_GRP_NOT_FOUND); + } + return g; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/CompanyService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/CompanyService.java new file mode 100644 index 0000000..ecbab86 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/CompanyService.java @@ -0,0 +1,89 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.system.dto.CompanyDto; +import com.zioinfo.signage.uiws.system.dto.CompanySaveDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.mapper.CompanyMapper; +import com.zioinfo.signage.uiws.system.model.SysCompany; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** 2.4 거래처(companies) CRUD + 검색팝업 + 다중삭제. */ +@Service +@RequiredArgsConstructor +public class CompanyService { + + private final CompanyMapper companyMapper; + + @Transactional(readOnly = true) + public PageResponse list(String keyword, int page, int size) { + List content = companyMapper.search(keyword, page * size, size).stream().map(this::toDto).toList(); + return PageResponse.of(content, companyMapper.countSearch(keyword), page, size); + } + + @Transactional(readOnly = true) + public List searchPopup(String keyword) { + return companyMapper.searchActive(keyword).stream().map(this::toDto).toList(); + } + + @Transactional(readOnly = true) + public CompanyDto get(String companyId) { + return toDto(find(companyId)); + } + + @Transactional + public CompanyDto create(CompanySaveDto dto) { + if (dto.companyId() == null || dto.companyId().isBlank()) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "companyId는 등록 시 필수입니다."); + } + if (companyMapper.existsById(dto.companyId())) { + throw new UiwsApiException(UiwsErrorCode.DUPLICATE_KEY, "이미 존재하는 거래처 ID입니다."); + } + SysCompany c = new SysCompany(); + c.setCompanyId(dto.companyId()); + c.setCompanyNm(dto.companyNm()); + c.setBizNo(dto.bizNo()); + c.setUseYn(dto.useYn()); + c.setCreatedBy(SysActor.id()); + companyMapper.insert(c); + return toDto(find(dto.companyId())); + } + + @Transactional + public CompanyDto update(String companyId, CompanySaveDto dto) { + SysCompany c = find(companyId); + c.setCompanyNm(dto.companyNm()); + c.setBizNo(dto.bizNo()); + c.setUseYn(dto.useYn()); + c.setUpdatedBy(SysActor.id()); + companyMapper.update(c); + return toDto(find(companyId)); + } + + @Transactional + public void delete(List ids) { + for (String id : ids) { + if (!companyMapper.existsById(id)) { + throw new UiwsApiException(UiwsErrorCode.COMPANY_NOT_FOUND); + } + companyMapper.deleteById(id); + } + } + + private CompanyDto toDto(SysCompany c) { + return new CompanyDto(c.getCompanyId(), c.getCompanyNm(), c.getBizNo(), c.getUseYn()); + } + + private SysCompany find(String companyId) { + SysCompany c = companyMapper.findById(companyId); + if (c == null) { + throw new UiwsApiException(UiwsErrorCode.COMPANY_NOT_FOUND); + } + return c; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/DeptRoleService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/DeptRoleService.java new file mode 100644 index 0000000..325f93a --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/DeptRoleService.java @@ -0,0 +1,61 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.system.dto.DeptUserRoleDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.mapper.DeptMapper; +import com.zioinfo.signage.uiws.system.mapper.DeptRoleMapper; +import com.zioinfo.signage.uiws.system.mapper.SysUserMapper; +import com.zioinfo.signage.uiws.system.model.SysUser; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 2.2 부서권한(dept-role). 부서 단위 권한 부여/삭제. + * 조회는 부서 소속 사용자 목록에 부서-권한(roleIds)을 동일하게 부여(권한이 부서로 결정되는 모델). + */ +@Service +@RequiredArgsConstructor +public class DeptRoleService { + + private final DeptRoleMapper deptRoleMapper; + private final DeptMapper deptMapper; + private final SysUserMapper userMapper; + + @Transactional(readOnly = true) + public PageResponse listDeptUsers(String deptId, int page, int size) { + ensureDept(deptId); + List roleIds = deptRoleMapper.findRoleIdsByDeptId(deptId); + List users = userMapper.search(null, deptId, page * size, size); + List content = users.stream() + .map(u -> new DeptUserRoleDto(u.getUserId(), u.getUserNm(), roleIds)).toList(); + return PageResponse.of(content, userMapper.countSearch(null, deptId), page, size); + } + + @Transactional + public void grant(String deptId, List roleIds) { + ensureDept(deptId); + String actor = SysActor.id(); + for (String roleId : roleIds) { + deptRoleMapper.insert(deptId, roleId, actor); + } + } + + @Transactional + public void revoke(String deptId, List roleIds) { + ensureDept(deptId); + for (String roleId : roleIds) { + deptRoleMapper.delete(deptId, roleId); + } + } + + private void ensureDept(String deptId) { + if (!deptMapper.existsById(deptId)) { + throw new UiwsApiException(UiwsErrorCode.DEPT_NOT_FOUND); + } + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/DeptService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/DeptService.java new file mode 100644 index 0000000..82e0d0d --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/DeptService.java @@ -0,0 +1,181 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.system.dto.DeptDto; +import com.zioinfo.signage.uiws.system.dto.DeptSaveDto; +import com.zioinfo.signage.uiws.system.dto.DeptTreeDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.mapper.DeptMapper; +import com.zioinfo.signage.uiws.system.mapper.SysUserMapper; +import com.zioinfo.signage.uiws.system.model.SysDept; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** 2.3 부서(depts) CRUD + 검색팝업 + 계층 트리. */ +@Service +@RequiredArgsConstructor +public class DeptService { + + private final DeptMapper deptMapper; + private final SysUserMapper userMapper; + + @Transactional(readOnly = true) + public PageResponse list(String keyword, int page, int size) { + List content = deptMapper.search(keyword, page * size, size).stream().map(this::toDto).toList(); + return PageResponse.of(content, deptMapper.countSearch(keyword), page, size); + } + + @Transactional(readOnly = true) + public List searchPopup(String keyword) { + return deptMapper.searchActive(keyword).stream().map(this::toDto).toList(); + } + + /** 부서 계층 트리(루트부터 중첩). sortOrd→deptId 순. */ + @Transactional(readOnly = true) + public List tree() { + List all = deptMapper.findAll(); + Set ids = all.stream().map(SysDept::getDeptId).collect(Collectors.toSet()); + + Map> childrenOf = new HashMap<>(); + for (SysDept d : all) { + if (d.getParentDeptId() != null && ids.contains(d.getParentDeptId())) { + childrenOf.computeIfAbsent(d.getParentDeptId(), k -> new ArrayList<>()).add(d); + } + } + Comparator order = Comparator + .comparing((SysDept d) -> d.getSortOrd() == null ? 0 : d.getSortOrd()) + .thenComparing(SysDept::getDeptId); + + List roots = all.stream() + .filter(d -> d.getParentDeptId() == null || !ids.contains(d.getParentDeptId())) + .sorted(order) + .toList(); + return roots.stream().map(r -> toNode(r, childrenOf, order, new HashSet<>())).toList(); + } + + private DeptTreeDto toNode(SysDept d, Map> childrenOf, + Comparator order, Set visited) { + if (!visited.add(d.getDeptId())) { + return new DeptTreeDto(d.getDeptId(), d.getDeptNm(), d.getParentDeptId(), + d.getSortOrd() == null ? 0 : d.getSortOrd(), d.getUseYn(), List.of()); + } + List children = childrenOf.getOrDefault(d.getDeptId(), List.of()).stream() + .sorted(order) + .map(c -> toNode(c, childrenOf, order, visited)) + .toList(); + return new DeptTreeDto(d.getDeptId(), d.getDeptNm(), d.getParentDeptId(), + d.getSortOrd() == null ? 0 : d.getSortOrd(), d.getUseYn(), children); + } + + @Transactional(readOnly = true) + public DeptDto get(String deptId) { + return toDto(find(deptId)); + } + + @Transactional + public DeptDto create(DeptSaveDto dto) { + if (dto.deptId() == null || dto.deptId().isBlank()) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "deptId는 등록 시 필수입니다."); + } + if (deptMapper.existsById(dto.deptId())) { + throw new UiwsApiException(UiwsErrorCode.DUPLICATE_KEY, "이미 존재하는 부서 ID입니다."); + } + validateParent(dto.deptId(), dto.parentDeptId()); + SysDept d = new SysDept(); + d.setDeptId(dto.deptId()); + d.setDeptNm(dto.deptNm()); + d.setParentDeptId(dto.parentDeptId()); + d.setSortOrd(dto.sortOrd() == null ? 0 : dto.sortOrd()); + d.setUseYn(dto.useYn()); + d.setCreatedBy(SysActor.id()); + deptMapper.insert(d); + return toDto(find(dto.deptId())); + } + + @Transactional + public DeptDto update(String deptId, DeptSaveDto dto) { + SysDept d = find(deptId); + validateParent(deptId, dto.parentDeptId()); + d.setDeptNm(dto.deptNm()); + d.setParentDeptId(dto.parentDeptId()); + d.setSortOrd(dto.sortOrd() == null ? 0 : dto.sortOrd()); + d.setUseYn(dto.useYn()); + d.setUpdatedBy(SysActor.id()); + deptMapper.update(d); + return toDto(find(deptId)); + } + + @Transactional + public void delete(String deptId) { + find(deptId); + if (deptMapper.existsByParentDeptId(deptId)) { + throw new UiwsApiException(UiwsErrorCode.RESOURCE_IN_USE, "하위 부서가 존재하여 삭제할 수 없습니다."); + } + if (!userMapper.findByDeptId(deptId).isEmpty()) { + throw new UiwsApiException(UiwsErrorCode.RESOURCE_IN_USE, "소속 사용자가 존재하여 삭제할 수 없습니다."); + } + deptMapper.deleteById(deptId); + } + + /** 상위부서 무결성: 자기참조 금지·존재 확인·순환(자기 하위부서를 상위로) 금지. */ + private void validateParent(String deptId, String parentId) { + if (parentId == null || parentId.isBlank()) { + return; + } + if (parentId.equals(deptId)) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "자기 자신을 상위부서로 지정할 수 없습니다."); + } + if (!deptMapper.existsById(parentId)) { + throw new UiwsApiException(UiwsErrorCode.DEPT_NOT_FOUND, "상위부서가 존재하지 않습니다: " + parentId); + } + if (deptId != null && selfAndDescendants(deptId).contains(parentId)) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "하위부서를 상위부서로 지정할 수 없습니다(순환 구조)."); + } + } + + /** deptId 자신 + 모든 하위부서 ID 집합(순환 방지용). */ + private Set selfAndDescendants(String deptId) { + List all = deptMapper.findAll(); + Map> childrenOf = new HashMap<>(); + for (SysDept d : all) { + if (d.getParentDeptId() != null) { + childrenOf.computeIfAbsent(d.getParentDeptId(), k -> new ArrayList<>()).add(d.getDeptId()); + } + } + Set result = new HashSet<>(); + ArrayList stack = new ArrayList<>(); + stack.add(deptId); + while (!stack.isEmpty()) { + String cur = stack.remove(stack.size() - 1); + if (!result.add(cur)) { + continue; + } + stack.addAll(childrenOf.getOrDefault(cur, List.of())); + } + return result; + } + + private DeptDto toDto(SysDept d) { + return new DeptDto(d.getDeptId(), d.getDeptNm(), d.getParentDeptId(), + d.getSortOrd() == null ? 0 : d.getSortOrd(), d.getUseYn()); + } + + private SysDept find(String deptId) { + SysDept d = deptMapper.findById(deptId); + if (d == null) { + throw new UiwsApiException(UiwsErrorCode.DEPT_NOT_FOUND); + } + return d; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/MenuService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/MenuService.java new file mode 100644 index 0000000..0d16034 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/MenuService.java @@ -0,0 +1,103 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.system.dto.MenuDto; +import com.zioinfo.signage.uiws.system.dto.MenuSaveDto; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.mapper.MenuMapper; +import com.zioinfo.signage.uiws.system.mapper.RoleMenuMapper; +import com.zioinfo.signage.uiws.system.model.SysMenu; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** 2.9 메뉴(menus) CRUD + 검색팝업 + 다중삭제. 프론트가 parentMenuId 로 트리 구성. */ +@Service +@RequiredArgsConstructor +public class MenuService { + + private final MenuMapper menuMapper; + private final RoleMenuMapper roleMenuMapper; + + @Transactional(readOnly = true) + public PageResponse list(int page, int size) { + List content = menuMapper.searchAll(page * size, size).stream().map(this::toDto).toList(); + return PageResponse.of(content, menuMapper.countAll(), page, size); + } + + @Transactional(readOnly = true) + public List searchPopup(String keyword) { + return menuMapper.search(keyword).stream().map(this::toDto).toList(); + } + + @Transactional(readOnly = true) + public MenuDto get(String menuId) { + return toDto(find(menuId)); + } + + @Transactional + public MenuDto create(MenuSaveDto dto) { + if (dto.menuId() == null || dto.menuId().isBlank()) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "menuId는 등록 시 필수입니다."); + } + if (menuMapper.existsById(dto.menuId())) { + throw new UiwsApiException(UiwsErrorCode.DUPLICATE_KEY, "이미 존재하는 메뉴 ID입니다."); + } + SysMenu m = new SysMenu(); + m.setMenuId(dto.menuId()); + apply(m, dto); + m.setCreatedBy(SysActor.id()); + menuMapper.insert(m); + return toDto(find(dto.menuId())); + } + + @Transactional + public MenuDto update(String menuId, MenuSaveDto dto) { + SysMenu m = find(menuId); + apply(m, dto); + m.setUpdatedBy(SysActor.id()); + menuMapper.update(m); + return toDto(find(menuId)); + } + + @Transactional + public void delete(List ids) { + for (String id : ids) { + if (!menuMapper.existsById(id)) { + throw new UiwsApiException(UiwsErrorCode.MENU_NOT_FOUND); + } + if (menuMapper.existsByParentMenuId(id)) { + throw new UiwsApiException(UiwsErrorCode.RESOURCE_IN_USE, "하위 메뉴가 존재하여 삭제할 수 없습니다: " + id); + } + if (roleMenuMapper.existsByMenuId(id)) { + throw new UiwsApiException(UiwsErrorCode.RESOURCE_IN_USE, "권한에 매핑된 메뉴는 삭제할 수 없습니다: " + id); + } + menuMapper.deleteById(id); + } + } + + private void apply(SysMenu m, MenuSaveDto dto) { + m.setMenuNm(dto.menuNm()); + m.setParentMenuId(dto.parentMenuId()); + m.setProgramId(dto.programId()); + m.setMenuUrl(dto.menuUrl()); + m.setSortOrd(dto.sortOrd() == null ? 0 : dto.sortOrd()); + m.setUseYn(dto.useYn()); + } + + private MenuDto toDto(SysMenu m) { + return new MenuDto(m.getMenuId(), m.getMenuNm(), m.getParentMenuId(), m.getProgramId(), + m.getMenuUrl(), m.getSortOrd() == null ? 0 : m.getSortOrd(), m.getUseYn()); + } + + private SysMenu find(String menuId) { + SysMenu m = menuMapper.findById(menuId); + if (m == null) { + throw new UiwsApiException(UiwsErrorCode.MENU_NOT_FOUND); + } + return m; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/ProgramService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/ProgramService.java new file mode 100644 index 0000000..2af8c27 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/ProgramService.java @@ -0,0 +1,98 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.ProgramDto; +import com.zioinfo.signage.uiws.system.dto.ProgramSaveDto; +import com.zioinfo.signage.uiws.system.mapper.MenuMapper; +import com.zioinfo.signage.uiws.system.mapper.ProgramMapper; +import com.zioinfo.signage.uiws.system.model.SysProgram; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** 2.8 프로그램(programs) CRUD + 검색팝업 + 다중삭제. */ +@Service +@RequiredArgsConstructor +public class ProgramService { + + private final ProgramMapper programMapper; + private final MenuMapper menuMapper; + + @Transactional(readOnly = true) + public PageResponse list(String keyword, String programType, int page, int size) { + List content = programMapper.search(keyword, programType, page * size, size) + .stream().map(this::toDto).toList(); + return PageResponse.of(content, programMapper.countSearch(keyword, programType), page, size); + } + + @Transactional(readOnly = true) + public List searchPopup(String keyword) { + return programMapper.searchActive(keyword).stream().map(this::toDto).toList(); + } + + @Transactional(readOnly = true) + public ProgramDto get(String programId) { + return toDto(find(programId)); + } + + @Transactional + public ProgramDto create(ProgramSaveDto dto) { + if (programMapper.existsById(dto.programId())) { + throw new UiwsApiException(UiwsErrorCode.DUPLICATE_KEY, "이미 존재하는 프로그램 ID입니다."); + } + SysProgram p = new SysProgram(); + p.setProgramId(dto.programId()); + apply(p, dto); + p.setCreatedBy(SysActor.id()); + programMapper.insert(p); + return toDto(find(dto.programId())); + } + + @Transactional + public ProgramDto update(String programId, ProgramSaveDto dto) { + SysProgram p = find(programId); + apply(p, dto); + p.setUpdatedBy(SysActor.id()); + programMapper.update(p); + return toDto(find(programId)); + } + + @Transactional + public void delete(List ids) { + for (String id : ids) { + if (!programMapper.existsById(id)) { + throw new UiwsApiException(UiwsErrorCode.PROGRAM_NOT_FOUND); + } + if (menuMapper.existsByProgramId(id)) { + throw new UiwsApiException(UiwsErrorCode.RESOURCE_IN_USE, + "메뉴에서 참조 중인 프로그램은 삭제할 수 없습니다: " + id); + } + programMapper.deleteById(id); + } + } + + private void apply(SysProgram p, ProgramSaveDto dto) { + p.setProgramNm(dto.programNm()); + p.setProgramType(dto.programType()); + p.setProgramUrl(dto.programUrl()); + p.setCategory(dto.category()); + p.setUseYn(dto.useYn()); + } + + private ProgramDto toDto(SysProgram p) { + return new ProgramDto(p.getProgramId(), p.getProgramNm(), p.getProgramType(), + p.getProgramUrl(), p.getCategory(), p.getUseYn()); + } + + private SysProgram find(String programId) { + SysProgram p = programMapper.findById(programId); + if (p == null) { + throw new UiwsApiException(UiwsErrorCode.PROGRAM_NOT_FOUND); + } + return p; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/PublicLookupService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/PublicLookupService.java new file mode 100644 index 0000000..7f1a2c3 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/PublicLookupService.java @@ -0,0 +1,35 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.system.dto.PublicCompanyDto; +import com.zioinfo.signage.uiws.system.dto.PublicDeptDto; +import com.zioinfo.signage.uiws.system.mapper.CompanyMapper; +import com.zioinfo.signage.uiws.system.mapper.DeptMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 가입 화면(비인증) 공개 조회. use_yn='Y' 부서/거래처만 노출. + * (가입 시 존재하지 않는 FK 입력 → 오류 방지) + */ +@Service +@RequiredArgsConstructor +public class PublicLookupService { + + private final DeptMapper deptMapper; + private final CompanyMapper companyMapper; + + @Transactional(readOnly = true) + public List depts() { + return deptMapper.findActiveOrdered().stream() + .map(d -> new PublicDeptDto(d.getDeptId(), d.getDeptNm())).toList(); + } + + @Transactional(readOnly = true) + public List companies() { + return companyMapper.findActiveOrdered().stream() + .map(c -> new PublicCompanyDto(c.getCompanyId(), c.getCompanyNm())).toList(); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/RoleMenuService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/RoleMenuService.java new file mode 100644 index 0000000..304cb18 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/RoleMenuService.java @@ -0,0 +1,91 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.RoleDto; +import com.zioinfo.signage.uiws.system.dto.RoleMenuDto; +import com.zioinfo.signage.uiws.system.mapper.MenuMapper; +import com.zioinfo.signage.uiws.system.mapper.RoleMapper; +import com.zioinfo.signage.uiws.system.mapper.RoleMenuMapper; +import com.zioinfo.signage.uiws.system.model.SysMenu; +import com.zioinfo.signage.uiws.system.model.SysRole; +import com.zioinfo.signage.uiws.system.model.SysRoleMenu; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * 2.5 메뉴생성(role-menus). 권한 목록 + 권한별 메뉴 매핑 조회/저장. + * 조회는 전체 사용중 메뉴 기준으로 매핑 여부(read/write)를 합쳐 반환. + */ +@Service +@RequiredArgsConstructor +public class RoleMenuService { + + private final RoleMapper roleMapper; + private final RoleMenuMapper roleMenuMapper; + private final MenuMapper menuMapper; + + @Transactional(readOnly = true) + public PageResponse listRoles(int page, int size) { + List content = roleMapper.search(null, page * size, size).stream() + .map(this::toRoleDto).toList(); + return PageResponse.of(content, roleMapper.countSearch(null), page, size); + } + + @Transactional(readOnly = true) + public List getRoleMenus(String roleId) { + ensureRole(roleId); + Map mapped = new LinkedHashMap<>(); + for (SysRoleMenu rm : roleMenuMapper.findByRoleId(roleId)) { + mapped.put(rm.getMenuId(), rm); + } + List allMenus = menuMapper.findAllOrdered(); + return allMenus.stream().map(m -> { + SysRoleMenu rm = mapped.get(m.getMenuId()); + String readYn = rm != null ? rm.getReadYn() : "N"; + String writeYn = rm != null ? rm.getWriteYn() : "N"; + return new RoleMenuDto(m.getMenuId(), m.getMenuNm(), readYn, writeYn); + }).toList(); + } + + /** 전체 치환 저장: read/write 중 하나라도 'Y'면 매핑 보존, 둘 다 'N'이면 제거. */ + @Transactional + public void saveRoleMenus(String roleId, List menus) { + ensureRole(roleId); + String actor = SysActor.id(); + roleMenuMapper.deleteByRoleId(roleId); + if (menus == null) { + return; + } + for (RoleMenuDto dto : menus) { + boolean read = "Y".equals(dto.readYn()); + boolean write = "Y".equals(dto.writeYn()); + if (!read && !write) { + continue; + } + SysRoleMenu rm = new SysRoleMenu(); + rm.setRoleId(roleId); + rm.setMenuId(dto.menuId()); + rm.setReadYn(read ? "Y" : "N"); + rm.setWriteYn(write ? "Y" : "N"); + rm.setCreatedBy(actor); + roleMenuMapper.insert(rm); + } + } + + private RoleDto toRoleDto(SysRole r) { + return new RoleDto(r.getRoleId(), r.getRoleNm(), r.getRoleDesc(), r.getUseYn()); + } + + private void ensureRole(String roleId) { + if (!roleMapper.existsById(roleId)) { + throw new UiwsApiException(UiwsErrorCode.ROLE_NOT_FOUND); + } + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/RoleService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/RoleService.java new file mode 100644 index 0000000..142cee7 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/RoleService.java @@ -0,0 +1,89 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.RoleDto; +import com.zioinfo.signage.uiws.system.dto.RoleSaveDto; +import com.zioinfo.signage.uiws.system.mapper.DeptRoleMapper; +import com.zioinfo.signage.uiws.system.mapper.RoleMapper; +import com.zioinfo.signage.uiws.system.mapper.RoleMenuMapper; +import com.zioinfo.signage.uiws.system.model.SysRole; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** 2.1 권한(roles) CRUD. */ +@Service +@RequiredArgsConstructor +public class RoleService { + + private final RoleMapper roleMapper; + private final RoleMenuMapper roleMenuMapper; + private final DeptRoleMapper deptRoleMapper; + + @Transactional(readOnly = true) + public PageResponse list(String keyword, int page, int size) { + List content = roleMapper.search(keyword, page * size, size).stream().map(this::toDto).toList(); + return PageResponse.of(content, roleMapper.countSearch(keyword), page, size); + } + + @Transactional(readOnly = true) + public RoleDto get(String roleId) { + return toDto(find(roleId)); + } + + @Transactional + public RoleDto create(RoleSaveDto dto) { + if (dto.roleId() == null || dto.roleId().isBlank()) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "roleId는 등록 시 필수입니다."); + } + if (roleMapper.existsById(dto.roleId())) { + throw new UiwsApiException(UiwsErrorCode.DUPLICATE_KEY, "이미 존재하는 권한 ID입니다."); + } + SysRole role = new SysRole(); + role.setRoleId(dto.roleId()); + role.setRoleNm(dto.roleNm()); + role.setRoleDesc(dto.roleDesc()); + role.setUseYn(dto.useYn()); + role.setCreatedBy(SysActor.id()); + roleMapper.insert(role); + return toDto(find(dto.roleId())); + } + + @Transactional + public RoleDto update(String roleId, RoleSaveDto dto) { + SysRole role = find(roleId); + role.setRoleNm(dto.roleNm()); + role.setRoleDesc(dto.roleDesc()); + role.setUseYn(dto.useYn()); + role.setUpdatedBy(SysActor.id()); + roleMapper.update(role); + return toDto(find(roleId)); + } + + @Transactional + public void delete(List ids) { + for (String id : ids) { + if (deptRoleMapper.existsByRoleId(id)) { + throw new UiwsApiException(UiwsErrorCode.RESOURCE_IN_USE, "부서에 부여된 권한은 삭제할 수 없습니다: " + id); + } + roleMenuMapper.deleteByRoleId(id); + roleMapper.deleteById(id); + } + } + + private RoleDto toDto(SysRole r) { + return new RoleDto(r.getRoleId(), r.getRoleNm(), r.getRoleDesc(), r.getUseYn()); + } + + private SysRole find(String roleId) { + SysRole r = roleMapper.findById(roleId); + if (r == null) { + throw new UiwsApiException(UiwsErrorCode.ROLE_NOT_FOUND); + } + return r; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/SysActor.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/SysActor.java new file mode 100644 index 0000000..de8e082 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/SysActor.java @@ -0,0 +1,24 @@ +package com.zioinfo.signage.uiws.system.service; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; + +/** + * 현재 사용자 ID 추출(감사 컬럼 created_by/updated_by 세팅용). 원본 CurrentUser 대체. + * CMS JwtFilter 가 username(String) 을 principal 로 설정 → getName() 으로 추출. + */ +public final class SysActor { + + private static final String SYSTEM = "SYSTEM"; + + private SysActor() { + } + + public static String id() { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + if (auth != null && auth.getName() != null && !auth.getName().isBlank()) { + return auth.getName(); + } + return SYSTEM; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/system/service/UserService.java b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/UserService.java new file mode 100644 index 0000000..018e7e3 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/system/service/UserService.java @@ -0,0 +1,234 @@ +package com.zioinfo.signage.uiws.system.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.common.mail.MailSender; +import com.zioinfo.signage.uiws.system.dto.CheckIdResponse; +import com.zioinfo.signage.uiws.system.dto.PageResponse; +import com.zioinfo.signage.uiws.system.dto.UserDto; +import com.zioinfo.signage.uiws.system.dto.UserSaveDto; +import com.zioinfo.signage.uiws.system.mapper.CompanyMapper; +import com.zioinfo.signage.uiws.system.mapper.DeptMapper; +import com.zioinfo.signage.uiws.system.mapper.SysUserMapper; +import com.zioinfo.signage.uiws.system.model.SysCompany; +import com.zioinfo.signage.uiws.system.model.SysDept; +import com.zioinfo.signage.uiws.system.model.SysUser; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.security.SecureRandom; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 2.6 사용자(users). 관리자 사용자 CRUD/검색/중복확인/다중삭제/비번초기화/잠금해제/승인. + * 관리자 등록 사용자는 approval_yn='Y'. 비밀번호는 BCrypt — 응답·로그(코드 외)에 절대 노출 금지. + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class UserService { + + private static final SecureRandom RANDOM = new SecureRandom(); + + private final SysUserMapper userMapper; + private final DeptMapper deptMapper; + private final CompanyMapper companyMapper; + private final PasswordEncoder passwordEncoder; + private final MailSender mailSender; + + @Transactional(readOnly = true) + public PageResponse list(String keyword, String deptId, int page, int size) { + Map deptNames = deptNameMap(); + Map companyNames = companyNameMap(); + List content = userMapper.search(keyword, deptId, page * size, size).stream() + .map(u -> toDto(u, deptNames, companyNames)).toList(); + return PageResponse.of(content, userMapper.countSearch(keyword, deptId), page, size); + } + + @Transactional(readOnly = true) + public List searchPopup(String keyword, String deptId) { + Map deptNames = deptNameMap(); + Map companyNames = companyNameMap(); + return userMapper.searchActive(keyword, deptId).stream() + .map(u -> toDto(u, deptNames, companyNames)).toList(); + } + + @Transactional(readOnly = true) + public CheckIdResponse checkId(String userId) { + boolean available = userId != null && !userId.isBlank() && !userMapper.existsById(userId); + return new CheckIdResponse(available); + } + + @Transactional(readOnly = true) + public UserDto get(String userId) { + return toDto(find(userId), deptNameMap(), companyNameMap()); + } + + @Transactional + public UserDto create(UserSaveDto dto) { + if (userMapper.existsById(dto.userId())) { + throw new UiwsApiException(UiwsErrorCode.USER_ID_DUPLICATED); + } + String rawPw = (dto.password() == null || dto.password().isBlank()) + ? generateTempPassword() : dto.password(); + + SysUser u = new SysUser(); + u.setUserId(dto.userId()); + u.setUserNm(dto.userNm()); + u.setPassword(passwordEncoder.encode(rawPw)); + u.setEmail(dto.email()); + u.setGradeCd(dto.gradeCd()); + u.setDeptId(dto.deptId()); + u.setCompanyId(dto.companyId()); + u.setRoleCd(normalizeRole(dto.roleCd())); + u.setNaverworksId(blankToNull(dto.naverworksId())); + u.setLoginFailCnt(0); + u.setLockYn("N"); + u.setUseYn(dto.useYn() == null ? "Y" : dto.useYn()); + u.setApprovalYn("Y"); // 관리자 생성 → 즉시 승인 + u.setVerifyMethod("EMAIL"); + u.setPwChangeYn("Y"); // 최초 로그인 시 비번 변경 유도 + u.setCreatedBy(SysActor.id()); + userMapper.insert(u); + return toDto(find(dto.userId()), deptNameMap(), companyNameMap()); + } + + @Transactional + public UserDto update(String userId, UserSaveDto dto) { + SysUser u = find(userId); + u.setUserNm(dto.userNm()); + u.setEmail(dto.email()); + u.setGradeCd(dto.gradeCd()); + u.setDeptId(dto.deptId()); + u.setCompanyId(dto.companyId()); + if (dto.roleCd() != null && !dto.roleCd().isBlank()) { + u.setRoleCd(normalizeRole(dto.roleCd())); + } + u.setNaverworksId(blankToNull(dto.naverworksId())); + if (dto.useYn() != null && !dto.useYn().isBlank()) { + u.setUseYn(dto.useYn()); + } + u.setPassword((dto.password() != null && !dto.password().isBlank()) + ? passwordEncoder.encode(dto.password()) : null); // null → XML 에서 비밀번호 미변경 + u.setUpdatedBy(SysActor.id()); + userMapper.update(u); + return toDto(find(userId), deptNameMap(), companyNameMap()); + } + + /** 사용자 삭제 = 소프트삭제(use_yn='N' + 승인 회수). 이력 보존 위해 하드삭제 금지. */ + @Transactional + public void delete(List ids) { + for (String id : ids) { + SysUser u = find(id); + u.setUseYn("N"); + u.setApprovalYn("N"); + u.setUpdatedBy(SysActor.id()); + userMapper.update(u); + } + } + + /** 비번 초기화: 임시비번 생성 → BCrypt 저장 → 메일/로그(코드 외)로만 전달, 잠금 해제. */ + @Transactional + public void resetPassword(String userId) { + SysUser u = find(userId); + String temp = generateTempPassword(); + u.setPassword(passwordEncoder.encode(temp)); + u.setLockYn("N"); + u.setLoginFailCnt(0); + u.setPwChangeYn("Y"); + u.setUpdatedBy(SysActor.id()); + userMapper.update(u); + // 임시비번은 메일/로그 채널로만 — API 응답에는 절대 미포함(보안 불변규칙). + mailSender.send(u.getEmail(), "[zioinfo-signage] 비밀번호 초기화", + String.format("임시 비밀번호: %s\n로그인 후 즉시 변경하세요.", temp)); + } + + /** 잠금 해제. */ + @Transactional + public void unlock(String userId) { + SysUser u = find(userId); + u.setLockYn("N"); + u.setLoginFailCnt(0); + u.setUpdatedBy(SysActor.id()); + userMapper.update(u); + } + + /** 가입 승인 — approval_yn='Y'. */ + @Transactional + public void approve(String userId) { + SysUser u = find(userId); + u.setApprovalYn("Y"); + u.setUpdatedBy(SysActor.id()); + userMapper.update(u); + } + + /** 승인 취소 — approval_yn='N'. */ + @Transactional + public void revokeApproval(String userId) { + SysUser u = find(userId); + u.setApprovalYn("N"); + u.setUpdatedBy(SysActor.id()); + userMapper.update(u); + } + + // ------------------------------------------------------------------ + private UserDto toDto(SysUser u, Map deptNames, Map companyNames) { + String deptNm = u.getDeptId() == null ? null : deptNames.get(u.getDeptId()); + String companyNm = u.getCompanyId() == null ? null : companyNames.get(u.getCompanyId()); + return new UserDto(u.getUserId(), u.getUserNm(), u.getEmail(), u.getGradeCd(), + u.getDeptId(), deptNm, u.getCompanyId(), companyNm, + u.getRoleCd(), u.getNaverworksId(), u.getLockYn(), u.getUseYn(), u.getApprovalYn()); + } + + private static String blankToNull(String s) { + return (s == null || s.isBlank()) ? null : s; + } + + private String normalizeRole(String roleCd) { + if ("MANAGER".equals(roleCd) || "ADMIN".equals(roleCd)) { + return roleCd; + } + return "USER"; + } + + private Map deptNameMap() { + return deptMapper.findAll().stream() + .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptNm, (a, b) -> a, HashMap::new)); + } + + private Map companyNameMap() { + return companyMapper.findAll().stream() + .collect(Collectors.toMap(SysCompany::getCompanyId, SysCompany::getCompanyNm, (a, b) -> a, HashMap::new)); + } + + private SysUser find(String userId) { + SysUser u = userMapper.findById(userId); + if (u == null) { + throw new UiwsApiException(UiwsErrorCode.USER_NOT_FOUND); + } + return u; + } + + private String generateTempPassword() { + String upper = "ABCDEFGHJKLMNPQRSTUVWXYZ"; + String lower = "abcdefghijkmnpqrstuvwxyz"; + String digit = "23456789"; + String special = "!@#$%"; + String all = upper + lower + digit + special; + StringBuilder sb = new StringBuilder(); + sb.append(upper.charAt(RANDOM.nextInt(upper.length()))); + sb.append(lower.charAt(RANDOM.nextInt(lower.length()))); + sb.append(digit.charAt(RANDOM.nextInt(digit.length()))); + sb.append(special.charAt(RANDOM.nextInt(special.length()))); + for (int i = 0; i < 6; i++) { + sb.append(all.charAt(RANDOM.nextInt(all.length()))); + } + return sb.toString(); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/worklog/controller/WorklogController.java b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/controller/WorklogController.java new file mode 100644 index 0000000..f402e49 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/controller/WorklogController.java @@ -0,0 +1,94 @@ +package com.zioinfo.signage.uiws.worklog.controller; + +import com.zioinfo.signage.common.ApiResponse; +import com.zioinfo.signage.uiws.worklog.dto.WorklogDtos.*; +import com.zioinfo.signage.uiws.worklog.service.WorklogService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDate; +import java.util.List; + +/** + * UIWS 이식 — 업무일지(모듈 06). 인증 필수(/api/worklogs). + * 원본 /pdf(JasperReports) 엔드포인트는 ERP 의존성 미보유로 제외(보고서는 후속 트랙 — signage_port.md 참조). + */ +@RestController +@RequestMapping("/api/worklogs") +@RequiredArgsConstructor +public class WorklogController { + + private final WorklogService worklogService; + + @GetMapping + public ApiResponse list( + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate, + @RequestParam(required = false) String writerId, + @RequestParam(required = false) String progressCd, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { + return ApiResponse.ok(worklogService.list(fromDate, toDate, writerId, progressCd, page, size)); + } + + @GetMapping("/dashboard/progress") + public ApiResponse> progressSummary( + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fromDate, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate toDate) { + return ApiResponse.ok(worklogService.progressSummary(fromDate, toDate)); + } + + @GetMapping("/calendar") + public ApiResponse> calendar( + @RequestParam(required = false) String yearMonth, + @RequestParam(required = false) String writerId) { + return ApiResponse.ok(worklogService.calendar(yearMonth, writerId)); + } + + @GetMapping("/search") + public ApiResponse> search( + @RequestParam(required = false) String keyword, + @RequestParam(required = false) String writerId) { + return ApiResponse.ok(worklogService.search(keyword, writerId)); + } + + @PostMapping + public ApiResponse create(@Valid @RequestBody WorklogSaveDto dto) { + return ApiResponse.ok(worklogService.create(dto)); + } + + @GetMapping("/{id}") + public ApiResponse detail(@PathVariable("id") Long id) { + return ApiResponse.ok(worklogService.detail(id)); + } + + @PutMapping("/{id}") + public ApiResponse update(@PathVariable("id") Long id, @Valid @RequestBody WorklogSaveDto dto) { + return ApiResponse.ok(worklogService.update(id, dto)); + } + + @DeleteMapping("/{id}") + public ApiResponse delete(@PathVariable("id") Long id) { + worklogService.delete(id); + return ApiResponse.ok(null); + } + + @PostMapping("/{id}/comments") + public ApiResponse addComment(@PathVariable("id") Long id, + @Valid @RequestBody CommentRequest req) { + return ApiResponse.ok(worklogService.addComment(id, req)); + } + + @PostMapping("/comments/{cmtId}/confirm") + public ApiResponse confirmComment(@PathVariable("cmtId") Long cmtId) { + worklogService.confirmComment(cmtId); + return ApiResponse.ok(null); + } + + @GetMapping("/comments/unconfirmed") + public ApiResponse> unconfirmedComments() { + return ApiResponse.ok(worklogService.unconfirmedByMe()); + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/worklog/dto/WorklogDtos.java b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/dto/WorklogDtos.java new file mode 100644 index 0000000..b5ce4da --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/dto/WorklogDtos.java @@ -0,0 +1,118 @@ +package com.zioinfo.signage.uiws.worklog.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.zioinfo.signage.uiws.worklog.model.UiwsWorklogDtl; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +import java.util.List; + +/** + * 업무일지(모듈 06) DTO. 원본 com.urp.uiws.worklog.dto.* 이식(shape 동일, _state 보존). + */ +public final class WorklogDtos { + + private WorklogDtos() { + } + + public record WorklogListDto( + Long worklogId, + String title, + String writerNm, + String workDate, + String progressCd, + long commentCount + ) { + } + + public record WorklogCalendarDto( + String workDate, + Long worklogId, + String workStatusNm, + boolean isHoliday, + String holidayNm + ) { + } + + public record WorklogDetailDto( + Long worklogId, + String title, + String writerId, + String writerNm, + String workDate, + String workStatusCd, + String progressCd, + String repeatYn, + String repeatStartDate, + String repeatEndDate, + List details, + List comments + ) { + } + + public record WorklogDtlDto( + Long dtlId, + Integer startHour, + Integer endHour, + String workTypeCd, + String companyId, + String workContent, + String issueContent, + Integer sortOrd, + String createdAt, + String updatedAt, + @JsonProperty("_state") String state + ) { + public static WorklogDtlDto from(UiwsWorklogDtl d) { + return new WorklogDtlDto( + d.getDtlId(), d.getStartHour(), d.getEndHour(), d.getWorkTypeCd(), d.getCompanyId(), + d.getWorkContent(), d.getIssueContent(), d.getSortOrd(), + d.getCreatedAt() != null ? d.getCreatedAt().toString() : null, + d.getUpdatedAt() != null ? d.getUpdatedAt().toString() : null, + null); + } + } + + public record WorklogSaveDto( + @NotBlank String title, + @NotBlank String writerId, + @NotNull String workDate, + @NotBlank String workStatusCd, + String progressCd, + String repeatYn, + String repeatStartDate, + String repeatEndDate, + @Valid List details + ) { + } + + public record WorklogCommentDto( + Long cmtId, + String cmtContent, + String writerNm, + String createdAt, + String kakaoSentYn, + String confirmYn + ) { + } + + public record CommentRequest(@NotBlank String cmtContent) { + } + + public record ProgressSummaryDto(String progressCd, String progressNm, long count) { + } + + public record UnconfirmedCommentDto( + Long cmtId, + Long worklogId, + String worklogTitle, + String writerNm, + String cmtContent, + String createdAt + ) { + } + + public record WorklogPage(List content, long totalElements, int page, int size, int totalPages) { + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/worklog/mapper/WorklogMapper.java b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/mapper/WorklogMapper.java new file mode 100644 index 0000000..653cd37 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/mapper/WorklogMapper.java @@ -0,0 +1,96 @@ +package com.zioinfo.signage.uiws.worklog.mapper; + +import com.zioinfo.signage.uiws.worklog.model.UiwsWorklog; +import com.zioinfo.signage.uiws.worklog.model.UiwsWorklogCmt; +import com.zioinfo.signage.uiws.worklog.model.UiwsWorklogDtl; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +/** + * 업무일지 MyBatis 매퍼. 원본 JPA Worklog/WorklogDtl/WorklogCmt Repository 변환 이식. + * 진행상태 집계는 ported tb_uiws_worklog 기반(코어 TB_CODE 미이식 → 코드값 직접 집계). + */ +@Mapper +public interface WorklogMapper { + + // ── worklog 헤더 + int insertWorklog(UiwsWorklog w); + + int updateWorklog(UiwsWorklog w); + + UiwsWorklog findWorklogById(@Param("worklogId") Long worklogId); + + boolean existsWorklogById(@Param("worklogId") Long worklogId); + + int deleteWorklogById(@Param("worklogId") Long worklogId); + + List searchList(@Param("from") LocalDate from, + @Param("to") LocalDate to, + @Param("writerId") String writerId, + @Param("progressCd") String progressCd, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds, + @Param("limit") int limit, + @Param("offset") int offset); + + long countList(@Param("from") LocalDate from, + @Param("to") LocalDate to, + @Param("writerId") String writerId, + @Param("progressCd") String progressCd, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds); + + List findByMonth(@Param("from") LocalDate from, + @Param("to") LocalDate to, + @Param("writerId") String writerId, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds); + + List searchPopup(@Param("keyword") String keyword, + @Param("writerId") String writerId, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds); + + /** 진행상태별 건수(progress_cd, cnt). */ + List> progressSummary(@Param("from") LocalDate from, + @Param("to") LocalDate to, + @Param("scopeAll") boolean scopeAll, + @Param("ownerIds") List ownerIds); + + // ── 상세(dtl) + int insertDtl(UiwsWorklogDtl d); + + int updateDtl(UiwsWorklogDtl d); + + int deleteDtlById(@Param("dtlId") Long dtlId); + + List findDtlByWorklogId(@Param("worklogId") Long worklogId); + + // ── 댓글(cmt) + int insertCmt(UiwsWorklogCmt c); + + UiwsWorklogCmt findCmtById(@Param("cmtId") Long cmtId); + + int updateCmtKakaoSent(@Param("cmtId") Long cmtId); + + int confirmCmt(@Param("cmtId") Long cmtId, @Param("actor") String actor); + + List findCmtByWorklogId(@Param("worklogId") Long worklogId); + + List> countCommentsByWorklogIds(@Param("ids") List ids); + + List findUnconfirmedByWriter(@Param("writerId") String writerId); + + // ── 사용자명 라벨(코어 user 재사용) + List> findUserNames(@Param("ids") List ids); + + /** 댓글 알림 메일 발송 대상 이메일(username 기준). */ + String findUserEmail(@Param("username") String username); + + List findWorklogsByIds(@Param("ids") List ids); +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklog.java b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklog.java new file mode 100644 index 0000000..ab63575 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklog.java @@ -0,0 +1,23 @@ +package com.zioinfo.signage.uiws.worklog.model; + +import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** 업무일지 헤더 (tb_uiws_worklog). 원본 com.urp.uiws.domain.Worklog 이식. */ +@Data +public class UiwsWorklog { + private Long worklogId; + private String title; + private String writerId; + private LocalDate workDate; + private String workStatusCd; + private String progressCd; // ONGOING | DONE + private String repeatYn; // Y | N + private LocalDate repeatStartDate; + private LocalDate repeatEndDate; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklogCmt.java b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklogCmt.java new file mode 100644 index 0000000..4f925cb --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklogCmt.java @@ -0,0 +1,19 @@ +package com.zioinfo.signage.uiws.worklog.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 업무일지 댓글 (tb_uiws_worklog_cmt). 원본 com.urp.uiws.domain.WorklogCmt 이식. */ +@Data +public class UiwsWorklogCmt { + private Long cmtId; + private Long worklogId; + private String cmtContent; + private String writerId; + private String kakaoSentYn; + private String confirmYn; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklogDtl.java b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklogDtl.java new file mode 100644 index 0000000..a59e67b --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/model/UiwsWorklogDtl.java @@ -0,0 +1,22 @@ +package com.zioinfo.signage.uiws.worklog.model; + +import lombok.Data; +import java.time.LocalDateTime; + +/** 업무일지 시간대별 상세 (tb_uiws_worklog_dtl). 원본 com.urp.uiws.domain.WorklogDtl 이식. */ +@Data +public class UiwsWorklogDtl { + private Long dtlId; + private Long worklogId; + private Integer startHour; + private Integer endHour; + private String workTypeCd; + private String companyId; + private String workContent; + private String issueContent; + private Integer sortOrd; + private String createdBy; + private LocalDateTime createdAt; + private String updatedBy; + private LocalDateTime updatedAt; +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/worklog/service/WorklogNotifier.java b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/service/WorklogNotifier.java new file mode 100644 index 0000000..623b656 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/service/WorklogNotifier.java @@ -0,0 +1,31 @@ +package com.zioinfo.signage.uiws.worklog.service; + +import com.zioinfo.signage.uiws.common.mail.MailSender; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * 업무일지 댓글 알림 — 원본 NaverWorksNotifier(외부 메신저) 대신 MailSender 폴백으로 이식. + * 보안 불변규칙(외부 API 금지) 준수: 외부 메신저 호출 없이 메일/로그 채널로만 알림한다. + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class WorklogNotifier { + + private final MailSender mailSender; + + /** + * 일지 작성자에게 댓글 알림. 발송되면 true(=KAKAO_SENT_YN 'Y' 선반영). + * email 미보유 시 로그만 남기고 false. + */ + public boolean notifyComment(String writerId, String email, String subject, String body) { + if (email == null || email.isBlank()) { + log.info("[UIWS-WL-NOTIFY] no email for writer={} (skip mail, log only)", writerId); + return false; + } + mailSender.send(email, subject, body); + return true; + } +} diff --git a/backend/src/main/java/com/zioinfo/signage/uiws/worklog/service/WorklogService.java b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/service/WorklogService.java new file mode 100644 index 0000000..e409e61 --- /dev/null +++ b/backend/src/main/java/com/zioinfo/signage/uiws/worklog/service/WorklogService.java @@ -0,0 +1,438 @@ +package com.zioinfo.signage.uiws.worklog.service; + +import com.zioinfo.signage.uiws.common.UiwsApiException; +import com.zioinfo.signage.uiws.common.UiwsCurrentUser; +import com.zioinfo.signage.uiws.common.UiwsDataScope; +import com.zioinfo.signage.uiws.common.UiwsErrorCode; +import com.zioinfo.signage.uiws.worklog.dto.WorklogDtos.*; +import com.zioinfo.signage.uiws.worklog.mapper.WorklogMapper; +import com.zioinfo.signage.uiws.worklog.model.UiwsWorklog; +import com.zioinfo.signage.uiws.worklog.model.UiwsWorklogCmt; +import com.zioinfo.signage.uiws.worklog.model.UiwsWorklogDtl; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.YearMonth; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 업무일지(모듈 06) 서비스 — 원본 com.urp.uiws.worklog.service.WorklogService MyBatis 변환 이식. + * + * silo 단순화(코어 TB_CODE/TB_DEPT 미이식): + * - 근무상태/진행 코드 라벨: 코드값 그대로 노출(공통코드 미이식). 진행 라벨은 ONGOING/DONE 한글 매핑만 내장. + * - 진행상태 집계: ONGOING/DONE 고정 셋 0건 포함 반환(차트 범례 안정). + * - 댓글 권한: 원본 "관할 상무 이상"(부서계층+직급) → ERP RBAC MANAGER/ADMIN/CFO 로 완화 이식. + * - 댓글 알림: NaverWorks(외부) → MailSender 폴백(외부 API 금지 준수). + */ +@Service +@RequiredArgsConstructor +public class WorklogService { + + private static final String DEFAULT_PROGRESS = "ONGOING"; + private static final DateTimeFormatter DT = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"); + /** 진행 코드 → 라벨(공통코드 미이식 silo 보정). */ + private static final Map PROGRESS_LABEL = Map.of("ONGOING", "진행중", "DONE", "종료"); + + private final WorklogMapper mapper; + private final WorklogNotifier notifier; + + // ------------------------------------------------------------------ 목록(리스트형) + @Transactional(readOnly = true) + public WorklogPage list(LocalDate fromDate, LocalDate toDate, String writerId, String progressCd, int page, int size) { + LocalDate to = (toDate != null) ? toDate : LocalDate.now(); + LocalDate from = (fromDate != null) ? fromDate : to.minusMonths(1); + UiwsDataScope.Scope scope = UiwsDataScope.current(); + String wid = blankToNull(writerId); + String pc = blankToNull(progressCd); + long total = mapper.countList(from, to, wid, pc, scope.all(), scope.ownerIds()); + List rows = mapper.searchList(from, to, wid, pc, scope.all(), scope.ownerIds(), size, page * size); + return new WorklogPage(toListDtos(rows), total, page, size, totalPages(total, size)); + } + + // ------------------------------------------------------------------ 목록(달력형) + @Transactional(readOnly = true) + public List calendar(String yearMonth, String writerId) { + YearMonth ym = parseYearMonth(yearMonth); + LocalDate from = ym.atDay(1); + LocalDate to = ym.atEndOfMonth(); + UiwsDataScope.Scope scope = UiwsDataScope.current(); + List rows = mapper.findByMonth(from, to, blankToNull(writerId), scope.all(), scope.ownerIds()); + // 공휴일 마스터 미연동 → isHoliday=false. 근무상태 라벨은 코드값 노출(공통코드 미이식). + return rows.stream() + .map(w -> new WorklogCalendarDto(w.getWorkDate().toString(), w.getWorklogId(), + w.getWorkStatusCd(), false, null)) + .toList(); + } + + // ------------------------------------------------------------------ 조회 팝업 + @Transactional(readOnly = true) + public List search(String keyword, String writerId) { + UiwsDataScope.Scope scope = UiwsDataScope.current(); + List rows = mapper.searchPopup(blankToNull(keyword), blankToNull(writerId), scope.all(), scope.ownerIds()); + return toListDtos(rows); + } + + // ------------------------------------------------------------------ 대시보드: 진행상태별 집계 + @Transactional(readOnly = true) + public List progressSummary(LocalDate fromDate, LocalDate toDate) { + LocalDate to = (toDate != null) ? toDate : LocalDate.now(); + LocalDate from = (fromDate != null) ? fromDate : to.minusMonths(1); + UiwsDataScope.Scope scope = UiwsDataScope.current(); + Map counts = new LinkedHashMap<>(); + for (Map r : mapper.progressSummary(from, to, scope.all(), scope.ownerIds())) { + counts.put(str(r.get("progressCd")), toLong(r.get("cnt"))); + } + // 코드 정의 순서(진행중→종료)로 0건 포함 반환. + List out = new ArrayList<>(); + for (String code : List.of("ONGOING", "DONE")) { + out.add(new ProgressSummaryDto(code, PROGRESS_LABEL.getOrDefault(code, code), counts.getOrDefault(code, 0L))); + } + // 정의 외 코드값도 누락 없이 추가 + counts.forEach((k, v) -> { + if (!"ONGOING".equals(k) && !"DONE".equals(k)) { + out.add(new ProgressSummaryDto(k, k, v)); + } + }); + return out; + } + + // ------------------------------------------------------------------ 등록 + @Transactional + public WorklogDetailDto create(WorklogSaveDto dto) { + String actor = UiwsCurrentUser.id(); + UiwsWorklog w = new UiwsWorklog(); + applyHeader(w, dto); + w.setWriterId((dto.writerId() != null && !dto.writerId().isBlank()) ? dto.writerId() : actor); + w.setCreatedBy(actor); + w.setCreatedAt(LocalDateTime.now()); + mapper.insertWorklog(w); + + List toInsert = (dto.details() == null) ? List.of() + : dto.details().stream().filter(d -> !"DEL".equalsIgnoreCase(safeState(d.state()))).toList(); + validateNoOverlap(toInsert); + for (WorklogDtlDto d : toInsert) { + mapper.insertDtl(newDtl(w.getWorklogId(), d, actor)); + } + return detail(w.getWorklogId()); + } + + // ------------------------------------------------------------------ 상세 + @Transactional(readOnly = true) + public WorklogDetailDto detail(Long worklogId) { + return toDetail(findWorklog(worklogId)); + } + + // ------------------------------------------------------------------ 수정(시간대별 일괄, _state) + @Transactional + public WorklogDetailDto update(Long worklogId, WorklogSaveDto dto) { + String actor = UiwsCurrentUser.id(); + UiwsWorklog w = findWorklog(worklogId); + applyHeader(w, dto); + if (dto.writerId() != null && !dto.writerId().isBlank()) { + w.setWriterId(dto.writerId()); + } + w.setUpdatedBy(actor); + w.setUpdatedAt(LocalDateTime.now()); + mapper.updateWorklog(w); + + List existing = mapper.findDtlByWorklogId(worklogId); + Map existingById = existing.stream() + .collect(Collectors.toMap(UiwsWorklogDtl::getDtlId, d -> d)); + + List details = (dto.details() == null) ? List.of() : dto.details(); + List survivors = new ArrayList<>(); + for (WorklogDtlDto d : details) { + String st = safeState(d.state()); + if ("DEL".equalsIgnoreCase(st)) { + if (d.dtlId() != null && existingById.containsKey(d.dtlId())) { + mapper.deleteDtlById(d.dtlId()); + } + continue; + } + if ("MOD".equalsIgnoreCase(st) && d.dtlId() != null) { + UiwsWorklogDtl tgt = existingById.get(d.dtlId()); + if (tgt == null) { + throw new UiwsApiException(UiwsErrorCode.WORKLOG_NOT_FOUND, "수정 대상 상세를 찾을 수 없습니다."); + } + applyDtl(tgt, d); + tgt.setUpdatedBy(actor); + tgt.setUpdatedAt(LocalDateTime.now()); + mapper.updateDtl(tgt); + survivors.add(d); + continue; + } + // _state 미표기 + 기존 dtlId 보유 = 미변경 유지행 → INSERT 금지 + if (d.dtlId() != null && existingById.containsKey(d.dtlId())) { + survivors.add(d); + continue; + } + // ADD 또는 진짜 신규 → INSERT + mapper.insertDtl(newDtl(worklogId, d, actor)); + survivors.add(d); + } + validateNoOverlap(survivors); + return detail(worklogId); + } + + // ------------------------------------------------------------------ 삭제 + @Transactional + public void delete(Long worklogId) { + if (!mapper.existsWorklogById(worklogId)) { + throw new UiwsApiException(UiwsErrorCode.WORKLOG_NOT_FOUND); + } + // 상세/댓글은 DB ON DELETE CASCADE. 헤더 삭제로 일괄 제거. + mapper.deleteWorklogById(worklogId); + } + + // ------------------------------------------------------------------ 댓글 등록(+알림) + @Transactional + public WorklogCommentDto addComment(Long worklogId, CommentRequest req) { + String actor = UiwsCurrentUser.id(); + UiwsWorklog w = findWorklog(worklogId); + assertCanComment(); + + UiwsWorklogCmt c = new UiwsWorklogCmt(); + c.setWorklogId(worklogId); + c.setCmtContent(req.cmtContent()); + c.setWriterId(actor); + c.setKakaoSentYn("N"); + c.setConfirmYn("N"); + c.setCreatedBy(actor); + c.setCreatedAt(LocalDateTime.now()); + mapper.insertCmt(c); + + // 알림: 일지 작성자에게 메일 폴백(외부 메신저 미사용). + String writerEmail = userEmail(w.getWriterId()); + String subject = "[UIWS] 업무일지 새 댓글: " + w.getTitle(); + String body = "업무일지에 새 댓글이 등록되었습니다.\n내용: " + req.cmtContent(); + boolean sent = notifier.notifyComment(w.getWriterId(), writerEmail, subject, body); + if (sent) { + mapper.updateCmtKakaoSent(c.getCmtId()); + c.setKakaoSentYn("Y"); + } + + String writerNm = userNames(List.of(actor)).getOrDefault(actor, actor); + return new WorklogCommentDto(c.getCmtId(), c.getCmtContent(), writerNm, + fmt(c.getCreatedAt()), c.getKakaoSentYn(), c.getConfirmYn()); + } + + // ------------------------------------------------------------------ 댓글 확인(작성자 전용) + @Transactional + public void confirmComment(Long cmtId) { + String actor = UiwsCurrentUser.id(); + UiwsWorklogCmt c = mapper.findCmtById(cmtId); + if (c == null) { + throw new UiwsApiException(UiwsErrorCode.WORKLOG_NOT_FOUND, "댓글을 찾을 수 없습니다."); + } + UiwsWorklog w = findWorklog(c.getWorklogId()); + if (!w.getWriterId().equals(actor)) { + throw new UiwsApiException(UiwsErrorCode.FORBIDDEN, "본인 업무일지의 댓글만 확인 처리할 수 있습니다."); + } + mapper.confirmCmt(cmtId, actor); + } + + // ------------------------------------------------------------------ 내가 단 댓글 중 작성자 미확인 목록 + @Transactional(readOnly = true) + public List unconfirmedByMe() { + String me = UiwsCurrentUser.id(); + List rows = mapper.findUnconfirmedByWriter(me); + if (rows.isEmpty()) { + return List.of(); + } + List worklogIds = rows.stream().map(UiwsWorklogCmt::getWorklogId).distinct().toList(); + Map worklogs = mapper.findWorklogsByIds(worklogIds).stream() + .collect(Collectors.toMap(UiwsWorklog::getWorklogId, wl -> wl)); + Map writerNames = userNames( + worklogs.values().stream().map(UiwsWorklog::getWriterId).toList()); + return rows.stream().map(c -> { + UiwsWorklog wl = worklogs.get(c.getWorklogId()); + return new UnconfirmedCommentDto(c.getCmtId(), c.getWorklogId(), + wl != null ? wl.getTitle() : null, + wl != null ? writerNames.getOrDefault(wl.getWriterId(), wl.getWriterId()) : null, + c.getCmtContent(), fmt(c.getCreatedAt())); + }).toList(); + } + + // ================================================================== helpers + + /** 댓글 권한(silo 완화): ERP RBAC MANAGER/ADMIN/CFO 만 작성 가능. */ + private void assertCanComment() { + if (!UiwsCurrentUser.isManagerOrAbove()) { + throw new UiwsApiException(UiwsErrorCode.FORBIDDEN, "댓글은 관리자/매니저 권한만 작성할 수 있습니다."); + } + } + + private List toListDtos(List rows) { + Map cmtCounts = commentCounts(rows.stream().map(UiwsWorklog::getWorklogId).toList()); + Map writerNames = userNames(rows.stream().map(UiwsWorklog::getWriterId).toList()); + return rows.stream() + .map(w -> new WorklogListDto(w.getWorklogId(), w.getTitle(), + writerNames.getOrDefault(w.getWriterId(), w.getWriterId()), + w.getWorkDate().toString(), w.getProgressCd(), + cmtCounts.getOrDefault(w.getWorklogId(), 0L))) + .toList(); + } + + private WorklogDetailDto toDetail(UiwsWorklog w) { + List dtls = mapper.findDtlByWorklogId(w.getWorklogId()); + List cmts = mapper.findCmtByWorklogId(w.getWorklogId()); + List nameIds = new ArrayList<>(); + nameIds.add(w.getWriterId()); + cmts.forEach(c -> nameIds.add(c.getWriterId())); + Map writerNames = userNames(nameIds); + + List details = dtls.stream().map(WorklogDtlDto::from).toList(); + List comments = cmts.stream() + .map(c -> new WorklogCommentDto(c.getCmtId(), c.getCmtContent(), + writerNames.getOrDefault(c.getWriterId(), c.getWriterId()), + fmt(c.getCreatedAt()), c.getKakaoSentYn(), c.getConfirmYn())) + .toList(); + return new WorklogDetailDto(w.getWorklogId(), w.getTitle(), w.getWriterId(), + writerNames.getOrDefault(w.getWriterId(), w.getWriterId()), w.getWorkDate().toString(), + w.getWorkStatusCd(), w.getProgressCd(), w.getRepeatYn(), + w.getRepeatStartDate() != null ? w.getRepeatStartDate().toString() : null, + w.getRepeatEndDate() != null ? w.getRepeatEndDate().toString() : null, + details, comments); + } + + private void applyHeader(UiwsWorklog w, WorklogSaveDto dto) { + w.setTitle(dto.title()); + w.setWorkDate(parseDate(dto.workDate())); + w.setWorkStatusCd(dto.workStatusCd()); + w.setProgressCd((dto.progressCd() != null && !dto.progressCd().isBlank()) ? dto.progressCd() : DEFAULT_PROGRESS); + w.setRepeatYn((dto.repeatYn() != null && !dto.repeatYn().isBlank()) ? dto.repeatYn() : "N"); + w.setRepeatStartDate(parseDateNullable(dto.repeatStartDate())); + w.setRepeatEndDate(parseDateNullable(dto.repeatEndDate())); + } + + private UiwsWorklogDtl newDtl(Long worklogId, WorklogDtlDto d, String actor) { + UiwsWorklogDtl e = new UiwsWorklogDtl(); + e.setWorklogId(worklogId); + applyDtl(e, d); + e.setCreatedBy(actor); + e.setCreatedAt(LocalDateTime.now()); + return e; + } + + private void applyDtl(UiwsWorklogDtl e, WorklogDtlDto d) { + if (d.startHour() == null || d.endHour() == null + || d.startHour() < 0 || d.endHour() > 24 || d.endHour() < d.startHour()) { + throw new UiwsApiException(UiwsErrorCode.WORKLOG_TIME_INVALID); + } + e.setStartHour(d.startHour()); + e.setEndHour(d.endHour()); + e.setWorkTypeCd(d.workTypeCd()); + e.setCompanyId(d.companyId()); + e.setWorkContent(d.workContent()); + e.setIssueContent(d.issueContent()); + e.setSortOrd(d.sortOrd() != null ? d.sortOrd() : 0); + } + + private void validateNoOverlap(List details) { + List rows = details.stream() + .filter(d -> d.startHour() != null && d.endHour() != null) + .sorted((a, b) -> Integer.compare(a.startHour(), b.startHour())) + .toList(); + for (int i = 1; i < rows.size(); i++) { + WorklogDtlDto prev = rows.get(i - 1); + WorklogDtlDto cur = rows.get(i); + if (cur.startHour() < prev.endHour()) { + throw new UiwsApiException(UiwsErrorCode.WORKLOG_TIME_OVERLAP); + } + } + } + + private UiwsWorklog findWorklog(Long id) { + UiwsWorklog w = mapper.findWorklogById(id); + if (w == null) { + throw new UiwsApiException(UiwsErrorCode.WORKLOG_NOT_FOUND); + } + return w; + } + + private Map commentCounts(List worklogIds) { + if (worklogIds == null || worklogIds.isEmpty()) { + return Map.of(); + } + Map result = new LinkedHashMap<>(); + for (Map cc : mapper.countCommentsByWorklogIds(worklogIds)) { + result.put(toLong(cc.get("worklogId")), toLong(cc.get("cnt"))); + } + return result; + } + + private Map userNames(List userIds) { + List ids = userIds.stream().filter(s -> s != null && !s.isBlank()).distinct().toList(); + if (ids.isEmpty()) { + return Map.of(); + } + return mapper.findUserNames(ids).stream() + .collect(Collectors.toMap(r -> r.get("username"), r -> r.get("fullName"), (a, b) -> a)); + } + + /** writerId(username) → email (댓글 알림 메일 발송용). 미보유 시 null. */ + private String userEmail(String writerId) { + if (writerId == null || writerId.isBlank()) { + return null; + } + return mapper.findUserEmail(writerId); + } + + private static int totalPages(long total, int size) { + return size <= 0 ? 0 : (int) ((total + size - 1) / size); + } + + private static String blankToNull(String s) { + return (s == null || s.isBlank()) ? null : s; + } + + private static String safeState(String s) { + return s == null ? "" : s.trim(); + } + + private static String str(Object o) { + return o == null ? "" : o.toString(); + } + + private static long toLong(Object o) { + if (o == null) { + return 0L; + } + return (o instanceof Number n) ? n.longValue() : Long.parseLong(o.toString()); + } + + private static String fmt(LocalDateTime dt) { + return dt != null ? dt.format(DT) : null; + } + + private static LocalDate parseDate(String s) { + try { + return LocalDate.parse(s); + } catch (Exception e) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "날짜 형식이 올바르지 않습니다(yyyy-MM-dd)."); + } + } + + private static LocalDate parseDateNullable(String s) { + return (s == null || s.isBlank()) ? null : parseDate(s); + } + + private static YearMonth parseYearMonth(String s) { + try { + if (s == null || s.isBlank()) { + return YearMonth.now(); + } + return YearMonth.parse(s); + } catch (Exception e) { + throw new UiwsApiException(UiwsErrorCode.INVALID_REQUEST, "yearMonth 형식이 올바르지 않습니다(yyyy-MM)."); + } + } +} diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml new file mode 100644 index 0000000..dd5019e --- /dev/null +++ b/backend/src/main/resources/application.yml @@ -0,0 +1,78 @@ +server: + port: 8019 + +spring: + application: + name: zioinfo-signage + datasource: + url: ${DB_URL:jdbc:postgresql://localhost:5432/signage_db} + username: ${DB_USER:signage_user} + password: ${DB_PASS:signage_pass2026} + driver-class-name: org.postgresql.Driver + hikari: + maximum-pool-size: 3 + connection-timeout: 30000 + # UIWS 이식: 부팅 시 schema.sql + 91_uiws_port.sql 멱등 적용 + # (둘 다 IF NOT EXISTS / ADD COLUMN IF NOT EXISTS / ON CONFLICT DO NOTHING — 재실행 안전). + # 기존 deploy 의 psql -f schema.sql 와 중복돼도 멱등. 91_uiws_port 는 deploy 미적용분(uiws 테이블/2FA 컬럼) 보강. + sql: + init: + mode: always + continue-on-error: true + schema-locations: + - classpath:db/schema.sql + # UIWS system(권한관리) 이식 — tb_uiws_* (멱등, 90 → 91 순서) + - classpath:db/90_uiws_system.sql + - classpath:db/91_uiws_port.sql + # AI 기법(중앙 guardia-rag) 토글 — 테넌트 격리 signage_rag_setting (멱등) + - classpath:db/92_signage_rag_setting.sql + # 로그인 보조(가입 승인대기/아이디찾기) — signage_user name/approval_status ALTER (멱등) + - classpath:db/93_signage_login_helper.sql + # AI 플랫폼(Claude 전환) provider/모델 설정 시드 — signage_setting ai.* (멱등) + - classpath:db/94_seed_ai_config.sql + web: + resources: + static-locations: classpath:/static/ + mvc: + throw-exception-if-no-handler-found: true + +mybatis: + # UIWS 이식: mapper/uiws/*.xml 포함을 위해 재귀 글로브(**)로 확장(기존 mapper/*.xml 포함). + mapper-locations: classpath:mapper/**/*.xml + configuration: + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl + type-aliases-package: com.zioinfo.signage.domain + +guardia: + ollama-url: ${OLLAMA_URL:http://localhost:11434} + ollama-text-model: ${OLLAMA_TEXT_MODEL:llama3.2:1b} + itsm-url: ${ITSM_URL:http://localhost:9001} + # 로컬 임베디드 DuckDB AI 학습/분석 저장소(오프라인). 미가용 시 조용히 비활성(본업 무영향). + learning: + duckdb-path: ${LEARNING_DUCKDB_PATH:/opt/guardia-signage/data/signage_learning.duckdb} + # 중앙 guardia-rag (온프레미스 루프백 전용 — 외부 엔드포인트 금지). + # 미가용/타임아웃 시 SignageRagClient 가 degraded 폴백, 기존 OllamaClient/룰로 무손실 동작. + rag: + base-url: ${RAG_URL:http://127.0.0.1:8020} + timeout-ms: ${RAG_TIMEOUT_MS:120000} + enabled: ${RAG_ENABLED:true} + solution: signage + max-concurrent-streams: 2 + jwt: + secret: ${JWT_SECRET:ZioInfoSignageJwtSecret2026VeryLongSecretKeyForHS256AlgorithmAtLeast256Bits} + expiration: 86400000 + +management: + endpoints: + web: + exposure: + include: health + endpoint: + health: + show-details: never + +logging: + level: + com.zioinfo.signage: DEBUG + org.mybatis: WARN diff --git a/backend/src/main/resources/db/90_uiws_system.sql b/backend/src/main/resources/db/90_uiws_system.sql new file mode 100644 index 0000000..f30dbf3 --- /dev/null +++ b/backend/src/main/resources/db/90_uiws_system.sql @@ -0,0 +1,240 @@ +-- ============================================================================ +-- UIWS system(시스템관리·권한관리) 이식 (zioinfo-signage) — com.zioinfo.signage.uiws.system +-- 원본: workspace/uiws/db/02_schema_core.sql (TB_DEPT/COMPANY/CODE_GRP/CODE/USER/ROLE/ +-- DEPT_ROLE/PROGRAM/MENU/ROLE_MENU). 멀티테넌트 키 체계(VARCHAR ID)를 그대로 유지. +-- +-- 네임스페이스 격리: 원본 TB_* → 소문자 tb_uiws_ 프리픽스. ESN signage_user(BIGSERIAL) 와 +-- 별개 계정 모델(tb_uiws_sys_user: VARCHAR user_id) — 절대 병합하지 않는다. +-- 멱등: 전부 CREATE TABLE IF NOT EXISTS / ON CONFLICT DO NOTHING. mode:always 재실행 완전 멱등. +-- FK 정책: tb_uiws_* 내부 참조만 물리 FK(원본과 동일). 비밀번호는 BCrypt 저장. +-- 보안: 비밀번호/임시비번/자격증명은 응답·로그(코드 외)로 노출하지 않는다(불변규칙). +-- ============================================================================ + +SET client_encoding = 'UTF8'; + +-- ─────────────────────────────────────────────────────────────────────────── +-- 부서 (자기참조 계층) +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_dept ( + dept_id VARCHAR(20) NOT NULL, + dept_nm VARCHAR(100) NOT NULL, + parent_dept_id VARCHAR(20), + sort_ord INT DEFAULT 0, + use_yn CHAR(1) NOT NULL DEFAULT 'Y', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_dept PRIMARY KEY (dept_id), + CONSTRAINT fk_uiws_dept_parent FOREIGN KEY (parent_dept_id) REFERENCES tb_uiws_dept (dept_id), + CONSTRAINT ck_uiws_dept_use_yn CHECK (use_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_dept IS 'UIWS 이식: 부서 (2-depth 계층, 자기참조)'; + +-- ─────────────────────────────────────────────────────────────────────────── +-- 거래처(=근무처) 마스터 +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_company ( + company_id VARCHAR(20) NOT NULL, + company_nm VARCHAR(100) NOT NULL, + biz_no VARCHAR(20), + use_yn CHAR(1) NOT NULL DEFAULT 'Y', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_company PRIMARY KEY (company_id), + CONSTRAINT ck_uiws_company_use_yn CHECK (use_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_company IS 'UIWS 이식: 거래처=근무처 마스터'; + +-- ─────────────────────────────────────────────────────────────────────────── +-- 공통코드 그룹 / 값 (복합 PK) +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_code_grp ( + grp_cd VARCHAR(30) NOT NULL, + grp_nm VARCHAR(100) NOT NULL, + use_yn CHAR(1) NOT NULL DEFAULT 'Y', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_code_grp PRIMARY KEY (grp_cd), + CONSTRAINT ck_uiws_code_grp_use_yn CHECK (use_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_code_grp IS 'UIWS 이식: 공통코드 그룹'; + +CREATE TABLE IF NOT EXISTS tb_uiws_code ( + grp_cd VARCHAR(30) NOT NULL, + code_val VARCHAR(30) NOT NULL, + code_nm VARCHAR(100) NOT NULL, + sort_ord INT DEFAULT 0, + use_yn CHAR(1) NOT NULL DEFAULT 'Y', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_code PRIMARY KEY (grp_cd, code_val), + CONSTRAINT fk_uiws_code_grp FOREIGN KEY (grp_cd) REFERENCES tb_uiws_code_grp (grp_cd), + CONSTRAINT ck_uiws_code_use_yn CHECK (use_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_code IS 'UIWS 이식: 공통코드 값 (복합 PK: grp_cd + code_val)'; + +-- ─────────────────────────────────────────────────────────────────────────── +-- 사용자(계정) — CMS cms_user 와 별개(VARCHAR user_id, 멀티테넌트 업무 사용자) +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_sys_user ( + user_id VARCHAR(20) NOT NULL, + user_nm VARCHAR(50) NOT NULL, + password VARCHAR(100) NOT NULL, -- BCrypt + email VARCHAR(100) NOT NULL, + grade_cd VARCHAR(20), + dept_id VARCHAR(20), + company_id VARCHAR(20), + role_cd VARCHAR(20) NOT NULL DEFAULT 'USER', -- USER/MANAGER/ADMIN + naverworks_id VARCHAR(100), + login_fail_cnt INT NOT NULL DEFAULT 0, + lock_yn CHAR(1) NOT NULL DEFAULT 'N', + use_yn CHAR(1) NOT NULL DEFAULT 'Y', + approval_yn CHAR(1) NOT NULL DEFAULT 'N', + verify_method VARCHAR(20) NOT NULL DEFAULT 'EMAIL', + otp_secret VARCHAR(100), + pw_change_yn CHAR(1) NOT NULL DEFAULT 'N', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_sys_user PRIMARY KEY (user_id), + CONSTRAINT fk_uiws_sysuser_dept FOREIGN KEY (dept_id) REFERENCES tb_uiws_dept (dept_id), + CONSTRAINT fk_uiws_sysuser_company FOREIGN KEY (company_id) REFERENCES tb_uiws_company (company_id), + CONSTRAINT uq_uiws_sysuser_email UNIQUE (email), + CONSTRAINT ck_uiws_sysuser_lock_yn CHECK (lock_yn IN ('Y','N')), + CONSTRAINT ck_uiws_sysuser_use_yn CHECK (use_yn IN ('Y','N')), + CONSTRAINT ck_uiws_sysuser_approval_yn CHECK (approval_yn IN ('Y','N')), + CONSTRAINT ck_uiws_sysuser_verify CHECK (verify_method IN ('EMAIL','OTP')), + CONSTRAINT ck_uiws_sysuser_pwchg_yn CHECK (pw_change_yn IN ('Y','N')), + CONSTRAINT ck_uiws_sysuser_role_cd CHECK (role_cd IN ('USER','MANAGER','ADMIN')), + CONSTRAINT ck_uiws_sysuser_fail_cnt CHECK (login_fail_cnt >= 0) +); +COMMENT ON TABLE tb_uiws_sys_user IS 'UIWS 이식: 업무 사용자 계정(BCrypt, 잠금/실패횟수, 가입승인) — CMS cms_user 와 별개'; + +-- ─────────────────────────────────────────────────────────────────────────── +-- 권한(역할) / 부서-권한 매핑 +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_role ( + role_id VARCHAR(20) NOT NULL, + role_nm VARCHAR(100) NOT NULL, + role_desc VARCHAR(255), + use_yn CHAR(1) NOT NULL DEFAULT 'Y', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_role PRIMARY KEY (role_id), + CONSTRAINT ck_uiws_role_use_yn CHECK (use_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_role IS 'UIWS 이식: 권한(역할)'; + +CREATE TABLE IF NOT EXISTS tb_uiws_dept_role ( + dept_id VARCHAR(20) NOT NULL, + role_id VARCHAR(20) NOT NULL, + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_dept_role PRIMARY KEY (dept_id, role_id), + CONSTRAINT fk_uiws_deptrole_dept FOREIGN KEY (dept_id) REFERENCES tb_uiws_dept (dept_id), + CONSTRAINT fk_uiws_deptrole_role FOREIGN KEY (role_id) REFERENCES tb_uiws_role (role_id) +); +COMMENT ON TABLE tb_uiws_dept_role IS 'UIWS 이식: 부서-권한 매핑 (복합 PK)'; + +-- ─────────────────────────────────────────────────────────────────────────── +-- 프로그램(화면) / 메뉴 / 권한-메뉴 매핑 +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_program ( + program_id VARCHAR(20) NOT NULL, + program_nm VARCHAR(100) NOT NULL, + program_type VARCHAR(10) NOT NULL, + program_url VARCHAR(200), + category VARCHAR(50), + use_yn CHAR(1) NOT NULL DEFAULT 'Y', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_program PRIMARY KEY (program_id), + CONSTRAINT ck_uiws_program_type CHECK (program_type IN ('FORM','POPUP')), + CONSTRAINT ck_uiws_program_use_yn CHECK (use_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_program IS 'UIWS 이식: 프로그램(화면 FORM/POPUP)'; + +CREATE TABLE IF NOT EXISTS tb_uiws_menu ( + menu_id VARCHAR(20) NOT NULL, + menu_nm VARCHAR(100) NOT NULL, + parent_menu_id VARCHAR(20), + program_id VARCHAR(20), + menu_url VARCHAR(200), + sort_ord INT DEFAULT 0, + use_yn CHAR(1) NOT NULL DEFAULT 'Y', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_menu PRIMARY KEY (menu_id), + CONSTRAINT fk_uiws_menu_parent FOREIGN KEY (parent_menu_id) REFERENCES tb_uiws_menu (menu_id), + CONSTRAINT fk_uiws_menu_program FOREIGN KEY (program_id) REFERENCES tb_uiws_program (program_id), + CONSTRAINT ck_uiws_menu_use_yn CHECK (use_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_menu IS 'UIWS 이식: 메뉴 (2-depth 자기참조, 프로그램 연결)'; + +CREATE TABLE IF NOT EXISTS tb_uiws_role_menu ( + role_id VARCHAR(20) NOT NULL, + menu_id VARCHAR(20) NOT NULL, + read_yn CHAR(1) NOT NULL DEFAULT 'Y', + write_yn CHAR(1) NOT NULL DEFAULT 'N', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_role_menu PRIMARY KEY (role_id, menu_id), + CONSTRAINT fk_uiws_rolemenu_role FOREIGN KEY (role_id) REFERENCES tb_uiws_role (role_id), + CONSTRAINT fk_uiws_rolemenu_menu FOREIGN KEY (menu_id) REFERENCES tb_uiws_menu (menu_id), + CONSTRAINT ck_uiws_rolemenu_read_yn CHECK (read_yn IN ('Y','N')), + CONSTRAINT ck_uiws_rolemenu_write_yn CHECK (write_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_role_menu IS 'UIWS 이식: 권한-메뉴 매핑 (복합 PK, 조회/등록 권한)'; + +-- 조회 보조 인덱스 +CREATE INDEX IF NOT EXISTS ix_uiws_sysuser_dept ON tb_uiws_sys_user (dept_id); +CREATE INDEX IF NOT EXISTS ix_uiws_sysuser_company ON tb_uiws_sys_user (company_id); +CREATE INDEX IF NOT EXISTS ix_uiws_menu_parent ON tb_uiws_menu (parent_menu_id, sort_ord); + +-- ─────────────────────────────────────────────────────────────────────────── +-- 최소 시드(멱등): 기본 권한 + 거래처 + 부서. ON CONFLICT DO NOTHING. +-- ─────────────────────────────────────────────────────────────────────────── +INSERT INTO tb_uiws_role (role_id, role_nm, role_desc, use_yn, created_by) +VALUES ('ADMIN', '관리자', '시스템 관리자', 'Y', 'SYSTEM'), + ('MANAGER', '매니저', '팀 관리자', 'Y', 'SYSTEM'), + ('USER', '일반사용자', '일반 사용자', 'Y', 'SYSTEM') +ON CONFLICT (role_id) DO NOTHING; + +INSERT INTO tb_uiws_company (company_id, company_nm, use_yn, created_by) +VALUES ('ZIOINFO', '지오정보기술', 'Y', 'SYSTEM') +ON CONFLICT (company_id) DO NOTHING; + +INSERT INTO tb_uiws_dept (dept_id, dept_nm, parent_dept_id, sort_ord, use_yn, created_by) +VALUES ('ROOT', '본사', NULL, 0, 'Y', 'SYSTEM') +ON CONFLICT (dept_id) DO NOTHING; + +-- ─────────────────────────────────────────────────────────────────────────── +-- 로그인 보조(회원가입·아이디찾기·비번초기화) 이식: signage_user 보강 컬럼. +-- approved 기본값 true → 기존 계정/시드는 그대로 로그인 가능(회귀 0). 신규 회원가입만 approved=false 로 INSERT, +-- ADMIN 승인 전 로그인 차단(AuthService.login 의 approved 게이트에서 검사). +-- display_name: 아이디찾기(이름+이메일 매칭)용. pw_change_yn: 임시비번 발급 후 변경 유도 플래그. +-- ─────────────────────────────────────────────────────────────────────────── +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS approved BOOLEAN DEFAULT true; +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS display_name VARCHAR(100); +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS pw_change_yn BOOLEAN DEFAULT false; +UPDATE signage_user SET approved = true WHERE approved IS NULL; + +-- end 90_uiws_system.sql diff --git a/backend/src/main/resources/db/91_uiws_port.sql b/backend/src/main/resources/db/91_uiws_port.sql new file mode 100644 index 0000000..cec70ea --- /dev/null +++ b/backend/src/main/resources/db/91_uiws_port.sql @@ -0,0 +1,243 @@ +-- ============================================================================ +-- UIWS 업무 테이블 이식 (ESN) — 2026-06-20, uiws-schema-porter +-- 계획서: .claude/agents/_workspace/uiws_port_plan.md (schema-porter 트랙 6.1) +-- 원본: workspace/uiws/db/{03_worklog,04_schedule,05_message,02_core(2FA)}.sql +-- +-- 네임스페이스 격리: UIWS TB_* → 소문자 tb_uiws_ 프리픽스 (기존 tb_audit_log 등과 충돌 회피). +-- 멱등: 전부 CREATE TABLE IF NOT EXISTS / ADD COLUMN IF NOT EXISTS / ON CONFLICT DO NOTHING. +-- mode:always 재실행 시 완전 멱등(기존 schema.sql·시드 무영향). +-- FK 정책: tb_uiws_* 내부 참조만 물리 FK. 외부 user/code/company/dept FK는 논리참조로 완화 +-- (UIWS는 VARCHAR USER_ID 키 / ESN signage_user PK는 BIGSERIAL — 키 체계 불일치 → 컬럼만 유지). +-- 코드값(WORK_STATUS_CD/WORK_TYPE_CD/RCV_TYPE 등): TB_CODE 미이식 → 일반 컬럼 + CHECK만 유지. +-- ============================================================================ + +SET client_encoding = 'UTF8'; + +-- ─────────────────────────────────────────────────────────────────────────── +-- [worklog] tb_uiws_worklog — 업무일지 헤더 (원본 TB_WORKLOG) +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_worklog ( + worklog_id BIGINT GENERATED ALWAYS AS IDENTITY, + title VARCHAR(200) NOT NULL, + writer_id VARCHAR(20) NOT NULL, -- 논리참조(UIWS USER_ID) + work_date DATE NOT NULL, + work_status_cd VARCHAR(30) NOT NULL, -- WORK_STATUS 코드값(논리) + progress_cd VARCHAR(30) NOT NULL DEFAULT 'ONGOING', + repeat_yn CHAR(1) NOT NULL DEFAULT 'N', + repeat_start_date DATE, + repeat_end_date DATE, + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_worklog PRIMARY KEY (worklog_id), + CONSTRAINT ck_uiws_worklog_progress CHECK (progress_cd IN ('ONGOING','DONE')), + CONSTRAINT ck_uiws_worklog_repeat_yn CHECK (repeat_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_worklog IS 'UIWS 이식: 업무일지 헤더 (근무일자/근무상태/반복)'; + +-- tb_uiws_worklog_dtl — 시간대별 상세 (통계 집계 원천, 원본 TB_WORKLOG_DTL) +CREATE TABLE IF NOT EXISTS tb_uiws_worklog_dtl ( + dtl_id BIGINT GENERATED ALWAYS AS IDENTITY, + worklog_id BIGINT NOT NULL, + start_hour INT NOT NULL, + end_hour INT NOT NULL, + work_type_cd VARCHAR(30) NOT NULL, -- WORK_TYPE 코드값(논리) + company_id VARCHAR(20) NOT NULL, -- 논리참조(UIWS COMPANY_ID) + work_content TEXT, + issue_content TEXT, + sort_ord INT DEFAULT 0, + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_worklog_dtl PRIMARY KEY (dtl_id), + CONSTRAINT fk_uiws_dtl_worklog FOREIGN KEY (worklog_id) + REFERENCES tb_uiws_worklog (worklog_id) ON DELETE CASCADE, + CONSTRAINT ck_uiws_dtl_start_hour CHECK (start_hour BETWEEN 0 AND 24), + CONSTRAINT ck_uiws_dtl_end_hour CHECK (end_hour BETWEEN 0 AND 24), + CONSTRAINT ck_uiws_dtl_hour_order CHECK (end_hour >= start_hour) +); +COMMENT ON TABLE tb_uiws_worklog_dtl IS 'UIWS 이식: 업무일지 시간대별 상세 (헤더 삭제 시 CASCADE)'; + +-- tb_uiws_worklog_cmt — 댓글 (원본 TB_WORKLOG_CMT) +CREATE TABLE IF NOT EXISTS tb_uiws_worklog_cmt ( + cmt_id BIGINT GENERATED ALWAYS AS IDENTITY, + worklog_id BIGINT NOT NULL, + cmt_content TEXT NOT NULL, + writer_id VARCHAR(20) NOT NULL, -- 논리참조 + kakao_sent_yn CHAR(1) NOT NULL DEFAULT 'N', + confirm_yn CHAR(1) NOT NULL DEFAULT 'N', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_worklog_cmt PRIMARY KEY (cmt_id), + CONSTRAINT fk_uiws_cmt_worklog FOREIGN KEY (worklog_id) + REFERENCES tb_uiws_worklog (worklog_id) ON DELETE CASCADE, + CONSTRAINT ck_uiws_cmt_confirm_yn CHECK (confirm_yn IN ('Y','N')), + CONSTRAINT ck_uiws_cmt_kakao_yn CHECK (kakao_sent_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_worklog_cmt IS 'UIWS 이식: 업무일지 댓글 (등록 시 카카오 알림톡)'; + +CREATE INDEX IF NOT EXISTS ix_uiws_worklog_date_writer ON tb_uiws_worklog (work_date, writer_id, work_status_cd); +CREATE INDEX IF NOT EXISTS ix_uiws_worklog_writer ON tb_uiws_worklog (writer_id); +CREATE INDEX IF NOT EXISTS ix_uiws_dtl_type_company ON tb_uiws_worklog_dtl (work_type_cd, company_id); +CREATE INDEX IF NOT EXISTS ix_uiws_dtl_worklog ON tb_uiws_worklog_dtl (worklog_id); +CREATE INDEX IF NOT EXISTS ix_uiws_dtl_company ON tb_uiws_worklog_dtl (company_id); +CREATE INDEX IF NOT EXISTS ix_uiws_cmt_worklog ON tb_uiws_worklog_cmt (worklog_id); + +-- ─────────────────────────────────────────────────────────────────────────── +-- [schedule] tb_uiws_schedule — 일정 개인/부서 (원본 TB_SCHEDULE) +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_schedule ( + schedule_id BIGINT GENERATED ALWAYS AS IDENTITY, + sche_type VARCHAR(10) NOT NULL, + title VARCHAR(200) NOT NULL, + sche_gubun_cd VARCHAR(30), + importance_cd VARCHAR(30), + start_dt TIMESTAMP NOT NULL, + end_dt TIMESTAMP NOT NULL, + content TEXT, + owner_id VARCHAR(20) NOT NULL, -- 논리참조 + dept_id VARCHAR(20), -- 논리참조 + charger_id VARCHAR(20), -- 논리참조 + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_schedule PRIMARY KEY (schedule_id), + CONSTRAINT ck_uiws_sche_type CHECK (sche_type IN ('PERSONAL','DEPT')), + CONSTRAINT ck_uiws_sche_dt_order CHECK (end_dt >= start_dt) +); +COMMENT ON TABLE tb_uiws_schedule IS 'UIWS 이식: 일정(개인 PERSONAL / 부서 DEPT)'; + +-- tb_uiws_diary — 일지(일정 연계 선택, 원본 TB_DIARY) +CREATE TABLE IF NOT EXISTS tb_uiws_diary ( + diary_id BIGINT GENERATED ALWAYS AS IDENTITY, + title VARCHAR(200) NOT NULL, + content TEXT, + schedule_id BIGINT, + writer_id VARCHAR(20) NOT NULL, -- 논리참조 + diary_date DATE, + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_diary PRIMARY KEY (diary_id), + CONSTRAINT fk_uiws_diary_sche FOREIGN KEY (schedule_id) + REFERENCES tb_uiws_schedule (schedule_id) ON DELETE SET NULL +); +COMMENT ON TABLE tb_uiws_diary IS 'UIWS 이식: 일지 (일정 연계 선택, 일정 삭제 시 연계 해제)'; + +-- tb_uiws_attach — 첨부파일 폴리모픽 (원본 TB_ATTACH, 물리 FK 미적용) +CREATE TABLE IF NOT EXISTS tb_uiws_attach ( + attach_id BIGINT GENERATED ALWAYS AS IDENTITY, + ref_type VARCHAR(20) NOT NULL, + ref_id BIGINT NOT NULL, + file_nm VARCHAR(255) NOT NULL, + file_path VARCHAR(500) NOT NULL, + file_size BIGINT, + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_attach PRIMARY KEY (attach_id), + CONSTRAINT ck_uiws_attach_ref_type CHECK (ref_type IN ('SCHEDULE','DIARY')), + CONSTRAINT ck_uiws_attach_size CHECK (file_size IS NULL OR file_size >= 0) +); +COMMENT ON TABLE tb_uiws_attach IS 'UIWS 이식: 첨부파일 (폴리모픽 REF_TYPE=SCHEDULE/DIARY)'; + +CREATE INDEX IF NOT EXISTS ix_uiws_sche_dt_range ON tb_uiws_schedule (start_dt, end_dt, sche_type); +CREATE INDEX IF NOT EXISTS ix_uiws_sche_owner ON tb_uiws_schedule (owner_id); +CREATE INDEX IF NOT EXISTS ix_uiws_sche_dept ON tb_uiws_schedule (dept_id); +CREATE INDEX IF NOT EXISTS ix_uiws_diary_sche ON tb_uiws_diary (schedule_id); +CREATE INDEX IF NOT EXISTS ix_uiws_diary_writer ON tb_uiws_diary (writer_id, diary_date); +CREATE INDEX IF NOT EXISTS ix_uiws_attach_ref ON tb_uiws_attach (ref_type, ref_id); + +-- ─────────────────────────────────────────────────────────────────────────── +-- [message] tb_uiws_message — 쪽지 헤더 (원본 TB_MESSAGE) +-- REF_WORKLOG_ID → tb_uiws_worklog (내부 FK 유지), REPLY_TO_ID → 자기참조. +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_message ( + message_id BIGINT GENERATED ALWAYS AS IDENTITY, + sender_id VARCHAR(20) NOT NULL, -- 논리참조 + title VARCHAR(200) NOT NULL, + content TEXT NOT NULL, + ref_worklog_id BIGINT, + reply_to_id BIGINT, + sent_at TIMESTAMP NOT NULL DEFAULT now(), + sender_del_yn CHAR(1) NOT NULL DEFAULT 'N', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_message PRIMARY KEY (message_id), + CONSTRAINT fk_uiws_msg_worklog FOREIGN KEY (ref_worklog_id) + REFERENCES tb_uiws_worklog (worklog_id) ON DELETE SET NULL, + CONSTRAINT fk_uiws_msg_reply FOREIGN KEY (reply_to_id) + REFERENCES tb_uiws_message (message_id), + CONSTRAINT ck_uiws_msg_sender_del_yn CHECK (sender_del_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_message IS 'UIWS 이식: 쪽지 헤더 (참조 업무일지/답장 원본 자기참조)'; + +-- tb_uiws_message_rcv — 수신자 (원본 TB_MESSAGE_RCV) +CREATE TABLE IF NOT EXISTS tb_uiws_message_rcv ( + rcv_id BIGINT GENERATED ALWAYS AS IDENTITY, + message_id BIGINT NOT NULL, + receiver_id VARCHAR(20) NOT NULL, -- 논리참조 + rcv_type VARCHAR(10) NOT NULL, -- MSG_RCV_TYPE 코드값(논리) + read_yn CHAR(1) NOT NULL DEFAULT 'N', + read_at TIMESTAMP, + receiver_del_yn CHAR(1) NOT NULL DEFAULT 'N', + created_by VARCHAR(20) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_message_rcv PRIMARY KEY (rcv_id), + CONSTRAINT fk_uiws_rcv_message FOREIGN KEY (message_id) + REFERENCES tb_uiws_message (message_id) ON DELETE CASCADE, + CONSTRAINT uq_uiws_rcv_msg_receiver UNIQUE (message_id, receiver_id), + CONSTRAINT ck_uiws_rcv_type CHECK (rcv_type IN ('RECV','REF')), + CONSTRAINT ck_uiws_rcv_read_yn CHECK (read_yn IN ('Y','N')), + CONSTRAINT ck_uiws_rcv_del_yn CHECK (receiver_del_yn IN ('Y','N')) +); +COMMENT ON TABLE tb_uiws_message_rcv IS 'UIWS 이식: 쪽지 수신자(수신 RECV/참조 REF, 개봉여부)'; + +CREATE INDEX IF NOT EXISTS ix_uiws_rcv_receiver_read ON tb_uiws_message_rcv (receiver_id, read_yn); +CREATE INDEX IF NOT EXISTS ix_uiws_rcv_message ON tb_uiws_message_rcv (message_id); +CREATE INDEX IF NOT EXISTS ix_uiws_msg_sender ON tb_uiws_message (sender_id, sent_at); + +-- ─────────────────────────────────────────────────────────────────────────── +-- [2FA] tb_uiws_login_verify — 로그인 2차 검증 코드 (원본 TB_LOGIN_VERIFY) +-- USER_ID 는 논리참조(외부 user FK 미적용 — 키 체계 불일치). +-- ─────────────────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS tb_uiws_login_verify ( + verify_id BIGINT GENERATED ALWAYS AS IDENTITY, + user_id VARCHAR(50) NOT NULL, -- ESN username 논리참조 + verify_method VARCHAR(20) NOT NULL DEFAULT 'EMAIL', + verify_code VARCHAR(10) NOT NULL, + expire_at TIMESTAMP NOT NULL, + verified_yn CHAR(1) NOT NULL DEFAULT 'N', + created_by VARCHAR(20) NOT NULL DEFAULT 'SYSTEM', + created_at TIMESTAMP NOT NULL DEFAULT now(), + updated_by VARCHAR(20), + updated_at TIMESTAMP, + CONSTRAINT pk_tb_uiws_login_verify PRIMARY KEY (verify_id), + CONSTRAINT ck_uiws_verify_yn CHECK (verified_yn IN ('Y','N')), + CONSTRAINT ck_uiws_verify_method CHECK (verify_method IN ('EMAIL','OTP')) +); +COMMENT ON TABLE tb_uiws_login_verify IS 'UIWS 이식(2FA): 로그인 2차 검증 코드(이메일/OTP, 만료)'; +CREATE INDEX IF NOT EXISTS ix_uiws_verify_user ON tb_uiws_login_verify (user_id, verified_yn); + +-- ─────────────────────────────────────────────────────────────────────────── +-- [2FA] 기존 user 테이블 컬럼 보강 (DROP/재정의 금지 — ADD COLUMN IF NOT EXISTS 멱등) +-- 이메일 인증코드·만료시각, 실패 카운트(기본 0), 잠금(기본 false), OTP 시크릿. +-- ─────────────────────────────────────────────────────────────────────────── +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS email_verify_code VARCHAR(10); +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS email_verify_expire TIMESTAMP; +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS login_fail_count INT DEFAULT 0; +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS locked BOOLEAN DEFAULT false; +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS otp_secret VARCHAR(255); + +-- end 91_uiws_port.sql diff --git a/backend/src/main/resources/db/92_signage_rag_setting.sql b/backend/src/main/resources/db/92_signage_rag_setting.sql new file mode 100644 index 0000000..baedbc3 --- /dev/null +++ b/backend/src/main/resources/db/92_signage_rag_setting.sql @@ -0,0 +1,53 @@ +-- ============================================================================ +-- 92_signage_rag_setting.sql — ESN 최신 AI 기법(중앙 guardia-rag) 토글 설정 (멱등) +-- ---------------------------------------------------------------------------- +-- 기존 signage_setting 은 전역(테넌트 무차원)이라 RAG 기법 토글의 *테넌트 격리* 요건을 +-- 만족하지 못한다. 그래서 (tenant_code, setting_key) 복합 PK 의 전용 테이블을 신설한다. +-- sql.init.mode=always + continue-on-error 환경에서 재실행 안전(IF NOT EXISTS / ON CONFLICT). +-- 무거운 기법(rerank·graphrag·stream)은 서버 RAM 제약상 기본 OFF, retrieval_mode 기본 vector. +-- 자격증명/PII 미저장 — 운영 토글 값만. +-- ============================================================================ + +CREATE TABLE IF NOT EXISTS signage_rag_setting ( + tenant_code VARCHAR(20) NOT NULL, + setting_key VARCHAR(100) NOT NULL, + setting_value TEXT, + updated_at TIMESTAMP DEFAULT NOW(), + PRIMARY KEY (tenant_code, setting_key) +); + +-- 테넌트별 기본 토글 시드 (멱등). 4개 테넌트 × 토글 키. +-- 무거운 기법 기본 off, 소형모델, vector 모드, top_k=5. +INSERT INTO signage_rag_setting (tenant_code, setting_key, setting_value) VALUES + ('LGINNOTEK','rag.enabled','true'), ('LGINNOTEK','rag.retrieval_mode','vector'), + ('LGINNOTEK','rag.rerank','false'), ('LGINNOTEK','rag.graphrag','false'), + ('LGINNOTEK','rag.tool_use','false'), ('LGINNOTEK','rag.structured','true'), + ('LGINNOTEK','rag.stream','false'), ('LGINNOTEK','rag.top_k','5'), + ('LGINNOTEK','rag.agent_max_steps','4'), ('LGINNOTEK','rag.temperature','0.1'), + ('LGINNOTEK','rag.faithfulness_threshold','0.5'), + ('LGINNOTEK','rag.generation_model','llama3.2:1b'), + + ('LGIT','rag.enabled','true'), ('LGIT','rag.retrieval_mode','vector'), + ('LGIT','rag.rerank','false'), ('LGIT','rag.graphrag','false'), + ('LGIT','rag.tool_use','false'), ('LGIT','rag.structured','true'), + ('LGIT','rag.stream','false'), ('LGIT','rag.top_k','5'), + ('LGIT','rag.agent_max_steps','4'), ('LGIT','rag.temperature','0.1'), + ('LGIT','rag.faithfulness_threshold','0.5'), + ('LGIT','rag.generation_model','llama3.2:1b'), + + ('EMART','rag.enabled','true'), ('EMART','rag.retrieval_mode','vector'), + ('EMART','rag.rerank','false'), ('EMART','rag.graphrag','false'), + ('EMART','rag.tool_use','false'), ('EMART','rag.structured','true'), + ('EMART','rag.stream','false'), ('EMART','rag.top_k','5'), + ('EMART','rag.agent_max_steps','4'), ('EMART','rag.temperature','0.1'), + ('EMART','rag.faithfulness_threshold','0.5'), + ('EMART','rag.generation_model','llama3.2:1b'), + + ('ZIOINFO','rag.enabled','true'), ('ZIOINFO','rag.retrieval_mode','vector'), + ('ZIOINFO','rag.rerank','false'), ('ZIOINFO','rag.graphrag','false'), + ('ZIOINFO','rag.tool_use','false'), ('ZIOINFO','rag.structured','true'), + ('ZIOINFO','rag.stream','false'), ('ZIOINFO','rag.top_k','5'), + ('ZIOINFO','rag.agent_max_steps','4'), ('ZIOINFO','rag.temperature','0.1'), + ('ZIOINFO','rag.faithfulness_threshold','0.5'), + ('ZIOINFO','rag.generation_model','llama3.2:1b') +ON CONFLICT (tenant_code, setting_key) DO NOTHING; diff --git a/backend/src/main/resources/db/93_signage_login_helper.sql b/backend/src/main/resources/db/93_signage_login_helper.sql new file mode 100644 index 0000000..028f69a --- /dev/null +++ b/backend/src/main/resources/db/93_signage_login_helper.sql @@ -0,0 +1,12 @@ +-- ============================================================================ +-- 로그인 보조 3종(회원가입 승인대기 / 아이디찾기 / 비밀번호 초기화) — signage_user ALTER +-- 멱등: ADD COLUMN IF NOT EXISTS. mode:always 재실행 완전 멱등(기존 데이터 무영향). +-- - name : 아이디찾기/비번초기화 매칭 키(이름+이메일). +-- - approval_status : 가입 신청 상태. 기존 행 기본 APPROVED, 신규 가입 PENDING(is_active=FALSE). +-- 보안: 임시비밀번호/자격증명은 메일/로그 채널로만 전달(컬럼/응답 노출 없음, 불변규칙). +-- ============================================================================ + +SET client_encoding = 'UTF8'; + +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS name VARCHAR(100); +ALTER TABLE signage_user ADD COLUMN IF NOT EXISTS approval_status VARCHAR(20) DEFAULT 'APPROVED'; diff --git a/backend/src/main/resources/db/94_seed_ai_config.sql b/backend/src/main/resources/db/94_seed_ai_config.sql new file mode 100644 index 0000000..e651fbb --- /dev/null +++ b/backend/src/main/resources/db/94_seed_ai_config.sql @@ -0,0 +1,28 @@ +-- ===================================================================== +-- GUARDiA SIGNAGE — 94. AI 플랫폼(LLM provider) 설정 시드 (멱등) +-- 대상 DB : guardia_signage_db (테이블 signage_setting — schema.sql 에서 생성) +-- 적용 : application.yml spring.sql.init.mode=always + schema-locations 에 본 파일 등재. +-- mode:always 재실행 안전(ON CONFLICT DO NOTHING). +-- 설명 : 외부 Claude(Anthropic) API 를 온프레미스 Ollama 와 병행·선택형으로 추가. +-- 관리자(ADMIN)가 런타임으로 provider/모델을 선택(재기동 불요, AiConfigService). +-- * ai.provider : ollama(기본) / claude / qwen3 / deepseek / glm +-- * ai.claude.model : claude-sonnet-4-6(기본) / claude-haiku-4-5 / claude-opus-4-8 +-- * ai.ollama.textModel: 빈값(=서버 프로퍼티 guardia.ollama-text-model 폴백, llama3.2:1b) +-- * ai.enabled : true(기본, off=규칙기반 degraded) +-- 보안 : Claude API 키는 DB 에 저장하지 않는다 — 서버 환경변수 ANTHROPIC_API_KEY 로만 주입. +-- 본 시드에 키/시크릿/IP/비밀번호 일절 미포함. +-- 무회귀 : 기본 provider=ollama → 설정 미변경 시 기존 Ollama 동작과 바이트 동일. +-- 멱등 : INSERT ... ON CONFLICT (setting_key) DO NOTHING. +-- 참고 : 기존 ai.ollama.text.model / ai.ollama.enabled(레거시 키)와 별개(신규 ai.* 키). +-- ===================================================================== + +SET client_encoding = 'UTF8'; + +INSERT INTO signage_setting (setting_key, setting_value, category, description) VALUES + ('ai.provider', 'ollama', 'AI', 'LLM provider(ollama/claude/qwen3/deepseek/glm)'), + ('ai.claude.model', 'claude-sonnet-4-6', 'AI', 'Claude 모델 ID(화이트리스트)'), + ('ai.ollama.textModel', '', 'AI', 'Ollama 텍스트 모델(빈값=서버 기본 폴백)'), + ('ai.enabled', 'true', 'AI', '전역 AI 사용 여부(off=규칙기반 degraded)') +ON CONFLICT (setting_key) DO NOTHING; + +-- end 94_seed_ai_config.sql diff --git a/backend/src/main/resources/db/schema.sql b/backend/src/main/resources/db/schema.sql new file mode 100644 index 0000000..2245ff5 --- /dev/null +++ b/backend/src/main/resources/db/schema.sql @@ -0,0 +1,486 @@ +-- ============================================================================ +-- GUARDiA SIGNAGE — 전자간판(e-SignBoard / ESB) 중앙관제 플랫폼 PostgreSQL 스키마 +-- (signage_db) · 파생 베이스: guardia-esn. 사업계획서(E-SIGNBOARD) 7대 기능 반영. +-- 지역: 서울 / 대전 / 대구 / 부산 · 매장코드(store_code) 중심 중앙관리. +-- 모든 CREATE/INSERT 는 멱등(IF NOT EXISTS / ON CONFLICT DO NOTHING). +-- ============================================================================ + +-- ── 운영사(테넌트) ─────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_tenant ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) UNIQUE NOT NULL, + tenant_name VARCHAR(200) NOT NULL, + description TEXT, + is_active BOOLEAN DEFAULT TRUE, + created_at TIMESTAMP DEFAULT NOW() +); + +INSERT INTO signage_tenant (tenant_code, tenant_name, description) VALUES + ('ZIOINFO', '지오정보기술', '전자간판 중앙관제 운영(기본)'), + ('CULINAN', '컬리넌홀딩스', 'e-SignBoard 사업 운영사'), + ('GOV', '지자체 간판개선', '정부/지자체 간판 표준화 시범사업') +ON CONFLICT (tenant_code) DO NOTHING; + +-- ── 지역 마스터(서울/대전/대구/부산) ───────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_region ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + region_code VARCHAR(30) NOT NULL, + region_name VARCHAR(100) NOT NULL, + dc_name VARCHAR(200), -- 관할 데이터센터(H.Q.) 명 + description TEXT, + is_active BOOLEAN DEFAULT TRUE, + created_at TIMESTAMP DEFAULT NOW(), + UNIQUE (tenant_code, region_code) +); + +INSERT INTO signage_region (tenant_code, region_code, region_name, dc_name) VALUES + ('ZIOINFO', 'SEOUL', '서울', '서울 중앙 데이터센터'), + ('ZIOINFO', 'DAEJEON', '대전', '대전 지역센터'), + ('ZIOINFO', 'DAEGU', '대구', '대구 지역센터'), + ('ZIOINFO', 'BUSAN', '부산', '부산 지역센터') +ON CONFLICT (tenant_code, region_code) DO NOTHING; + +-- ── 매장 그룹(지역 단위 그룹) ──────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_store_group ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + group_code VARCHAR(50) NOT NULL, + group_name VARCHAR(200) NOT NULL, + description TEXT, + is_active BOOLEAN DEFAULT TRUE, + created_at TIMESTAMP DEFAULT NOW(), + UNIQUE (tenant_code, group_code) +); + +INSERT INTO signage_store_group (tenant_code, group_code, group_name) VALUES + ('ZIOINFO', 'GRP-SEOUL', '서울권 매장'), + ('ZIOINFO', 'GRP-DAEJEON', '대전권 매장'), + ('ZIOINFO', 'GRP-DAEGU', '대구권 매장'), + ('ZIOINFO', 'GRP-BUSAN', '부산권 매장') +ON CONFLICT (tenant_code, group_code) DO NOTHING; + +-- ── 매장(store_code = 매장코드, 중앙관리 단위) ──────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_store ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_code VARCHAR(50) NOT NULL, -- 매장코드 (예: 1000, 2000, 4001) + store_name VARCHAR(200) NOT NULL, + address VARCHAR(500), + phone VARCHAR(50), + store_group_id BIGINT REFERENCES signage_store_group(id), + manager_name VARCHAR(100), + is_active BOOLEAN DEFAULT TRUE, + created_at TIMESTAMP DEFAULT NOW(), + UNIQUE (tenant_code, store_code) +); + +INSERT INTO signage_store (tenant_code, store_code, store_name, address, manager_name, store_group_id) +SELECT 'ZIOINFO', '1000', '서울 강남 1호점', '서울 강남구 테헤란로 1', '김서울', g.id +FROM signage_store_group g WHERE g.group_code = 'GRP-SEOUL' AND g.tenant_code = 'ZIOINFO' +ON CONFLICT (tenant_code, store_code) DO NOTHING; + +INSERT INTO signage_store (tenant_code, store_code, store_name, address, manager_name, store_group_id) +SELECT 'ZIOINFO', '2000', '대전 둔산 2호점', '대전 서구 둔산로 2', '박대전', g.id +FROM signage_store_group g WHERE g.group_code = 'GRP-DAEJEON' AND g.tenant_code = 'ZIOINFO' +ON CONFLICT (tenant_code, store_code) DO NOTHING; + +INSERT INTO signage_store (tenant_code, store_code, store_name, address, manager_name, store_group_id) +SELECT 'ZIOINFO', '4001', '부산 서면 1호점', '부산 부산진구 중앙대로 4001', '이부산', g.id +FROM signage_store_group g WHERE g.group_code = 'GRP-BUSAN' AND g.tenant_code = 'ZIOINFO' +ON CONFLICT (tenant_code, store_code) DO NOTHING; + +-- ── 템플릿 그룹(Template/Font/Image Code 묶음) ─────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_template_group ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + group_code VARCHAR(50) NOT NULL, + group_name VARCHAR(200) NOT NULL, + description TEXT, + is_active BOOLEAN DEFAULT TRUE, + created_at TIMESTAMP DEFAULT NOW(), + UNIQUE (tenant_code, group_code) +); + +INSERT INTO signage_template_group (tenant_code, group_code, group_name, description) VALUES + ('ZIOINFO', 'TG-STD', '표준 간판 템플릿군', '상호/전화/문구 표준 레이아웃'), + ('ZIOINFO', 'TG-PROMO', '광고 템플릿군', '주기 광고 편성용 템플릿') +ON CONFLICT (tenant_code, group_code) DO NOTHING; + +-- ── 간판 템플릿(Template/Font/Image Code) ──────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_template ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + template_code VARCHAR(50) NOT NULL, + template_name VARCHAR(200) NOT NULL, + template_type VARCHAR(50) DEFAULT 'SIGN', -- SIGN, FONT, IMAGE, PROMO, CUSTOM + template_group_id BIGINT REFERENCES signage_template_group(id), + font_code VARCHAR(50), -- Font Code + image_code VARCHAR(50), -- Image Code + width INTEGER, + height INTEGER, + description TEXT, + layout_json TEXT, + is_active BOOLEAN DEFAULT TRUE, + created_at TIMESTAMP DEFAULT NOW(), + UNIQUE (tenant_code, template_code) +); + +INSERT INTO signage_template (tenant_code, template_code, template_name, template_type, font_code, image_code, width, height, description) VALUES + ('ZIOINFO', 'SIGN-STD', '표준 간판(상호/전화/문구)', 'SIGN', 'FONT-NANUM', 'IMG-FRAME01', 1920, 480, '가로형 표준 전자간판'), + ('ZIOINFO', 'SIGN-PROMO','광고 편성 간판', 'PROMO', 'FONT-NANUM', 'IMG-PROMO01', 1920, 480, '주기 광고 표시'), + ('ZIOINFO', 'FONT-NANUM','나눔고딕 폰트', 'FONT', 'FONT-NANUM', NULL, NULL, NULL, '기본 폰트 코드') +ON CONFLICT (tenant_code, template_code) DO NOTHING; + +-- ── 간판정보 변환(중앙배포 소스 데이터) ────────────────────────────────────── +-- 상호/전화/문구 등 간판정보 원본 → 중앙배포(zip/md5/REST) 대상 레코드. +CREATE TABLE IF NOT EXISTS signage_pos_cvt ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT REFERENCES signage_store(id), + pos_code VARCHAR(100), + product_code VARCHAR(100) NOT NULL, -- 간판 콘텐츠 코드 + product_name VARCHAR(300), -- 상호/콘텐츠 명 + price NUMERIC(12,2), -- (호환 필드) 부가 값 + sale_price NUMERIC(12,2), + currency VARCHAR(10) DEFAULT 'KRW', + status VARCHAR(20) DEFAULT 'PENDING', -- PENDING, PROCESSED, ERROR, IGNORED + error_message TEXT, + processed_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_cvt_tenant ON signage_pos_cvt(tenant_code, status); +CREATE INDEX IF NOT EXISTS idx_signage_cvt_store ON signage_pos_cvt(store_id, status); + +-- ── 알람 / 모니터링(디바이스 상태·장애) ────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_alarm ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT REFERENCES signage_store(id), + alarm_type VARCHAR(50) NOT NULL, -- DEVICE, NETWORK, DISPLAY, FIRMWARE, DEPLOY, SYSTEM + alarm_code VARCHAR(100), + severity VARCHAR(20) NOT NULL, -- CRITICAL, HIGH, MEDIUM, LOW + message TEXT, + status VARCHAR(20) DEFAULT 'OPEN', -- OPEN, ACKNOWLEDGED, RESOLVED + resolved_by VARCHAR(100), + resolution TEXT, + resolved_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_alarm_tenant ON signage_alarm(tenant_code, status); +CREATE INDEX IF NOT EXISTS idx_signage_alarm_severity ON signage_alarm(severity, status); + +INSERT INTO signage_alarm (tenant_code, store_id, alarm_type, alarm_code, severity, message, status) +SELECT 'ZIOINFO', s.id, 'DEVICE', 'ESB-OFFLINE', 'HIGH', '전자간판(ESB) 오프라인 감지 — 현장 점검 필요', 'OPEN' +FROM signage_store s WHERE s.store_code = '1000' LIMIT 1; + +INSERT INTO signage_alarm (tenant_code, store_id, alarm_type, alarm_code, severity, message, status) +SELECT 'ZIOINFO', s.id, 'DISPLAY', 'IMG-STALE', 'MEDIUM', '간판 이미지 갱신 지연(30초 폴링 미확인)', 'OPEN' +FROM signage_store s WHERE s.store_code = '2000' LIMIT 1; + +-- ── 게이트웨이(Gen1/Gen2/Gen2+ EMS)·허브·ESB 태그 디바이스 ─────────────────── +CREATE TABLE IF NOT EXISTS signage_gateway ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT REFERENCES signage_store(id), + device_type VARCHAR(50) NOT NULL, -- GATEWAY, HUB, ESB_TAG + gw_type VARCHAR(30), -- GEN1, GEN2, GEN2_PLUS_EMS + device_id VARCHAR(100) NOT NULL, + ip_address VARCHAR(50), + mac_address VARCHAR(50), + firmware_version VARCHAR(50), + status VARCHAR(20) DEFAULT 'ONLINE', -- ONLINE, OFFLINE, ERROR, UPDATING + battery_level INTEGER, + signal_strength VARCHAR(20), + last_seen_at TIMESTAMP DEFAULT NOW(), + created_at TIMESTAMP DEFAULT NOW(), + UNIQUE (device_id) +); +CREATE INDEX IF NOT EXISTS idx_signage_gw_tenant ON signage_gateway(tenant_code, status); +CREATE INDEX IF NOT EXISTS idx_signage_gw_store ON signage_gateway(store_id, status); + +INSERT INTO signage_gateway (tenant_code, store_id, device_type, gw_type, device_id, ip_address, firmware_version, status) +SELECT 'ZIOINFO', s.id, 'GATEWAY', 'GEN2_PLUS_EMS', 'GW-1000-001', '192.168.10.1', 'GWFW-2.1.0', 'ONLINE' +FROM signage_store s WHERE s.store_code = '1000' LIMIT 1 +ON CONFLICT (device_id) DO NOTHING; + +INSERT INTO signage_gateway (tenant_code, store_id, device_type, gw_type, device_id, firmware_version, status, battery_level) +SELECT 'ZIOINFO', s.id, 'ESB_TAG', 'GEN2', 'ESB-1000-0001', 'ESBFW-1.4.2', 'ONLINE', 92 +FROM signage_store s WHERE s.store_code = '1000' LIMIT 1 +ON CONFLICT (device_id) DO NOTHING; + +INSERT INTO signage_gateway (tenant_code, store_id, device_type, gw_type, device_id, firmware_version, status, battery_level) +SELECT 'ZIOINFO', s.id, 'ESB_TAG', 'GEN1', 'ESB-2000-0001', 'ESBFW-1.3.9', 'OFFLINE', 11 +FROM signage_store s WHERE s.store_code = '2000' LIMIT 1 +ON CONFLICT (device_id) DO NOTHING; + +-- ── 작업 이력(설치/유지보수/펌웨어/점검) ───────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_work_history ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT REFERENCES signage_store(id), + work_type VARCHAR(50) NOT NULL, -- INSTALL, MAINTENANCE, FIRMWARE_UPDATE, REPLACEMENT, INSPECTION + work_content TEXT, + worker_name VARCHAR(100), + status VARCHAR(20) DEFAULT 'SCHEDULED', -- SCHEDULED, IN_PROGRESS, COMPLETED, CANCELLED + remarks TEXT, + started_at TIMESTAMP, + completed_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_work_tenant ON signage_work_history(tenant_code, status); + +-- ── 펌웨어(eESB / GW / Tag FW 중앙배포) ─────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_firmware ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + firmware_version VARCHAR(50) NOT NULL, + device_type VARCHAR(50) NOT NULL, -- EESB, GW, TAG + file_name VARCHAR(300), + file_path VARCHAR(500), + file_size BIGINT, + checksum VARCHAR(200), + description TEXT, + is_latest BOOLEAN DEFAULT FALSE, + created_at TIMESTAMP DEFAULT NOW() +); + +INSERT INTO signage_firmware (tenant_code, firmware_version, device_type, file_name, description, is_latest) VALUES + ('ZIOINFO', 'GWFW-2.1.0', 'GW', 'gw_fw_2.1.0.bin', 'GW 게이트웨이 최신 펌웨어', true), + ('ZIOINFO', 'ESBFW-1.4.2', 'EESB', 'eesb_fw_1.4.2.bin', 'eESB 본체 최신 펌웨어', true), + ('ZIOINFO', 'TAGFW-1.4.2', 'TAG', 'tag_fw_1.4.2.bin', 'Tag 최신 펌웨어', true) +ON CONFLICT DO NOTHING; + +-- ── 사용자(매장코드별 계정 중앙관리) ───────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_user ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) REFERENCES signage_tenant(tenant_code), + store_code VARCHAR(50), -- 소속 매장코드(NULL=본사/전역) + username VARCHAR(200) UNIQUE NOT NULL, + password_hash VARCHAR(500) NOT NULL, + role VARCHAR(50) DEFAULT 'USER', -- ADMIN, MANAGER, USER + email VARCHAR(300), + phone VARCHAR(50), + is_active BOOLEAN DEFAULT TRUE, + last_login_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW() +); + +-- 기본 관리자 (비밀번호: admin123 / BCrypt $2a$12$) +INSERT INTO signage_user (tenant_code, store_code, username, password_hash, role) +VALUES (NULL, NULL, 'admin', '$2a$12$N9qo8uLOickgx2ZMRZoMyeIjZAgcfl7p92ldGxad68LnCWh7Vz.Xm', 'ADMIN') +ON CONFLICT (username) DO NOTHING; + +INSERT INTO signage_user (tenant_code, store_code, username, password_hash, role) +VALUES ('ZIOINFO', '1000', 'seoul_manager', '$2a$12$N9qo8uLOickgx2ZMRZoMyeIjZAgcfl7p92ldGxad68LnCWh7Vz.Xm', 'MANAGER') +ON CONFLICT (username) DO NOTHING; + +-- ── 간판 콘텐츠(상품/가격 호환 도메인) ─────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_product ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT REFERENCES signage_store(id), + product_code VARCHAR(100) NOT NULL, -- 콘텐츠 코드 + product_name VARCHAR(300) NOT NULL, -- 콘텐츠 명(상호 등) + category VARCHAR(100), + price NUMERIC(12,2), + sale_price NUMERIC(12,2), + currency VARCHAR(10) DEFAULT 'KRW', + is_active BOOLEAN DEFAULT TRUE, + updated_at TIMESTAMP DEFAULT NOW(), + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_content_store ON signage_product(store_id, product_code); + +INSERT INTO signage_product (tenant_code, store_id, product_code, product_name, category) +SELECT 'ZIOINFO', s.id, 'C-1000-01', '강남 1호점 상호', '간판콘텐츠' +FROM signage_store s WHERE s.store_code = '1000' LIMIT 1 +ON CONFLICT DO NOTHING; + +-- ── 간판 이미지(상호/전화/문구 편집 산출물) ────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_sign_image ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT REFERENCES signage_store(id), + store_code VARCHAR(50), + image_code VARCHAR(100) NOT NULL, + biz_name VARCHAR(200), -- 상호 + phone VARCHAR(50), -- 전화번호 + message TEXT, -- 문구 + template_code VARCHAR(50), + width INTEGER, + height INTEGER, + image_path VARCHAR(500), + status VARCHAR(20) DEFAULT 'DRAFT', -- DRAFT, READY, DEPLOYED + created_at TIMESTAMP DEFAULT NOW(), + UNIQUE (tenant_code, image_code) +); +CREATE INDEX IF NOT EXISTS idx_signage_image_store ON signage_sign_image(store_id, status); + +INSERT INTO signage_sign_image (tenant_code, store_id, store_code, image_code, biz_name, phone, message, template_code, status) +SELECT 'ZIOINFO', s.id, '1000', 'IMG-1000-01', '지오 카페 강남점', '02-123-4567', '신선한 원두 · 오늘의 커피', 'SIGN-STD', 'READY' +FROM signage_store s WHERE s.store_code = '1000' LIMIT 1 +ON CONFLICT (tenant_code, image_code) DO NOTHING; + +-- ── 전자간판(ESB) 태그 바인딩 — 디바이스↔콘텐츠↔현재표시 ───────────────────── +CREATE TABLE IF NOT EXISTS signage_signboard ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT NOT NULL REFERENCES signage_store(id), + device_id VARCHAR(100) NOT NULL, -- ESB_TAG device_id + product_code VARCHAR(100), -- 현재 표시 콘텐츠 + location_code VARCHAR(100), -- 설치 위치코드 (예: 외벽-정면) + template_code VARCHAR(50), + display_data TEXT, -- 현재 화면 데이터(JSON) + last_price NUMERIC(12,2), + last_updated_at TIMESTAMP, + bind_status VARCHAR(20) DEFAULT 'ACTIVE', -- ACTIVE, UNBOUND, ERROR + created_at TIMESTAMP DEFAULT NOW(), + UNIQUE (device_id) +); +CREATE INDEX IF NOT EXISTS idx_signage_board_store ON signage_signboard(store_id, bind_status); +CREATE INDEX IF NOT EXISTS idx_signage_board_content ON signage_signboard(tenant_code, product_code); +CREATE INDEX IF NOT EXISTS idx_signage_board_loc ON signage_signboard(store_id, location_code); + +INSERT INTO signage_signboard (tenant_code, store_id, device_id, product_code, location_code, template_code) +SELECT 'ZIOINFO', s.id, 'ESB-1000-0001', 'C-1000-01', '외벽-정면', 'SIGN-STD' +FROM signage_store s WHERE s.store_code = '1000' LIMIT 1 +ON CONFLICT (device_id) DO NOTHING; + +-- ── 간판정보 중앙배포(CSV→zip+md5→REST, 30초 폴링) ────────────────────────── +-- 사업계획서 슬라이드20 계약: {header:{token}, body:{type,sub_type,code,path,md5,file_name,file_size}} +CREATE TABLE IF NOT EXISTS signage_sign_deploy ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_code VARCHAR(50) NOT NULL, -- 매장코드로 구분(예: 1000, 2000, 4001) + deploy_type VARCHAR(30) NOT NULL DEFAULT 'SIGN_FILE', -- SIGN_FILE, POS_FILE, TEMPLATE, SW + sub_type VARCHAR(50), + code VARCHAR(50), + file_name VARCHAR(300), + file_size BIGINT, + md5 VARCHAR(64), + file_path VARCHAR(500), + status VARCHAR(20) DEFAULT 'PENDING', -- PENDING, SENT, CHECKED, APPLIED, FAILED + poll_interval_sec INTEGER DEFAULT 30, + last_polled_at TIMESTAMP, + deployed_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_deploy_store ON signage_sign_deploy(store_code, status); +CREATE INDEX IF NOT EXISTS idx_signage_deploy_status ON signage_sign_deploy(status, created_at); + +INSERT INTO signage_sign_deploy (tenant_code, store_code, deploy_type, code, file_name, file_size, md5, status) +VALUES ('ZIOINFO', '1000', 'SIGN_FILE', '1000', 'sign_20200710130354.csv', 42553, '9F515EFD02CCFD16454E76B93E7B34B4', 'PENDING') +ON CONFLICT DO NOTHING; + +-- ── 배포 전파 큐(펌웨어/간판정보 태그 전송 추적) ───────────────────────────── +CREATE TABLE IF NOT EXISTS signage_update_queue ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT REFERENCES signage_store(id), + binding_id BIGINT REFERENCES signage_signboard(id), + device_id VARCHAR(100) NOT NULL, + product_code VARCHAR(100), + new_price NUMERIC(12,2), + new_sale_price NUMERIC(12,2), + template_code VARCHAR(50), + render_data TEXT, + priority INTEGER DEFAULT 5, + status VARCHAR(20) DEFAULT 'PENDING', -- PENDING, SENDING, SENT, CONFIRMED, FAILED, CANCELLED + retry_count INTEGER DEFAULT 0, + max_retry INTEGER DEFAULT 3, + error_message TEXT, + sent_at TIMESTAMP, + confirmed_at TIMESTAMP, + pos_cvt_id BIGINT REFERENCES signage_pos_cvt(id), + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_queue_device ON signage_update_queue(device_id, status); +CREATE INDEX IF NOT EXISTS idx_signage_queue_store ON signage_update_queue(store_id, status, created_at); +CREATE INDEX IF NOT EXISTS idx_signage_queue_pend ON signage_update_queue(status, priority, created_at) WHERE status = 'PENDING'; + +-- ── 백업/복구(일 1회 · 매장코드별) ─────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_backup ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_code VARCHAR(50) NOT NULL, + backup_type VARCHAR(30) DEFAULT 'FULL', -- FULL, SIGN, CONFIG + file_name VARCHAR(300), + file_size BIGINT, + md5 VARCHAR(64), + file_path VARCHAR(500), + status VARCHAR(20) DEFAULT 'SUCCESS', -- SUCCESS, FAILED, RESTORING, RESTORED + backup_at TIMESTAMP DEFAULT NOW(), + restored_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_backup_store ON signage_backup(store_code, backup_at DESC); + +INSERT INTO signage_backup (tenant_code, store_code, backup_type, file_name, file_size, status) +VALUES ('ZIOINFO', '1000', 'FULL', 'backup_1000_20200710.zip', 1048576, 'SUCCESS') +ON CONFLICT DO NOTHING; + +-- ── 광고/스케줄(주기 광고 편성) ────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_ad_schedule ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20) NOT NULL REFERENCES signage_tenant(tenant_code), + store_id BIGINT REFERENCES signage_store(id), + store_code VARCHAR(50), + ad_name VARCHAR(200) NOT NULL, + media_type VARCHAR(20) DEFAULT 'IMAGE', -- IMAGE, VIDEO + media_path VARCHAR(500), + template_code VARCHAR(50), + start_at TIMESTAMP, + end_at TIMESTAMP, + daily_start VARCHAR(5), -- HH:MM + daily_end VARCHAR(5), + priority INTEGER DEFAULT 5, + status VARCHAR(20) DEFAULT 'SCHEDULED', -- SCHEDULED, ACTIVE, ENDED, PAUSED + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_ad_store ON signage_ad_schedule(store_id, status); +CREATE INDEX IF NOT EXISTS idx_signage_ad_status ON signage_ad_schedule(status, start_at); + +INSERT INTO signage_ad_schedule (tenant_code, store_id, store_code, ad_name, media_type, template_code, daily_start, daily_end, status) +SELECT 'ZIOINFO', s.id, '1000', '아침 특가 광고', 'IMAGE', 'SIGN-PROMO', '07:00', '11:00', 'ACTIVE' +FROM signage_store s WHERE s.store_code = '1000' LIMIT 1 +ON CONFLICT DO NOTHING; + +-- ── 감사 로그 ───────────────────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_audit_log ( + id BIGSERIAL PRIMARY KEY, + tenant_code VARCHAR(20), + username VARCHAR(200), + action VARCHAR(200) NOT NULL, + resource VARCHAR(200), + resource_id VARCHAR(100), + detail TEXT, + ip_address VARCHAR(50), + user_agent VARCHAR(500), + success BOOLEAN DEFAULT TRUE, + created_at TIMESTAMP DEFAULT NOW() +); +CREATE INDEX IF NOT EXISTS idx_signage_audit_created ON signage_audit_log(created_at DESC); +CREATE INDEX IF NOT EXISTS idx_signage_audit_tenant ON signage_audit_log(tenant_code, created_at DESC); +CREATE INDEX IF NOT EXISTS idx_signage_audit_action ON signage_audit_log(action, created_at DESC); +CREATE INDEX IF NOT EXISTS idx_signage_audit_user ON signage_audit_log(username, created_at DESC); + +-- ── 시스템 설정(admin 보조) ────────────────────────────────────────────────── +CREATE TABLE IF NOT EXISTS signage_setting ( + setting_key VARCHAR(100) PRIMARY KEY, + setting_value TEXT, + category VARCHAR(50) DEFAULT 'GENERAL', + description VARCHAR(300), + updated_at TIMESTAMP DEFAULT NOW() +); + +INSERT INTO signage_setting (setting_key, setting_value, category, description) VALUES + ('system.name', 'GUARDiA SIGNAGE', 'GENERAL', '시스템 표시명'), + ('deploy.poll.interval.sec', '30', 'DEPLOY', '간판정보 폴링 주기(초)'), + ('deploy.retry.max', '3', 'DEPLOY', '배포 전송 실패 재시도 횟수'), + ('backup.schedule.daily', '03:00', 'BACKUP', '매장코드별 일 1회 백업 시각'), + ('alarm.retention.days', '90', 'ALARM', '알람 이력 보존 일수'), + ('audit.retention.days', '365', 'GENERAL', '감사 로그 보존 일수'), + ('ai.ollama.text.model', 'llama3.2:1b', 'AI', 'Ollama 텍스트 모델'), + ('ai.ollama.enabled', 'true', 'AI', 'AI 분석 기능 사용 여부') +ON CONFLICT (setting_key) DO NOTHING; diff --git a/backend/src/main/resources/mapper/AdScheduleMapper.xml b/backend/src/main/resources/mapper/AdScheduleMapper.xml new file mode 100644 index 0000000..883398a --- /dev/null +++ b/backend/src/main/resources/mapper/AdScheduleMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_ad_schedule (tenant_code, store_id, store_code, ad_name, media_type, media_path, template_code, start_at, end_at, daily_start, daily_end, priority, status) + VALUES (#{tenantCode}, #{storeId}, #{storeCode}, #{adName}, #{mediaType}, #{mediaPath}, #{templateCode}, #{startAt}, #{endAt}, #{dailyStart}, #{dailyEnd}, #{priority}, #{status}) + + + + UPDATE signage_ad_schedule SET + tenant_code = #{tenantCode}, + store_id = #{storeId}, + store_code = #{storeCode}, + ad_name = #{adName}, + media_type = #{mediaType}, + media_path = #{mediaPath}, + template_code = #{templateCode}, + start_at = #{startAt}, + end_at = #{endAt}, + daily_start = #{dailyStart}, + daily_end = #{dailyEnd}, + priority = #{priority}, + status = #{status} + WHERE id = #{id} + + + DELETE FROM signage_ad_schedule WHERE id = #{id} + + + + diff --git a/backend/src/main/resources/mapper/AlarmMapper.xml b/backend/src/main/resources/mapper/AlarmMapper.xml new file mode 100644 index 0000000..b8e17d4 --- /dev/null +++ b/backend/src/main/resources/mapper/AlarmMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_alarm (tenant_code, store_id, alarm_type, alarm_code, severity, message, status) + VALUES (#{tenantCode}, #{storeId}, #{alarmType}, #{alarmCode}, #{severity}, #{message}, 'OPEN') + + + + UPDATE signage_alarm SET + alarm_type = #{alarmType}, + severity = #{severity}, + message = #{message}, + status = #{status} + WHERE id = #{id} + + + + UPDATE signage_alarm SET + status = 'RESOLVED', + resolved_by = #{resolvedBy}, + resolution = #{resolution}, + resolved_at = NOW() + WHERE id = #{id} + + + DELETE FROM signage_alarm WHERE id = #{id} + + + + + + + + diff --git a/backend/src/main/resources/mapper/AuditLogMapper.xml b/backend/src/main/resources/mapper/AuditLogMapper.xml new file mode 100644 index 0000000..7ad4006 --- /dev/null +++ b/backend/src/main/resources/mapper/AuditLogMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_audit_log + (tenant_code, username, action, resource, resource_id, detail, ip_address, user_agent, success) + VALUES + (#{tenantCode}, #{username}, #{action}, #{resource}, #{resourceId}, #{detail}, + #{ipAddress}, #{userAgent}, #{success}) + + + + + AND tenant_code = #{tenantCode} + AND username = #{username} + AND action = #{action} + AND resource = #{resource} + AND created_at >= #{from} + AND created_at <= #{to} + + + + + + + + diff --git a/backend/src/main/resources/mapper/BackupMapper.xml b/backend/src/main/resources/mapper/BackupMapper.xml new file mode 100644 index 0000000..ee16a38 --- /dev/null +++ b/backend/src/main/resources/mapper/BackupMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_backup (tenant_code, store_code, backup_type, file_name, file_size, md5, file_path, status) + VALUES (#{tenantCode}, #{storeCode}, #{backupType}, #{fileName}, #{fileSize}, #{md5}, #{filePath}, #{status}) + + + + UPDATE signage_backup SET + tenant_code = #{tenantCode}, + store_code = #{storeCode}, + backup_type = #{backupType}, + file_name = #{fileName}, + file_size = #{fileSize}, + md5 = #{md5}, + file_path = #{filePath}, + status = #{status} + WHERE id = #{id} + + + DELETE FROM signage_backup WHERE id = #{id} + + + + diff --git a/backend/src/main/resources/mapper/DashboardMapper.xml b/backend/src/main/resources/mapper/DashboardMapper.xml new file mode 100644 index 0000000..1610d53 --- /dev/null +++ b/backend/src/main/resources/mapper/DashboardMapper.xml @@ -0,0 +1,46 @@ + + + + + + + diff --git a/backend/src/main/resources/mapper/FirmwareMapper.xml b/backend/src/main/resources/mapper/FirmwareMapper.xml new file mode 100644 index 0000000..51e1c73 --- /dev/null +++ b/backend/src/main/resources/mapper/FirmwareMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_firmware (tenant_code, firmware_version, device_type, file_name, file_path, + file_size, checksum, description, is_latest) + VALUES (#{tenantCode}, #{firmwareVersion}, #{deviceType}, #{fileName}, #{filePath}, + #{fileSize}, #{checksum}, #{description}, #{latest}) + + + + UPDATE signage_firmware SET + firmware_version = #{firmwareVersion}, + description = #{description}, + is_latest = #{latest} + WHERE id = #{id} + + + + UPDATE signage_firmware SET is_latest = false + WHERE device_type = #{deviceType} + AND tenant_code = #{tenantCode} + + + DELETE FROM signage_firmware WHERE id = #{id} + + diff --git a/backend/src/main/resources/mapper/GatewayMapper.xml b/backend/src/main/resources/mapper/GatewayMapper.xml new file mode 100644 index 0000000..c4915c4 --- /dev/null +++ b/backend/src/main/resources/mapper/GatewayMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_gateway (tenant_code, store_id, device_type, gw_type, device_id, ip_address, + mac_address, firmware_version, status) + VALUES (#{tenantCode}, #{storeId}, #{deviceType}, #{gwType}, #{deviceId}, #{ipAddress}, + #{macAddress}, #{firmwareVersion}, #{status}) + + + + UPDATE signage_gateway SET + gw_type = #{gwType}, + ip_address = #{ipAddress}, + mac_address = #{macAddress}, + firmware_version = #{firmwareVersion}, + status = #{status}, + battery_level = #{batteryLevel}, + signal_strength = #{signalStrength}, + last_seen_at = NOW() + WHERE id = #{id} + + + + UPDATE signage_gateway SET status = #{status}, last_seen_at = NOW() + WHERE id = #{id} + + + DELETE FROM signage_gateway WHERE id = #{id} + + + + + + + + diff --git a/backend/src/main/resources/mapper/PosCvtMapper.xml b/backend/src/main/resources/mapper/PosCvtMapper.xml new file mode 100644 index 0000000..ff7b0ad --- /dev/null +++ b/backend/src/main/resources/mapper/PosCvtMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_pos_cvt (tenant_code, store_id, pos_code, product_code, product_name, + price, sale_price, currency, status) + VALUES (#{tenantCode}, #{storeId}, #{posCode}, #{productCode}, #{productName}, + #{price}, #{salePrice}, #{currency}, 'PENDING') + + + + UPDATE signage_pos_cvt SET + status = #{status}, + error_message = #{errorMessage}, + processed_at = CASE WHEN #{status} = 'PROCESSED' THEN NOW() ELSE processed_at END + WHERE id = #{id} + + + + + + + diff --git a/backend/src/main/resources/mapper/ProductMapper.xml b/backend/src/main/resources/mapper/ProductMapper.xml new file mode 100644 index 0000000..f8a6c29 --- /dev/null +++ b/backend/src/main/resources/mapper/ProductMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_product (tenant_code, store_id, product_code, product_name, + category, price, sale_price, currency, is_active) + VALUES (#{tenantCode}, #{storeId}, #{productCode}, #{productName}, + #{category}, #{price}, #{salePrice}, #{currency}, #{active}) + + + + UPDATE signage_product SET + product_name = #{productName}, + category = #{category}, + price = #{price}, + sale_price = #{salePrice}, + currency = #{currency}, + is_active = #{active}, + updated_at = NOW() + WHERE id = #{id} + + + DELETE FROM signage_product WHERE id = #{id} + + diff --git a/backend/src/main/resources/mapper/RagSettingMapper.xml b/backend/src/main/resources/mapper/RagSettingMapper.xml new file mode 100644 index 0000000..ed98af8 --- /dev/null +++ b/backend/src/main/resources/mapper/RagSettingMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + INSERT INTO signage_rag_setting (tenant_code, setting_key, setting_value, updated_at) + VALUES (#{tenantCode}, #{settingKey}, #{settingValue}, NOW()) + ON CONFLICT (tenant_code, setting_key) DO UPDATE + SET setting_value = EXCLUDED.setting_value, + updated_at = NOW() + + + diff --git a/backend/src/main/resources/mapper/RegionMapper.xml b/backend/src/main/resources/mapper/RegionMapper.xml new file mode 100644 index 0000000..be60887 --- /dev/null +++ b/backend/src/main/resources/mapper/RegionMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_region (tenant_code, region_code, region_name, dc_name, description, is_active) + VALUES (#{tenantCode}, #{regionCode}, #{regionName}, #{dcName}, #{description}, #{active}) + + + + UPDATE signage_region SET + tenant_code = #{tenantCode}, + region_code = #{regionCode}, + region_name = #{regionName}, + dc_name = #{dcName}, + description = #{description}, + is_active = #{active} + WHERE id = #{id} + + + DELETE FROM signage_region WHERE id = #{id} + + + + diff --git a/backend/src/main/resources/mapper/SettingMapper.xml b/backend/src/main/resources/mapper/SettingMapper.xml new file mode 100644 index 0000000..c7ccae9 --- /dev/null +++ b/backend/src/main/resources/mapper/SettingMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + INSERT INTO signage_setting (setting_key, setting_value, category, description, updated_at) + VALUES (#{settingKey}, #{settingValue}, #{category}, #{description}, NOW()) + ON CONFLICT (setting_key) DO UPDATE + SET setting_value = EXCLUDED.setting_value, + updated_at = NOW() + + + diff --git a/backend/src/main/resources/mapper/SignBoardMapper.xml b/backend/src/main/resources/mapper/SignBoardMapper.xml new file mode 100644 index 0000000..6429ec9 --- /dev/null +++ b/backend/src/main/resources/mapper/SignBoardMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_signboard + (tenant_code, store_id, device_id, product_code, location_code, + template_code, last_price, bind_status) + VALUES + (#{tenantCode}, #{storeId}, #{deviceId}, #{productCode}, #{locationCode}, + #{templateCode}, #{lastPrice}, 'ACTIVE') + + + + UPDATE signage_signboard SET + product_code = #{productCode}, + location_code = #{locationCode}, + template_code = #{templateCode}, + display_data = #{displayData}, + last_price = #{lastPrice}, + last_updated_at = NOW(), + bind_status = #{bindStatus} + WHERE id = #{id} + + + + UPDATE signage_signboard SET + bind_status = 'UNBOUND', + product_code = NULL, + last_updated_at = NOW() + WHERE id = #{id} + + + DELETE FROM signage_signboard WHERE id = #{id} + + + + + + diff --git a/backend/src/main/resources/mapper/SignDeployMapper.xml b/backend/src/main/resources/mapper/SignDeployMapper.xml new file mode 100644 index 0000000..2d0ae40 --- /dev/null +++ b/backend/src/main/resources/mapper/SignDeployMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE signage_sign_deploy SET last_polled_at = NOW(), + status = CASE WHEN status = 'PENDING' THEN 'SENT' ELSE status END + WHERE id = #{id} + + + + UPDATE signage_sign_deploy SET status = 'APPLIED', deployed_at = NOW() + WHERE id = #{id} + + + + INSERT INTO signage_sign_deploy (tenant_code, store_code, deploy_type, sub_type, code, file_name, file_size, md5, file_path, status, poll_interval_sec) + VALUES (#{tenantCode}, #{storeCode}, #{deployType}, #{subType}, #{code}, #{fileName}, #{fileSize}, #{md5}, #{filePath}, #{status}, #{pollIntervalSec}) + + + + UPDATE signage_sign_deploy SET + tenant_code = #{tenantCode}, + store_code = #{storeCode}, + deploy_type = #{deployType}, + sub_type = #{subType}, + code = #{code}, + file_name = #{fileName}, + file_size = #{fileSize}, + md5 = #{md5}, + file_path = #{filePath}, + status = #{status}, + poll_interval_sec = #{pollIntervalSec} + WHERE id = #{id} + + + DELETE FROM signage_sign_deploy WHERE id = #{id} + + + + diff --git a/backend/src/main/resources/mapper/SignImageMapper.xml b/backend/src/main/resources/mapper/SignImageMapper.xml new file mode 100644 index 0000000..c2fbbb1 --- /dev/null +++ b/backend/src/main/resources/mapper/SignImageMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_sign_image (tenant_code, store_id, store_code, image_code, biz_name, phone, message, template_code, width, height, image_path, status) + VALUES (#{tenantCode}, #{storeId}, #{storeCode}, #{imageCode}, #{bizName}, #{phone}, #{message}, #{templateCode}, #{width}, #{height}, #{imagePath}, #{status}) + + + + UPDATE signage_sign_image SET + tenant_code = #{tenantCode}, + store_id = #{storeId}, + store_code = #{storeCode}, + image_code = #{imageCode}, + biz_name = #{bizName}, + phone = #{phone}, + message = #{message}, + template_code = #{templateCode}, + width = #{width}, + height = #{height}, + image_path = #{imagePath}, + status = #{status} + WHERE id = #{id} + + + DELETE FROM signage_sign_image WHERE id = #{id} + + + + diff --git a/backend/src/main/resources/mapper/StoreGroupMapper.xml b/backend/src/main/resources/mapper/StoreGroupMapper.xml new file mode 100644 index 0000000..292d7a8 --- /dev/null +++ b/backend/src/main/resources/mapper/StoreGroupMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_store_group (tenant_code, group_code, group_name, description, is_active) + VALUES (#{tenantCode}, #{groupCode}, #{groupName}, #{description}, #{active}) + + + + UPDATE signage_store_group SET + group_name = #{groupName}, + description = #{description}, + is_active = #{active} + WHERE id = #{id} + + + DELETE FROM signage_store_group WHERE id = #{id} + + diff --git a/backend/src/main/resources/mapper/StoreMapper.xml b/backend/src/main/resources/mapper/StoreMapper.xml new file mode 100644 index 0000000..f2cdab0 --- /dev/null +++ b/backend/src/main/resources/mapper/StoreMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_store (tenant_code, store_code, store_name, address, phone, + store_group_id, manager_name, is_active) + VALUES (#{tenantCode}, #{storeCode}, #{storeName}, #{address}, #{phone}, + #{storeGroupId}, #{managerName}, #{active}) + + + + UPDATE signage_store SET + store_name = #{storeName}, + address = #{address}, + phone = #{phone}, + store_group_id = #{storeGroupId}, + manager_name = #{managerName}, + is_active = #{active} + WHERE id = #{id} + + + DELETE FROM signage_store WHERE id = #{id} + + + + + + diff --git a/backend/src/main/resources/mapper/TemplateGroupMapper.xml b/backend/src/main/resources/mapper/TemplateGroupMapper.xml new file mode 100644 index 0000000..8bdf3ea --- /dev/null +++ b/backend/src/main/resources/mapper/TemplateGroupMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_template_group (tenant_code, group_code, group_name, description, is_active) + VALUES (#{tenantCode}, #{groupCode}, #{groupName}, #{description}, #{active}) + + + + UPDATE signage_template_group SET + tenant_code = #{tenantCode}, + group_code = #{groupCode}, + group_name = #{groupName}, + description = #{description}, + is_active = #{active} + WHERE id = #{id} + + + DELETE FROM signage_template_group WHERE id = #{id} + + + + diff --git a/backend/src/main/resources/mapper/TemplateMapper.xml b/backend/src/main/resources/mapper/TemplateMapper.xml new file mode 100644 index 0000000..e6c7578 --- /dev/null +++ b/backend/src/main/resources/mapper/TemplateMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_template (tenant_code, template_code, template_name, template_type, + width, height, description, layout_json, is_active) + VALUES (#{tenantCode}, #{templateCode}, #{templateName}, #{templateType}, + #{width}, #{height}, #{description}, #{layoutJson}, #{active}) + + + + UPDATE signage_template SET + template_name = #{templateName}, + template_type = #{templateType}, + width = #{width}, + height = #{height}, + description = #{description}, + layout_json = #{layoutJson}, + is_active = #{active} + WHERE id = #{id} + + + DELETE FROM signage_template WHERE id = #{id} + + diff --git a/backend/src/main/resources/mapper/TenantMapper.xml b/backend/src/main/resources/mapper/TenantMapper.xml new file mode 100644 index 0000000..de7f3e4 --- /dev/null +++ b/backend/src/main/resources/mapper/TenantMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_tenant (tenant_code, tenant_name, description, is_active) + VALUES (#{tenantCode}, #{tenantName}, #{description}, #{active}) + + + + UPDATE signage_tenant SET + tenant_name = #{tenantName}, + description = #{description}, + is_active = #{active} + WHERE id = #{id} + + + + DELETE FROM signage_tenant WHERE id = #{id} + + + diff --git a/backend/src/main/resources/mapper/UpdateQueueMapper.xml b/backend/src/main/resources/mapper/UpdateQueueMapper.xml new file mode 100644 index 0000000..458ee41 --- /dev/null +++ b/backend/src/main/resources/mapper/UpdateQueueMapper.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_update_queue + (tenant_code, store_id, binding_id, device_id, product_code, + new_price, new_sale_price, template_code, priority, status, pos_cvt_id) + VALUES + (#{tenantCode}, #{storeId}, #{bindingId}, #{deviceId}, #{productCode}, + #{newPrice}, #{newSalePrice}, #{templateCode}, #{priority}, 'PENDING', #{posCvtId}) + + + + UPDATE signage_update_queue SET + status = #{status}, + error_message = #{errorMessage}, + sent_at = CASE WHEN #{status} = 'SENT' THEN NOW() ELSE sent_at END, + confirmed_at = CASE WHEN #{status} = 'CONFIRMED' THEN NOW() ELSE confirmed_at END + WHERE id = #{id} + + + + + UPDATE signage_update_queue SET + status = 'CONFIRMED', + confirmed_at = NOW() + WHERE device_id = #{deviceId} + AND status IN ('SENDING', 'SENT') + + + + UPDATE signage_update_queue SET retry_count = retry_count + 1 + WHERE id = #{id} + + + + + + + + + diff --git a/backend/src/main/resources/mapper/UserAuthMapper.xml b/backend/src/main/resources/mapper/UserAuthMapper.xml new file mode 100644 index 0000000..c4f16a9 --- /dev/null +++ b/backend/src/main/resources/mapper/UserAuthMapper.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE signage_user SET last_login_at = NOW() WHERE username = #{username} + + + + + + UPDATE signage_user SET login_fail_count = 0 WHERE username = #{username} + + + + UPDATE signage_user + SET login_fail_count = COALESCE(login_fail_count, 0) + 1, + locked = (COALESCE(login_fail_count, 0) + 1 >= #{maxFail}) + WHERE username = #{username} + + + + UPDATE signage_user + SET email_verify_code = #{code}, email_verify_expire = #{expire}, login_fail_count = 0 + WHERE username = #{username} + + + + UPDATE signage_user SET email_verify_code = NULL, email_verify_expire = NULL WHERE username = #{username} + + + + UPDATE signage_user SET locked = false, login_fail_count = 0 WHERE username = #{username} + + + + + + + + INSERT INTO signage_user (tenant_code, username, password_hash, role, name, email, phone, + is_active, approval_status, created_at) + VALUES (#{tenantCode}, #{username}, #{passwordHash}, 'USER', #{name}, #{email}, #{phone}, + FALSE, 'PENDING', NOW()) + + + + + + + + UPDATE signage_user SET password_hash = #{passwordHash} WHERE username = #{username} + + + diff --git a/backend/src/main/resources/mapper/UserMapper.xml b/backend/src/main/resources/mapper/UserMapper.xml new file mode 100644 index 0000000..6f7772d --- /dev/null +++ b/backend/src/main/resources/mapper/UserMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_user (tenant_code, username, password_hash, role, email, phone, is_active) + VALUES (#{tenantCode}, #{username}, #{passwordHash}, #{role}, #{email}, #{phone}, #{active}) + + + + UPDATE signage_user SET + tenant_code = #{tenantCode}, + role = #{role}, + email = #{email}, + phone = #{phone}, + is_active = #{active} + WHERE id = #{id} + + + + UPDATE signage_user SET password_hash = #{passwordHash} WHERE id = #{id} + + + DELETE FROM signage_user WHERE id = #{id} + + diff --git a/backend/src/main/resources/mapper/WorkMapper.xml b/backend/src/main/resources/mapper/WorkMapper.xml new file mode 100644 index 0000000..e58052c --- /dev/null +++ b/backend/src/main/resources/mapper/WorkMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO signage_work_history (tenant_code, store_id, work_type, work_content, + worker_name, status, remarks, started_at) + VALUES (#{tenantCode}, #{storeId}, #{workType}, #{workContent}, + #{workerName}, #{status}, #{remarks}, #{startedAt}) + + + + UPDATE signage_work_history SET + work_type = #{workType}, + work_content = #{workContent}, + worker_name = #{workerName}, + status = #{status}, + remarks = #{remarks}, + started_at = #{startedAt}, + completed_at = #{completedAt} + WHERE id = #{id} + + + DELETE FROM signage_work_history WHERE id = #{id} + + + + + + diff --git a/backend/src/main/resources/mapper/uiws/LoginVerifyMapper.xml b/backend/src/main/resources/mapper/uiws/LoginVerifyMapper.xml new file mode 100644 index 0000000..48d42d7 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/LoginVerifyMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + INSERT INTO tb_uiws_login_verify + (user_id, verify_method, verify_code, expire_at, verified_yn, created_by, created_at) + VALUES + (#{userId}, #{verifyMethod}, #{verifyCode}, #{expireAt}, #{verifiedYn}, #{createdBy}, #{createdAt}) + + + diff --git a/backend/src/main/resources/mapper/uiws/MessageMapper.xml b/backend/src/main/resources/mapper/uiws/MessageMapper.xml new file mode 100644 index 0000000..3663db5 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/MessageMapper.xml @@ -0,0 +1,137 @@ + + + + + + + + + INSERT INTO tb_uiws_message + (sender_id, title, content, ref_worklog_id, reply_to_id, sent_at, sender_del_yn, created_by, created_at) + VALUES + (#{senderId}, #{title}, #{content}, #{refWorklogId}, #{replyToId}, #{sentAt}, #{senderDelYn}, #{createdBy}, #{createdAt}) + + + + + + + + + + + + UPDATE tb_uiws_message + SET sender_del_yn = 'Y', updated_by = #{actor}, updated_at = now() + WHERE sender_id = #{senderId} + AND message_id IN + #{id} + + + + + INSERT INTO tb_uiws_message_rcv + (message_id, receiver_id, rcv_type, read_yn, receiver_del_yn, created_by, created_at) + VALUES + (#{messageId}, #{receiverId}, #{rcvType}, #{readYn}, #{receiverDelYn}, #{createdBy}, #{createdAt}) + + + + + + + + + + + + UPDATE tb_uiws_message_rcv + SET read_yn = 'Y', read_at = #{readAt}, updated_by = #{actor}, updated_at = now() + WHERE rcv_id = #{rcvId} + + + + UPDATE tb_uiws_message_rcv + SET receiver_del_yn = 'Y', updated_by = #{actor}, updated_at = now() + WHERE receiver_id = #{receiverId} + AND message_id IN + #{id} + + + + + + + + + + diff --git a/backend/src/main/resources/mapper/uiws/ScheduleMapper.xml b/backend/src/main/resources/mapper/uiws/ScheduleMapper.xml new file mode 100644 index 0000000..35a96ac --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/ScheduleMapper.xml @@ -0,0 +1,168 @@ + + + + + + + + + INSERT INTO tb_uiws_schedule + (sche_type, title, sche_gubun_cd, importance_cd, start_dt, end_dt, content, + owner_id, dept_id, charger_id, created_by, created_at) + VALUES + (#{scheType}, #{title}, #{scheGubunCd}, #{importanceCd}, #{startDt}, #{endDt}, #{content}, + #{ownerId}, #{deptId}, #{chargerId}, #{createdBy}, #{createdAt}) + + + + UPDATE tb_uiws_schedule SET + sche_type = #{scheType}, title = #{title}, sche_gubun_cd = #{scheGubunCd}, + importance_cd = #{importanceCd}, start_dt = #{startDt}, end_dt = #{endDt}, + content = #{content}, dept_id = #{deptId}, charger_id = #{chargerId}, + updated_by = #{updatedBy}, updated_at = #{updatedAt} + WHERE schedule_id = #{scheduleId} + + + + + + + + DELETE FROM tb_uiws_schedule WHERE schedule_id = #{scheduleId} + + + + + + + WHERE start_dt < #{to} + AND end_dt >= #{from} + AND sche_type = #{scheType} + + AND owner_id IN + #{oid} + + + + + + + + + + + + INSERT INTO tb_uiws_diary + (title, content, schedule_id, writer_id, diary_date, created_by, created_at) + VALUES + (#{title}, #{content}, #{scheduleId}, #{writerId}, #{diaryDate}, #{createdBy}, #{createdAt}) + + + + UPDATE tb_uiws_diary SET + title = #{title}, content = #{content}, schedule_id = #{scheduleId}, diary_date = #{diaryDate}, + updated_by = #{updatedBy}, updated_at = #{updatedAt} + WHERE diary_id = #{diaryId} + + + + + + + + DELETE FROM tb_uiws_diary WHERE diary_id = #{diaryId} + + + + + + + + + INSERT INTO tb_uiws_attach + (ref_type, ref_id, file_nm, file_path, file_size, created_by, created_at) + VALUES + (#{refType}, #{refId}, #{fileNm}, #{filePath}, #{fileSize}, #{createdBy}, #{createdAt}) + + + + + + UPDATE tb_uiws_attach + SET ref_type = #{refType}, ref_id = #{refId}, updated_by = #{actor}, updated_at = now() + WHERE attach_id = #{attachId} + + + + + + DELETE FROM tb_uiws_attach WHERE attach_id = #{attachId} + + + + DELETE FROM tb_uiws_attach WHERE ref_type = #{refType} AND ref_id = #{refId} + + + + + + diff --git a/backend/src/main/resources/mapper/uiws/StatsMapper.xml b/backend/src/main/resources/mapper/uiws/StatsMapper.xml new file mode 100644 index 0000000..74fd6aa --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/StatsMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + diff --git a/backend/src/main/resources/mapper/uiws/WorklogMapper.xml b/backend/src/main/resources/mapper/uiws/WorklogMapper.xml new file mode 100644 index 0000000..380d292 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/WorklogMapper.xml @@ -0,0 +1,181 @@ + + + + + + + + + INSERT INTO tb_uiws_worklog + (title, writer_id, work_date, work_status_cd, progress_cd, repeat_yn, + repeat_start_date, repeat_end_date, created_by, created_at) + VALUES + (#{title}, #{writerId}, #{workDate}, #{workStatusCd}, #{progressCd}, #{repeatYn}, + #{repeatStartDate}, #{repeatEndDate}, #{createdBy}, #{createdAt}) + + + + UPDATE tb_uiws_worklog SET + title = #{title}, writer_id = #{writerId}, work_date = #{workDate}, + work_status_cd = #{workStatusCd}, progress_cd = #{progressCd}, repeat_yn = #{repeatYn}, + repeat_start_date = #{repeatStartDate}, repeat_end_date = #{repeatEndDate}, + updated_by = #{updatedBy}, updated_at = #{updatedAt} + WHERE worklog_id = #{worklogId} + + + + + + + + DELETE FROM tb_uiws_worklog WHERE worklog_id = #{worklogId} + + + + + AND writer_id IN + #{oid} + + + + + + + + + + + + + + + + INSERT INTO tb_uiws_worklog_dtl + (worklog_id, start_hour, end_hour, work_type_cd, company_id, work_content, issue_content, + sort_ord, created_by, created_at) + VALUES + (#{worklogId}, #{startHour}, #{endHour}, #{workTypeCd}, #{companyId}, #{workContent}, #{issueContent}, + #{sortOrd}, #{createdBy}, #{createdAt}) + + + + UPDATE tb_uiws_worklog_dtl SET + start_hour = #{startHour}, end_hour = #{endHour}, work_type_cd = #{workTypeCd}, + company_id = #{companyId}, work_content = #{workContent}, issue_content = #{issueContent}, + sort_ord = #{sortOrd}, updated_by = #{updatedBy}, updated_at = #{updatedAt} + WHERE dtl_id = #{dtlId} + + + + DELETE FROM tb_uiws_worklog_dtl WHERE dtl_id = #{dtlId} + + + + + + + INSERT INTO tb_uiws_worklog_cmt + (worklog_id, cmt_content, writer_id, kakao_sent_yn, confirm_yn, created_by, created_at) + VALUES + (#{worklogId}, #{cmtContent}, #{writerId}, #{kakaoSentYn}, #{confirmYn}, #{createdBy}, #{createdAt}) + + + + + + UPDATE tb_uiws_worklog_cmt SET kakao_sent_yn = 'Y' WHERE cmt_id = #{cmtId} + + + + UPDATE tb_uiws_worklog_cmt + SET confirm_yn = 'Y', updated_by = #{actor}, updated_at = now() + WHERE cmt_id = #{cmtId} + + + + + + + + + + + + + + + + diff --git a/backend/src/main/resources/mapper/uiws/system/CodeMapper.xml b/backend/src/main/resources/mapper/uiws/system/CodeMapper.xml new file mode 100644 index 0000000..02e2e38 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/CodeMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + AND (grp_cd ILIKE '%' || #{keyword} || '%' OR grp_nm ILIKE '%' || #{keyword} || '%') + + + + + + + + + + + + + INSERT INTO tb_uiws_code_grp (grp_cd, grp_nm, use_yn, created_by, created_at) + VALUES (#{grpCd}, #{grpNm}, #{useYn}, #{createdBy}, now()) + + + + UPDATE tb_uiws_code_grp SET + grp_nm = #{grpNm}, use_yn = #{useYn}, updated_by = #{updatedBy}, updated_at = now() + WHERE grp_cd = #{grpCd} + + + + DELETE FROM tb_uiws_code_grp WHERE grp_cd = #{grpCd} + + + + + + + + INSERT INTO tb_uiws_code (grp_cd, code_val, code_nm, sort_ord, use_yn, created_by, created_at) + VALUES (#{grpCd}, #{codeVal}, #{codeNm}, #{sortOrd}, #{useYn}, #{createdBy}, now()) + + + + DELETE FROM tb_uiws_code WHERE grp_cd = #{grpCd} + + diff --git a/backend/src/main/resources/mapper/uiws/system/CompanyMapper.xml b/backend/src/main/resources/mapper/uiws/system/CompanyMapper.xml new file mode 100644 index 0000000..a34d059 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/CompanyMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + AND (company_id ILIKE '%' || #{keyword} || '%' OR company_nm ILIKE '%' || #{keyword} || '%') + + + + + + + + + + + + + + + + + + + INSERT INTO tb_uiws_company (company_id, company_nm, biz_no, use_yn, created_by, created_at) + VALUES (#{companyId}, #{companyNm}, #{bizNo}, #{useYn}, #{createdBy}, now()) + + + + UPDATE tb_uiws_company SET + company_nm = #{companyNm}, biz_no = #{bizNo}, use_yn = #{useYn}, + updated_by = #{updatedBy}, updated_at = now() + WHERE company_id = #{companyId} + + + + DELETE FROM tb_uiws_company WHERE company_id = #{companyId} + + diff --git a/backend/src/main/resources/mapper/uiws/system/DeptMapper.xml b/backend/src/main/resources/mapper/uiws/system/DeptMapper.xml new file mode 100644 index 0000000..1a72be7 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/DeptMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + AND (dept_id ILIKE '%' || #{keyword} || '%' OR dept_nm ILIKE '%' || #{keyword} || '%') + + + + + + + + + + + + + + + + + + + + + INSERT INTO tb_uiws_dept (dept_id, dept_nm, parent_dept_id, sort_ord, use_yn, created_by, created_at) + VALUES (#{deptId}, #{deptNm}, #{parentDeptId}, #{sortOrd}, #{useYn}, #{createdBy}, now()) + + + + UPDATE tb_uiws_dept SET + dept_nm = #{deptNm}, parent_dept_id = #{parentDeptId}, sort_ord = #{sortOrd}, + use_yn = #{useYn}, updated_by = #{updatedBy}, updated_at = now() + WHERE dept_id = #{deptId} + + + + DELETE FROM tb_uiws_dept WHERE dept_id = #{deptId} + + diff --git a/backend/src/main/resources/mapper/uiws/system/DeptRoleMapper.xml b/backend/src/main/resources/mapper/uiws/system/DeptRoleMapper.xml new file mode 100644 index 0000000..dcc6a6f --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/DeptRoleMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + INSERT INTO tb_uiws_dept_role (dept_id, role_id, created_by, created_at) + VALUES (#{deptId}, #{roleId}, #{actor}, now()) + ON CONFLICT (dept_id, role_id) DO NOTHING + + + + DELETE FROM tb_uiws_dept_role WHERE dept_id = #{deptId} AND role_id = #{roleId} + + diff --git a/backend/src/main/resources/mapper/uiws/system/MenuMapper.xml b/backend/src/main/resources/mapper/uiws/system/MenuMapper.xml new file mode 100644 index 0000000..7d0129a --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/MenuMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO tb_uiws_menu + (menu_id, menu_nm, parent_menu_id, program_id, menu_url, sort_ord, use_yn, created_by, created_at) + VALUES + (#{menuId}, #{menuNm}, #{parentMenuId}, #{programId}, #{menuUrl}, #{sortOrd}, #{useYn}, #{createdBy}, now()) + + + + UPDATE tb_uiws_menu SET + menu_nm = #{menuNm}, parent_menu_id = #{parentMenuId}, program_id = #{programId}, + menu_url = #{menuUrl}, sort_ord = #{sortOrd}, use_yn = #{useYn}, + updated_by = #{updatedBy}, updated_at = now() + WHERE menu_id = #{menuId} + + + + DELETE FROM tb_uiws_menu WHERE menu_id = #{menuId} + + diff --git a/backend/src/main/resources/mapper/uiws/system/ProgramMapper.xml b/backend/src/main/resources/mapper/uiws/system/ProgramMapper.xml new file mode 100644 index 0000000..5d933c6 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/ProgramMapper.xml @@ -0,0 +1,59 @@ + + + + + + + WHERE 1=1 + + AND (program_id ILIKE '%' || #{keyword} || '%' OR program_nm ILIKE '%' || #{keyword} || '%') + + AND program_type = #{programType} + + + + + + + + + + + + + + INSERT INTO tb_uiws_program + (program_id, program_nm, program_type, program_url, category, use_yn, created_by, created_at) + VALUES + (#{programId}, #{programNm}, #{programType}, #{programUrl}, #{category}, #{useYn}, #{createdBy}, now()) + + + + UPDATE tb_uiws_program SET + program_nm = #{programNm}, program_type = #{programType}, program_url = #{programUrl}, + category = #{category}, use_yn = #{useYn}, updated_by = #{updatedBy}, updated_at = now() + WHERE program_id = #{programId} + + + + DELETE FROM tb_uiws_program WHERE program_id = #{programId} + + diff --git a/backend/src/main/resources/mapper/uiws/system/RoleMapper.xml b/backend/src/main/resources/mapper/uiws/system/RoleMapper.xml new file mode 100644 index 0000000..ada2aa7 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/RoleMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + AND (role_id ILIKE '%' || #{keyword} || '%' OR role_nm ILIKE '%' || #{keyword} || '%') + + + + + + + + + + + + + INSERT INTO tb_uiws_role (role_id, role_nm, role_desc, use_yn, created_by, created_at) + VALUES (#{roleId}, #{roleNm}, #{roleDesc}, #{useYn}, #{createdBy}, now()) + + + + UPDATE tb_uiws_role SET + role_nm = #{roleNm}, role_desc = #{roleDesc}, use_yn = #{useYn}, + updated_by = #{updatedBy}, updated_at = now() + WHERE role_id = #{roleId} + + + + DELETE FROM tb_uiws_role WHERE role_id = #{roleId} + + diff --git a/backend/src/main/resources/mapper/uiws/system/RoleMenuMapper.xml b/backend/src/main/resources/mapper/uiws/system/RoleMenuMapper.xml new file mode 100644 index 0000000..5f4ad7c --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/RoleMenuMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + INSERT INTO tb_uiws_role_menu (role_id, menu_id, read_yn, write_yn, created_by, created_at) + VALUES (#{roleId}, #{menuId}, #{readYn}, #{writeYn}, #{createdBy}, now()) + ON CONFLICT (role_id, menu_id) DO UPDATE SET + read_yn = EXCLUDED.read_yn, write_yn = EXCLUDED.write_yn + + + + DELETE FROM tb_uiws_role_menu WHERE role_id = #{roleId} + + diff --git a/backend/src/main/resources/mapper/uiws/system/SysUserMapper.xml b/backend/src/main/resources/mapper/uiws/system/SysUserMapper.xml new file mode 100644 index 0000000..0a33419 --- /dev/null +++ b/backend/src/main/resources/mapper/uiws/system/SysUserMapper.xml @@ -0,0 +1,70 @@ + + + + + + + WHERE 1=1 + + AND (user_id ILIKE '%' || #{keyword} || '%' + OR user_nm ILIKE '%' || #{keyword} || '%' + OR email ILIKE '%' || #{keyword} || '%') + + AND dept_id = #{deptId} + + + + + + + + + + + + + + + + INSERT INTO tb_uiws_sys_user + (user_id, user_nm, password, email, grade_cd, dept_id, company_id, role_cd, + naverworks_id, login_fail_cnt, lock_yn, use_yn, approval_yn, verify_method, + pw_change_yn, created_by, created_at) + VALUES + (#{userId}, #{userNm}, #{password}, #{email}, #{gradeCd}, #{deptId}, #{companyId}, #{roleCd}, + #{naverworksId}, #{loginFailCnt}, #{lockYn}, #{useYn}, #{approvalYn}, #{verifyMethod}, + #{pwChangeYn}, #{createdBy}, now()) + + + + UPDATE tb_uiws_sys_user SET + user_nm = #{userNm}, email = #{email}, grade_cd = #{gradeCd}, + dept_id = #{deptId}, company_id = #{companyId}, role_cd = #{roleCd}, + naverworks_id = #{naverworksId}, lock_yn = #{lockYn}, use_yn = #{useYn}, + approval_yn = #{approvalYn}, + password = #{password}, + updated_by = #{updatedBy}, updated_at = now() + WHERE user_id = #{userId} + + diff --git a/backend/src/main/resources/static/assets/index-0lU_ssmW.js b/backend/src/main/resources/static/assets/index-0lU_ssmW.js new file mode 100644 index 0000000..3029a61 --- /dev/null +++ b/backend/src/main/resources/static/assets/index-0lU_ssmW.js @@ -0,0 +1,142 @@ +var Wx=e=>{throw TypeError(e)};var dy=(e,t,n)=>t.has(e)||Wx("Cannot "+n);var j=(e,t,n)=>(dy(e,t,"read from private field"),n?n.call(e):t.get(e)),te=(e,t,n)=>t.has(e)?Wx("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(e):t.set(e,n),X=(e,t,n,r)=>(dy(e,t,"write to private field"),r?r.call(e,n):t.set(e,n),n),de=(e,t,n)=>(dy(e,t,"access private method"),n);var Zc=(e,t,n,r)=>({set _(a){X(e,t,a,n)},get _(){return j(e,t,r)}});(function(){const t=document.createElement("link").relList;if(t&&t.supports&&t.supports("modulepreload"))return;for(const a of document.querySelectorAll('link[rel="modulepreload"]'))r(a);new MutationObserver(a=>{for(const i of a)if(i.type==="childList")for(const o of i.addedNodes)o.tagName==="LINK"&&o.rel==="modulepreload"&&r(o)}).observe(document,{childList:!0,subtree:!0});function n(a){const i={};return a.integrity&&(i.integrity=a.integrity),a.referrerPolicy&&(i.referrerPolicy=a.referrerPolicy),a.crossOrigin==="use-credentials"?i.credentials="include":a.crossOrigin==="anonymous"?i.credentials="omit":i.credentials="same-origin",i}function r(a){if(a.ep)return;a.ep=!0;const i=n(a);fetch(a.href,i)}})();var Jc=typeof globalThis<"u"?globalThis:typeof window<"u"?window:typeof global<"u"?global:typeof self<"u"?self:{};function Be(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var v_={exports:{}},Uh={};/** + * @license React + * react-jsx-runtime.production.js + * + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */var f$=Symbol.for("react.transitional.element"),d$=Symbol.for("react.fragment");function g_(e,t,n){var r=null;if(n!==void 0&&(r=""+n),t.key!==void 0&&(r=""+t.key),"key"in t){n={};for(var a in t)a!=="key"&&(n[a]=t[a])}else n=t;return t=n.ref,{$$typeof:f$,type:e,key:r,ref:t!==void 0?t:null,props:n}}Uh.Fragment=d$;Uh.jsx=g_;Uh.jsxs=g_;v_.exports=Uh;var g=v_.exports,b_={exports:{}},ue={};/** + * @license React + * react.production.js + * + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */var Eb=Symbol.for("react.transitional.element"),h$=Symbol.for("react.portal"),p$=Symbol.for("react.fragment"),y$=Symbol.for("react.strict_mode"),m$=Symbol.for("react.profiler"),v$=Symbol.for("react.consumer"),g$=Symbol.for("react.context"),b$=Symbol.for("react.forward_ref"),x$=Symbol.for("react.suspense"),S$=Symbol.for("react.memo"),x_=Symbol.for("react.lazy"),O$=Symbol.for("react.activity"),Zx=Symbol.iterator;function w$(e){return e===null||typeof e!="object"?null:(e=Zx&&e[Zx]||e["@@iterator"],typeof e=="function"?e:null)}var S_={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},O_=Object.assign,w_={};function ru(e,t,n){this.props=e,this.context=t,this.refs=w_,this.updater=n||S_}ru.prototype.isReactComponent={};ru.prototype.setState=function(e,t){if(typeof e!="object"&&typeof e!="function"&&e!=null)throw Error("takes an object of state variables to update or a function which returns an object of state variables.");this.updater.enqueueSetState(this,e,t,"setState")};ru.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,"forceUpdate")};function A_(){}A_.prototype=ru.prototype;function _b(e,t,n){this.props=e,this.context=t,this.refs=w_,this.updater=n||S_}var Tb=_b.prototype=new A_;Tb.constructor=_b;O_(Tb,ru.prototype);Tb.isPureReactComponent=!0;var Jx=Array.isArray;function Dm(){}var Ze={H:null,A:null,T:null,S:null},E_=Object.prototype.hasOwnProperty;function jb(e,t,n){var r=n.ref;return{$$typeof:Eb,type:e,key:t,ref:r!==void 0?r:null,props:n}}function A$(e,t){return jb(e.type,t,e.props)}function Cb(e){return typeof e=="object"&&e!==null&&e.$$typeof===Eb}function E$(e){var t={"=":"=0",":":"=2"};return"$"+e.replace(/[=:]/g,function(n){return t[n]})}var e1=/\/+/g;function hy(e,t){return typeof e=="object"&&e!==null&&e.key!=null?E$(""+e.key):t.toString(36)}function _$(e){switch(e.status){case"fulfilled":return e.value;case"rejected":throw e.reason;default:switch(typeof e.status=="string"?e.then(Dm,Dm):(e.status="pending",e.then(function(t){e.status==="pending"&&(e.status="fulfilled",e.value=t)},function(t){e.status==="pending"&&(e.status="rejected",e.reason=t)})),e.status){case"fulfilled":return e.value;case"rejected":throw e.reason}}throw e}function Co(e,t,n,r,a){var i=typeof e;(i==="undefined"||i==="boolean")&&(e=null);var o=!1;if(e===null)o=!0;else switch(i){case"bigint":case"string":case"number":o=!0;break;case"object":switch(e.$$typeof){case Eb:case h$:o=!0;break;case x_:return o=e._init,Co(o(e._payload),t,n,r,a)}}if(o)return a=a(e),o=r===""?"."+hy(e,0):r,Jx(a)?(n="",o!=null&&(n=o.replace(e1,"$&/")+"/"),Co(a,t,n,"",function(s){return s})):a!=null&&(Cb(a)&&(a=A$(a,n+(a.key==null||e&&e.key===a.key?"":(""+a.key).replace(e1,"$&/")+"/")+o)),t.push(a)),1;o=0;var l=r===""?".":r+":";if(Jx(e))for(var u=0;u>>1,F=$[q];if(0>>1;qa(ee,z))hea($e,ee)?($[q]=$e,$[he]=z,q=he):($[q]=ee,$[G]=z,q=G);else if(hea($e,z))$[q]=$e,$[he]=z,q=he;else break e}}return L}function a($,L){var z=$.sortIndex-L.sortIndex;return z!==0?z:$.id-L.id}if(e.unstable_now=void 0,typeof performance=="object"&&typeof performance.now=="function"){var i=performance;e.unstable_now=function(){return i.now()}}else{var o=Date,l=o.now();e.unstable_now=function(){return o.now()-l}}var u=[],s=[],f=1,c=null,d=3,h=!1,b=!1,v=!1,m=!1,p=typeof setTimeout=="function"?setTimeout:null,y=typeof clearTimeout=="function"?clearTimeout:null,x=typeof setImmediate<"u"?setImmediate:null;function w($){for(var L=n(s);L!==null;){if(L.callback===null)r(s);else if(L.startTime<=$)r(s),L.sortIndex=L.expirationTime,t(u,L);else break;L=n(s)}}function S($){if(v=!1,w($),!b)if(n(u)!==null)b=!0,O||(O=!0,R());else{var L=n(s);L!==null&&P(S,L.startTime-$)}}var O=!1,A=-1,E=5,T=-1;function C(){return m?!0:!(e.unstable_now()-T$&&C());){var q=c.callback;if(typeof q=="function"){c.callback=null,d=c.priorityLevel;var F=q(c.expirationTime<=$);if($=e.unstable_now(),typeof F=="function"){c.callback=F,w($),L=!0;break t}c===n(u)&&r(u),w($)}else r(u);c=n(u)}if(c!==null)L=!0;else{var W=n(s);W!==null&&P(S,W.startTime-$),L=!1}}break e}finally{c=null,d=z,h=!1}L=void 0}}finally{L?R():O=!1}}}var R;if(typeof x=="function")R=function(){x(D)};else if(typeof MessageChannel<"u"){var U=new MessageChannel,k=U.port2;U.port1.onmessage=D,R=function(){k.postMessage(null)}}else R=function(){p(D,0)};function P($,L){A=p(function(){$(e.unstable_now())},L)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function($){$.callback=null},e.unstable_forceFrameRate=function($){0>$||125<$?console.error("forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported"):E=0<$?Math.floor(1e3/$):5},e.unstable_getCurrentPriorityLevel=function(){return d},e.unstable_next=function($){switch(d){case 1:case 2:case 3:var L=3;break;default:L=d}var z=d;d=L;try{return $()}finally{d=z}},e.unstable_requestPaint=function(){m=!0},e.unstable_runWithPriority=function($,L){switch($){case 1:case 2:case 3:case 4:case 5:break;default:$=3}var z=d;d=$;try{return L()}finally{d=z}},e.unstable_scheduleCallback=function($,L,z){var q=e.unstable_now();switch(typeof z=="object"&&z!==null?(z=z.delay,z=typeof z=="number"&&0q?($.sortIndex=z,t(s,$),n(u)===null&&$===n(s)&&(v?(y(A),A=-1):v=!0,P(S,z-q))):($.sortIndex=F,t(u,$),b||h||(b=!0,O||(O=!0,R()))),$},e.unstable_shouldYield=C,e.unstable_wrapCallback=function($){var L=d;return function(){var z=d;d=L;try{return $.apply(this,arguments)}finally{d=z}}}})(j_);T_.exports=j_;var C$=T_.exports,C_={exports:{}},rn={};/** + * @license React + * react-dom.production.js + * + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */var M$=_;function M_(e){var t="https://react.dev/errors/"+e;if(1"u"||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!="function"))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(N_)}catch(e){console.error(e)}}N_(),C_.exports=rn;var $$=C_.exports;/** + * @license React + * react-dom-client.production.js + * + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */var _t=C$,R_=_,P$=$$;function I(e){var t="https://react.dev/errors/"+e;if(1Po||(e.current=Im[Po],Im[Po]=null,Po--)}function Fe(e,t){Po++,Im[Po]=e.current,e.current=t}var wr=Tr(null),Os=Tr(null),Va=Tr(null),rd=Tr(null);function ad(e,t){switch(Fe(Va,t),Fe(Os,e),Fe(wr,null),t.nodeType){case 9:case 11:e=(e=t.documentElement)&&(e=e.namespaceURI)?sS(e):0;break;default:if(e=t.tagName,t=t.namespaceURI)t=sS(t),e=aC(t,e);else switch(e){case"svg":e=1;break;case"math":e=2;break;default:e=0}}$t(wr),Fe(wr,e)}function xl(){$t(wr),$t(Os),$t(Va)}function Hm(e){e.memoizedState!==null&&Fe(rd,e);var t=wr.current,n=aC(t,e.type);t!==n&&(Fe(Os,e),Fe(wr,n))}function id(e){Os.current===e&&($t(wr),$t(Os)),rd.current===e&&($t(rd),$s._currentValue=Gi)}var py,a1;function Oi(e){if(py===void 0)try{throw Error()}catch(n){var t=n.stack.trim().match(/\n( *(at )?)/);py=t&&t[1]||"",a1=-1)":-1a||u[r]!==s[a]){var f=` +`+u[r].replace(" at new "," at ");return e.displayName&&f.includes("")&&(f=f.replace("",e.displayName)),f}while(1<=r&&0<=a);break}}}finally{yy=!1,Error.prepareStackTrace=n}return(n=e?e.displayName||e.name:"")?Oi(n):""}function U$(e,t){switch(e.tag){case 26:case 27:case 5:return Oi(e.type);case 16:return Oi("Lazy");case 13:return e.child!==t&&t!==null?Oi("Suspense Fallback"):Oi("Suspense");case 19:return Oi("SuspenseList");case 0:case 15:return my(e.type,!1);case 11:return my(e.type.render,!1);case 1:return my(e.type,!0);case 31:return Oi("Activity");default:return""}}function i1(e){try{var t="",n=null;do t+=U$(e,n),n=e,e=e.return;while(e);return t}catch(r){return` +Error generating stack: `+r.message+` +`+r.stack}}var qm=Object.prototype.hasOwnProperty,Rb=_t.unstable_scheduleCallback,vy=_t.unstable_cancelCallback,z$=_t.unstable_shouldYield,I$=_t.unstable_requestPaint,jn=_t.unstable_now,H$=_t.unstable_getCurrentPriorityLevel,U_=_t.unstable_ImmediatePriority,z_=_t.unstable_UserBlockingPriority,od=_t.unstable_NormalPriority,q$=_t.unstable_LowPriority,I_=_t.unstable_IdlePriority,F$=_t.log,G$=_t.unstable_setDisableYieldValue,Tc=null,Cn=null;function Ha(e){if(typeof F$=="function"&&G$(e),Cn&&typeof Cn.setStrictMode=="function")try{Cn.setStrictMode(Tc,e)}catch{}}var Mn=Math.clz32?Math.clz32:V$,K$=Math.log,Y$=Math.LN2;function V$(e){return e>>>=0,e===0?32:31-(K$(e)/Y$|0)|0}var nf=256,rf=262144,af=4194304;function wi(e){var t=e&42;if(t!==0)return t;switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return e&261888;case 262144:case 524288:case 1048576:case 2097152:return e&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return e&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return e}}function Hh(e,t,n){var r=e.pendingLanes;if(r===0)return 0;var a=0,i=e.suspendedLanes,o=e.pingedLanes;e=e.warmLanes;var l=r&134217727;return l!==0?(r=l&~i,r!==0?a=wi(r):(o&=l,o!==0?a=wi(o):n||(n=l&~e,n!==0&&(a=wi(n))))):(l=r&~i,l!==0?a=wi(l):o!==0?a=wi(o):n||(n=r&~e,n!==0&&(a=wi(n)))),a===0?0:t!==0&&t!==a&&!(t&i)&&(i=a&-a,n=t&-t,i>=n||i===32&&(n&4194048)!==0)?t:a}function jc(e,t){return(e.pendingLanes&~(e.suspendedLanes&~e.pingedLanes)&t)===0}function X$(e,t){switch(e){case 1:case 2:case 4:case 8:case 64:return t+250;case 16:case 32:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return t+5e3;case 4194304:case 8388608:case 16777216:case 33554432:return-1;case 67108864:case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function H_(){var e=af;return af<<=1,!(af&62914560)&&(af=4194304),e}function gy(e){for(var t=[],n=0;31>n;n++)t.push(e);return t}function Cc(e,t){e.pendingLanes|=t,t!==268435456&&(e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0)}function Q$(e,t,n,r,a,i){var o=e.pendingLanes;e.pendingLanes=n,e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0,e.expiredLanes&=n,e.entangledLanes&=n,e.errorRecoveryDisabledLanes&=n,e.shellSuspendCounter=0;var l=e.entanglements,u=e.expirationTimes,s=e.hiddenUpdates;for(n=o&~n;0"u")return null;try{return e.activeElement||e.body}catch{return e.body}}var nP=/[\n"\\]/g;function Gn(e){return e.replace(nP,function(t){return"\\"+t.charCodeAt(0).toString(16)+" "})}function Km(e,t,n,r,a,i,o,l){e.name="",o!=null&&typeof o!="function"&&typeof o!="symbol"&&typeof o!="boolean"?e.type=o:e.removeAttribute("type"),t!=null?o==="number"?(t===0&&e.value===""||e.value!=t)&&(e.value=""+Hn(t)):e.value!==""+Hn(t)&&(e.value=""+Hn(t)):o!=="submit"&&o!=="reset"||e.removeAttribute("value"),t!=null?Ym(e,o,Hn(t)):n!=null?Ym(e,o,Hn(n)):r!=null&&e.removeAttribute("value"),a==null&&i!=null&&(e.defaultChecked=!!i),a!=null&&(e.checked=a&&typeof a!="function"&&typeof a!="symbol"),l!=null&&typeof l!="function"&&typeof l!="symbol"&&typeof l!="boolean"?e.name=""+Hn(l):e.removeAttribute("name")}function W_(e,t,n,r,a,i,o,l){if(i!=null&&typeof i!="function"&&typeof i!="symbol"&&typeof i!="boolean"&&(e.type=i),t!=null||n!=null){if(!(i!=="submit"&&i!=="reset"||t!=null)){Gm(e);return}n=n!=null?""+Hn(n):"",t=t!=null?""+Hn(t):n,l||t===e.value||(e.value=t),e.defaultValue=t}r=r??a,r=typeof r!="function"&&typeof r!="symbol"&&!!r,e.checked=l?e.checked:!!r,e.defaultChecked=!!r,o!=null&&typeof o!="function"&&typeof o!="symbol"&&typeof o!="boolean"&&(e.name=o),Gm(e)}function Ym(e,t,n){t==="number"&&ld(e.ownerDocument)===e||e.defaultValue===""+n||(e.defaultValue=""+n)}function Wo(e,t,n,r){if(e=e.options,t){t={};for(var a=0;a"u"||typeof window.document>"u"||typeof window.document.createElement>"u"),Xm=!1;if(la)try{var Nu={};Object.defineProperty(Nu,"passive",{get:function(){Xm=!0}}),window.addEventListener("test",Nu,Nu),window.removeEventListener("test",Nu,Nu)}catch{Xm=!1}var qa=null,Bb=null,kf=null;function nT(){if(kf)return kf;var e,t=Bb,n=t.length,r,a="value"in qa?qa.value:qa.textContent,i=a.length;for(e=0;e=rs),m1=" ",v1=!1;function aT(e,t){switch(e){case"keyup":return MP.indexOf(t.keyCode)!==-1;case"keydown":return t.keyCode!==229;case"keypress":case"mousedown":case"focusout":return!0;default:return!1}}function iT(e){return e=e.detail,typeof e=="object"&&"data"in e?e.data:null}var Lo=!1;function RP(e,t){switch(e){case"compositionend":return iT(t);case"keypress":return t.which!==32?null:(v1=!0,m1);case"textInput":return e=t.data,e===m1&&v1?null:e;default:return null}}function $P(e,t){if(Lo)return e==="compositionend"||!zb&&aT(e,t)?(e=nT(),kf=Bb=qa=null,Lo=!1,e):null;switch(e){case"paste":return null;case"keypress":if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1=t)return{node:n,offset:t-e};e=r}e:{for(;n;){if(n.nextSibling){n=n.nextSibling;break e}n=n.parentNode}n=void 0}n=O1(n)}}function sT(e,t){return e&&t?e===t?!0:e&&e.nodeType===3?!1:t&&t.nodeType===3?sT(e,t.parentNode):"contains"in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1:!1}function cT(e){e=e!=null&&e.ownerDocument!=null&&e.ownerDocument.defaultView!=null?e.ownerDocument.defaultView:window;for(var t=ld(e.document);t instanceof e.HTMLIFrameElement;){try{var n=typeof t.contentWindow.location.href=="string"}catch{n=!1}if(n)e=t.contentWindow;else break;t=ld(e.document)}return t}function Ib(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t==="input"&&(e.type==="text"||e.type==="search"||e.type==="tel"||e.type==="url"||e.type==="password")||t==="textarea"||e.contentEditable==="true")}var IP=la&&"documentMode"in document&&11>=document.documentMode,Bo=null,Qm=null,is=null,Wm=!1;function A1(e,t,n){var r=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;Wm||Bo==null||Bo!==ld(r)||(r=Bo,"selectionStart"in r&&Ib(r)?r={start:r.selectionStart,end:r.selectionEnd}:(r=(r.ownerDocument&&r.ownerDocument.defaultView||window).getSelection(),r={anchorNode:r.anchorNode,anchorOffset:r.anchorOffset,focusNode:r.focusNode,focusOffset:r.focusOffset}),is&&Es(is,r)||(is=r,r=Ed(Qm,"onSelect"),0>=o,a-=o,br=1<<32-Mn(t)+a|n<E?(T=A,A=null):T=A.sibling;var C=d(p,A,x[E],w);if(C===null){A===null&&(A=T);break}e&&A&&C.alternate===null&&t(p,A),y=i(C,y,E),O===null?S=C:O.sibling=C,O=C,A=T}if(E===x.length)return n(p,A),Se&&qr(p,E),S;if(A===null){for(;EE?(T=A,A=null):T=A.sibling;var D=d(p,A,C.value,w);if(D===null){A===null&&(A=T);break}e&&A&&D.alternate===null&&t(p,A),y=i(D,y,E),O===null?S=D:O.sibling=D,O=D,A=T}if(C.done)return n(p,A),Se&&qr(p,E),S;if(A===null){for(;!C.done;E++,C=x.next())C=c(p,C.value,w),C!==null&&(y=i(C,y,E),O===null?S=C:O.sibling=C,O=C);return Se&&qr(p,E),S}for(A=r(A);!C.done;E++,C=x.next())C=h(A,p,E,C.value,w),C!==null&&(e&&C.alternate!==null&&A.delete(C.key===null?E:C.key),y=i(C,y,E),O===null?S=C:O.sibling=C,O=C);return e&&A.forEach(function(R){return t(p,R)}),Se&&qr(p,E),S}function m(p,y,x,w){if(typeof x=="object"&&x!==null&&x.type===$o&&x.key===null&&(x=x.props.children),typeof x=="object"&&x!==null){switch(x.$$typeof){case tf:e:{for(var S=x.key;y!==null;){if(y.key===S){if(S=x.type,S===$o){if(y.tag===7){n(p,y.sibling),w=a(y,x.props.children),w.return=p,p=w;break e}}else if(y.elementType===S||typeof S=="object"&&S!==null&&S.$$typeof===Ea&&Ai(S)===y.type){n(p,y.sibling),w=a(y,x.props),$u(w,x),w.return=p,p=w;break e}n(p,y);break}else t(p,y);y=y.sibling}x.type===$o?(w=Ki(x.props.children,p.mode,w,x.key),w.return=p,p=w):(w=Bf(x.type,x.key,x.props,null,p.mode,w),$u(w,x),w.return=p,p=w)}return o(p);case Xu:e:{for(S=x.key;y!==null;){if(y.key===S)if(y.tag===4&&y.stateNode.containerInfo===x.containerInfo&&y.stateNode.implementation===x.implementation){n(p,y.sibling),w=a(y,x.children||[]),w.return=p,p=w;break e}else{n(p,y);break}else t(p,y);y=y.sibling}w=Ty(x,p.mode,w),w.return=p,p=w}return o(p);case Ea:return x=Ai(x),m(p,y,x,w)}if(Qu(x))return b(p,y,x,w);if(Mu(x)){if(S=Mu(x),typeof S!="function")throw Error(I(150));return x=S.call(x),v(p,y,x,w)}if(typeof x.then=="function")return m(p,y,sf(x),w);if(x.$$typeof===Xr)return m(p,y,uf(p,x),w);cf(p,x)}return typeof x=="string"&&x!==""||typeof x=="number"||typeof x=="bigint"?(x=""+x,y!==null&&y.tag===6?(n(p,y.sibling),w=a(y,x),w.return=p,p=w):(n(p,y),w=_y(x,p.mode,w),w.return=p,p=w),o(p)):n(p,y)}return function(p,y,x,w){try{js=0;var S=m(p,y,x,w);return el=null,S}catch(A){if(A===lu||A===Vh)throw A;var O=En(29,A,null,p.mode);return O.lanes=w,O.return=p,O}finally{}}}var to=ET(!0),_T=ET(!1),_a=!1;function Qb(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,lanes:0,hiddenCallbacks:null},callbacks:null}}function av(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,callbacks:null})}function Qa(e){return{lane:e,tag:0,payload:null,callback:null,next:null}}function Wa(e,t,n){var r=e.updateQueue;if(r===null)return null;if(r=r.shared,Ae&2){var a=r.pending;return a===null?t.next=t:(t.next=a.next,a.next=t),r.pending=t,t=sd(e),vT(e,null,n),t}return Yh(e,r,t,n),sd(e)}function ls(e,t,n){if(t=t.updateQueue,t!==null&&(t=t.shared,(n&4194048)!==0)){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,F_(e,n)}}function Cy(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null&&(r=r.updateQueue,n===r)){var a=null,i=null;if(n=n.firstBaseUpdate,n!==null){do{var o={lane:n.lane,tag:n.tag,payload:n.payload,callback:null,next:null};i===null?a=i=o:i=i.next=o,n=n.next}while(n!==null);i===null?a=i=t:i=i.next=t}else a=i=t;n={baseState:r.baseState,firstBaseUpdate:a,lastBaseUpdate:i,shared:r.shared,callbacks:r.callbacks},e.updateQueue=n;return}e=n.lastBaseUpdate,e===null?n.firstBaseUpdate=t:e.next=t,n.lastBaseUpdate=t}var iv=!1;function us(){if(iv){var e=Jo;if(e!==null)throw e}}function ss(e,t,n,r){iv=!1;var a=e.updateQueue;_a=!1;var i=a.firstBaseUpdate,o=a.lastBaseUpdate,l=a.shared.pending;if(l!==null){a.shared.pending=null;var u=l,s=u.next;u.next=null,o===null?i=s:o.next=s,o=u;var f=e.alternate;f!==null&&(f=f.updateQueue,l=f.lastBaseUpdate,l!==o&&(l===null?f.firstBaseUpdate=s:l.next=s,f.lastBaseUpdate=u))}if(i!==null){var c=a.baseState;o=0,f=s=u=null,l=i;do{var d=l.lane&-536870913,h=d!==l.lane;if(h?(be&d)===d:(r&d)===d){d!==0&&d===wl&&(iv=!0),f!==null&&(f=f.next={lane:0,tag:l.tag,payload:l.payload,callback:null,next:null});e:{var b=e,v=l;d=t;var m=n;switch(v.tag){case 1:if(b=v.payload,typeof b=="function"){c=b.call(m,c,d);break e}c=b;break e;case 3:b.flags=b.flags&-65537|128;case 0:if(b=v.payload,d=typeof b=="function"?b.call(m,c,d):b,d==null)break e;c=Je({},c,d);break e;case 2:_a=!0}}d=l.callback,d!==null&&(e.flags|=64,h&&(e.flags|=8192),h=a.callbacks,h===null?a.callbacks=[d]:h.push(d))}else h={lane:d,tag:l.tag,payload:l.payload,callback:l.callback,next:null},f===null?(s=f=h,u=c):f=f.next=h,o|=d;if(l=l.next,l===null){if(l=a.shared.pending,l===null)break;h=l,l=h.next,h.next=null,a.lastBaseUpdate=h,a.shared.pending=null}}while(!0);f===null&&(u=c),a.baseState=u,a.firstBaseUpdate=s,a.lastBaseUpdate=f,i===null&&(a.shared.lanes=0),si|=o,e.lanes=o,e.memoizedState=c}}function TT(e,t){if(typeof e!="function")throw Error(I(191,e));e.call(t)}function jT(e,t){var n=e.callbacks;if(n!==null)for(e.callbacks=null,e=0;ei?i:8;var o=ae.T,l={};ae.T=l,s0(e,!1,t,n);try{var u=a(),s=ae.S;if(s!==null&&s(l,u),u!==null&&typeof u=="object"&&typeof u.then=="function"){var f=QP(u,r);cs(e,t,f,Nn(e))}else cs(e,t,r,Nn(e))}catch(c){cs(e,t,{then:function(){},status:"rejected",reason:c},Nn())}finally{Ee.p=i,o!==null&&l.types!==null&&(o.types=l.types),ae.T=o}}function nD(){}function cv(e,t,n,r){if(e.tag!==5)throw Error(I(476));var a=JT(e).queue;ZT(e,a,t,Gi,n===null?nD:function(){return ej(e),n(r)})}function JT(e){var t=e.memoizedState;if(t!==null)return t;t={memoizedState:Gi,baseState:Gi,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:sa,lastRenderedState:Gi},next:null};var n={};return t.next={memoizedState:n,baseState:n,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:sa,lastRenderedState:n},next:null},e.memoizedState=t,e=e.alternate,e!==null&&(e.memoizedState=t),t}function ej(e){var t=JT(e);t.next===null&&(t=e.alternate.memoizedState),cs(e,t.next.queue,{},Nn())}function u0(){return It($s)}function tj(){return ct().memoizedState}function nj(){return ct().memoizedState}function rD(e){for(var t=e.return;t!==null;){switch(t.tag){case 24:case 3:var n=Nn();e=Qa(n);var r=Wa(t,e,n);r!==null&&(hn(r,t,n),ls(r,t,n)),t={cache:Yb()},e.payload=t;return}t=t.return}}function aD(e,t,n){var r=Nn();n={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null},Zh(e)?aj(t,n):(n=qb(e,t,n,r),n!==null&&(hn(n,e,r),ij(n,t,r)))}function rj(e,t,n){var r=Nn();cs(e,t,n,r)}function cs(e,t,n,r){var a={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null};if(Zh(e))aj(t,a);else{var i=e.alternate;if(e.lanes===0&&(i===null||i.lanes===0)&&(i=t.lastRenderedReducer,i!==null))try{var o=t.lastRenderedState,l=i(o,n);if(a.hasEagerState=!0,a.eagerState=l,$n(l,o))return Yh(e,t,a,0),ze===null&&Kh(),!1}catch{}finally{}if(n=qb(e,t,a,r),n!==null)return hn(n,e,r),ij(n,t,r),!0}return!1}function s0(e,t,n,r){if(r={lane:2,revertLane:g0(),gesture:null,action:r,hasEagerState:!1,eagerState:null,next:null},Zh(e)){if(t)throw Error(I(479))}else t=qb(e,n,r,2),t!==null&&hn(t,e,2)}function Zh(e){var t=e.alternate;return e===fe||t!==null&&t===fe}function aj(e,t){tl=yd=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function ij(e,t,n){if(n&4194048){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,F_(e,n)}}var Ms={readContext:It,use:Qh,useCallback:at,useContext:at,useEffect:at,useImperativeHandle:at,useLayoutEffect:at,useInsertionEffect:at,useMemo:at,useReducer:at,useRef:at,useState:at,useDebugValue:at,useDeferredValue:at,useTransition:at,useSyncExternalStore:at,useId:at,useHostTransitionStatus:at,useFormState:at,useActionState:at,useOptimistic:at,useMemoCache:at,useCacheRefresh:at};Ms.useEffectEvent=at;var oj={readContext:It,use:Qh,useCallback:function(e,t){return Wt().memoizedState=[e,t===void 0?null:t],e},useContext:It,useEffect:U1,useImperativeHandle:function(e,t,n){n=n!=null?n.concat([e]):null,If(4194308,4,YT.bind(null,t,e),n)},useLayoutEffect:function(e,t){return If(4194308,4,e,t)},useInsertionEffect:function(e,t){If(4,2,e,t)},useMemo:function(e,t){var n=Wt();t=t===void 0?null:t;var r=e();if(no){Ha(!0);try{e()}finally{Ha(!1)}}return n.memoizedState=[r,t],r},useReducer:function(e,t,n){var r=Wt();if(n!==void 0){var a=n(t);if(no){Ha(!0);try{n(t)}finally{Ha(!1)}}}else a=t;return r.memoizedState=r.baseState=a,e={pending:null,lanes:0,dispatch:null,lastRenderedReducer:e,lastRenderedState:a},r.queue=e,e=e.dispatch=aD.bind(null,fe,e),[r.memoizedState,e]},useRef:function(e){var t=Wt();return e={current:e},t.memoizedState=e},useState:function(e){e=uv(e);var t=e.queue,n=rj.bind(null,fe,t);return t.dispatch=n,[e.memoizedState,n]},useDebugValue:o0,useDeferredValue:function(e,t){var n=Wt();return l0(n,e,t)},useTransition:function(){var e=uv(!1);return e=ZT.bind(null,fe,e.queue,!0,!1),Wt().memoizedState=e,[!1,e]},useSyncExternalStore:function(e,t,n){var r=fe,a=Wt();if(Se){if(n===void 0)throw Error(I(407));n=n()}else{if(n=t(),ze===null)throw Error(I(349));be&127||$T(r,t,n)}a.memoizedState=n;var i={value:n,getSnapshot:t};return a.queue=i,U1(DT.bind(null,r,i,e),[e]),r.flags|=2048,El(9,{destroy:void 0},PT.bind(null,r,i,n,t),null),n},useId:function(){var e=Wt(),t=ze.identifierPrefix;if(Se){var n=xr,r=br;n=(r&~(1<<32-Mn(r)-1)).toString(32)+n,t="_"+t+"R_"+n,n=md++,0<\/script>",i=i.removeChild(i.firstChild);break;case"select":i=typeof r.is=="string"?o.createElement("select",{is:r.is}):o.createElement("select"),r.multiple?i.multiple=!0:r.size&&(i.size=r.size);break;default:i=typeof r.is=="string"?o.createElement(a,{is:r.is}):o.createElement(a)}}i[Bt]=t,i[yn]=r;e:for(o=t.child;o!==null;){if(o.tag===5||o.tag===6)i.appendChild(o.stateNode);else if(o.tag!==4&&o.tag!==27&&o.child!==null){o.child.return=o,o=o.child;continue}if(o===t)break e;for(;o.sibling===null;){if(o.return===null||o.return===t)break e;o=o.return}o.sibling.return=o.return,o=o.sibling}t.stateNode=i;e:switch(qt(i,a,r),a){case"button":case"input":case"select":case"textarea":r=!!r.autoFocus;break e;case"img":r=!0;break e;default:r=!1}r&&kr(t)}}return Ye(t),Ly(t,t.type,e===null?null:e.memoizedProps,t.pendingProps,n),null;case 6:if(e&&t.stateNode!=null)e.memoizedProps!==r&&kr(t);else{if(typeof r!="string"&&t.stateNode===null)throw Error(I(166));if(e=Va.current,wo(t)){if(e=t.stateNode,n=t.memoizedProps,r=null,a=Ut,a!==null)switch(a.tag){case 27:case 5:r=a.memoizedProps}e[Bt]=t,e=!!(e.nodeValue===n||r!==null&&r.suppressHydrationWarning===!0||rC(e.nodeValue,n)),e||li(t,!0)}else e=_d(e).createTextNode(r),e[Bt]=t,t.stateNode=e}return Ye(t),null;case 31:if(n=t.memoizedState,e===null||e.memoizedState!==null){if(r=wo(t),n!==null){if(e===null){if(!r)throw Error(I(318));if(e=t.memoizedState,e=e!==null?e.dehydrated:null,!e)throw Error(I(557));e[Bt]=t}else Ji(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;Ye(t),e=!1}else n=jy(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=n),e=!0;if(!e)return t.flags&256?(An(t),t):(An(t),null);if(t.flags&128)throw Error(I(558))}return Ye(t),null;case 13:if(r=t.memoizedState,e===null||e.memoizedState!==null&&e.memoizedState.dehydrated!==null){if(a=wo(t),r!==null&&r.dehydrated!==null){if(e===null){if(!a)throw Error(I(318));if(a=t.memoizedState,a=a!==null?a.dehydrated:null,!a)throw Error(I(317));a[Bt]=t}else Ji(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;Ye(t),a=!1}else a=jy(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=a),a=!0;if(!a)return t.flags&256?(An(t),t):(An(t),null)}return An(t),t.flags&128?(t.lanes=n,t):(n=r!==null,e=e!==null&&e.memoizedState!==null,n&&(r=t.child,a=null,r.alternate!==null&&r.alternate.memoizedState!==null&&r.alternate.memoizedState.cachePool!==null&&(a=r.alternate.memoizedState.cachePool.pool),i=null,r.memoizedState!==null&&r.memoizedState.cachePool!==null&&(i=r.memoizedState.cachePool.pool),i!==a&&(r.flags|=2048)),n!==e&&n&&(t.child.flags|=8192),ff(t,t.updateQueue),Ye(t),null);case 4:return xl(),e===null&&b0(t.stateNode.containerInfo),Ye(t),null;case 10:return ta(t.type),Ye(t),null;case 19:if($t(st),r=t.memoizedState,r===null)return Ye(t),null;if(a=(t.flags&128)!==0,i=r.rendering,i===null)if(a)Pu(r,!1);else{if(lt!==0||e!==null&&e.flags&128)for(e=t.child;e!==null;){if(i=pd(e),i!==null){for(t.flags|=128,Pu(r,!1),e=i.updateQueue,t.updateQueue=e,ff(t,e),t.subtreeFlags=0,e=n,n=t.child;n!==null;)gT(n,e),n=n.sibling;return Fe(st,st.current&1|2),Se&&qr(t,r.treeForkCount),t.child}e=e.sibling}r.tail!==null&&jn()>xd&&(t.flags|=128,a=!0,Pu(r,!1),t.lanes=4194304)}else{if(!a)if(e=pd(i),e!==null){if(t.flags|=128,a=!0,e=e.updateQueue,t.updateQueue=e,ff(t,e),Pu(r,!0),r.tail===null&&r.tailMode==="hidden"&&!i.alternate&&!Se)return Ye(t),null}else 2*jn()-r.renderingStartTime>xd&&n!==536870912&&(t.flags|=128,a=!0,Pu(r,!1),t.lanes=4194304);r.isBackwards?(i.sibling=t.child,t.child=i):(e=r.last,e!==null?e.sibling=i:t.child=i,r.last=i)}return r.tail!==null?(e=r.tail,r.rendering=e,r.tail=e.sibling,r.renderingStartTime=jn(),e.sibling=null,n=st.current,Fe(st,a?n&1|2:n&1),Se&&qr(t,r.treeForkCount),e):(Ye(t),null);case 22:case 23:return An(t),Wb(),r=t.memoizedState!==null,e!==null?e.memoizedState!==null!==r&&(t.flags|=8192):r&&(t.flags|=8192),r?n&536870912&&!(t.flags&128)&&(Ye(t),t.subtreeFlags&6&&(t.flags|=8192)):Ye(t),n=t.updateQueue,n!==null&&ff(t,n.retryQueue),n=null,e!==null&&e.memoizedState!==null&&e.memoizedState.cachePool!==null&&(n=e.memoizedState.cachePool.pool),r=null,t.memoizedState!==null&&t.memoizedState.cachePool!==null&&(r=t.memoizedState.cachePool.pool),r!==n&&(t.flags|=2048),e!==null&&$t(Yi),null;case 24:return n=null,e!==null&&(n=e.memoizedState.cache),t.memoizedState.cache!==n&&(t.flags|=2048),ta(mt),Ye(t),null;case 25:return null;case 30:return null}throw Error(I(156,t.tag))}function sD(e,t){switch(Kb(t),t.tag){case 1:return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return ta(mt),xl(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 26:case 27:case 5:return id(t),null;case 31:if(t.memoizedState!==null){if(An(t),t.alternate===null)throw Error(I(340));Ji()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 13:if(An(t),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(I(340));Ji()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return $t(st),null;case 4:return xl(),null;case 10:return ta(t.type),null;case 22:case 23:return An(t),Wb(),e!==null&&$t(Yi),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 24:return ta(mt),null;case 25:return null;default:return null}}function gj(e,t){switch(Kb(t),t.tag){case 3:ta(mt),xl();break;case 26:case 27:case 5:id(t);break;case 4:xl();break;case 31:t.memoizedState!==null&&An(t);break;case 13:An(t);break;case 19:$t(st);break;case 10:ta(t.type);break;case 22:case 23:An(t),Wb(),e!==null&&$t(Yi);break;case 24:ta(mt)}}function Pc(e,t){try{var n=t.updateQueue,r=n!==null?n.lastEffect:null;if(r!==null){var a=r.next;n=a;do{if((n.tag&e)===e){r=void 0;var i=n.create,o=n.inst;r=i(),o.destroy=r}n=n.next}while(n!==a)}}catch(l){Me(t,t.return,l)}}function ui(e,t,n){try{var r=t.updateQueue,a=r!==null?r.lastEffect:null;if(a!==null){var i=a.next;r=i;do{if((r.tag&e)===e){var o=r.inst,l=o.destroy;if(l!==void 0){o.destroy=void 0,a=t;var u=n,s=l;try{s()}catch(f){Me(a,u,f)}}}r=r.next}while(r!==i)}}catch(f){Me(t,t.return,f)}}function bj(e){var t=e.updateQueue;if(t!==null){var n=e.stateNode;try{jT(t,n)}catch(r){Me(e,e.return,r)}}}function xj(e,t,n){n.props=ro(e.type,e.memoizedProps),n.state=e.memoizedState;try{n.componentWillUnmount()}catch(r){Me(e,t,r)}}function fs(e,t){try{var n=e.ref;if(n!==null){switch(e.tag){case 26:case 27:case 5:var r=e.stateNode;break;case 30:r=e.stateNode;break;default:r=e.stateNode}typeof n=="function"?e.refCleanup=n(r):n.current=r}}catch(a){Me(e,t,a)}}function Sr(e,t){var n=e.ref,r=e.refCleanup;if(n!==null)if(typeof r=="function")try{r()}catch(a){Me(e,t,a)}finally{e.refCleanup=null,e=e.alternate,e!=null&&(e.refCleanup=null)}else if(typeof n=="function")try{n(null)}catch(a){Me(e,t,a)}else n.current=null}function Sj(e){var t=e.type,n=e.memoizedProps,r=e.stateNode;try{e:switch(t){case"button":case"input":case"select":case"textarea":n.autoFocus&&r.focus();break e;case"img":n.src?r.src=n.src:n.srcSet&&(r.srcset=n.srcSet)}}catch(a){Me(e,e.return,a)}}function By(e,t,n){try{var r=e.stateNode;ND(r,e.type,n,t),r[yn]=t}catch(a){Me(e,e.return,a)}}function Oj(e){return e.tag===5||e.tag===3||e.tag===26||e.tag===27&&fi(e.type)||e.tag===4}function Uy(e){e:for(;;){for(;e.sibling===null;){if(e.return===null||Oj(e.return))return null;e=e.return}for(e.sibling.return=e.return,e=e.sibling;e.tag!==5&&e.tag!==6&&e.tag!==18;){if(e.tag===27&&fi(e.type)||e.flags&2||e.child===null||e.tag===4)continue e;e.child.return=e,e=e.child}if(!(e.flags&2))return e.stateNode}}function yv(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?(n.nodeType===9?n.body:n.nodeName==="HTML"?n.ownerDocument.body:n).insertBefore(e,t):(t=n.nodeType===9?n.body:n.nodeName==="HTML"?n.ownerDocument.body:n,t.appendChild(e),n=n._reactRootContainer,n!=null||t.onclick!==null||(t.onclick=Qr));else if(r!==4&&(r===27&&fi(e.type)&&(n=e.stateNode,t=null),e=e.child,e!==null))for(yv(e,t,n),e=e.sibling;e!==null;)yv(e,t,n),e=e.sibling}function bd(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.insertBefore(e,t):n.appendChild(e);else if(r!==4&&(r===27&&fi(e.type)&&(n=e.stateNode),e=e.child,e!==null))for(bd(e,t,n),e=e.sibling;e!==null;)bd(e,t,n),e=e.sibling}function wj(e){var t=e.stateNode,n=e.memoizedProps;try{for(var r=e.type,a=t.attributes;a.length;)t.removeAttributeNode(a[0]);qt(t,r,n),t[Bt]=e,t[yn]=n}catch(i){Me(e,e.return,i)}}var Vr=!1,yt=!1,zy=!1,Z1=typeof WeakSet=="function"?WeakSet:Set,Mt=null;function cD(e,t){if(e=e.containerInfo,Ov=Md,e=cT(e),Ib(e)){if("selectionStart"in e)var n={start:e.selectionStart,end:e.selectionEnd};else e:{n=(n=e.ownerDocument)&&n.defaultView||window;var r=n.getSelection&&n.getSelection();if(r&&r.rangeCount!==0){n=r.anchorNode;var a=r.anchorOffset,i=r.focusNode;r=r.focusOffset;try{n.nodeType,i.nodeType}catch{n=null;break e}var o=0,l=-1,u=-1,s=0,f=0,c=e,d=null;t:for(;;){for(var h;c!==n||a!==0&&c.nodeType!==3||(l=o+a),c!==i||r!==0&&c.nodeType!==3||(u=o+r),c.nodeType===3&&(o+=c.nodeValue.length),(h=c.firstChild)!==null;)d=c,c=h;for(;;){if(c===e)break t;if(d===n&&++s===a&&(l=o),d===i&&++f===r&&(u=o),(h=c.nextSibling)!==null)break;c=d,d=c.parentNode}c=h}n=l===-1||u===-1?null:{start:l,end:u}}else n=null}n=n||{start:0,end:0}}else n=null;for(wv={focusedElem:e,selectionRange:n},Md=!1,Mt=t;Mt!==null;)if(t=Mt,e=t.child,(t.subtreeFlags&1028)!==0&&e!==null)e.return=t,Mt=e;else for(;Mt!==null;){switch(t=Mt,i=t.alternate,e=t.flags,t.tag){case 0:if(e&4&&(e=t.updateQueue,e=e!==null?e.events:null,e!==null))for(n=0;n title"))),qt(i,r,n),i[Bt]=e,Nt(i),r=i;break e;case"link":var o=gS("link","href",a).get(r+(n.href||""));if(o){for(var l=0;lm&&(o=m,m=v,v=o);var p=w1(l,v),y=w1(l,m);if(p&&y&&(h.rangeCount!==1||h.anchorNode!==p.node||h.anchorOffset!==p.offset||h.focusNode!==y.node||h.focusOffset!==y.offset)){var x=c.createRange();x.setStart(p.node,p.offset),h.removeAllRanges(),v>m?(h.addRange(x),h.extend(y.node,y.offset)):(x.setEnd(y.node,y.offset),h.addRange(x))}}}}for(c=[],h=l;h=h.parentNode;)h.nodeType===1&&c.push({element:h,left:h.scrollLeft,top:h.scrollTop});for(typeof l.focus=="function"&&l.focus(),l=0;ln?32:n,ae.T=null,n=gv,gv=null;var i=Ja,o=na;if(At=0,Tl=Ja=null,na=0,Ae&6)throw Error(I(331));var l=Ae;if(Ae|=4,Pj(i.current),Nj(i,i.current,o,n),Ae=l,Dc(0,!1),Cn&&typeof Cn.onPostCommitFiberRoot=="function")try{Cn.onPostCommitFiberRoot(Tc,i)}catch{}return!0}finally{Ee.p=a,ae.T=r,Xj(e,t)}}function nS(e,t,n){t=Kn(n,t),t=dv(e.stateNode,t,2),e=Wa(e,t,2),e!==null&&(Cc(e,2),jr(e))}function Me(e,t,n){if(e.tag===3)nS(e,e,n);else for(;t!==null;){if(t.tag===3){nS(t,e,n);break}else if(t.tag===1){var r=t.stateNode;if(typeof t.type.getDerivedStateFromError=="function"||typeof r.componentDidCatch=="function"&&(Za===null||!Za.has(r))){e=Kn(n,e),n=fj(2),r=Wa(t,n,2),r!==null&&(dj(n,r,t,e),Cc(r,2),jr(r));break}}t=t.return}}function Hy(e,t,n){var r=e.pingCache;if(r===null){r=e.pingCache=new hD;var a=new Set;r.set(t,a)}else a=r.get(t),a===void 0&&(a=new Set,r.set(t,a));a.has(n)||(y0=!0,a.add(n),e=gD.bind(null,e,t,n),t.then(e,e))}function gD(e,t,n){var r=e.pingCache;r!==null&&r.delete(t),e.pingedLanes|=e.suspendedLanes&n,e.warmLanes&=~n,ze===e&&(be&n)===n&&(lt===4||lt===3&&(be&62914560)===be&&300>jn()-Jh?!(Ae&2)&&jl(e,0):m0|=n,_l===be&&(_l=0)),jr(e)}function Wj(e,t){t===0&&(t=H_()),e=mo(e,t),e!==null&&(Cc(e,t),jr(e))}function bD(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),Wj(e,n)}function xD(e,t){var n=0;switch(e.tag){case 31:case 13:var r=e.stateNode,a=e.memoizedState;a!==null&&(n=a.retryLane);break;case 19:r=e.stateNode;break;case 22:r=e.stateNode._retryCache;break;default:throw Error(I(314))}r!==null&&r.delete(t),Wj(e,n)}function SD(e,t){return Rb(e,t)}var wd=null,No=null,xv=!1,Ad=!1,qy=!1,Ka=0;function jr(e){e!==No&&e.next===null&&(No===null?wd=No=e:No=No.next=e),Ad=!0,xv||(xv=!0,wD())}function Dc(e,t){if(!qy&&Ad){qy=!0;do for(var n=!1,r=wd;r!==null;){if(e!==0){var a=r.pendingLanes;if(a===0)var i=0;else{var o=r.suspendedLanes,l=r.pingedLanes;i=(1<<31-Mn(42|e)+1)-1,i&=a&~(o&~l),i=i&201326741?i&201326741|1:i?i|2:0}i!==0&&(n=!0,rS(r,i))}else i=be,i=Hh(r,r===ze?i:0,r.cancelPendingCommit!==null||r.timeoutHandle!==-1),!(i&3)||jc(r,i)||(n=!0,rS(r,i));r=r.next}while(n);qy=!1}}function OD(){Zj()}function Zj(){Ad=xv=!1;var e=0;Ka!==0&&$D()&&(e=Ka);for(var t=jn(),n=null,r=wd;r!==null;){var a=r.next,i=Jj(r,t);i===0?(r.next=null,n===null?wd=a:n.next=a,a===null&&(No=n)):(n=r,(e!==0||i&3)&&(Ad=!0)),r=a}At!==0&&At!==5||Dc(e),Ka!==0&&(Ka=0)}function Jj(e,t){for(var n=e.suspendedLanes,r=e.pingedLanes,a=e.expirationTimes,i=e.pendingLanes&-62914561;0l)break;var f=u.transferSize,c=u.initiatorType;f&&uS(c)&&(u=u.responseEnd,o+=f*(u"u"?null:document;function uC(e,t,n){var r=su;if(r&&typeof t=="string"&&t){var a=Gn(t);a='link[rel="'+e+'"][href="'+a+'"]',typeof n=="string"&&(a+='[crossorigin="'+n+'"]'),yS.has(a)||(yS.add(a),e={rel:e,crossOrigin:n,href:t},r.querySelector(a)===null&&(t=r.createElement("link"),qt(t,"link",e),Nt(t),r.head.appendChild(t)))}}function HD(e){va.D(e),uC("dns-prefetch",e,null)}function qD(e,t){va.C(e,t),uC("preconnect",e,t)}function FD(e,t,n){va.L(e,t,n);var r=su;if(r&&e&&t){var a='link[rel="preload"][as="'+Gn(t)+'"]';t==="image"&&n&&n.imageSrcSet?(a+='[imagesrcset="'+Gn(n.imageSrcSet)+'"]',typeof n.imageSizes=="string"&&(a+='[imagesizes="'+Gn(n.imageSizes)+'"]')):a+='[href="'+Gn(e)+'"]';var i=a;switch(t){case"style":i=Cl(e);break;case"script":i=cu(e)}Jn.has(i)||(e=Je({rel:"preload",href:t==="image"&&n&&n.imageSrcSet?void 0:e,as:t},n),Jn.set(i,e),r.querySelector(a)!==null||t==="style"&&r.querySelector(kc(i))||t==="script"&&r.querySelector(Lc(i))||(t=r.createElement("link"),qt(t,"link",e),Nt(t),r.head.appendChild(t)))}}function GD(e,t){va.m(e,t);var n=su;if(n&&e){var r=t&&typeof t.as=="string"?t.as:"script",a='link[rel="modulepreload"][as="'+Gn(r)+'"][href="'+Gn(e)+'"]',i=a;switch(r){case"audioworklet":case"paintworklet":case"serviceworker":case"sharedworker":case"worker":case"script":i=cu(e)}if(!Jn.has(i)&&(e=Je({rel:"modulepreload",href:e},t),Jn.set(i,e),n.querySelector(a)===null)){switch(r){case"audioworklet":case"paintworklet":case"serviceworker":case"sharedworker":case"worker":case"script":if(n.querySelector(Lc(i)))return}r=n.createElement("link"),qt(r,"link",e),Nt(r),n.head.appendChild(r)}}}function KD(e,t,n){va.S(e,t,n);var r=su;if(r&&e){var a=Qo(r).hoistableStyles,i=Cl(e);t=t||"default";var o=a.get(i);if(!o){var l={loading:0,preload:null};if(o=r.querySelector(kc(i)))l.loading=5;else{e=Je({rel:"stylesheet",href:e,"data-precedence":t},n),(n=Jn.get(i))&&x0(e,n);var u=o=r.createElement("link");Nt(u),qt(u,"link",e),u._p=new Promise(function(s,f){u.onload=s,u.onerror=f}),u.addEventListener("load",function(){l.loading|=1}),u.addEventListener("error",function(){l.loading|=2}),l.loading|=4,Gf(o,t,r)}o={type:"stylesheet",instance:o,count:1,state:l},a.set(i,o)}}}function YD(e,t){va.X(e,t);var n=su;if(n&&e){var r=Qo(n).hoistableScripts,a=cu(e),i=r.get(a);i||(i=n.querySelector(Lc(a)),i||(e=Je({src:e,async:!0},t),(t=Jn.get(a))&&S0(e,t),i=n.createElement("script"),Nt(i),qt(i,"link",e),n.head.appendChild(i)),i={type:"script",instance:i,count:1,state:null},r.set(a,i))}}function VD(e,t){va.M(e,t);var n=su;if(n&&e){var r=Qo(n).hoistableScripts,a=cu(e),i=r.get(a);i||(i=n.querySelector(Lc(a)),i||(e=Je({src:e,async:!0,type:"module"},t),(t=Jn.get(a))&&S0(e,t),i=n.createElement("script"),Nt(i),qt(i,"link",e),n.head.appendChild(i)),i={type:"script",instance:i,count:1,state:null},r.set(a,i))}}function mS(e,t,n,r){var a=(a=Va.current)?Td(a):null;if(!a)throw Error(I(446));switch(e){case"meta":case"title":return null;case"style":return typeof n.precedence=="string"&&typeof n.href=="string"?(t=Cl(n.href),n=Qo(a).hoistableStyles,r=n.get(t),r||(r={type:"style",instance:null,count:0,state:null},n.set(t,r)),r):{type:"void",instance:null,count:0,state:null};case"link":if(n.rel==="stylesheet"&&typeof n.href=="string"&&typeof n.precedence=="string"){e=Cl(n.href);var i=Qo(a).hoistableStyles,o=i.get(e);if(o||(a=a.ownerDocument||a,o={type:"stylesheet",instance:null,count:0,state:{loading:0,preload:null}},i.set(e,o),(i=a.querySelector(kc(e)))&&!i._p&&(o.instance=i,o.state.loading=5),Jn.has(e)||(n={rel:"preload",as:"style",href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},Jn.set(e,n),i||XD(a,e,n,o.state))),t&&r===null)throw Error(I(528,""));return o}if(t&&r!==null)throw Error(I(529,""));return null;case"script":return t=n.async,n=n.src,typeof n=="string"&&t&&typeof t!="function"&&typeof t!="symbol"?(t=cu(n),n=Qo(a).hoistableScripts,r=n.get(t),r||(r={type:"script",instance:null,count:0,state:null},n.set(t,r)),r):{type:"void",instance:null,count:0,state:null};default:throw Error(I(444,e))}}function Cl(e){return'href="'+Gn(e)+'"'}function kc(e){return'link[rel="stylesheet"]['+e+"]"}function sC(e){return Je({},e,{"data-precedence":e.precedence,precedence:null})}function XD(e,t,n,r){e.querySelector('link[rel="preload"][as="style"]['+t+"]")?r.loading=1:(t=e.createElement("link"),r.preload=t,t.addEventListener("load",function(){return r.loading|=1}),t.addEventListener("error",function(){return r.loading|=2}),qt(t,"link",n),Nt(t),e.head.appendChild(t))}function cu(e){return'[src="'+Gn(e)+'"]'}function Lc(e){return"script[async]"+e}function vS(e,t,n){if(t.count++,t.instance===null)switch(t.type){case"style":var r=e.querySelector('style[data-href~="'+Gn(n.href)+'"]');if(r)return t.instance=r,Nt(r),r;var a=Je({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return r=(e.ownerDocument||e).createElement("style"),Nt(r),qt(r,"style",a),Gf(r,n.precedence,e),t.instance=r;case"stylesheet":a=Cl(n.href);var i=e.querySelector(kc(a));if(i)return t.state.loading|=4,t.instance=i,Nt(i),i;r=sC(n),(a=Jn.get(a))&&x0(r,a),i=(e.ownerDocument||e).createElement("link"),Nt(i);var o=i;return o._p=new Promise(function(l,u){o.onload=l,o.onerror=u}),qt(i,"link",r),t.state.loading|=4,Gf(i,n.precedence,e),t.instance=i;case"script":return i=cu(n.src),(a=e.querySelector(Lc(i)))?(t.instance=a,Nt(a),a):(r=n,(a=Jn.get(i))&&(r=Je({},n),S0(r,a)),e=e.ownerDocument||e,a=e.createElement("script"),Nt(a),qt(a,"link",r),e.head.appendChild(a),t.instance=a);case"void":return null;default:throw Error(I(443,t.type))}else t.type==="stylesheet"&&!(t.state.loading&4)&&(r=t.instance,t.state.loading|=4,Gf(r,n.precedence,e));return t.instance}function Gf(e,t,n){for(var r=n.querySelectorAll('link[rel="stylesheet"][data-precedence],style[data-precedence]'),a=r.length?r[r.length-1]:null,i=a,o=0;o title"):null)}function QD(e,t,n){if(n===1||t.itemProp!=null)return!1;switch(e){case"meta":case"title":return!0;case"style":if(typeof t.precedence!="string"||typeof t.href!="string"||t.href==="")break;return!0;case"link":if(typeof t.rel!="string"||typeof t.href!="string"||t.href===""||t.onLoad||t.onError)break;switch(t.rel){case"stylesheet":return e=t.disabled,typeof t.precedence=="string"&&e==null;default:return!0}case"script":if(t.async&&typeof t.async!="function"&&typeof t.async!="symbol"&&!t.onLoad&&!t.onError&&t.src&&typeof t.src=="string")return!0}return!1}function cC(e){return!(e.type==="stylesheet"&&!(e.state.loading&3))}function WD(e,t,n,r){if(n.type==="stylesheet"&&(typeof r.media!="string"||matchMedia(r.media).matches!==!1)&&!(n.state.loading&4)){if(n.instance===null){var a=Cl(r.href),i=t.querySelector(kc(a));if(i){t=i._p,t!==null&&typeof t=="object"&&typeof t.then=="function"&&(e.count++,e=jd.bind(e),t.then(e,e)),n.state.loading|=4,n.instance=i,Nt(i);return}i=t.ownerDocument||t,r=sC(r),(a=Jn.get(a))&&x0(r,a),i=i.createElement("link"),Nt(i);var o=i;o._p=new Promise(function(l,u){o.onload=l,o.onerror=u}),qt(i,"link",r),n.instance=i}e.stylesheets===null&&(e.stylesheets=new Map),e.stylesheets.set(n,t),(t=n.state.preload)&&!(n.state.loading&3)&&(e.count++,n=jd.bind(e),t.addEventListener("load",n),t.addEventListener("error",n))}}var Xy=0;function ZD(e,t){return e.stylesheets&&e.count===0&&Yf(e,e.stylesheets),0Xy?50:800)+t);return e.unsuspend=n,function(){e.unsuspend=null,clearTimeout(r),clearTimeout(a)}}:null}function jd(){if(this.count--,this.count===0&&(this.imgCount===0||!this.waitingForImages)){if(this.stylesheets)Yf(this,this.stylesheets);else if(this.unsuspend){var e=this.unsuspend;this.unsuspend=null,e()}}}var Cd=null;function Yf(e,t){e.stylesheets=null,e.unsuspend!==null&&(e.count++,Cd=new Map,t.forEach(JD,e),Cd=null,jd.call(e))}function JD(e,t){if(!(t.state.loading&4)){var n=Cd.get(e);if(n)var r=n.get(null);else{n=new Map,Cd.set(e,n);for(var a=e.querySelectorAll("link[data-precedence],style[data-precedence]"),i=0;i"u"||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!="function"))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(gC)}catch(e){console.error(e)}}gC(),__.exports=zh;var l3=__.exports;/** + * react-router v7.18.1 + * + * Copyright (c) Remix Software Inc. + * + * This source code is licensed under the MIT license found in the + * LICENSE.md file in the root directory of this source tree. + * + * @license MIT + */var _0=/^(?:[a-z][a-z0-9+.-]*:|[\\/]{2})/i,bC=/^[\\/]{2}/;function u3(e,t){return t+e.replace(/\\/g,"/")}var _S="popstate";function TS(e){return typeof e=="object"&&e!=null&&"pathname"in e&&"search"in e&&"hash"in e&&"state"in e&&"key"in e}function s3(e={}){function t(r,a){var s;let i=(s=a.state)==null?void 0:s.masked,{pathname:o,search:l,hash:u}=i||r.location;return Nv("",{pathname:o,search:l,hash:u},a.state&&a.state.usr||null,a.state&&a.state.key||"default",i?{pathname:r.location.pathname,search:r.location.search,hash:r.location.hash}:void 0)}function n(r,a){return typeof a=="string"?a:ks(a)}return f3(t,n,null,e)}function rt(e,t){if(e===!1||e===null||typeof e>"u")throw new Error(t)}function fr(e,t){if(!e){typeof console<"u"&&console.warn(t);try{throw new Error(t)}catch{}}}function c3(){return Math.random().toString(36).substring(2,10)}function jS(e,t){return{usr:e.state,key:e.key,idx:t,masked:e.mask?{pathname:e.pathname,search:e.search,hash:e.hash}:void 0}}function Nv(e,t,n=null,r,a){return{pathname:typeof e=="string"?e:e.pathname,search:"",hash:"",...typeof t=="string"?fu(t):t,state:n,key:t&&t.key||r||c3(),mask:a}}function ks({pathname:e="/",search:t="",hash:n=""}){return t&&t!=="?"&&(e+=t.charAt(0)==="?"?t:"?"+t),n&&n!=="#"&&(e+=n.charAt(0)==="#"?n:"#"+n),e}function fu(e){let t={};if(e){let n=e.indexOf("#");n>=0&&(t.hash=e.substring(n),e=e.substring(0,n));let r=e.indexOf("?");r>=0&&(t.search=e.substring(r),e=e.substring(0,r)),e&&(t.pathname=e)}return t}function f3(e,t,n,r={}){let{window:a=document.defaultView,v5Compat:i=!1}=r,o=a.history,l="POP",u=null,s=f();s==null&&(s=0,o.replaceState({...o.state,idx:s},""));function f(){return(o.state||{idx:null}).idx}function c(){l="POP";let m=f(),p=m==null?null:m-s;s=m,u&&u({action:l,location:v.location,delta:p})}function d(m,p){l="PUSH";let y=TS(m)?m:Nv(v.location,m,p);s=f()+1;let x=jS(y,s),w=v.createHref(y.mask||y);try{o.pushState(x,"",w)}catch(S){if(S instanceof DOMException&&S.name==="DataCloneError")throw S;a.location.assign(w)}i&&u&&u({action:l,location:v.location,delta:1})}function h(m,p){l="REPLACE";let y=TS(m)?m:Nv(v.location,m,p);s=f();let x=jS(y,s),w=v.createHref(y.mask||y);o.replaceState(x,"",w),i&&u&&u({action:l,location:v.location,delta:0})}function b(m){return d3(a,m)}let v={get action(){return l},get location(){return e(a,o)},listen(m){if(u)throw new Error("A history only accepts one active listener");return a.addEventListener(_S,c),u=m,()=>{a.removeEventListener(_S,c),u=null}},createHref(m){return t(a,m)},createURL:b,encodeLocation(m){let p=b(m);return{pathname:p.pathname,search:p.search,hash:p.hash}},push:d,replace:h,go(m){return o.go(m)}};return v}function d3(e,t,n=!1){let r="http://localhost";e&&(r=e.location.origin!=="null"?e.location.origin:e.location.href),rt(r,"No window.location.(origin|href) available to create URL");let a=typeof t=="string"?t:ks(t);return a=a.replace(/ $/,"%20"),!n&&bC.test(a)&&(a=r+a),new URL(a,r)}function xC(e,t,n="/"){return h3(e,t,n,!1)}function h3(e,t,n,r,a){let i=typeof t=="string"?fu(t):t,o=da(i.pathname||"/",n);if(o==null)return null;let l=p3(e),u=null,s=E3(o);for(let f=0;u==null&&f{let f={relativePath:s===void 0?o.path||"":s,caseSensitive:o.caseSensitive===!0,childrenIndex:l,route:o};if(f.relativePath.startsWith("/")){if(!f.relativePath.startsWith(r)&&u)return;rt(f.relativePath.startsWith(r),`Absolute route path "${f.relativePath}" nested under path "${r}" is not valid. An absolute child route path must start with the combined path of all its parent routes.`),f.relativePath=f.relativePath.slice(r.length)}let c=cr([r,f.relativePath]),d=n.concat(f);o.children&&o.children.length>0&&(rt(o.index!==!0,`Index routes must not have child routes. Please remove all child routes from route path "${c}".`),SC(o.children,t,d,c,u)),!(o.path==null&&!o.index)&&t.push({path:c,score:O3(c,o.index),routesMeta:d.map((h,b)=>{let[v,m]=AC(h.relativePath,h.caseSensitive,b===d.length-1);return{...h,matcher:v,compiledParams:m}})})};return e.forEach((o,l)=>{var u;if(o.path===""||!((u=o.path)!=null&&u.includes("?")))i(o,l);else for(let s of OC(o.path))i(o,l,!0,s)}),t}function OC(e){let t=e.split("/");if(t.length===0)return[];let[n,...r]=t,a=n.endsWith("?"),i=n.replace(/\?$/,"");if(r.length===0)return a?[i,""]:[i];let o=OC(r.join("/")),l=[];return l.push(...o.map(u=>u===""?i:[i,u].join("/"))),a&&l.push(...o),l.map(u=>e.startsWith("/")&&u===""?"/":u)}function y3(e){e.sort((t,n)=>t.score!==n.score?n.score-t.score:w3(t.routesMeta.map(r=>r.childrenIndex),n.routesMeta.map(r=>r.childrenIndex)))}var m3=/^:[\w-]+$/,v3=3,g3=2,b3=1,x3=10,S3=-2,CS=e=>e==="*";function O3(e,t){let n=e.split("/"),r=n.length;return n.some(CS)&&(r+=S3),t&&(r+=g3),n.filter(a=>!CS(a)).reduce((a,i)=>a+(m3.test(i)?v3:i===""?b3:x3),r)}function w3(e,t){return e.length===t.length&&e.slice(0,-1).every((r,a)=>r===t[a])?e[e.length-1]-t[t.length-1]:0}function A3(e,t,n=!1){let{routesMeta:r}=e,a={},i="/",o=[];for(let l=0;l{if(f==="*"){let b=l[d]||"";o=i.slice(0,i.length-b.length).replace(/(.)\/+$/,"$1")}const h=l[d];return c&&!h?s[f]=void 0:s[f]=(h||"").replace(/%2F/g,"/"),s},{}),pathname:i,pathnameBase:o,pattern:e}}function AC(e,t=!1,n=!0){fr(e==="*"||!e.endsWith("*")||e.endsWith("/*"),`Route path "${e}" will be treated as if it were "${e.replace(/\*$/,"/*")}" because the \`*\` character must always follow a \`/\` in the pattern. To get rid of this warning, please change the route path to "${e.replace(/\*$/,"/*")}".`);let r=[],a="^"+e.replace(/\/*\*?$/,"").replace(/^\/*/,"/").replace(/[\\.*+^${}|()[\]]/g,"\\$&").replace(/\/:([\w-]+)(\?)?/g,(o,l,u,s,f)=>{if(r.push({paramName:l,isOptional:u!=null}),u){let c=f.charAt(s+o.length);return c&&c!=="/"?"/([^\\/]*)":"(?:/([^\\/]*))?"}return"/([^\\/]+)"}).replace(/\/([\w-]+)\?(\/|$)/g,"(/$1)?$2");return e.endsWith("*")?(r.push({paramName:"*"}),a+=e==="*"||e==="/*"?"(.*)$":"(?:\\/(.+)|\\/*)$"):n?a+="\\/*$":e!==""&&e!=="/"&&(a+="(?:(?=\\/|$))"),[new RegExp(a,t?void 0:"i"),r]}function E3(e){try{return e.split("/").map(t=>decodeURIComponent(t).replace(/\//g,"%2F")).join("/")}catch(t){return fr(!1,`The URL path "${e}" could not be decoded because it is a malformed URL segment. This is probably due to a bad percent encoding (${t}).`),e}}function da(e,t){if(t==="/")return e;if(!e.toLowerCase().startsWith(t.toLowerCase()))return null;let n=t.endsWith("/")?t.length-1:t.length,r=e.charAt(n);return r&&r!=="/"?null:e.slice(n)||"/"}function _3(e,t="/"){let{pathname:n,search:r="",hash:a=""}=typeof e=="string"?fu(e):e,i;return n?(n=EC(n),n.startsWith("/")?i=MS(n.substring(1),"/"):i=MS(n,t)):i=t,{pathname:i,search:C3(r),hash:M3(a)}}function MS(e,t){let n=$d(t).split("/");return e.split("/").forEach(a=>{a===".."?n.length>1&&n.pop():a!=="."&&n.push(a)}),n.length>1?n.join("/"):"/"}function Qy(e,t,n,r){return`Cannot include a '${e}' character in a manually specified \`to.${t}\` field [${JSON.stringify(r)}]. Please separate it out to the \`to.${n}\` field. Alternatively you may provide the full path as a string in and the router will parse it for you.`}function T3(e){return e.filter((t,n)=>n===0||t.route.path&&t.route.path.length>0)}function T0(e){let t=T3(e);return t.map((n,r)=>r===t.length-1?n.pathname:n.pathnameBase)}function ap(e,t,n,r=!1){let a;typeof e=="string"?a=fu(e):(a={...e},rt(!a.pathname||!a.pathname.includes("?"),Qy("?","pathname","search",a)),rt(!a.pathname||!a.pathname.includes("#"),Qy("#","pathname","hash",a)),rt(!a.search||!a.search.includes("#"),Qy("#","search","hash",a)));let i=e===""||a.pathname==="",o=i?"/":a.pathname,l;if(o==null)l=n;else{let c=t.length-1;if(!r&&o.startsWith("..")){let d=o.split("/");for(;d[0]==="..";)d.shift(),c-=1;a.pathname=d.join("/")}l=c>=0?t[c]:"/"}let u=_3(a,l),s=o&&o!=="/"&&o.endsWith("/"),f=(i||o===".")&&n.endsWith("/");return!u.pathname.endsWith("/")&&(s||f)&&(u.pathname+="/"),u}var EC=e=>e.replace(/[\\/]{2,}/g,"/"),cr=e=>EC(e.join("/")),$d=e=>e.replace(/\/+$/,""),j3=e=>$d(e).replace(/^\/*/,"/"),C3=e=>!e||e==="?"?"":e.startsWith("?")?e:"?"+e,M3=e=>!e||e==="#"?"":e.startsWith("#")?e:"#"+e,N3=class{constructor(e,t,n,r=!1){this.status=e,this.statusText=t||"",this.internal=r,n instanceof Error?(this.data=n.toString(),this.error=n):this.data=n}};function R3(e){return e!=null&&typeof e.status=="number"&&typeof e.statusText=="string"&&typeof e.internal=="boolean"&&"data"in e}function $3(e){let t=e.map(n=>n.route.path).filter(Boolean);return cr(t)||"/"}var _C=typeof window<"u"&&typeof window.document<"u"&&typeof window.document.createElement<"u";function TC(e,t){let n=e;if(typeof n!="string"||!_0.test(n))return{absoluteURL:void 0,isExternal:!1,to:n};let r=n,a=!1;if(_C)try{let i=new URL(window.location.href),o=bC.test(n)?new URL(u3(n,i.protocol)):new URL(n),l=da(o.pathname,t);o.origin===i.origin&&l!=null?n=l+o.search+o.hash:a=!0}catch{fr(!1,` contains an invalid URL which will probably break when clicked - please update to a valid URL path.`)}return{absoluteURL:r,isExternal:a,to:n}}Object.getOwnPropertyNames(Object.prototype).sort().join("\0");var jC=["POST","PUT","PATCH","DELETE"];new Set(jC);var P3=["GET",...jC];new Set(P3);var D3=["about:","blob:","chrome:","chrome-untrusted:","content:","data:","devtools:","file:","filesystem:","javascript:"];function k3(e){try{return D3.includes(new URL(e).protocol)}catch{return!1}}var du=_.createContext(null);du.displayName="DataRouter";var ip=_.createContext(null);ip.displayName="DataRouterState";var CC=_.createContext(!1);function L3(){return _.useContext(CC)}var MC=_.createContext({isTransitioning:!1});MC.displayName="ViewTransition";var B3=_.createContext(new Map);B3.displayName="Fetchers";var U3=_.createContext(null);U3.displayName="Await";var kn=_.createContext(null);kn.displayName="Navigation";var Bc=_.createContext(null);Bc.displayName="Location";var hr=_.createContext({outlet:null,matches:[],isDataRoute:!1});hr.displayName="Route";var j0=_.createContext(null);j0.displayName="RouteError";var NC="REACT_ROUTER_ERROR",z3="REDIRECT",I3="ROUTE_ERROR_RESPONSE";function H3(e){if(e.startsWith(`${NC}:${z3}:{`))try{let t=JSON.parse(e.slice(28));if(typeof t=="object"&&t&&typeof t.status=="number"&&typeof t.statusText=="string"&&typeof t.location=="string"&&typeof t.reloadDocument=="boolean"&&typeof t.replace=="boolean")return t}catch{}}function q3(e){if(e.startsWith(`${NC}:${I3}:{`))try{let t=JSON.parse(e.slice(40));if(typeof t=="object"&&t&&typeof t.status=="number"&&typeof t.statusText=="string")return new N3(t.status,t.statusText,t.data)}catch{}}function F3(e,{relative:t}={}){rt(hu(),"useHref() may be used only in the context of a component.");let{basename:n,navigator:r}=_.useContext(kn),{hash:a,pathname:i,search:o}=Uc(e,{relative:t}),l=i;return n!=="/"&&(l=i==="/"?n:cr([n,i])),r.createHref({pathname:l,search:o,hash:a})}function hu(){return _.useContext(Bc)!=null}function Cr(){return rt(hu(),"useLocation() may be used only in the context of a component."),_.useContext(Bc).location}var RC="You should call navigate() in a React.useEffect(), not when your component is first rendered.";function $C(e){_.useContext(kn).static||_.useLayoutEffect(e)}function op(){let{isDataRoute:e}=_.useContext(hr);return e?ik():G3()}function G3(){rt(hu(),"useNavigate() may be used only in the context of a component.");let e=_.useContext(du),{basename:t,navigator:n}=_.useContext(kn),{matches:r}=_.useContext(hr),{pathname:a}=Cr(),i=JSON.stringify(T0(r)),o=_.useRef(!1);return $C(()=>{o.current=!0}),_.useCallback((u,s={})=>{if(fr(o.current,RC),!o.current)return;if(typeof u=="number"){n.go(u);return}let f=ap(u,JSON.parse(i),a,s.relative==="path");e==null&&t!=="/"&&(f.pathname=f.pathname==="/"?t:cr([t,f.pathname])),(s.replace?n.replace:n.push)(f,s.state,s)},[t,n,i,a,e])}var K3=_.createContext(null);function Y3(e){let t=_.useContext(hr).outlet;return _.useMemo(()=>t&&_.createElement(K3.Provider,{value:e},t),[t,e])}function Uc(e,{relative:t}={}){let{matches:n}=_.useContext(hr),{pathname:r}=Cr(),a=JSON.stringify(T0(n));return _.useMemo(()=>ap(e,JSON.parse(a),r,t==="path"),[e,a,r,t])}function V3(e,t){return PC(e,t)}function PC(e,t,n){var m;rt(hu(),"useRoutes() may be used only in the context of a component.");let{navigator:r}=_.useContext(kn),{matches:a}=_.useContext(hr),i=a[a.length-1],o=i?i.params:{},l=i?i.pathname:"/",u=i?i.pathnameBase:"/",s=i&&i.route;{let p=s&&s.path||"";kC(l,!s||p.endsWith("*")||p.endsWith("*?"),`You rendered descendant (or called \`useRoutes()\`) at "${l}" (under ) but the parent route path has no trailing "*". This means if you navigate deeper, the parent won't match anymore and therefore the child routes will never render. + +Please change the parent to .`)}let f=Cr(),c;if(t){let p=typeof t=="string"?fu(t):t;rt(u==="/"||((m=p.pathname)==null?void 0:m.startsWith(u)),`When overriding the location using \`\` or \`useRoutes(routes, location)\`, the location pathname must begin with the portion of the URL pathname that was matched by all parent routes. The current pathname base is "${u}" but pathname "${p.pathname}" was given in the \`location\` prop.`),c=p}else c=f;let d=c.pathname||"/",h=d;if(u!=="/"){let p=u.replace(/^\//,"").split("/");h="/"+d.replace(/^\//,"").split("/").slice(p.length).join("/")}let b=n&&n.state.matches.length?n.state.matches.map(p=>Object.assign(p,{route:n.manifest[p.route.id]||p.route})):xC(e,{pathname:h});fr(s||b!=null,`No routes matched location "${c.pathname}${c.search}${c.hash}" `),fr(b==null||b[b.length-1].route.element!==void 0||b[b.length-1].route.Component!==void 0||b[b.length-1].route.lazy!==void 0,`Matched leaf route at location "${c.pathname}${c.search}${c.hash}" does not have an element or Component. This means it will render an with a null value by default resulting in an "empty" page.`);let v=J3(b&&b.map(p=>Object.assign({},p,{params:Object.assign({},o,p.params),pathname:cr([u,r.encodeLocation?r.encodeLocation(p.pathname.replace(/%/g,"%25").replace(/\?/g,"%3F").replace(/#/g,"%23")).pathname:p.pathname]),pathnameBase:p.pathnameBase==="/"?u:cr([u,r.encodeLocation?r.encodeLocation(p.pathnameBase.replace(/%/g,"%25").replace(/\?/g,"%3F").replace(/#/g,"%23")).pathname:p.pathnameBase])})),a,n);return t&&v?_.createElement(Bc.Provider,{value:{location:{pathname:"/",search:"",hash:"",state:null,key:"default",mask:void 0,...c},navigationType:"POP"}},v):v}function X3(){let e=ak(),t=R3(e)?`${e.status} ${e.statusText}`:e instanceof Error?e.message:JSON.stringify(e),n=e instanceof Error?e.stack:null,r="rgba(200,200,200, 0.5)",a={padding:"0.5rem",backgroundColor:r},i={padding:"2px 4px",backgroundColor:r},o=null;return console.error("Error handled by React Router default ErrorBoundary:",e),o=_.createElement(_.Fragment,null,_.createElement("p",null,"💿 Hey developer 👋"),_.createElement("p",null,"You can provide a way better UX than this when your app throws errors by providing your own ",_.createElement("code",{style:i},"ErrorBoundary")," or"," ",_.createElement("code",{style:i},"errorElement")," prop on your route.")),_.createElement(_.Fragment,null,_.createElement("h2",null,"Unexpected Application Error!"),_.createElement("h3",{style:{fontStyle:"italic"}},t),n?_.createElement("pre",{style:a},n):null,o)}var Q3=_.createElement(X3,null),DC=class extends _.Component{constructor(e){super(e),this.state={location:e.location,revalidation:e.revalidation,error:e.error}}static getDerivedStateFromError(e){return{error:e}}static getDerivedStateFromProps(e,t){return t.location!==e.location||t.revalidation!=="idle"&&e.revalidation==="idle"?{error:e.error,location:e.location,revalidation:e.revalidation}:{error:e.error!==void 0?e.error:t.error,location:t.location,revalidation:e.revalidation||t.revalidation}}componentDidCatch(e,t){this.props.onError?this.props.onError(e,t):console.error("React Router caught the following error during render",e)}render(){let e=this.state.error;if(this.context&&typeof e=="object"&&e&&"digest"in e&&typeof e.digest=="string"){const n=q3(e.digest);n&&(e=n)}let t=e!==void 0?_.createElement(hr.Provider,{value:this.props.routeContext},_.createElement(j0.Provider,{value:e,children:this.props.component})):this.props.children;return this.context?_.createElement(W3,{error:e},t):t}};DC.contextType=CC;var Wy=new WeakMap;function W3({children:e,error:t}){let{basename:n}=_.useContext(kn);if(typeof t=="object"&&t&&"digest"in t&&typeof t.digest=="string"){let r=H3(t.digest);if(r){let a=Wy.get(t);if(a)throw a;let i=TC(r.location,n),o=i.absoluteURL||i.to;if(k3(o))throw new Error("Invalid redirect location");if(_C&&!Wy.get(t))if(i.isExternal||r.reloadDocument)window.location.href=o;else{const l=Promise.resolve().then(()=>window.__reactRouterDataRouter.navigate(i.to,{replace:r.replace}));throw Wy.set(t,l),l}return _.createElement("meta",{httpEquiv:"refresh",content:`0;url=${o}`})}}return e}function Z3({routeContext:e,match:t,children:n}){let r=_.useContext(du);return r&&r.static&&r.staticContext&&(t.route.errorElement||t.route.ErrorBoundary)&&(r.staticContext._deepestRenderedBoundaryId=t.route.id),_.createElement(hr.Provider,{value:e},n)}function J3(e,t=[],n){let r=n==null?void 0:n.state;if(e==null){if(!r)return null;if(r.errors)e=r.matches;else if(t.length===0&&!r.initialized&&r.matches.length>0)e=r.matches;else return null}let a=e,i=r==null?void 0:r.errors;if(i!=null){let f=a.findIndex(c=>c.route.id&&(i==null?void 0:i[c.route.id])!==void 0);rt(f>=0,`Could not find a matching route for errors on route IDs: ${Object.keys(i).join(",")}`),a=a.slice(0,Math.min(a.length,f+1))}let o=!1,l=-1;if(n&&r){o=r.renderFallback;for(let f=0;f=0?a=a.slice(0,l+1):a=[a[0]];break}}}}let u=n==null?void 0:n.onError,s=r&&u?(f,c)=>{var d,h;u(f,{location:r.location,params:((h=(d=r.matches)==null?void 0:d[0])==null?void 0:h.params)??{},pattern:$3(r.matches),errorInfo:c})}:void 0;return a.reduceRight((f,c,d)=>{let h,b=!1,v=null,m=null;r&&(h=i&&c.route.id?i[c.route.id]:void 0,v=c.route.errorElement||Q3,o&&(l<0&&d===0?(kC("route-fallback",!1,"No `HydrateFallback` element provided to render during initial hydration"),b=!0,m=null):l===d&&(b=!0,m=c.route.hydrateFallbackElement||null)));let p=t.concat(a.slice(0,d+1)),y=()=>{let x;return h?x=v:b?x=m:c.route.Component?x=_.createElement(c.route.Component,null):c.route.element?x=c.route.element:x=f,_.createElement(Z3,{match:c,routeContext:{outlet:f,matches:p,isDataRoute:r!=null},children:x})};return r&&(c.route.ErrorBoundary||c.route.errorElement||d===0)?_.createElement(DC,{location:r.location,revalidation:r.revalidation,component:v,error:h,children:y(),routeContext:{outlet:null,matches:p,isDataRoute:!0},onError:s}):y()},null)}function C0(e){return`${e} must be used within a data router. See https://reactrouter.com/en/main/routers/picking-a-router.`}function ek(e){let t=_.useContext(du);return rt(t,C0(e)),t}function tk(e){let t=_.useContext(ip);return rt(t,C0(e)),t}function nk(e){let t=_.useContext(hr);return rt(t,C0(e)),t}function M0(e){let t=nk(e),n=t.matches[t.matches.length-1];return rt(n.route.id,`${e} can only be used on routes that contain a unique "id"`),n.route.id}function rk(){return M0("useRouteId")}function ak(){var r;let e=_.useContext(j0),t=tk("useRouteError"),n=M0("useRouteError");return e!==void 0?e:(r=t.errors)==null?void 0:r[n]}function ik(){let{router:e}=ek("useNavigate"),t=M0("useNavigate"),n=_.useRef(!1);return $C(()=>{n.current=!0}),_.useCallback(async(a,i={})=>{fr(n.current,RC),n.current&&(typeof a=="number"?await e.navigate(a):await e.navigate(a,{fromRouteId:t,...i}))},[e,t])}var NS={};function kC(e,t,n){!t&&!NS[e]&&(NS[e]=!0,fr(!1,n))}_.memo(ok);function ok({routes:e,manifest:t,future:n,state:r,isStatic:a,onError:i}){return PC(e,void 0,{manifest:t,state:r,isStatic:a,onError:i})}function LC({to:e,replace:t,state:n,relative:r}){rt(hu()," may be used only in the context of a component.");let{static:a}=_.useContext(kn);fr(!a," must not be used on the initial render in a . This is a no-op, but you should modify your code so the is only ever rendered in response to some user interaction or state change.");let{matches:i}=_.useContext(hr),{pathname:o}=Cr(),l=op(),u=ap(e,T0(i),o,r==="path"),s=JSON.stringify(u);return _.useEffect(()=>{l(JSON.parse(s),{replace:t,state:n,relative:r})},[l,s,r,t,n]),null}function lk(e){return Y3(e.context)}function et(e){rt(!1,"A is only ever to be used as the child of element, never rendered directly. Please wrap your in a .")}function uk({basename:e="/",children:t=null,location:n,navigationType:r="POP",navigator:a,static:i=!1,useTransitions:o}){rt(!hu(),"You cannot render a inside another . You should never have more than one in your app.");let l=e.replace(/^\/*/,"/"),u=_.useMemo(()=>({basename:l,navigator:a,static:i,useTransitions:o,future:{}}),[l,a,i,o]);typeof n=="string"&&(n=fu(n));let{pathname:s="/",search:f="",hash:c="",state:d=null,key:h="default",mask:b}=n,v=_.useMemo(()=>{let m=da(s,l);return m==null?null:{location:{pathname:m,search:f,hash:c,state:d,key:h,mask:b},navigationType:r}},[l,s,f,c,d,h,r,b]);return fr(v!=null,` is not able to match the URL "${s}${f}${c}" because it does not start with the basename, so the won't render anything.`),v==null?null:_.createElement(kn.Provider,{value:u},_.createElement(Bc.Provider,{children:t,value:v}))}function sk({children:e,location:t}){return V3(Rv(e),t)}function Rv(e,t=[]){let n=[];return _.Children.forEach(e,(r,a)=>{if(!_.isValidElement(r))return;let i=[...t,a];if(r.type===_.Fragment){n.push.apply(n,Rv(r.props.children,i));return}rt(r.type===et,`[${typeof r.type=="string"?r.type:r.type.name}] is not a component. All component children of must be a or `),rt(!r.props.index||!r.props.children,"An index route cannot have child routes.");let o={id:r.props.id||i.join("-"),caseSensitive:r.props.caseSensitive,element:r.props.element,Component:r.props.Component,index:r.props.index,path:r.props.path,middleware:r.props.middleware,loader:r.props.loader,action:r.props.action,hydrateFallbackElement:r.props.hydrateFallbackElement,HydrateFallback:r.props.HydrateFallback,errorElement:r.props.errorElement,ErrorBoundary:r.props.ErrorBoundary,hasErrorBoundary:r.props.hasErrorBoundary===!0||r.props.ErrorBoundary!=null||r.props.errorElement!=null,shouldRevalidate:r.props.shouldRevalidate,handle:r.props.handle,lazy:r.props.lazy};r.props.children&&(o.children=Rv(r.props.children,i)),n.push(o)}),n}var Xf="get",Qf="application/x-www-form-urlencoded";function lp(e){return typeof HTMLElement<"u"&&e instanceof HTMLElement}function ck(e){return lp(e)&&e.tagName.toLowerCase()==="button"}function fk(e){return lp(e)&&e.tagName.toLowerCase()==="form"}function dk(e){return lp(e)&&e.tagName.toLowerCase()==="input"}function hk(e){return!!(e.metaKey||e.altKey||e.ctrlKey||e.shiftKey)}function pk(e,t){return e.button===0&&(!t||t==="_self")&&!hk(e)}var vf=null;function yk(){if(vf===null)try{new FormData(document.createElement("form"),0),vf=!1}catch{vf=!0}return vf}var mk=new Set(["application/x-www-form-urlencoded","multipart/form-data","text/plain"]);function Zy(e){return e!=null&&!mk.has(e)?(fr(!1,`"${e}" is not a valid \`encType\` for \`

\`/\`\` and will default to "${Qf}"`),null):e}function vk(e,t){let n,r,a,i,o;if(fk(e)){let l=e.getAttribute("action");r=l?da(l,t):null,n=e.getAttribute("method")||Xf,a=Zy(e.getAttribute("enctype"))||Qf,i=new FormData(e)}else if(ck(e)||dk(e)&&(e.type==="submit"||e.type==="image")){let l=e.form;if(l==null)throw new Error('Cannot submit a + )} + {p.onDelete && ( + + )} + + ), + }) + } + + return ( +
+ setModal({ ...(p.defaults || {}) })}>{p.addLabel || '추가'} + )} /> + {p.toolbarExtra && {p.toolbarExtra}} + {isLoading ?
로딩 중...
+ : r.id} />} + + {modal && p.form && ( + setModal(null)}> + saveMut.mutate(d)} saving={saveMut.isPending} /> + + )} + + ) +} + +export function CrudForm({ spec, initial, onSave, saving }: { + spec: FormFieldSpec[]; initial: any; onSave: (d: any) => void; saving?: boolean +}) { + const init: any = { id: initial.id } + spec.forEach(f => { + init[f.key] = initial[f.key] ?? (f.type === 'checkbox' ? true : f.type === 'number' ? '' : '') + }) + const [f, setF] = useState(init) + const set = (k: string, v: any) => setF((p: any) => ({ ...p, [k]: v })) + + return ( + { e.preventDefault(); onSave(f) }}> + {spec.map(fs => ( + + {fs.type === 'select' ? ( + + ) : fs.type === 'textarea' ? ( +