Merge branch 'dev' into first_open_fetch
This commit is contained in:
@@ -272,36 +272,6 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
// 커뮤니케이션 메뉴 끝
|
||||
|
||||
|
||||
// 분석 메뉴 시작
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ANALYSIS,
|
||||
ADMIN_ANALYSIS_OPERATION_LOG,
|
||||
"Operation Log (수행로그)",
|
||||
"/analysis/operationlog",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ANALYSIS,
|
||||
ADMIN_ANALYSIS_OPERATION_LOG_UPDATE,
|
||||
"수행로그 상세",
|
||||
"/analysis/operationlog/{{pathVar}}",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ANALYSIS_OPERATION_LOG,
|
||||
ADMIN_ANALYSIS_OPERATION_LOG_EXCEL,
|
||||
"수행로그 Excel",
|
||||
"/analysis/operationlog/excel",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
// 분석 메뉴 끝
|
||||
|
||||
|
||||
// 관리자 시작
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
@@ -330,15 +300,6 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
false,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_ADMIN,
|
||||
ADMIN_SETTINGS_ADMIN_DELETE,
|
||||
"관리자 삭제",
|
||||
"/settings/admins/delete",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_ADMIN,
|
||||
|
||||
@@ -91,7 +91,10 @@ public class DailyUtil {
|
||||
* @return true=수정 가능, false=수정 불가
|
||||
*/
|
||||
public boolean isModifiable(LocalDate startDate, LocalDate endDate) {
|
||||
LocalDate limitStart = LocalDate.now().minusDays(DailyRecordConstants.MODIFIY_LIMIT_DAY);
|
||||
LocalDate today = LocalDate.now();
|
||||
boolean isModifyPeriod = today.getDayOfMonth() <= DailyRecordConstants.MODIFY_LIMIT_DAY;
|
||||
|
||||
LocalDate limitStart = isModifyPeriod? today.minusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).withDayOfMonth(1):today.minusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH-1).withDayOfMonth(1);
|
||||
|
||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
||||
}
|
||||
@@ -104,11 +107,27 @@ public class DailyUtil {
|
||||
* @return true=등록 가능, false=등록 불가
|
||||
*/
|
||||
public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) {
|
||||
LocalDate limitStart = LocalDate.now().minusDays(DailyRecordConstants.REGISTER_LIMIT_DAY);
|
||||
LocalDate today = LocalDate.now();
|
||||
boolean isModifyPeriod = today.getDayOfMonth() <= DailyRecordConstants.REGISTER_LIMIT_DAY;
|
||||
|
||||
LocalDate limitStart = isModifyPeriod? today.minusMonths(DailyRecordConstants.REGISTER_LIMIT_MONTH).withDayOfMonth(1):today.minusMonths(DailyRecordConstants.REGISTER_LIMIT_MONTH-1).withDayOfMonth(1);
|
||||
|
||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
||||
}
|
||||
|
||||
/**
|
||||
* 오늘 날짜 기준으로 등록/수정 가능한 날짜 가져오기
|
||||
*
|
||||
*/
|
||||
public LocalDate getLimitDate(){
|
||||
LocalDate today = LocalDate.now();
|
||||
boolean isModifyPeriod = today.getDayOfMonth() <= DailyRecordConstants.REGISTER_LIMIT_DAY;
|
||||
|
||||
return isModifyPeriod? today.minusMonths(DailyRecordConstants.REGISTER_LIMIT_MONTH).withDayOfMonth(1):today.minusMonths(DailyRecordConstants.REGISTER_LIMIT_MONTH-1).withDayOfMonth(1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 문자형 타입의 숫자에 콤마 적용
|
||||
*
|
||||
|
||||
@@ -36,4 +36,15 @@ public final class CommonConstants {
|
||||
* 관리자 비밀번호 유효성 실패 메시지
|
||||
*/
|
||||
public static final String ADMIN_PASSWORD_MSG = "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다.";
|
||||
|
||||
/**
|
||||
* Validator NotBlank errorCode
|
||||
*/
|
||||
public static final String VALID_CODE_NOTBLANK = "valid.common.required";
|
||||
|
||||
/**
|
||||
* 핸드폰 번호 규칙
|
||||
*/
|
||||
public static final String PHONE_REGEX = "^01([0|1|6|7|8|9])-?([0-9]{3,4})-?([0-9]{4})$";
|
||||
|
||||
}
|
||||
|
||||
@@ -36,14 +36,33 @@ public final class DailyRecordConstants {
|
||||
public static final String FORESTRY_EXPENSE_MARK = "81011";
|
||||
|
||||
/**
|
||||
* 일계부 등록 가능 일
|
||||
* [정책] 15일전까지 데이터 등록 가능
|
||||
* 일계부 등록 가능 월
|
||||
* [정책] 해당월 15일까지는 이전달 데이터 등록 가능
|
||||
* 이전 달을 의미하는 상수
|
||||
*/
|
||||
public static final int REGISTER_LIMIT_DAY = 15;
|
||||
public static final int REGISTER_LIMIT_MONTH = 1;
|
||||
|
||||
/**
|
||||
* 일계부 등록 가능 일
|
||||
* [정책] 해당월 15일까지는 이전달 데이터 등록 가능
|
||||
* 날짜 기준 정책
|
||||
* TODO 15로 변경
|
||||
*/
|
||||
public static final int REGISTER_LIMIT_DAY = 31;
|
||||
|
||||
/**
|
||||
* 일계부 수정 가능 월
|
||||
* [정책] 해당월 15일까지는 이전달 데이터 수정 가능
|
||||
* 이전 달을 의미하는 상수
|
||||
*/
|
||||
public static final int MODIFY_LIMIT_MONTH = 1;
|
||||
|
||||
/**
|
||||
* 일계부 수정 가능 일
|
||||
* [정책] 15일전까지 데이터 수정 가능
|
||||
* [정책] 해당월 15일까지는 이전달 데이터 수정 가능
|
||||
* 날짜 기준 정책
|
||||
* TODO : 15로 변경
|
||||
*/
|
||||
public static final int MODIFIY_LIMIT_DAY = 15;
|
||||
public static final int MODIFY_LIMIT_DAY = 31;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.logging.SafeLogger;
|
||||
import app.module.core.config.application.util.AuditUtil;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.config.constants.CommonConstants;
|
||||
import app.module.core.usecase.admin.checkAdminId.persistence.CheckAdminIdMapper;
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelAdminCreateVO;
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
|
||||
@@ -13,6 +15,7 @@ import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.stereotype.Component;
|
||||
@@ -21,11 +24,14 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
|
||||
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(ExcelSaveAdminIdDao.class));
|
||||
|
||||
@Value("${spring.profiles.active}")
|
||||
private String activeProfiles;
|
||||
|
||||
@@ -42,6 +48,8 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
|
||||
Sheet sheet = workbook.getSheetAt(0);
|
||||
Integer success = 0;
|
||||
List<UICodeElement> uiCodeElementList = uiCodeListMapper.findByParentId("code.region.main", CommonUtil.getLoginUserRole(),activeProfiles);
|
||||
List<String> errorList = new ArrayList<>();
|
||||
|
||||
// 첫 번째 행은 헤더로 간주하고 스킵
|
||||
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
|
||||
Row row = sheet.getRow(i);
|
||||
@@ -57,7 +65,14 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
|
||||
|
||||
Integer duplicate = checkAdminIdMapper.checkAdminId(admin.getId());
|
||||
|
||||
if(duplicate == 0) {
|
||||
if(duplicate == 0
|
||||
&& !admin.getId().isEmpty()
|
||||
&& admin.getId().matches(CommonConstants.ADMIN_ID_REGEX)
|
||||
&& !admin.getRoleId().isEmpty()
|
||||
&& !admin.getPassword().isEmpty()
|
||||
&& admin.getPassword().matches(CommonConstants.ADMIN_PASSWORD_REGEX)
|
||||
&& !admin.getPhone().isEmpty()
|
||||
&& admin.getPhone().matches(CommonConstants.PHONE_REGEX) ) {
|
||||
SaveAdminCmd cmd = new SaveAdminCmd(
|
||||
null,
|
||||
admin.getId(),
|
||||
@@ -76,6 +91,18 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
|
||||
saveAdminMapper.insertAdminHasRoles(
|
||||
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), admin.getRoleId())));
|
||||
}
|
||||
}else{
|
||||
errorList.add(admin.getId());
|
||||
safeLogger.warn(
|
||||
"[EXCEL 누락] 관리자 아이디={} 필수 필드 누락: duplicate={}, role={}, name={}, password={}, regionMainCode={}, phone={} ",
|
||||
admin.getId(),
|
||||
duplicate == 0,
|
||||
admin.getRoleId(),
|
||||
admin.getName(),
|
||||
admin.getPassword(),
|
||||
admin.getRegionMainCode(),
|
||||
admin.getPhone()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,7 +126,7 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
|
||||
case "관리자" -> "ROLE_ADMIN";
|
||||
case "지방실사" -> "ROLE_LOCAL_INSPECTOR";
|
||||
case "조사원" -> "ROLE_RESEARCHER";
|
||||
default -> "";
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -108,7 +135,7 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
|
||||
|
||||
return uiCodeElementList.stream().filter(code -> code.getCodeText().equals(cell.getStringCellValue().trim()))
|
||||
.findFirst()
|
||||
.map(UICodeElement::getId).orElse("");
|
||||
.map(UICodeElement::getId).orElse(null);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortOut;
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
@@ -15,7 +14,6 @@ class UICodeListService implements UICodeListPortIn {
|
||||
|
||||
private final UICodeListPortOut uiCodeListPortOut;
|
||||
|
||||
@Cacheable("ChildUICodesByParentIdCache")
|
||||
@Override
|
||||
public List<UICodeElement> connect(String parentId) {
|
||||
return uiCodeListPortOut.connect(parentId);
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
AND dr.day_group_no = g.day_group_no
|
||||
LEFT JOIN daily_day_group ddg
|
||||
ON ddg.group_no = g.day_group_no
|
||||
WHERE dr.all_status != 'DONE' OR dr.id is null
|
||||
WHERE dr.all_status not in('DONE','TODAY_NONE') OR dr.id is null
|
||||
ORDER BY g.day_group_no
|
||||
</select>
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
#{parentId},
|
||||
#{orderNo},
|
||||
#{codeText},
|
||||
#{codeType},
|
||||
#{codeValue},
|
||||
#{codeType},
|
||||
#{msgCode},
|
||||
#{inUse},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>)
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
FROM uicode
|
||||
WHERE id = #{id}
|
||||
AND is_deleted = false
|
||||
ORDER BY order_no ASC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -73,6 +73,20 @@ DROP TABLE IF EXISTS article ;
|
||||
|
||||
DROP SEQUENCE IF EXISTS article_comment_seq ;
|
||||
|
||||
-- 미사용 테이블 삭제
|
||||
drop table IF EXISTS address;
|
||||
drop sequence IF EXISTS address_seq;
|
||||
drop table IF EXISTS notice_has_upload_file ;
|
||||
drop table IF EXISTS operation_log ;
|
||||
drop sequence IF EXISTS operation_log_seq;
|
||||
drop table IF EXISTS researcher_has_area ;
|
||||
drop sequence IF EXISTS researcher_has_area_seq;
|
||||
drop table IF EXISTS research_area ;
|
||||
drop sequence IF EXISTS research_area_seq;
|
||||
drop table IF EXISTS upload_receipt_files ;
|
||||
drop sequence IF EXISTS upload_receipt_files_seq;
|
||||
|
||||
|
||||
delete from uri_has_role where uri_id in (
|
||||
'uri.admin.board.article.excel',
|
||||
'uri.admin.board.article.delete',
|
||||
@@ -401,6 +415,7 @@ CREATE TABLE batch_log (
|
||||
end_at TIMESTAMP,
|
||||
error_message VARCHAR(2000),
|
||||
created_at TIMESTAMP DEFAULT now(),
|
||||
created_ip VARCHAR(50),
|
||||
|
||||
CONSTRAINT batch_log_pkey PRIMARY KEY (id)
|
||||
);
|
||||
@@ -412,6 +427,27 @@ COMMENT ON COLUMN batch_log.start_at IS '배치 시작 시간';
|
||||
COMMENT ON COLUMN batch_log.end_at IS '배치 종료 시간';
|
||||
COMMENT ON COLUMN batch_log.error_message IS '에러 메시지 (실패한 경우)';
|
||||
COMMENT ON COLUMN batch_log.created_at IS '생성일';
|
||||
COMMENT ON COLUMN batch_log.created_ip IS '생성 IP';
|
||||
|
||||
|
||||
|
||||
-- ====================================================================================================================
|
||||
-- 배치 실행 여부
|
||||
-- ====================================================================================================================
|
||||
CREATE TABLE batch_check (
|
||||
type VARCHAR(50) NOT NULL,
|
||||
run_date DATE NOT NULL,
|
||||
created_ip VARCHAR(50) NOT NULL,
|
||||
created_at TIMESTAMP DEFAULT now(),
|
||||
PRIMARY KEY (type, run_date)
|
||||
);
|
||||
|
||||
COMMENT ON TABLE batch_check IS '배치 실행 여부 테이블';
|
||||
|
||||
COMMENT ON COLUMN batch_check.type IS '배치 타입';
|
||||
COMMENT ON COLUMN batch_check.run_date IS '배치 실행 날짜';
|
||||
COMMENT ON COLUMN batch_check.created_ip IS '실행 IP';
|
||||
COMMENT ON COLUMN batch_check.created_at IS '생성일';
|
||||
|
||||
|
||||
|
||||
@@ -576,7 +612,7 @@ as WITH param_matrix AS (
|
||||
SELECT p.household_seq,
|
||||
p.record_month,
|
||||
count(*) AS total_day_groups,
|
||||
case when to_char(CURRENT_DATE,'YYYYMM')::text = p.record_month then sum(case when to_char(CURRENT_DATE,'dd')::integer >= g.start_day then 1 else 0 end)else count(*) end as current_day_groups
|
||||
case when to_char(CURRENT_DATE,'YYYYMM')::text = p.record_month then sum(case when to_char(CURRENT_DATE,'dd')::integer >= g.start_day then 1 else 0 end) else count(*) end as current_day_groups
|
||||
FROM param_matrix p
|
||||
JOIN daily_day_group g ON g.start_day <= p.last_day
|
||||
GROUP BY p.household_seq, p.record_month;
|
||||
@@ -792,4 +828,9 @@ SELECT setval('suggestion_seq', (SELECT COALESCE(MAX(id), 0) FROM
|
||||
SELECT setval('term_agreement_seq', (SELECT COALESCE(MAX(id), 0) FROM term_agreement));
|
||||
SELECT setval('upload_file_seq', (SELECT COALESCE(MAX(id), 0) FROM upload_file));
|
||||
SELECT setval('upload_receipt_files_seq', (SELECT COALESCE(MAX(id), 0) FROM upload_receipt_files));
|
||||
SELECT setval('uri_has_role_seq', (SELECT COALESCE(MAX(id), 0) FROM uri_has_role));
|
||||
SELECT setval('uri_has_role_seq', (SELECT COALESCE(MAX(id), 0) FROM uri_has_role));
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user