일계부 데이터 Excel 일괄 업로드 기능 추가

관리자 > 임가현황
This commit is contained in:
2025-11-11 17:53:04 +09:00
parent 85a7a1be6d
commit f500993ac1
121 changed files with 3339 additions and 316 deletions

View File

@@ -126,4 +126,41 @@ public class CommonUtil {
flashMessages.add(msg);
session.setAttribute("flashAlertMessages", flashMessages);
}
public static String normalizePath(String path) {
if (path == null || path.trim().isEmpty()) {
log.warn("normalizePath: Input path is null or empty, returning default path");
String defaultPath = System.getProperty("user.home") + File.separator + "Downloads";
return Paths.get(defaultPath).toAbsolutePath().normalize().toString();
}
try {
// Paths.get을 사용하여 경로 정규화
Path normalizedPath = Paths.get(path).toAbsolutePath().normalize();
String result = normalizedPath.toString();
log.debug("Normalized path: {}", result);
return result;
} catch (Exception e) {
log.error("Error normalizing path: {}", path, e);
throw new IllegalArgumentException("Failed to normalize path: " + path, e);
}
}
public static void createDirectories(File directory) {
if (directory == null) {
throw new IllegalArgumentException("Directory cannot be null");
}
try {
if (!directory.exists()) {
boolean created = directory.mkdirs();
log.info("Directory created: {} (Success: {})", directory.getAbsolutePath(), created);
}
if (!directory.canWrite()) {
throw new IOException("No write permission for directory: " + directory.getAbsolutePath());
}
} catch (Exception e) {
log.error("Failed to create directory: {}", directory.getAbsolutePath(), e);
throw new RuntimeException("Failed to create directory", e);
}
}
}

View File

@@ -14,12 +14,16 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.time.LocalDate;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
@Slf4j
@Component
@RequiredArgsConstructor
public class DailyUtil {
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
/**
* int -> localdate
* @param month 월(yyyyMM)
@@ -179,4 +183,39 @@ public class DailyUtil {
returnValue.put("expenseMark", expenseMark);
return returnValue;
}
/**
* dateStr 문자열을 기준으로 수정 가능 여부 반환
* @param dateStr 수정 대상 월 (예: "2025-04-03")
* @return true = 수정 가능, false = 수정 불가
*/
public boolean isEditable(String dateStr) {
try {
LocalDate date = LocalDate.parse(dateStr, DATE_FORMATTER);
// 대상 월
YearMonth targetMonth = YearMonth.from(date);
// 마감일 계산
LocalDate limitDate;
if (DailyRecordConstants.MODIFY_LIMIT_DAY == 31) {
limitDate = targetMonth
.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH)
.atEndOfMonth();
} else {
limitDate = targetMonth
.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH)
.atDay(DailyRecordConstants.MODIFY_LIMIT_DAY);
}
LocalDate today = LocalDate.now();
// 오늘이 마감일 이후면 수정 불가
return !today.isAfter(limitDate);
} catch (Exception e) {
return false; // 형식 오류나 파싱 실패 → 수정 불가
}
}
}

View File

@@ -62,5 +62,12 @@ public final class DailyRecordConstants {
* 날짜 기준 정책
*/
public static final int MODIFY_LIMIT_DAY = 31;
/**
* admin 년도 시작일
*/
public static final int START_YEAR = 2024;
/**
* 첫 시작년도의 시작 월
*/
public static final int START_MONTH_OF_START_YEAR = 8;
}

View File

@@ -0,0 +1,27 @@
package app.module.core.usecase.daily.dayGroup.adapters.persistence;
import app.module.core.config.application.util.DailyUtil;
import app.module.core.usecase.daily.dayGroup.adapters.persistence.model.DailyDayGroupDto;
import app.module.core.usecase.daily.dayGroup.ports.DailyDayGroupPortOut;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import java.util.List;
@Slf4j
@Repository
@RequiredArgsConstructor
public class DailyDayGroupDao implements DailyDayGroupPortOut {
private final DailyDayGroupMapper dailyRecordMapper;
@Override
public DailyDayGroupDto detail(String searchDay) {
return dailyRecordMapper.getDailyDayGroup(searchDay);
}
@Override
public DailyDayGroupDto detailbyGroupNo(Integer groupNo) {
return dailyRecordMapper.getDailyDayGroupByGroupNo(groupNo);
}
}

View File

@@ -0,0 +1,16 @@
package app.module.core.usecase.daily.dayGroup.adapters.persistence;
import app.module.core.usecase.daily.dayGroup.adapters.persistence.model.DailyDayGroupDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface DailyDayGroupMapper {
DailyDayGroupDto getDailyDayGroup(String searchDay);
DailyDayGroupDto getDailyDayGroupByGroupNo(Integer groupNo);
}

View File

@@ -0,0 +1,20 @@
package app.module.core.usecase.daily.dayGroup.adapters.persistence.model;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import java.time.LocalDate;
import java.util.List;
@Slf4j
@Data
public class DailyDayGroupDto {
private Integer groupNo;
private Integer startDay;
private Integer endDay;
}

View File

@@ -0,0 +1,8 @@
package app.module.core.usecase.daily.dayGroup.ports;
import app.module.core.usecase.daily.dayGroup.adapters.persistence.model.DailyDayGroupDto;
public interface DailyDayGroupPortIn {
DailyDayGroupDto detail(String searchDay);
DailyDayGroupDto detailbyGroupNo(Integer groupNo);
}

View File

@@ -0,0 +1,11 @@
package app.module.core.usecase.daily.dayGroup.ports;
import app.module.core.usecase.daily.dayGroup.adapters.persistence.model.DailyDayGroupDto;
public interface DailyDayGroupPortOut {
DailyDayGroupDto detail(String searchDay);
DailyDayGroupDto detailbyGroupNo(Integer groupNo);
}

View File

@@ -0,0 +1,23 @@
package app.module.core.usecase.daily.dayGroup.ports.application;
import app.module.core.usecase.daily.dayGroup.adapters.persistence.model.DailyDayGroupDto;
import app.module.core.usecase.daily.dayGroup.ports.DailyDayGroupPortIn;
import app.module.core.usecase.daily.dayGroup.ports.DailyDayGroupPortOut;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class DailyDayGroupService implements DailyDayGroupPortIn {
private final DailyDayGroupPortOut portOut;
@Override
public DailyDayGroupDto detail(String searchDay) {
return portOut.detail(searchDay);
}
@Override
public DailyDayGroupDto detailbyGroupNo(Integer groupNo) {
return portOut.detailbyGroupNo(groupNo);
}
}

View File

@@ -1,11 +1,14 @@
package app.module.core.usecase.daily.record.adapters.persistence;
import app.module.core.usecase.daily.dayGroup.adapters.persistence.model.DailyDayGroupDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordAlertDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordExcelCmd;
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import app.module.core.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd;
import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -62,5 +65,19 @@ public interface DailyRecordMapper {
List<DailyRecordAlertDto> selectDailyNoRegister(@Param("searchMonth") String searchMonth, @Param("householdSeq")Long householdSeq);
List<String> selectMonthNoRegister(@Param("searchMonth")String searchMonth, @Param("householdSeq")Long householdSeq);
/**
* 일계부 항목 등록(생성)_Excel 업로드
*
* @param command 등록 데이터
*/
Long createDailyRecordExcel(CreateDailyRecordExcelCmd command);
/**
* 일계부 항목의 상태 수정_Excel 업로드
*
* @param command 수정 데이터
*/
void updateDailyRecordStatusExcel(UpdateDailyRecordStatusCmd command);
List<DailyRecordDto> getDailyDayGroup();
}

View File

@@ -45,6 +45,8 @@ public class DailyRecordDto {
*/
private boolean modifiable;
private Long householdSeq;
/**
* 현재 단계
*/

View File

@@ -0,0 +1,33 @@
package app.module.core.usecase.daily.record.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import app.module.core.config.application.enums.DailyStatus;
import app.module.core.config.application.enums.DailyTargetStatus;
import lombok.*;
import java.time.LocalDate;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@ToString
public class CreateDailyRecordExcelCmd extends AuditCommand {
private Long id;
private String recordMonth;
private int dayGroupNo;
private Long householdSeq;
private LocalDate startDate;
private LocalDate endDate;
private DailyStatus allStatus;
private DailyTargetStatus incomeStatus;
private DailyTargetStatus workStatus;
private DailyTargetStatus expenseStatus;
private DailyTargetStatus powerStatus;
private DailyTargetStatus forestryStatus;
private DailyTargetStatus farmingStatus;
private String excelStartDate;
private String excelEndDate;
}

View File

@@ -28,7 +28,6 @@ class UpdateFileDao implements UpdateFilePortOut {
command.getType().getName()
)));
if (!deletedFileList.isEmpty()) {
mapper.deleteFile(
AuditUtil.delete(new UpdateUploadFileParam(

View File

@@ -17,6 +17,7 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.io.File;
@@ -43,7 +44,9 @@ class GetAttachmentController {
private String uploadStorageType;
@GetMapping(path = "/content-disposition/attachment/{fileId}")
ResponseEntity<?> operate(@PathVariable Long fileId) throws MalformedURLException {
ResponseEntity<?> operate(@PathVariable Long fileId,
@RequestParam(value = "rename", required = false) String rename
) throws MalformedURLException {
GetFile getFile;
try {
@@ -54,8 +57,17 @@ class GetAttachmentController {
.body("파일을 찾을 수 없습니다: " + e.getMessage());
}
int dot = getFile.getOriginName().lastIndexOf('.');
String ext = (dot != -1) ? getFile.getOriginName().substring(dot) : "";
// rename이 있으면 이름 교체, 없으면 원본 유지
String baseName = (rename != null && !rename.isBlank()) ? rename :
(dot != -1 ? getFile.getOriginName().substring(0, dot) : getFile.getOriginName());
String fileName = baseName + ext;
// HTTP 헤더 설정
String encodedFileName = URLEncoder.encode(getFile.getOriginName(), StandardCharsets.UTF_8)
String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8)
.replace("+", "%20");
HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + encodedFileName);

View File

@@ -3,9 +3,12 @@ package app.module.core.usecase.uicode.view.adapters.persistence;
import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Optional;
@Mapper
public interface UICodeViewMapper {
Optional<UICodeView> findById(String id);
List<UICodeView> findAllCodes(String parentId);
List<UICodeView> findAllCodeTexts(String parentId);
}

View File

@@ -2,10 +2,12 @@ package app.module.core.usecase.uicode.view.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class UICodeView {

View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="app.module.core.usecase.daily.dayGroup.adapters.persistence.DailyDayGroupMapper">
<select id="getDailyDayGroup" resultType="app.module.core.usecase.daily.dayGroup.adapters.persistence.model.DailyDayGroupDto">
select
group_no
, start_day
, end_day
from daily_day_group
where
(start_day = CAST(#{searchDay} AS SMALLINT) or end_day = CAST(#{searchDay} AS SMALLINT))
and
is_deleted = false
Limit 1
</select>
<select id="getDailyDayGroupByGroupNo" resultType="app.module.core.usecase.daily.dayGroup.adapters.persistence.model.DailyDayGroupDto">
select
group_no
, start_day
, end_day
from daily_day_group
where
group_no = #{groupNo}
and
is_deleted = false
Limit 1
</select>
</mapper>

View File

@@ -6,7 +6,7 @@
resultType="app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto">
select ddg.group_no, ddg.start_day, ddg.end_day
, dr.id, dr.record_month, dr.day_group_no, dr.start_date, dr.end_date
, dr.all_status, dr.income_status, dr.work_status, dr.expense_status, dr.power_status, dr.forestry_status, dr.farming_status
, dr.all_status, dr.income_status, dr.work_status, dr.expense_status, dr.power_status, dr.forestry_status, dr.farming_status, dr.household_seq
from daily_day_group ddg
<if test="dailyRecordSeq == null">
left join
@@ -185,4 +185,74 @@
and ddg.is_deleted = false
</sql>
<select id="createDailyRecordExcel" resultType="long">
WITH existing AS (
SELECT id
FROM daily_record
WHERE household_seq = #{householdSeq}
AND record_month = #{recordMonth}
AND start_date = TO_DATE(#{recordMonth} || LPAD(#{excelStartDate}::text, 2, '0'), 'YYYYMMDD')
),
ins AS (
INSERT INTO daily_record (
household_seq, record_month, day_group_no, start_date, end_date,
all_status, income_status, work_status, expense_status, power_status, forestry_status, farming_status,
<include refid="common.fields.CreateUpdateBaseColumns"/>
)
SELECT
#{householdSeq},
#{recordMonth},
g.group_no,
TO_DATE(#{recordMonth} || LPAD(#{excelStartDate}::text, 2, '0'), 'YYYYMMDD'),
TO_DATE(#{recordMonth} || LPAD(#{excelEndDate}::text, 2, '0'), 'YYYYMMDD'),
#{allStatus}, #{incomeStatus}, #{workStatus}, #{expenseStatus}, #{powerStatus}, #{forestryStatus}, #{farmingStatus},
<include refid="common.fields.CreateUpdateBaseValues"/>
FROM daily_day_group g
WHERE g.is_deleted = false
AND g.start_day = CAST(#{excelStartDate} AS smallint)
AND NOT EXISTS (SELECT 1 FROM existing)
RETURNING id
)
SELECT id FROM ins
UNION ALL
SELECT id FROM existing
</select>
<update id="updateDailyRecordStatusExcel">
update daily_record set <include refid="common.fields.UpdateBaseSet"/>
<if test="allStatus != null and allStatus != ''">
, all_status = #{allStatus}
</if>
<if test="targetType != null and targetType != ''">
<choose>
<when test="targetType eq 'INCOME'">
, income_status = #{targetStatus}
</when>
<when test="targetType eq 'WORK'">
, work_status = #{targetStatus}
</when>
<when test="targetType eq 'EXPENSE'">
, expense_status = #{targetStatus}
</when>
<when test="targetType eq 'POWER'">
, power_status = #{targetStatus}
</when>
<when test="targetType eq 'FORESTRY'">
, forestry_status = #{targetStatus}
</when>
<when test="targetType eq 'FARMING'">
, farming_status = #{targetStatus}
</when>
</choose>
</if>
where is_deleted = false
and id = #{dayGroupNo}
</update>
<select id="getDailyDayGroup" resultType="app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto">
select start_day, group_no
from daily_day_group
where is_deleted = false
</select>
</mapper>

View File

@@ -21,4 +21,24 @@
ORDER BY order_no ASC
</select>
<select id="findAllCodes"
resultType="app.module.core.usecase.uicode.view.ports.application.domain.UICodeView">
/* findById : UICode 상세 조회 */
SELECT id, code_value
FROM uicode
WHERE parent_id = #{parentId}
AND is_deleted = false
</select>
<select id="findAllCodeTexts"
resultType="app.module.core.usecase.uicode.view.ports.application.domain.UICodeView">
/* findById : UICode 상세 조회 */
SELECT id, code_text
FROM uicode
WHERE parent_id = #{parentId}
AND is_deleted = false
</select>
</mapper>

View File

@@ -1372,6 +1372,7 @@ CREATE TABLE public.daily_expense (
deleted_at timestamp(6) NULL, -- 삭제일
deleted_by varchar(255) NULL, -- 삭제자
is_deleted bool DEFAULT false NULL, -- 삭제여부
ocr_error_result bool DEFAULT false NULL, -- ORC판독오류유무
CONSTRAINT daily_expense_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_expense__daily_record FOREIGN KEY (daily_record_seq) REFERENCES public.daily_record(id)
);
@@ -1399,6 +1400,7 @@ COMMENT ON COLUMN public.daily_expense.updated_by IS '수정자';
COMMENT ON COLUMN public.daily_expense.deleted_at IS '삭제일';
COMMENT ON COLUMN public.daily_expense.deleted_by IS '삭제자';
COMMENT ON COLUMN public.daily_expense.is_deleted IS '삭제여부';
COMMENT ON COLUMN public.daily_expense.ocr_error_result IS 'ORC판독오류유무';
@@ -1528,6 +1530,7 @@ CREATE TABLE public.daily_income (
deleted_at timestamp(6) NULL, -- 삭제일
deleted_by varchar(255) NULL, -- 삭제자
is_deleted bool DEFAULT false NULL, -- 삭제여부
ocr_error_result bool DEFAULT false NULL, -- ORC판독오류유무
CONSTRAINT daily_income_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_income__daily_record FOREIGN KEY (daily_record_seq) REFERENCES public.daily_record(id)
);
@@ -1556,6 +1559,7 @@ COMMENT ON COLUMN public.daily_income.updated_by IS '수정자';
COMMENT ON COLUMN public.daily_income.deleted_at IS '삭제일';
COMMENT ON COLUMN public.daily_income.deleted_by IS '삭제자';
COMMENT ON COLUMN public.daily_income.is_deleted IS '삭제여부';
COMMENT ON COLUMN public.daily_income.ocr_error_result IS 'ORC판독오류유무';