@@ -289,6 +290,9 @@ function SplmntDmndDialog({
files={row.uploadedFiles.map((file) => ({
fileKey: file.fileKey,
fileName: file.fileName,
+ onDownload: file.atflId
+ ? () => downloadByAtflId(file.atflId!)
+ : undefined,
}))}
inputId={fileInputId}
isUploadingByKey={isUploading}
@@ -322,7 +326,7 @@ function SplmntDmndDialog({
취소
diff --git a/apps/as/src/widgets/pbadms-sprt/ui/splmnt-dmnd-form-section.tsx b/apps/as/src/widgets/pbadms-sprt/ui/splmnt-dmnd-form-section.tsx
index eea7fb7af..8fdbec031 100644
--- a/apps/as/src/widgets/pbadms-sprt/ui/splmnt-dmnd-form-section.tsx
+++ b/apps/as/src/widgets/pbadms-sprt/ui/splmnt-dmnd-form-section.tsx
@@ -3,11 +3,9 @@
import { useEffect, useId, useRef, useState } from "react";
import { Controller, useFormContext, useWatch } from "react-hook-form";
-import { Paperclip } from "lucide-react";
-
import { dayjs, getDefaultFileKey, useTus } from "@/shared/lib";
import { AttachmentFileField, SectionCollapsible } from "@/shared/ui";
-import { attachService } from "@/entities/attach";
+import { AttachmentDownloadLink, attachService, useDownloadAttachmentByAtflId } from "@/entities/attach";
import {
Badge,
Table,
@@ -75,6 +73,7 @@ function SplmntDmndFormSection({ readOnly = false }: SplmntDmndFormSectionProps)
const initialFilesMappedRef = useRef(false);
const isMountedRef = useRef(true);
const atflCdByRowRef = useRef
>({});
+ const { mutate: downloadByAtflId } = useDownloadAttachmentByAtflId();
const { uploadFileAsync, isUploading, uploads } = useTus({
onSuccess: (atflCd, atflId, _file, fileKey) => {
@@ -274,10 +273,10 @@ function SplmntDmndFormSection({ readOnly = false }: SplmntDmndFormSectionProps)
{item.splmntDmndCn || "-"}
{item.splmntDmndAtchFileGroupId ? (
-
-
- {item.splmntDmndAtchFileNm || "첨부파일"}
-
+
) : null}
@@ -308,6 +307,9 @@ function SplmntDmndFormSection({ readOnly = false }: SplmntDmndFormSectionProps)
files={rowFiles.map((file) => ({
fileKey: file.fileKey,
fileName: file.fileName,
+ onDownload: file.atflId
+ ? () => downloadByAtflId(file.atflId!)
+ : undefined,
}))}
inputId={fileInputId}
isUploadingByKey={isUploading}
diff --git a/apps/as/src/widgets/pbadms-sprt/ui/supplement-demand-section.tsx b/apps/as/src/widgets/pbadms-sprt/ui/supplement-demand-section.tsx
index 1da222fdf..7151323bb 100644
--- a/apps/as/src/widgets/pbadms-sprt/ui/supplement-demand-section.tsx
+++ b/apps/as/src/widgets/pbadms-sprt/ui/supplement-demand-section.tsx
@@ -1,11 +1,9 @@
"use client";
-import { Paperclip } from "lucide-react";
-
import { dayjs } from "@/shared/lib";
import type { SplmntDmndResponseExtension, SplmntDmndSaveBase } from "@/shared/model";
import { SectionCollapsible } from "@/shared/ui";
-import { useDownloadAttachmentByAtflCd } from "@/entities/attach";
+import { AttachmentDownloadLink } from "@/entities/attach";
import {
Badge,
Table,
@@ -23,8 +21,6 @@ interface SupplementDemandSectionProps {
}
function SupplementDemandSection({ splmntDmndList }: SupplementDemandSectionProps) {
- const { mutate: downloadAttachment } = useDownloadAttachmentByAtflCd();
-
if (splmntDmndList.length === 0) {
return null;
}
@@ -70,13 +66,10 @@ function SupplementDemandSection({ splmntDmndList }: SupplementDemandSectionProp
@@ -89,13 +82,10 @@ function SupplementDemandSection({ splmntDmndList }: SupplementDemandSectionProp
diff --git a/apps/cs/src/entities/link/model/link-interface.ts b/apps/cs/src/entities/link/model/link-interface.ts
index 67cd75807..6cd1ba560 100644
--- a/apps/cs/src/entities/link/model/link-interface.ts
+++ b/apps/cs/src/entities/link/model/link-interface.ts
@@ -1,61 +1,62 @@
-import { z } from "zod";
+import { z } from "zod";
import type { PageableParams, PageableList } from "@/shared/model";
export interface Link {
- link_sn: string;
+ intg_link_sn: string;
link_nm: string;
link_clsf_cd: string;
- link_url: string;
- link_srvr_ip: string;
- link_db_cd: string;
- link_key: string;
- link_id: string;
- link_pswd: string;
- link_cycle_stng: string;
- srvc_usg: string;
- last_link_rslt_cd: string;
+ link_url_addr: string;
+ link_srvr_ip_addr: string;
+ link_db_nm: string;
+ link_api_no: string;
+ link_cntn_nm: string;
+ link_cntn_tkn_no: string;
+ link_cycle_stng_nm: string;
+ srvc_usg_nm: string;
+ last_link_rslt_nm: string;
last_link_excn_dt: string;
next_link_excn_dt: string;
- last_link_err_cd: string;
+ last_link_err_nm: string;
mdfcn_dt: string;
- mdfr_id_id: string;
- link_cycle_mi: string;
- link_key_expry_ymd: string;
+ mdfr_uuid: string;
+ link_cycle_no: string;
+ link_expry_ymd: string;
}
export interface LinkLog {
rownum: number;
- link_sn: string;
+ intg_link_sn: string;
link_nm: string;
- link_rslt_cd: string;
+ link_rslt_nm: string;
err_cn: string;
- link_err_cd: string;
+ link_err_nm: string;
log_crt_dt: string;
+ link_excn_stp_nm: string;
}
export interface LinkInfo extends LinkFormData {
- link_sn: string;
+ intg_link_sn: string;
link_nm: string;
link_clsf_cd: string;
- link_url: string;
- link_srvr_ip: string;
- link_db_cd: string;
- link_key: string;
- link_id: string;
- link_pswd: string;
- srvc_usg: string;
- last_link_rslt_cd: string;
+ link_url_addr: string;
+ link_srvr_ip_addr: string;
+ link_db_nm: string;
+ link_api_no: string;
+ link_cntn_nm: string;
+ link_cntn_tkn_no: string;
+ srvc_usg_nm: string;
+ last_link_rslt_nm: string;
last_link_excn_dt: string;
next_link_excn_dt: string;
- last_link_err_cd: string;
+ last_link_err_nm: string;
mdfcn_dt: string;
- mdfr_id: string;
- link_cycle_mi: number;
- link_key_expry_ymd: string;
+ mdfr_uuid: string;
+ link_cycle_no: number;
+ link_expry_ymd: string;
}
export interface LinkStats {
- link_sn: string;
+ intg_link_sn: string;
link_nm: string;
count: number;
}
@@ -63,16 +64,16 @@ export interface LinkStats {
export interface LinkVrbl {
link_vrbl_sn: string;
link_vrbl_nm: string;
- link_vrbl_vl: string;
- link_vrbl_cd: string;
+ link_vrbl_vl_cn: string;
+ link_vrbl_cd_nm: string;
link_vrbl_expln: string;
mdfcn_dt: string;
- mdfr_id: string;
+ mdfr_uuid: string;
}
export interface LinkTable {
link_nm: string;
- link_sn: string;
+ intg_link_sn: string;
tbl_sn: string;
sou_tbl_nm: string;
sou_tbl_korn_nm: string;
@@ -87,16 +88,16 @@ export interface LinkTableColumns {
col_sn: string;
sou_col_nm: string;
sou_col_korn_nm: string;
- sou_col_data_frm: string;
+ sou_col_frm_nm: string;
sou_col_sz: number;
trsf_col_nm: string;
trsf_col_korn_nm: string;
- trsf_col_data_frm: string;
+ trsf_col_frm_nm: string;
trsf_col_sz: number
pk_yn: string;
col_seq: number;
mdfcn_dt: string;
- mdfr_id: string;
+ mdfr_uuid: string;
}
export const linkFormSchema = z.object({
@@ -106,48 +107,48 @@ export const linkFormSchema = z.object({
}, {
message: "연계 분류를 선택해주세요"
}),
- link_sn: z.string().max(50).nullable().optional(),
+ intg_link_sn: z.string().max(50).nullable().optional(),
link_nm: z.string().max(40, { message: '연계명은 40자 이하로 입력해 주세요.' }).nonempty({ message: '연계명은 필수입니다.' }),
- link_url: z.string().max(1000, { message: '연계 URL은 1000자 이하로 입력해 주세요.' }).nonempty({ message: '연계 URL은 필수입니다.' }),
- link_srvr_ip: z.string().max(20).nullable().optional(),
- link_db_cd: z.string().max(10).nullable().optional(),
- link_key: z.string().max(100, { message: '연계 KEY는 100자 이하로 입력해 주세요.' }).nonempty({ message: '연계 KEY는 필수입니다.' }),
- link_id: z.string().max(20).nullable().optional(),
- link_pswd: z.string().max(128).nullable().optional(),
- srvc_usg: z.string().max(40).nullable().optional(),
- last_link_rslt_cd: z.string().max(4).nullable().optional(),
+ link_url_addr: z.string().max(1000, { message: '연계 URL은 1000자 이하로 입력해 주세요.' }).nonempty({ message: '연계 URL은 필수입니다.' }),
+ link_srvr_ip_addr: z.string().max(20).nullable().optional(),
+ link_db_nm: z.string().max(10).nullable().optional(),
+ link_api_no: z.string().max(100, { message: '연계 KEY는 100자 이하로 입력해 주세요.' }).nonempty({ message: '연계 KEY는 필수입니다.' }),
+ link_cntn_nm: z.string().max(20).nullable().optional(),
+ link_cntn_tkn_no: z.string().max(25, { message: '연계 접속 토큰은 25자 이하로 입력해 주세요.' }).nullable().optional(),
+ srvc_usg_nm: z.string().max(40).nullable().optional(),
+ last_link_rslt_nm: z.string().max(4).nullable().optional(),
last_link_excn_dt: z.string().max(40).nullable().optional(),
next_link_excn_dt: z.string().max(40).nullable().optional(),
- last_link_err_cd: z.string().max(50, { message: '마지막 연계 오류 코드는 50자 이하입니다.' }).nullable().optional(),
+ last_link_err_nm: z.string().max(50, { message: '마지막 연계 오류 코드는 50자 이하입니다.' }).nullable().optional(),
mdfcn_dt: z.string().nullable().optional(),
- mdfr_id: z.string().nullable().optional(),
- link_cycle_mi: z.coerce.number().nullable().optional().refine((val) => {
+ mdfr_uuid: z.string().nullable().optional(),
+ link_cycle_no: z.coerce.number().nullable().optional().refine((val) => {
if (val == null) return true;
return val >= 5;
}, {
message: "연계 주기는 5분 이상이어야 합니다."
}),
- link_key_expry_ymd: z.string().nullable().optional(),
+ link_expry_ymd: z.string().nullable().optional(),
});
export const linkVrblFormSchema = z.object({
- link_sn: z.string().max(50).nullable().optional(),
+ intg_link_sn: z.string().max(50).nullable().optional(),
link_vrbl_sn: z.string().max(50).nullable().optional(),
link_vrbl_nm: z.string().max(40, { message: '변수명은 40자 이하로 입력해 주세요.' }).nonempty({ message: '변수명은 필수입니다.' }),
link_vrbl_expln: z.string().max(4000, { message: '설명은 400자 이하로 입력해 주세요.' }).nullable().optional(),
- link_vrbl_cd: z.string().max(10, { message: '변수코드는 10자 이하로 입력해 주세요.' }).nullable().optional(),
- link_vrbl_vl: z.string().max(1000, { message: '변수값은 1000자 이하로 입력해 주세요.' }).nonempty({ message: '변수값은 필수입니다.' }),
+ link_vrbl_cd_nm: z.string().max(10, { message: '변수코드는 10자 이하로 입력해 주세요.' }).nullable().optional(),
+ link_vrbl_vl_cn: z.string().max(1000, { message: '변수값은 1000자 이하로 입력해 주세요.' }).nonempty({ message: '변수값은 필수입니다.' }),
mdfcn_dt: z.string().nullable().optional(),
- mdfr_id: z.string().nullable().optional(),
+ mdfr_uuid: z.string().nullable().optional(),
});
export const LinkTableColumnsSchema = z.object({
- link_sn: z.string().max(50).nullable().optional(),
+ intg_link_sn: z.string().max(50).nullable().optional(),
tbl_sn: z.string().max(50).nullable().optional(),
col_sn: z.string().max(50).nullable().optional(),
sou_col_nm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nullable().optional(),
sou_col_korn_nm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nullable().optional(),
- sou_col_data_frm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nullable().optional(),
+ sou_col_frm_nm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nullable().optional(),
sou_col_sz: z.coerce.number().nullable().optional().refine((val) => {
if (val == null) return true;
return val.toString().replace('.', '').length <= 14;
@@ -157,7 +158,7 @@ export const LinkTableColumnsSchema = z.object({
pk_yn: z.string().max(1).nonempty(),
trsf_col_nm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nonempty({ message: '변환컬럼명은 필수입니다.' }),
trsf_col_korn_nm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nonempty({ message: '변환컬럼 한글명은 필수입니다.' }),
- trsf_col_data_frm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nonempty({ message: '변환컬럼 데이터 형식은 필수입니다.' }),
+ trsf_col_frm_nm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nonempty({ message: '변환컬럼 데이터 형식은 필수입니다.' }),
trsf_col_sz: z.coerce.number().nullable().optional().refine((val) => {
if (val == null) return true;
return val.toString().replace('.', '').length <= 14;
@@ -166,11 +167,11 @@ export const LinkTableColumnsSchema = z.object({
}),
col_seq: z.coerce.number().nullable().optional(),
mdfcn_dt: z.string().nullable().optional(),
- mdfr_id: z.string().nullable().optional(),
+ mdfr_uuid: z.string().nullable().optional(),
});
export const LinkTableSchema = z.object({
- link_sn: z.string().max(50).nullable().optional(),
+ intg_link_sn: z.string().max(50).nullable().optional(),
tbl_sn: z.string().max(50).nullable().optional(),
link_nm: z.string().max(50).nullable().optional(),
sou_tbl_nm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nullable().optional(),
@@ -180,7 +181,7 @@ export const LinkTableSchema = z.object({
trsf_tbl_korn_nm: z.string().max(40, { message: '40자 이하로 입력해 주세요.' }).nonempty({ message: '변환테이블 한글명은 필수입니다.' }),
trsf_tbl_expln: z.string().max(2000, { message: '설명은 2000자 이하로 입력해 주세요.' }).nullable().optional(),
mdfcn_dt: z.string().nullable().optional(),
- mdfr_id: z.string().nullable().optional(),
+ mdfr_uuid: z.string().nullable().optional(),
});
interface LinkStatsListObject {
@@ -195,6 +196,7 @@ export interface LinkSearchParam extends PageableParams {
endDate?: string;
isSucc?: string;
linkClfsCd?: string;
+ linkExecStep?: string;
}
export type LinkFormData = z.infer;
diff --git a/apps/cs/src/pages/link/model/table-columns.tsx b/apps/cs/src/pages/link/model/table-columns.tsx
index 800801277..829743849 100644
--- a/apps/cs/src/pages/link/model/table-columns.tsx
+++ b/apps/cs/src/pages/link/model/table-columns.tsx
@@ -1,4 +1,4 @@
-import dayjs from "dayjs";
+import dayjs from "dayjs";
import { createColumnHelper } from "@tanstack/react-table";
import { type Link } from "@/entities/link";
import QuickStartButton from "../ui/QuickStartButton";
@@ -35,39 +35,39 @@ const columns = [
id: 'no',
header: 'NO',
}),
- columnHelper.accessor('link_sn', {
- id: 'link_sn',
+ columnHelper.accessor('intg_link_sn', {
+ id: 'intg_link_sn',
header: '연계일련번호',
}),
columnHelper.accessor('link_nm', {
id: 'link_nm',
header: '연계 명',
}),
- columnHelper.accessor('link_url', {
- id: 'link_url',
+ columnHelper.accessor('link_url_addr', {
+ id: 'link_url_addr',
header: '연계 URL',
cell: (info) => (info.getValue() ? info.getValue() : '-'),
}),
- columnHelper.accessor('link_srvr_ip', {
- id: 'link_srvr_ip',
+ columnHelper.accessor('link_srvr_ip_addr', {
+ id: 'link_srvr_ip_addr',
header: '연계서버 IP',
cell: (info) => (info.getValue() ? info.getValue() : '-'),
}),
- columnHelper.accessor('link_cycle_mi', {
- id: 'link_cycle_mi',
+ columnHelper.accessor('link_cycle_no', {
+ id: 'link_cycle_no',
header: '연계 주기',
cell: (info) => convertMinutesToPeriod(Number(info.getValue())),
}),
- columnHelper.accessor('srvc_usg', {
- id: 'srvc_usg',
+ columnHelper.accessor('srvc_usg_nm', {
+ id: 'srvc_usg_nm',
header: '서비스용도',
cell: (info) => (info.getValue() ? info.getValue() : '-'),
}),
columnHelper.display({
- id: 'last_link_rslt_cd',
+ id: 'last_link_rslt_nm',
header: '연계상태',
cell: (info) => {
- const resultCd = info.row.original.last_link_rslt_cd;
+ const resultCd = info.row.original.last_link_rslt_nm;
return {resultCd === 'SUCC' ? '성공' : (resultCd === 'FAIL' ? '실패' : (resultCd === 'RUNN' ? '진행중' : '대기'))}
},
}),
@@ -80,7 +80,7 @@ const columns = [
id: 'quick_start_btn',
header: '즉시 실행',
cell: (info) => {
- return
+ return
}
})
];
diff --git a/apps/cs/src/pages/link/ui/LinkExpiredAlert.tsx b/apps/cs/src/pages/link/ui/LinkExpiredAlert.tsx
index 92628a755..ab5091389 100644
--- a/apps/cs/src/pages/link/ui/LinkExpiredAlert.tsx
+++ b/apps/cs/src/pages/link/ui/LinkExpiredAlert.tsx
@@ -1,4 +1,4 @@
-import type { Link, LinkList } from "@/entities/link/model/link-interface";
+import type { Link, LinkList } from "@/entities/link/model/link-interface";
import {
Button,
DropdownMenu,
@@ -18,11 +18,11 @@ const LinkExpiredAlert = ({ linkList }: { linkList: UseQueryResult })
useEffect(() => {
if (linkList?.data?.content) {
const expriedLinks = linkList.data.content.filter((l) => {
- if (l.link_key_expry_ymd === 'none' || !l.link_key_expry_ymd) {
+ if (l.link_expry_ymd === 'none' || !l.link_expry_ymd) {
return false;
}
- const expryDate = dayjs(l.link_key_expry_ymd, 'YYMMDD');
+ const expryDate = dayjs(l.link_expry_ymd, 'YYMMDD');
const today = dayjs();
const daysDiff = expryDate.diff(today, 'day');
@@ -56,11 +56,11 @@ const LinkExpiredAlert = ({ linkList }: { linkList: UseQueryResult })
{expriedLinkList.length > 0 ?
{expriedLinkList.map((l) => {
- const expryDate = dayjs(l.link_key_expry_ymd, 'YYMMDD');
+ const expryDate = dayjs(l.link_expry_ymd, 'YYMMDD');
const today = dayjs();
const daysDiff = expryDate.diff(today, 'day');
- return router.push(`link/register/${l.link_sn}`)}>
+ return router.push(`link/register/${l.intg_link_sn}`)}>
{daysDiff > 0 ?
{l.link_nm} API KEY 만료 {daysDiff}일전
diff --git a/apps/cs/src/pages/link/ui/link-form.tsx b/apps/cs/src/pages/link/ui/link-form.tsx
index 51d8c9f18..6969c6165 100644
--- a/apps/cs/src/pages/link/ui/link-form.tsx
+++ b/apps/cs/src/pages/link/ui/link-form.tsx
@@ -1,4 +1,4 @@
-import {
+import {
Button,
Input,
Table,
@@ -55,7 +55,7 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
const newData = {
...data,
- link_key_expry_ymd: isNoExprie ? 'none' :dayjs(expryDate).format('YYYYMMDD'),
+ link_expry_ymd: isNoExprie ? 'none' :dayjs(expryDate).format('YYYYMMDD'),
};
await handleConfirm(async () => {
@@ -133,7 +133,7 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
(
@@ -222,7 +222,7 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
(
@@ -233,9 +233,9 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
autoComplete="off"
/>
- {form.formState.errors.link_url && (
+ {form.formState.errors.link_url_addr && (
- {form.formState.errors.link_url.message}
+ {form.formState.errors.link_url_addr.message}
)}
@@ -250,7 +250,7 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
(
@@ -277,7 +277,7 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
(
@@ -288,9 +288,9 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
autoComplete="off"
/>
- {form.formState.errors.link_key && (
+ {form.formState.errors.link_api_no && (
- {form.formState.errors.link_key.message}
+ {form.formState.errors.link_api_no.message}
)}
@@ -303,7 +303,7 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
(
@@ -333,9 +333,9 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
- {form.formState.errors.link_key_expry_ymd.message}
+ {form.formState.errors.link_expry_ymd.message}
)}
@@ -348,7 +348,7 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,