Merge branch 'dev' into deploy-dev-admin
This commit is contained in:
@@ -112,6 +112,14 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
|
||||
-Dspring.datasource.url=jdbc:postgresql://15.165.180.203:5432/korea_research
|
||||
-Dspring.datasource.username=ko_research
|
||||
-Dspring.datasource.password=koresearch1@#4
|
||||
-Daes.secret-key=092HW829O0A0AVR0
|
||||
-Dpath.upload.storage=SFTP
|
||||
-Dpath.upload.sftp.public=/home/etribe/data/upload
|
||||
-Dpath.upload.sftp.tmpdir=${user.home}/upload/tmpdir
|
||||
-Dfile.upload.sftp.ip=115.68.193.117
|
||||
-Dfile.upload.sftp.id=etribe
|
||||
-Dfile.upload.sftp.password=Etribe@3415
|
||||
-Dfile.upload.sftp.port=22
|
||||
```
|
||||
|
||||
## JDBC 및 데이터 핸들링 구성 옵션
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -6677,6 +6677,14 @@ input[type=number] {
|
||||
-webkit-justify-content: space-between;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.table-group .table-tit-group.large {
|
||||
margin-bottom: 2.4rem;
|
||||
}
|
||||
.table-group .table-tit-group.large h3 {
|
||||
font-size: 2.4rem;
|
||||
font-weight: 700;
|
||||
color: #212529;
|
||||
}
|
||||
.table-group .table-tit-group h3 {
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
@@ -6708,6 +6716,9 @@ table a {
|
||||
table th {
|
||||
background-color: #f1f3f5 !important;
|
||||
}
|
||||
table tr.total {
|
||||
background-color: #F1F3F5;
|
||||
}
|
||||
table .align-right {
|
||||
text-align: right;
|
||||
}
|
||||
@@ -7193,6 +7204,18 @@ table tbody th {
|
||||
flex: 1;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.dounut-chart-area .chart-group.type-green .donut-chart {
|
||||
background: conic-gradient(#95BA45 -webkit-calc(var(--percent) * 1%), #E9ECEF 0%);
|
||||
background: conic-gradient(#95BA45 calc(var(--percent) * 1%), #E9ECEF 0%);
|
||||
}
|
||||
.dounut-chart-area .chart-group.type-blue .donut-chart {
|
||||
background: conic-gradient(#00B09B -webkit-calc(var(--percent) * 1%), #E9ECEF 0%);
|
||||
background: conic-gradient(#00B09B calc(var(--percent) * 1%), #E9ECEF 0%);
|
||||
}
|
||||
.dounut-chart-area .chart-group.type-orange .donut-chart {
|
||||
background: conic-gradient(#FD9E01 -webkit-calc(var(--percent) * 1%), #E9ECEF 0%);
|
||||
background: conic-gradient(#FD9E01 calc(var(--percent) * 1%), #E9ECEF 0%);
|
||||
}
|
||||
.dounut-chart-area .chart-group dl {
|
||||
color: #212529;
|
||||
}
|
||||
@@ -7231,16 +7254,22 @@ table tbody th {
|
||||
|
||||
.donut-chart {
|
||||
--percent: 75;
|
||||
width: 160px;
|
||||
height: 160px;
|
||||
min-width: 16rem;
|
||||
min-height: 16rem;
|
||||
width: 16rem;
|
||||
height: 16rem;
|
||||
border-radius: 50%;
|
||||
background: conic-gradient(#95BA45 -webkit-calc(75 * 1%), #E9ECEF 0%);
|
||||
background: conic-gradient(#95BA45 calc(75 * 1%), #E9ECEF 0%);
|
||||
background: conic-gradient(#95BA45 -webkit-calc(var(--percent) * 1%), #E9ECEF 0%);
|
||||
background: conic-gradient(#95BA45 calc(var(--percent) * 1%), #E9ECEF 0%);
|
||||
background: conic-gradient(#95ba45 0 -webkit-calc(75 * 1%), #e9ecef 0);
|
||||
background: conic-gradient(#95ba45 0 calc(75 * 1%), #e9ecef 0);
|
||||
position: relative;
|
||||
}
|
||||
|
||||
@supports (background: conic-gradient(red 0deg, red 0deg 1deg, red 2deg)){
|
||||
.donut-chart {
|
||||
background: conic-gradient(#95ba45 0 -webkit-calc(var(--percent) * 1%), #e9ecef 0);
|
||||
background: conic-gradient(#95ba45 0 calc(var(--percent) * 1%), #e9ecef 0);
|
||||
}
|
||||
}
|
||||
.donut-chart::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
@@ -7253,6 +7282,100 @@ table tbody th {
|
||||
background: #fff;
|
||||
border-radius: 50%;
|
||||
}
|
||||
.donut-chart::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 50%;
|
||||
-webkit-transform: translateX(-50%);
|
||||
transform: translateX(-50%);
|
||||
width: 4px;
|
||||
height: 50px;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.donut-chart .end-line {
|
||||
content: "";
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 50%;
|
||||
-webkit-transform: translateX(-50%) rotate(-webkit-calc(var(--percent) * 3.6deg));
|
||||
transform: translateX(-50%) rotate(calc(var(--percent) * 3.6deg));
|
||||
-webkit-transform-origin: center 80px;
|
||||
transform-origin: center 80px;
|
||||
width: 4px;
|
||||
height: 50px;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.progress-group {
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
-webkit-box-align: center;
|
||||
-webkit-align-items: center;
|
||||
align-items: center;
|
||||
-webkit-box-pack: center;
|
||||
-webkit-justify-content: center;
|
||||
justify-content: center;
|
||||
gap: 2.4rem;
|
||||
}
|
||||
.progress-group.type-green .progress::-webkit-progress-value {
|
||||
background: #95BA45;
|
||||
border-radius: 0px;
|
||||
}
|
||||
.progress-group.type-blue .progress::-webkit-progress-value {
|
||||
background: #00B09B;
|
||||
border-radius: 0px;
|
||||
}
|
||||
.progress-group.type-orange .progress::-webkit-progress-value {
|
||||
background: #FD9E01;
|
||||
border-radius: 0px;
|
||||
}
|
||||
.progress-group .progress {
|
||||
-webkit-box-flex: 1;
|
||||
-webkit-flex: 1;
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
max-width: 20rem;
|
||||
height: 0.8rem;
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
appearance: none;
|
||||
}
|
||||
.progress-group .progress::-webkit-progress-bar {
|
||||
background: #E9ECEF;
|
||||
border-radius: 12px;
|
||||
height: 0.8rem;
|
||||
overflow: hidden;
|
||||
}
|
||||
.progress-group .progress::-webkit-progress-value {
|
||||
background: #95BA45;
|
||||
border-radius: 0px;
|
||||
}
|
||||
.progress-group .detail {
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
-webkit-box-align: center;
|
||||
-webkit-align-items: center;
|
||||
align-items: center;
|
||||
}
|
||||
.progress-group .detail .percent {
|
||||
position: relative;
|
||||
padding-right: 1.3rem;
|
||||
margin-right: 0.4rem;
|
||||
}
|
||||
.progress-group .detail .percent::after {
|
||||
position: absolute;
|
||||
content: "%";
|
||||
display: block;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
.progress-group .detail .d-flex {
|
||||
gap: 0.2rem;
|
||||
}
|
||||
|
||||
/* https://cdn.datatables.net/1.12.1/css/jquery.dataTables.min.css */
|
||||
table.dataTable td.dt-control {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -4,8 +4,8 @@
|
||||
|
||||
<div class="layer-wrap" th:fragment="modalFragment">
|
||||
<form autocomplete="off" method="get" name="reqVisitForm">
|
||||
<input name="page" value="0" type="hidden"/>
|
||||
<input name="size" value="10" type="hidden">
|
||||
<input type="hidden" name="visitInfoId">
|
||||
<input type="hidden" name="householdSeq">
|
||||
|
||||
<div class="component-modal mypage-wrap modal01 modal-visit-info" data-props-dimm-click="true" data-state="close">
|
||||
<div class="modal-dimm"></div>
|
||||
@@ -90,7 +90,7 @@
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn btn-primary" onclick="">
|
||||
<button type="button" class="btn btn-primary" onclick="goVisitInfoSave();">
|
||||
<span class="btn-txt">등록</span>
|
||||
</button>
|
||||
</div>
|
||||
@@ -106,27 +106,33 @@
|
||||
</form>
|
||||
|
||||
<script th:inline="javascript">
|
||||
// form 초기화
|
||||
const resetForm = () => {
|
||||
const form = document.forms['reqVisitForm'];
|
||||
const form = document.reqVisitForm;
|
||||
if (!form) return;
|
||||
|
||||
const today = new Date().toISOString().slice(0, 10);
|
||||
form.visitDate.value = today;
|
||||
form.visitInfoId.value = '';
|
||||
form.managementType.value = '';
|
||||
form.content.value = '';
|
||||
document.getElementById('isGiftSent_N').checked = true;
|
||||
if (datepickerInstance) {
|
||||
datepickerInstance.setDate(new Date(), { render: true });
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<script th:inline="javascript">
|
||||
// 임가방문정보 모달창 띄우기
|
||||
const showVisitInfoModal = (id) => {
|
||||
document.querySelector(".modal-visit-info").ui.open();
|
||||
const f = document.reqVisitForm;
|
||||
|
||||
resetForm();
|
||||
|
||||
if(id != null) {
|
||||
f.visitInfoId.value = id;
|
||||
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/visitInfo/' + id,
|
||||
`/api/visitInfo/${id}`,
|
||||
{},
|
||||
(response) => {
|
||||
console.log("임가방문정보 상세 응답값 : ", response);
|
||||
@@ -139,21 +145,81 @@
|
||||
'json'
|
||||
);
|
||||
}
|
||||
|
||||
document.querySelector(".modal-visit-info").ui.open();
|
||||
}
|
||||
|
||||
// 임가방문정보 상세 값 set
|
||||
const setFormData = (data) => {
|
||||
const form = document.forms['reqVisitForm'];
|
||||
const form = document.reqVisitForm;
|
||||
if (!form) return;
|
||||
|
||||
// 폼에 값 세팅
|
||||
form.visitDate.value = data.visitDate || '';
|
||||
form.managementType.value = data.managementType || '';
|
||||
form.content.value = data.content || '';
|
||||
|
||||
// 라디오 버튼 처리
|
||||
document.getElementById('isGiftSent_Y').checked = data.isGiftSent === true;
|
||||
document.getElementById('isGiftSent_N').checked = data.isGiftSent === false;
|
||||
|
||||
// 날짜 세팅
|
||||
if (datepickerInstance && data.visitDate) {
|
||||
datepickerInstance.setDate(new Date(data.visitDate), { render: true });
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// 임가방문정보 등록
|
||||
const goVisitInfoSave = () => {
|
||||
const f = document.reqVisitForm;
|
||||
let dataOj = $(f).serializeObject();
|
||||
|
||||
console.log("dataOj", dataOj);
|
||||
|
||||
// ajaxUtil._ajaxMethod(
|
||||
// '/api/visitInfo/create',
|
||||
// JSON.stringify(dataOj),
|
||||
// (response) => { // 성공
|
||||
// alert("등록이 완료되었습니다.");
|
||||
// location.href = '/households';
|
||||
// },
|
||||
// function (code, rstData) {
|
||||
// if(code == 422) alert(rstData.responseText);
|
||||
// if(code == 400) alert(rstData.responseJSON.message); //임가번호 중복체크
|
||||
// },
|
||||
// 'post',
|
||||
// 'json',
|
||||
// { handle422Type: 'alert' }
|
||||
// );
|
||||
}
|
||||
</script>
|
||||
|
||||
<script>
|
||||
let datepickerInstance = null;
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
const $el = document.querySelector('.component-datepicker');
|
||||
const datepicker = etUI.components.DatepickerComp();
|
||||
|
||||
datepicker.core.init($el, {
|
||||
dateSelectCallback: function (selectedDate) {
|
||||
console.log('선택된 날짜:', selectedDate);
|
||||
}
|
||||
});
|
||||
|
||||
datepickerInstance = datepicker.getDatepickerInstance();
|
||||
|
||||
// 초기 상태 오늘 날짜로
|
||||
if (datepickerInstance) {
|
||||
datepickerInstance.setDate(new Date(), { render: true });
|
||||
}
|
||||
});
|
||||
|
||||
$(document).ready(() => {
|
||||
const reqForm = document.reqForm;
|
||||
document.reqVisitForm.householdSeq.value = reqForm.householdSeq.value;
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</html>
|
||||
@@ -618,7 +618,6 @@
|
||||
|
||||
<!-- 임가방문정보 모달 -->
|
||||
<div th:replace="households/modal/modal-visit-info :: modalFragment"></div>
|
||||
|
||||
</section>
|
||||
|
||||
<section layout:fragment="script">
|
||||
|
||||
@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
|
||||
@RequiredArgsConstructor
|
||||
public enum FileStorageType {
|
||||
LOCAL("로컬 스토리지"),
|
||||
S3("AWS S3 스토리지");
|
||||
S3("AWS S3 스토리지"),
|
||||
SFTP("SFTP");
|
||||
private final String desc;
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ public enum FileUploadType {
|
||||
AcceptableFileType.PDF,
|
||||
AcceptableFileType.ZIP)),
|
||||
NOTICE(
|
||||
FileStorageType.LOCAL,
|
||||
FileStorageType.SFTP,
|
||||
"/notice",
|
||||
Set.of(
|
||||
AcceptableFileType.IMAGE,
|
||||
@@ -55,7 +55,7 @@ public enum FileUploadType {
|
||||
AcceptableFileType.ZIP)),
|
||||
|
||||
RECEIPT(
|
||||
FileStorageType.LOCAL,
|
||||
FileStorageType.SFTP,
|
||||
"/receipt",
|
||||
Set.of(
|
||||
AcceptableFileType.IMAGE
|
||||
|
||||
@@ -11,18 +11,24 @@ import javax.crypto.IllegalBlockSizeException;
|
||||
import javax.crypto.NoSuchPaddingException;
|
||||
import javax.crypto.spec.IvParameterSpec;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
public class AESEncryptUtil {
|
||||
|
||||
@Value("${encrypt.aes.key}")
|
||||
@Value("${aes.secret-key}")
|
||||
private String key;
|
||||
|
||||
@Value("${encrypt.aes.iv}")
|
||||
private String iv;
|
||||
|
||||
private static final String AES_ALGORITHM = "AES/CBC/PKCS5PADDING";
|
||||
public static final String ENCRYPT_IV = "0123456789ABCDEF";
|
||||
|
||||
public String encrypt(String text)
|
||||
throws NoSuchPaddingException, NoSuchAlgorithmException, BadPaddingException,
|
||||
IllegalBlockSizeException, InvalidAlgorithmParameterException, InvalidKeyException {
|
||||
@@ -48,6 +54,42 @@ public class AESEncryptUtil {
|
||||
return new String(decrypted, StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
|
||||
public byte[] encryptAesCbc(byte[] plainData) {
|
||||
if (plainData == null || plainData.length == 0) {
|
||||
throw new IllegalArgumentException("데이터는 null이거나 비어 있을 수 없습니다.");
|
||||
}
|
||||
|
||||
try {
|
||||
SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
|
||||
IvParameterSpec ivSpec = new IvParameterSpec(ENCRYPT_IV.getBytes(StandardCharsets.UTF_8));
|
||||
Cipher cipher = Cipher.getInstance(AES_ALGORITHM);
|
||||
cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);
|
||||
return org.apache.commons.codec.binary.Base64.encodeBase64(cipher.doFinal(plainData));
|
||||
} catch (Exception e) {
|
||||
log.error("바이너리 데이터 암호화 실패", e);
|
||||
throw new RuntimeException("바이너리 데이터 암호화 실패", e);
|
||||
}
|
||||
}
|
||||
|
||||
public byte[] decryptAesCbc(byte[] cipherData) {
|
||||
if (cipherData == null || cipherData.length == 0) {
|
||||
throw new IllegalArgumentException("암호문은 null이거나 비어 있을 수 없습니다.");
|
||||
}
|
||||
|
||||
try {
|
||||
byte[] encrypted = org.apache.commons.codec.binary.Base64.decodeBase64(cipherData);
|
||||
SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
|
||||
IvParameterSpec ivSpec = new IvParameterSpec(ENCRYPT_IV.getBytes(StandardCharsets.UTF_8));
|
||||
Cipher cipher = Cipher.getInstance(AES_ALGORITHM);
|
||||
cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec);
|
||||
return cipher.doFinal(encrypted);
|
||||
} catch (Exception e) {
|
||||
log.error("바이너리 데이터 복호화 실패", e);
|
||||
throw new RuntimeException("바이너리 데이터 복호화 실패", e);
|
||||
}
|
||||
}
|
||||
|
||||
private String getTransformation() {
|
||||
return "AES/CBC/PKCS5Padding";
|
||||
}
|
||||
|
||||
@@ -3,9 +3,16 @@ package app.module.core.config.application.util;
|
||||
import app.module.core.config.adapters.web.security.domain.SocialUser;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
@@ -14,6 +21,7 @@ import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
@Slf4j
|
||||
public class CommonUtil {
|
||||
|
||||
/**
|
||||
@@ -106,4 +114,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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
package app.module.core.config.application.util;
|
||||
|
||||
import app.module.core.usecase.file.getFile.ports.application.domain.GetFile;
|
||||
import app.module.core.usecase.file.saveToStorage.ports.application.strategy.SftpConnector;
|
||||
import com.jcraft.jsch.ChannelSftp;
|
||||
import com.jcraft.jsch.JSchException;
|
||||
import com.jcraft.jsch.SftpException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class SftpFileDownloader {
|
||||
private final SftpConnector sftpConnector;
|
||||
private final AESEncryptUtil encryptUtil;
|
||||
|
||||
@Value("${path.upload.sftp.public}")
|
||||
private String publicPath;
|
||||
|
||||
@Value("${file.download.base-path:/tmp/downloads}")
|
||||
private String defaultDownloadBasePath;
|
||||
|
||||
public void downloadFile(GetFile file) throws JSchException, SftpException, IOException {
|
||||
// SFTP 연결 확인 및 재연결
|
||||
if (!sftpConnector.isConnected()) {
|
||||
log.info("SFTP connection lost, attempting to reconnect");
|
||||
sftpConnector.connect();
|
||||
}
|
||||
ChannelSftp channelSftp = sftpConnector.getChannelSftp();
|
||||
if (channelSftp == null) {
|
||||
throw new SftpException(ChannelSftp.SSH_FX_NO_CONNECTION, "SFTP channel is not initialized");
|
||||
}
|
||||
|
||||
try {
|
||||
// 원격 파일 경로 (암호화된 파일명 사용)
|
||||
String remoteFilePath = CommonUtil.removeLastChar(publicPath, "/") + file.getPath() + "/" +"encrypted_"+ file.getName();
|
||||
log.info("Remote file path: {}", remoteFilePath);
|
||||
|
||||
// 다운로드 경로 정규화
|
||||
String basePath = CommonUtil.normalizePath(defaultDownloadBasePath);
|
||||
log.info("Base path: {}", basePath);
|
||||
String localEncryptedFilePath = basePath + File.separator + "encrypted_" + file.getOriginName();
|
||||
String localDecryptedFilePath = basePath + File.separator + file.getOriginName();
|
||||
log.info("Local encrypted file path: {}", localEncryptedFilePath);
|
||||
log.info("Local decrypted file path: {}", localDecryptedFilePath);
|
||||
|
||||
// 로컬 디렉토리 생성
|
||||
File localDir = new File(localEncryptedFilePath).getParentFile();
|
||||
CommonUtil.createDirectories(localDir);
|
||||
|
||||
// 원격 파일 존재 여부 확인 (디버깅 용)
|
||||
try {
|
||||
channelSftp.lstat(remoteFilePath);
|
||||
log.info("Remote file exists: {}", remoteFilePath);
|
||||
} catch (SftpException e) {
|
||||
log.error("Remote file does not exist: {}", remoteFilePath, e);
|
||||
throw new SftpException(ChannelSftp.SSH_FX_NO_SUCH_FILE, "Remote file does not exist: " + remoteFilePath);
|
||||
}
|
||||
|
||||
// 암호화된 파일 다운로드
|
||||
try (FileOutputStream fos = new FileOutputStream(localEncryptedFilePath)) {
|
||||
channelSftp.get(remoteFilePath, fos);
|
||||
log.info("File downloaded to: {}", localEncryptedFilePath);
|
||||
}
|
||||
|
||||
// 파일 복호화
|
||||
try {
|
||||
byte[] encryptedContent = Files.readAllBytes(Paths.get(localEncryptedFilePath));
|
||||
byte[] decryptedContent = encryptUtil.decryptAesCbc(encryptedContent);
|
||||
Files.write(Paths.get(localDecryptedFilePath), decryptedContent);
|
||||
log.info("File decrypted and saved to: {}", localDecryptedFilePath);
|
||||
file.setLocalPath(localDecryptedFilePath);
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to decrypt file: {}", file.getOriginName(), e);
|
||||
throw new IOException("Failed to decrypt file", e);
|
||||
} finally {
|
||||
// 암호화된 임시 파일 삭제
|
||||
Files.deleteIfExists(Paths.get(localEncryptedFilePath));
|
||||
log.info("Temporary encrypted file deleted: {}", localEncryptedFilePath);
|
||||
}
|
||||
|
||||
} catch (SftpException e) {
|
||||
log.error("Failed to download file: {} (Error: {})", file.getOriginName(), e.getMessage());
|
||||
throw e;
|
||||
} catch (IOException e) {
|
||||
log.error("IO error during file download or decryption: {}", file.getOriginName(), e);
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
log.error("Unexpected error during file download: {}", file.getOriginName(), e);
|
||||
throw new RuntimeException("Unexpected error during file download", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package app.module.core.usecase.file.downloadFile.adapters;
|
||||
|
||||
import app.module.core.config.application.util.SftpFileDownloader;
|
||||
import app.module.core.usecase.file.getFile.ports.GetFilePortIn;
|
||||
import app.module.core.usecase.file.getFile.ports.application.domain.GetFile;
|
||||
import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd;
|
||||
import com.jcraft.jsch.JSchException;
|
||||
import com.jcraft.jsch.SftpException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.core.io.FileSystemResource;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
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.RestController;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class DownloadFileController {
|
||||
private final GetFilePortIn getFilePortIn;
|
||||
private final SftpFileDownloader sftpFileDownloader;
|
||||
|
||||
@GetMapping(path = "/api/file/download/{fileId}")
|
||||
ResponseEntity<?> downloadFile(@PathVariable Long fileId) throws JSchException, SftpException, IOException {
|
||||
GetFile file = getFilePortIn.operate(new GetFileCmd(fileId)).orElseThrow(() -> new IllegalArgumentException("File not found: " + fileId));
|
||||
|
||||
// SFTP에서 파일 다운로드
|
||||
sftpFileDownloader.downloadFile(file);
|
||||
|
||||
// 로컬 파일 경로
|
||||
File downloadedFile = new File(file.getLocalPath());
|
||||
if (!downloadedFile.exists()) {
|
||||
throw new IllegalStateException("Downloaded file not found: " + file.getLocalPath());
|
||||
}
|
||||
|
||||
|
||||
String encodedFileName = URLEncoder.encode(file.getOriginName(), StandardCharsets.UTF_8)
|
||||
.replace("+", "%20");
|
||||
// HTTP 헤더 설정
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + encodedFileName);
|
||||
headers.add(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate");
|
||||
headers.add(HttpHeaders.PRAGMA, "no-cache");
|
||||
headers.add(HttpHeaders.EXPIRES, "0");
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.headers(headers)
|
||||
.contentLength(downloadedFile.length())
|
||||
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||
.body(new FileSystemResource(downloadedFile));
|
||||
}
|
||||
}
|
||||
@@ -9,8 +9,6 @@ import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetFile {
|
||||
private Long id;
|
||||
private FileUploadType type;
|
||||
@@ -18,8 +16,10 @@ public class GetFile {
|
||||
private String name;
|
||||
private String originName;
|
||||
private Long fileLength;
|
||||
private String localPath;
|
||||
private LocalDateTime createdAt;
|
||||
private String createdBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package app.module.core.usecase.file.saveToStorage.ports.application.strategy;
|
||||
|
||||
import com.jcraft.jsch.ChannelSftp;
|
||||
import com.jcraft.jsch.JSch;
|
||||
import com.jcraft.jsch.JSchException;
|
||||
import com.jcraft.jsch.Session;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
public class SftpConnector {
|
||||
@Value("${file.upload.sftp.ip}")
|
||||
private String host;
|
||||
@Value("${file.upload.sftp.id}")
|
||||
private String id;
|
||||
@Value("${file.upload.sftp.password}")
|
||||
private String password;
|
||||
|
||||
@Value("${file.upload.sftp.port}")
|
||||
private int port;
|
||||
|
||||
private Session session;
|
||||
private ChannelSftp channelSftp;
|
||||
|
||||
public void connect() throws JSchException {
|
||||
|
||||
if (host == null || id == null || password == null) {
|
||||
throw new IllegalStateException("SFTP configuration is incomplete: host=" + host + ", id=" + id + ", password=" + (password != null ? "****" : null));
|
||||
}
|
||||
|
||||
try {
|
||||
JSch jsch = new JSch();
|
||||
// 세션 설정
|
||||
session = jsch.getSession(id, host, port);
|
||||
session.setPassword(password);
|
||||
// 호스트 키 검증 비활성화 (개발 환경에서만 사용, 프로덕션에서는 적절히 설정)
|
||||
session.setConfig("StrictHostKeyChecking", "no");
|
||||
// 연결
|
||||
session.connect();
|
||||
|
||||
// SFTP 채널 열기
|
||||
channelSftp = (ChannelSftp) session.openChannel("sftp");
|
||||
channelSftp.connect();
|
||||
log.info("SFTP connection established successfully");
|
||||
}catch (JSchException e){
|
||||
log.error("Failed to connect to SFTP server", e);
|
||||
}
|
||||
}
|
||||
|
||||
public void disconnect() {
|
||||
if (channelSftp != null && channelSftp.isConnected()) {
|
||||
channelSftp.disconnect();
|
||||
log.info("SFTP channel disconnected");
|
||||
}
|
||||
if (session != null && session.isConnected()) {
|
||||
session.disconnect();
|
||||
log.info("SFTP channel disconnected");
|
||||
}
|
||||
}
|
||||
public boolean isConnected() {
|
||||
return channelSftp != null && channelSftp.isConnected() && session != null && session.isConnected();
|
||||
}
|
||||
|
||||
// ChannelSftp 객체 반환
|
||||
public ChannelSftp getChannelSftp() {
|
||||
return channelSftp;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
package app.module.core.usecase.file.saveToStorage.ports.application.strategy;
|
||||
|
||||
import app.module.core.config.application.enums.FileStorageType;
|
||||
import app.module.core.config.application.util.AESEncryptUtil;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import com.jcraft.jsch.ChannelSftp;
|
||||
import com.jcraft.jsch.JSchException;
|
||||
import com.jcraft.jsch.SftpException;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import jakarta.annotation.PreDestroy;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class SftpStorageFileUploadStrategy implements FileUploadStrategy {
|
||||
@Value("${path.upload.sftp.public}")
|
||||
private String publicPath;
|
||||
|
||||
@Value("${path.upload.sftp.tmpdir}")
|
||||
private String tmpPath;
|
||||
|
||||
private final SftpConnector sftpConnector;
|
||||
private final AESEncryptUtil aesEncryptUtil; // EncryptUtil 주입
|
||||
|
||||
@PostConstruct
|
||||
public void initialize() throws Exception {
|
||||
log.info("FileIoService - initialize : path.upload.public is {}", publicPath);
|
||||
log.info("FileIoService - initialize : path.upload.tmpdir is {}", tmpPath);
|
||||
|
||||
try {
|
||||
Files.createDirectories(Paths.get(tmpPath));
|
||||
// SFTP 연결 초기화
|
||||
sftpConnector.connect();
|
||||
// 원격 디렉토리 생성
|
||||
createRemoteDirectories(publicPath);
|
||||
} catch (JSchException | SftpException e) {
|
||||
throw new IOException("Could not initialize SFTP connection or directories", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void createRemoteDirectories(String path) throws SftpException {
|
||||
ChannelSftp channelSftp = sftpConnector.getChannelSftp();
|
||||
if (channelSftp != null) {
|
||||
String[] folders = path.split("/");
|
||||
String currentPath = "";
|
||||
for (String folder : folders) {
|
||||
if (!folder.isEmpty()) {
|
||||
currentPath += "/" + folder;
|
||||
try {
|
||||
channelSftp.cd(currentPath);
|
||||
} catch (SftpException e) {
|
||||
channelSftp.mkdir(currentPath);
|
||||
channelSftp.cd(currentPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public FileStorageType getStorageType() {
|
||||
return FileStorageType.SFTP;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void operate(MultipartFile multipartFile, String createSubPath, String createFilename) throws IOException {
|
||||
if (multipartFile == null || multipartFile.isEmpty()) {
|
||||
throw new RuntimeException("Failed to store empty file.");
|
||||
}
|
||||
|
||||
// 로컬 임시 파일 저장
|
||||
Path tmpFile = Paths.get(tmpPath, createFilename);
|
||||
Files.createDirectories(tmpFile.getParent());
|
||||
try (InputStream inputStream = multipartFile.getInputStream()) {
|
||||
Files.copy(inputStream, tmpFile, StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
|
||||
// 파일 내용 암호화
|
||||
Path encryptedFile = Paths.get(tmpPath, "encrypted_" + createFilename);
|
||||
try {
|
||||
// 파일 읽기
|
||||
byte[] fileContent = Files.readAllBytes(tmpFile);
|
||||
// 암호화
|
||||
byte[] encryptedContent = aesEncryptUtil.encryptAesCbc(fileContent);
|
||||
// 암호화된 내용을 임시 파일로 저장
|
||||
Files.write(encryptedFile, encryptedContent);
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to encrypt file: {}", createFilename, e);
|
||||
throw new IOException("Failed to encrypt file", e);
|
||||
}
|
||||
|
||||
String remotePath = CommonUtil.removeLastChar(publicPath, "/") + createSubPath;
|
||||
String remoteFilePath = remotePath + "/" + "encrypted_" + createFilename;
|
||||
|
||||
try {
|
||||
// 연결 상태 확인 및 재연결
|
||||
if (!sftpConnector.isConnected()) {
|
||||
log.warn("SFTP connection lost, attempting to reconnect");
|
||||
sftpConnector.connect();
|
||||
}
|
||||
|
||||
createRemoteDirectories(remotePath);
|
||||
ChannelSftp channelSftp = sftpConnector.getChannelSftp();
|
||||
|
||||
if (channelSftp == null) {
|
||||
throw new SftpException(ChannelSftp.SSH_FX_NO_CONNECTION, "SFTP channel is not initialized");
|
||||
}
|
||||
|
||||
// 암호화된 파일 업로드
|
||||
try (InputStream encryptedInputStream = Files.newInputStream(encryptedFile)) {
|
||||
channelSftp.put(encryptedInputStream, remoteFilePath);
|
||||
channelSftp.chmod(0644, remoteFilePath); // 권한 변경 (0777 -> 0644로 보안 강화)
|
||||
log.info("Encrypted file uploaded to SFTP: {}", remoteFilePath);
|
||||
}
|
||||
} catch (SftpException | JSchException e) {
|
||||
throw new RuntimeException("Failed to upload encrypted file to SFTP", e);
|
||||
} finally {
|
||||
// 임시 파일 삭제
|
||||
Files.deleteIfExists(tmpFile);
|
||||
Files.deleteIfExists(encryptedFile);
|
||||
}
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
public void cleanup() {
|
||||
sftpConnector.disconnect();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package app.module.core.usecase.file.url.strategy;
|
||||
|
||||
import app.module.core.config.application.enums.FileStorageType;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class SftpFileUrlStrategy implements FileUrlStrategy {
|
||||
|
||||
@Override
|
||||
public FileStorageType getStorageType() {
|
||||
return FileStorageType.SFTP;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInlineURL(String subPath, String filename) {
|
||||
return String.format("/content-disposition/inline%s/%s", subPath, filename);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAttachmentURL(Long fileId) {
|
||||
return String.format("/api/file/download/%s", fileId);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,13 +2,15 @@ package app.module.front.usecase.daily.calendar.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.enums.MonthStatus;
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
|
||||
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren;
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
|
||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@@ -23,6 +25,7 @@ import java.util.Objects;
|
||||
@RequiredArgsConstructor
|
||||
public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
private final RecordCalendarMapper recordCalendarMapper;
|
||||
private final DailyRecordMapper dailyRecordMapper;
|
||||
|
||||
@Override
|
||||
public List<RecordCalendar> operate(RecordCalendarCmd command) {
|
||||
@@ -176,7 +179,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
* @return
|
||||
*/
|
||||
private List<DailyRecordStatusDto> getDailyRecordStatus(RecordCalendarCmd command) {
|
||||
List<DailyRecordStatusDto> statusList = recordCalendarMapper.getDailyRecordStatus(command);
|
||||
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(new GetDailyRecordCmd(command.getSearchMonth(), null, command.getHouseholdSeq()));
|
||||
if (statusList == null || statusList.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package app.module.front.usecase.daily.calendar.adapters.persistence;
|
||||
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
@@ -18,14 +18,6 @@ public interface RecordCalendarMapper {
|
||||
*/
|
||||
List<DailyRecordCalendarDto> getCalendarByDailyRecord(RecordCalendarCmd command);
|
||||
|
||||
/**
|
||||
* 특정일의 일계부 등록 상태 조회
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 일계부 등록 현황 목록
|
||||
*/
|
||||
List<DailyRecordStatusDto> getDailyRecordStatus(RecordCalendarCmd command);
|
||||
|
||||
/**
|
||||
* 특정월의 월별 작성 상태 조회
|
||||
*
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package app.module.front.usecase.daily.calendar.ports;
|
||||
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package app.module.front.usecase.daily.calendar.ports;
|
||||
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package app.module.front.usecase.daily.calendar.ports.application;
|
||||
|
||||
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
|
||||
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn;
|
||||
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
|
||||
@@ -9,12 +8,7 @@ import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCa
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
|
||||
@@ -2,7 +2,9 @@ package app.module.front.usecase.daily.record.adapters.persistence;
|
||||
|
||||
import app.module.front.config.application.util.AuditUtil;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO;
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
|
||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortOut;
|
||||
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||
@@ -13,7 +15,9 @@ import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
@Slf4j
|
||||
@@ -55,11 +59,12 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
||||
|
||||
log.debug("[CreateDailyRecord] record={}", command);
|
||||
} else {
|
||||
// TODO : NONE 으로 변경시 연관 테이블 데이터 삭제할 것인가?
|
||||
dailyRecordMapper.updateDailyRecord(command);
|
||||
|
||||
log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, findCmd.getSearchMonth(), findCmd.getGroupNo());
|
||||
}
|
||||
|
||||
this.updateByAllStatus(findCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -76,6 +81,22 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
||||
|
||||
dailyRecordMapper.updateDailyRecordStatus(command);
|
||||
|
||||
// TODO : target 업데이트 후 데이터 등록이 완료된 건은 allStatus 값 변경해주기
|
||||
this.updateByAllStatus(new GetDailyRecordCmd(recordMonth, dayGroupNo, command.getHouseholdSeq()));
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO : target 업데이트 후 데이터 등록이 완료된 건은 allStatus 값 변경해주기
|
||||
* @param findCmd
|
||||
*/
|
||||
private void updateByAllStatus(GetDailyRecordCmd findCmd) {
|
||||
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(findCmd);
|
||||
if (statusList != null && !statusList.isEmpty()) {
|
||||
DailyRecordStatusDto statusDetail = statusList.get(0);
|
||||
|
||||
if (DailyTargetStatus.TARGET.equals(statusDetail.getIncomeStatus()) && statusDetail.getIncomeCount() != 0) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
package app.module.front.usecase.daily.record.adapters.persistence;
|
||||
|
||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
|
||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||
import app.module.front.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface DailyRecordMapper {
|
||||
/**
|
||||
@@ -16,6 +20,14 @@ public interface DailyRecordMapper {
|
||||
*/
|
||||
DailyRecordDto getDailyRecord(GetDailyRecordCmd command);
|
||||
|
||||
/**
|
||||
* 특정일의 일계부 등록 상태 조회
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 일계부 등록 현황 목록
|
||||
*/
|
||||
List<DailyRecordStatusDto> getDailyRecordStatus(GetDailyRecordCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 항목 등록 여부
|
||||
*
|
||||
|
||||
@@ -74,7 +74,9 @@ public class DailyRecordDto {
|
||||
* @return true=수정 가능, false=수정 불가
|
||||
*/
|
||||
public boolean isModifiable() {
|
||||
LocalDate limitStart = LocalDate.now().minusDays(15);
|
||||
// TODO : 15일로 변경, 테스트를 위해 30일로 진행중
|
||||
LocalDate limitStart = LocalDate.now().minusDays(30);
|
||||
log.debug("@@limitStart: {}", limitStart);
|
||||
|
||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package app.module.front.usecase.daily.calendar.adapters.persistence.model;
|
||||
package app.module.front.usecase.daily.record.adapters.persistence.model;
|
||||
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
|
||||
@@ -31,6 +31,6 @@ public class SuggestionController {
|
||||
|
||||
suggestionPortIn.create(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(null);
|
||||
return ResponseEntity.status(HttpStatus.OK).body(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,29 @@
|
||||
and ddg.group_no = #{groupNo}
|
||||
</select>
|
||||
|
||||
<select id="getDailyRecordStatus"
|
||||
resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto">
|
||||
select dr.id as daily_id
|
||||
, 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
|
||||
, (select count(*) from daily_income di where di.daily_record_seq = dr.id and di.is_deleted = false) as income_count
|
||||
, (select count(*) from daily_work dw where dw.daily_record_seq = dr.id and dw.is_deleted = false) as work_count
|
||||
, (select count(*) from daily_expense de where de.daily_record_seq = dr.id and de.is_deleted = false) as expense_count
|
||||
, (select count(*) from daily_power dp where dp.daily_record_seq = dr.id and dp.is_deleted = false) as power_count
|
||||
, (select count(*) from daily_forestry df1 where df1.daily_record_seq = dr.id and df1.is_deleted = false) as forestry_count
|
||||
, (select count(*) from daily_farming df2 where df2.daily_record_seq = dr.id and df2.is_deleted = false) as farming_count
|
||||
from daily_record dr
|
||||
where dr.is_deleted = false
|
||||
and dr.household_seq = #{householdSeq}
|
||||
and dr.record_month = #{searchMonth}
|
||||
</select>
|
||||
|
||||
<select id="getDailyRecordExistCount" resultType="int">
|
||||
select count(1) as exist
|
||||
from daily_record dr
|
||||
|
||||
@@ -16,29 +16,6 @@
|
||||
ddg.group_no asc
|
||||
</select>
|
||||
|
||||
<select id="getDailyRecordStatus"
|
||||
resultType="app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto">
|
||||
select dr.id as daily_id
|
||||
, 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
|
||||
, (select count(*) from daily_income di where di.daily_record_seq = dr.id and di.is_deleted = false) as income_count
|
||||
, (select count(*) from daily_work dw where dw.daily_record_seq = dr.id and dw.is_deleted = false) as work_count
|
||||
, (select count(*) from daily_expense de where de.daily_record_seq = dr.id and de.is_deleted = false) as expense_count
|
||||
, (select count(*) from daily_power dp where dp.daily_record_seq = dr.id and dp.is_deleted = false) as power_count
|
||||
, (select count(*) from daily_forestry df1 where df1.daily_record_seq = dr.id and df1.is_deleted = false) as forestry_count
|
||||
, (select count(*) from daily_farming df2 where df2.daily_record_seq = dr.id and df2.is_deleted = false) as farming_count
|
||||
from daily_record dr
|
||||
where dr.is_deleted = false
|
||||
and dr.household_seq = #{householdSeq}
|
||||
and dr.record_month = #{searchMonth}
|
||||
</select>
|
||||
|
||||
<select id="getMonthlyStatus">
|
||||
select mis.forest_product_status as forest_product, mis.bank_auto_transfer_input_status as bank_input, mis.bank_auto_transfer_output_status as bank_output
|
||||
from monthly_input_status mis
|
||||
@@ -115,7 +92,7 @@
|
||||
</select>
|
||||
|
||||
<select id="getLatestDate"
|
||||
resultType="app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto">
|
||||
resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto">
|
||||
select dr.id as daily_id
|
||||
, dr.day_group_no, dr.start_date, dr.end_date
|
||||
from daily_record dr
|
||||
|
||||
@@ -12,31 +12,7 @@
|
||||
</div>
|
||||
<div class="modal-content">
|
||||
<div class="modal-content-inner">
|
||||
<ul class="allmenu-list" th:if="${topNode != null}">
|
||||
<li th:each="menu : ${topNode.children}" th:if="${menu.showOnNavi}"
|
||||
th:with="accoClass=${#strings.containsIgnoreCase(menu.uri, '/record') ? 'acco': ''}
|
||||
, infoClass=${#strings.containsIgnoreCase(menu.uri, '/info') ? 'info': ''}"
|
||||
th:class="|${accoClass}${infoClass}|"
|
||||
th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, menu.id)}? 'active'">
|
||||
<!--/* 자식 nodes 가 없는 경우 */-->
|
||||
<a th:classappend="${currentURI.id == menu.id}? 'active'"
|
||||
th:href="${menu.uri}" th:if="${#lists.size(menu.children) == 0}"
|
||||
th:text="${menu.id == 'uri.front.record.calendar'} ? '일계부' : ${#messages.msg(menu.id)}">메뉴명</a>
|
||||
<!--/* 자식 nodes 가 있는 경우 */-->
|
||||
<a th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, menu.id)}? 'active'"
|
||||
th:href="${menu.uri}"
|
||||
th:if="${#lists.size(menu.children) > 0}"
|
||||
th:text="${menu.id == 'uri.front.record.calendar'} ? '일계부' : ${#messages.msg(menu.id)}">메뉴명</a>
|
||||
<ul class="detail-menu" th:if="${#lists.size(menu.children) > 0}">
|
||||
<li th:each="child : ${menu.children}" th:if="${child.showOnNavi}"
|
||||
th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, child.id)}? 'active'"
|
||||
>
|
||||
<a class="dropdown-item"
|
||||
th:href="${child.uri}" th:text="${#messages.msg(child.id)}">메뉴명</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<section class="menu-footer">
|
||||
<button type="button" class="btn-logout" onclick="kri.menu.logout()">로그아웃</button>
|
||||
</section>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
<strong>은행 자동이체(수입) 내역 <span>[[${bankList.totalElements}]]</span>건 등록</strong> 되었습니다.
|
||||
<strong>은행 자동이체(수입) 내역 <span id="totalItems">[[${bankList.totalElements}]]</span>건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
<p>수입 내역을 등록해 주세요.</p>
|
||||
</hgroup>
|
||||
@@ -246,7 +246,7 @@
|
||||
clearAllItems.style.display = "none";
|
||||
}
|
||||
},
|
||||
openAddForm() {
|
||||
openAddForm(callback) {
|
||||
ajaxUtil._ajaxAsyncMethod(
|
||||
"/api/front/info/bank/create/input/from",
|
||||
{},
|
||||
@@ -298,6 +298,9 @@
|
||||
ENV.module.modalPopup.open();
|
||||
|
||||
document.querySelector('.modal-content').scrollTop = 0;
|
||||
|
||||
// 모두 로드된 후 콜백 실행
|
||||
if (typeof callback === 'function') callback();
|
||||
},
|
||||
function(code, rstData) {
|
||||
kri.logger.error('Do nothing. code: '+ code, rstData);
|
||||
@@ -423,11 +426,9 @@
|
||||
const product = ENV.data.bankList.find(p => p.id == id);
|
||||
if (!product) return;
|
||||
|
||||
this.openAddForm();
|
||||
|
||||
setTimeout(function(){
|
||||
|
||||
this.openAddForm(() => {
|
||||
const form = document.getElementById('popupForm');
|
||||
if (!form) return;
|
||||
|
||||
Object.entries(product).forEach(([key, val]) => {
|
||||
const field = form.elements.namedItem(key);
|
||||
@@ -446,20 +447,39 @@
|
||||
ENV.elementRefs.select.transferCategoryCodeSelect.setValue(product.transferCategoryCode);
|
||||
ENV.elementRefs.select.unitCodeSelect.setValue(product.unitCode);
|
||||
document.getElementById("unit").value = product.unit;
|
||||
|
||||
},100)
|
||||
|
||||
});
|
||||
},
|
||||
// 선택 아이템 삭제
|
||||
deleteItemById(id) {
|
||||
ENV.data.bankList = ENV.data.bankList.filter(p => p.id != id);
|
||||
const target = document.querySelector(`#listBody div[data-id='${id}']`);
|
||||
if (target) target.remove();
|
||||
this.updateLayout();
|
||||
etUI.dialog.alert({
|
||||
title: '삭제 안내',
|
||||
message: '등록하신 내용을 삭제하시겠어요?<br>삭제된 내용은 복구할 수 없습니다.',
|
||||
type: 'confirm',
|
||||
dialogType: 'confirm',
|
||||
callback: function () {
|
||||
ENV.data.bankList = ENV.data.bankList.filter(p => p.id != id);
|
||||
const target = document.querySelector(`#listBody div[data-id='${id}']`);
|
||||
if (target) target.remove();
|
||||
formControl.updateLayout();
|
||||
},
|
||||
});
|
||||
},
|
||||
// 전체 초기화
|
||||
clearAllItems() {
|
||||
location.reload();
|
||||
etUI.dialog.alert({
|
||||
title: '초기화 안내',
|
||||
message: '등록하신 모든 내용을 삭제하시겠어요?<br>삭제된 내용은 복구할 수 없습니다.',
|
||||
type: 'confirm',
|
||||
dialogType: 'confirm',
|
||||
callback: function () {
|
||||
ENV.data.bankList = [];
|
||||
document.getElementById('listBody').innerHTML = '';
|
||||
formControl.updateLayout();
|
||||
|
||||
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
|
||||
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
goSave() {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
<strong>은행 자동이체(지출) 내역 <span>[[${bankList.totalElements}]]</span>건 등록</strong> 되었습니다.
|
||||
<strong>은행 자동이체(지출) 내역 <span id="totalItems">[[${bankList.totalElements}]]</span>건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
<p>지출 내역을 등록해 주세요.</p>
|
||||
</hgroup>
|
||||
@@ -245,7 +245,7 @@
|
||||
clearAllItems.style.display = "none";
|
||||
}
|
||||
},
|
||||
openAddForm() {
|
||||
openAddForm(callback) {
|
||||
ajaxUtil._ajaxAsyncMethod(
|
||||
"/api/front/info/bank/create/output/from",
|
||||
{},
|
||||
@@ -289,6 +289,9 @@
|
||||
|
||||
ENV.module.modalPopup.open();
|
||||
document.querySelector('.modal-content').scrollTop = 0;
|
||||
|
||||
// 모두 로드된 후 콜백 실행
|
||||
if (typeof callback === 'function') callback();
|
||||
},
|
||||
function(code, rstData) {
|
||||
kri.logger.error('Do nothing. code: '+ code, rstData);
|
||||
@@ -417,20 +420,18 @@
|
||||
const product = ENV.data.bankList.find(p => p.id == id);
|
||||
if (!product) return;
|
||||
|
||||
this.openAddForm();
|
||||
|
||||
setTimeout(function(){
|
||||
|
||||
this.openAddForm(() => {
|
||||
const form = document.getElementById('popupForm');
|
||||
if (!form) return;
|
||||
|
||||
Object.entries(product).forEach(([key, val]) => {
|
||||
const field = form.elements.namedItem(key);
|
||||
if (field) {
|
||||
field.value = val;
|
||||
if(key == 'transferCategoryCode' && val == "code.bank.input.self"){
|
||||
document.getElementById(val+"_value").value = product["transferCategory"];
|
||||
if (key === 'transferCategoryCode' && val === "code.bank.input.self") {
|
||||
document.getElementById(val + "_value").value = product["transferCategory"];
|
||||
}
|
||||
if(key == 'unitCode' && val == "code.record.unit.self"){
|
||||
if (key === 'unitCode' && val === "code.record.unit.self") {
|
||||
document.getElementById("unitDiv").style.display = "";
|
||||
}
|
||||
}
|
||||
@@ -439,20 +440,40 @@
|
||||
ENV.elementRefs.select.transferCategoryCodeSelect.setValue(product.transferCategoryCode);
|
||||
ENV.elementRefs.select.unitCodeSelect.setValue(product.unitCode);
|
||||
document.getElementById("unit").value = product.unit;
|
||||
|
||||
},100)
|
||||
});
|
||||
|
||||
},
|
||||
// 선택 아이템 삭제
|
||||
deleteItemById(id) {
|
||||
ENV.data.bankList = ENV.data.bankList.filter(p => p.id != id);
|
||||
const target = document.querySelector(`#listBody div[data-id='${id}']`);
|
||||
if (target) target.remove();
|
||||
this.updateLayout();
|
||||
etUI.dialog.alert({
|
||||
title: '삭제 안내',
|
||||
message: '등록하신 내용을 삭제하시겠어요?<br>삭제된 내용은 복구할 수 없습니다.',
|
||||
type: 'confirm',
|
||||
dialogType: 'confirm',
|
||||
callback: function () {
|
||||
ENV.data.bankList = ENV.data.bankList.filter(p => p.id != id);
|
||||
const target = document.querySelector(`#listBody div[data-id='${id}']`);
|
||||
if (target) target.remove();
|
||||
formControl.updateLayout();
|
||||
},
|
||||
});
|
||||
},
|
||||
// 전체 초기화
|
||||
clearAllItems() {
|
||||
location.reload();
|
||||
etUI.dialog.alert({
|
||||
title: '초기화 안내',
|
||||
message: '등록하신 모든 내용을 삭제하시겠어요?<br>삭제된 내용은 복구할 수 없습니다.',
|
||||
type: 'confirm',
|
||||
dialogType: 'confirm',
|
||||
callback: function () {
|
||||
ENV.data.bankList = [];
|
||||
document.getElementById('listBody').innerHTML = '';
|
||||
formControl.updateLayout();
|
||||
|
||||
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
|
||||
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
goSave() {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${currentMonthlyInfo.koreanMonth}]]의 <br>
|
||||
<strong>임산물 현황 <span>[[${currentList.totalElements}]]</span>건 등록</strong> 되었습니다.
|
||||
<strong>임산물 현황 <span id="totalItems">[[${currentList.totalElements}]]</span>건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
<p>임산물 현황을 등록해 주세요.</p>
|
||||
</hgroup>
|
||||
@@ -298,7 +298,7 @@
|
||||
|
||||
},
|
||||
// 등록폼 추가
|
||||
openAddForm() {
|
||||
openAddForm(callback) {
|
||||
|
||||
ajaxUtil._ajaxAsyncMethod(
|
||||
"/api/front/info/monthly/create/from",
|
||||
@@ -341,6 +341,9 @@
|
||||
ENV.module.modalPopup.open();
|
||||
|
||||
document.querySelector('.modal-content').scrollTop = 0;
|
||||
|
||||
// 모두 로드된 후 콜백 실행
|
||||
if (typeof callback === 'function') callback();
|
||||
},
|
||||
function(code, rstData) {
|
||||
kri.logger.error('Do nothing. code: '+ code, rstData);
|
||||
@@ -461,11 +464,10 @@
|
||||
const product = ENV.data.productList.find(p => p.id == id);
|
||||
if (!product) return;
|
||||
|
||||
this.openAddForm();
|
||||
|
||||
setTimeout(function() {
|
||||
|
||||
this.openAddForm(() => {
|
||||
const form = document.getElementById('forestForm');
|
||||
if (!form) return;
|
||||
|
||||
Object.entries(product).forEach(([key, val]) => {
|
||||
const field = form.elements.namedItem(key);
|
||||
if (field) {
|
||||
@@ -485,7 +487,6 @@
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
ENV.elementRefs.select.mainYieldUnitCodeSelect.setValue(product.mainYieldUnitCode);
|
||||
ENV.elementRefs.select.mainSaleUnitCodeSelect.setValue(product.mainSaleUnitCode);
|
||||
ENV.elementRefs.select.subYieldUnitCodeSelect.setValue(product.subYieldUnitCode);
|
||||
@@ -494,23 +495,39 @@
|
||||
document.getElementById("mainSaleUnit").value = product.mainSaleUnit;
|
||||
document.getElementById("subYieldUnit").value = product.subYieldUnit;
|
||||
document.getElementById("subSaleUnit").value = product.subSaleUnit;
|
||||
|
||||
},100);
|
||||
|
||||
});
|
||||
},
|
||||
// 선택 아이템 삭제
|
||||
deleteItemById(id) {
|
||||
ENV.data.productList = ENV.data.productList.filter(p => p.id != id);
|
||||
const target = document.querySelector(`#listBody div[data-id='${id}']`);
|
||||
if (target) target.remove();
|
||||
this.updateLayout();
|
||||
etUI.dialog.alert({
|
||||
title: '삭제 안내',
|
||||
message: '등록하신 내용을 삭제하시겠어요?<br>삭제된 내용은 복구할 수 없습니다.',
|
||||
type: 'confirm',
|
||||
dialogType: 'confirm',
|
||||
callback: function () {
|
||||
ENV.data.productList = ENV.data.productList.filter(p => p.id != id);
|
||||
const target = document.querySelector(`#listBody div[data-id='${id}']`);
|
||||
if (target) target.remove();
|
||||
formControl.updateLayout();
|
||||
},
|
||||
});
|
||||
},
|
||||
// 전체 초기화
|
||||
clearAllItems() {
|
||||
location.reload();
|
||||
// ENV.data.productList = [];
|
||||
// document.getElementById('listBody').innerHTML = '';
|
||||
// this.updateListHeader();
|
||||
etUI.dialog.alert({
|
||||
title: '초기화 안내',
|
||||
message: '등록하신 모든 내용을 삭제하시겠어요?<br>삭제된 내용은 복구할 수 없습니다.',
|
||||
type: 'confirm',
|
||||
dialogType: 'confirm',
|
||||
callback: function () {
|
||||
ENV.data.productList = [];
|
||||
document.getElementById('listBody').innerHTML = '';
|
||||
formControl.updateLayout();
|
||||
|
||||
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
|
||||
document.getElementById('totalItems').textContent = ENV.data.productList.length;
|
||||
},
|
||||
});
|
||||
},
|
||||
// 아이템 겟수 처리 아이템에 따른 레이아웃 정리
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="text" id="temp_input_0001" placeholder="이름을 입력해 주세요" th:field="*{ownerName}"
|
||||
<input type="text" id="temp_input_0001" placeholder="이름을 입력해 주세요" name="ownerName" th:field="*{ownerName}"
|
||||
maxlength="10">
|
||||
</div>
|
||||
</div>
|
||||
@@ -61,23 +61,23 @@
|
||||
</div>
|
||||
<div class="select-scroll">
|
||||
<ul class="">
|
||||
<li class="option" data-value="02">02</li>
|
||||
<li class="option" data-value="31">31</li>
|
||||
<li class="option" data-value="033">033</li>
|
||||
<li class="option" data-value="042">042</li>
|
||||
<li class="option" data-value="043">043</li>
|
||||
<li class="option" data-value="051">051</li>
|
||||
<li class="option" data-value="052">052</li>
|
||||
<li class="option" data-value="053">053</li>
|
||||
<li class="option" data-value="054">054</li>
|
||||
<li class="option" data-value="055">055</li>
|
||||
<li class="option" data-value="061">061</li>
|
||||
<li class="option" data-value="062">062</li>
|
||||
<li class="option" data-value="063">063</li>
|
||||
<li class="option" data-value="064">064</li>
|
||||
<li class="option" data-value="010">010</li>
|
||||
<li class="option" data-value="011">011</li>
|
||||
<li class="option" data-value="111">111</li>
|
||||
<li class="option" data-value="02" th:classappend="${userInfo.tel1 == '02'?' current':'' }">02</li>
|
||||
<li class="option" data-value="031" th:classappend="${userInfo.tel1 == '031'?' current':'' }">31</li>
|
||||
<li class="option" data-value="033" th:classappend="${userInfo.tel1 == '033'?' current':'' }">033</li>
|
||||
<li class="option" data-value="042" th:classappend="${userInfo.tel1 == '042'?' current':'' }">042</li>
|
||||
<li class="option" data-value="043" th:classappend="${userInfo.tel1 == '043'?' current':'' }">043</li>
|
||||
<li class="option" data-value="051" th:classappend="${userInfo.tel1 == '051'?' current':'' }">051</li>
|
||||
<li class="option" data-value="052" th:classappend="${userInfo.tel1 == '052'?' current':'' }">052</li>
|
||||
<li class="option" data-value="053" th:classappend="${userInfo.tel1 == '053'?' current':'' }">053</li>
|
||||
<li class="option" data-value="054" th:classappend="${userInfo.tel1 == '054'?' current':'' }">054</li>
|
||||
<li class="option" data-value="055" th:classappend="${userInfo.tel1 == '055'?' current':'' }">055</li>
|
||||
<li class="option" data-value="061" th:classappend="${userInfo.tel1 == '061'?' current':'' }">061</li>
|
||||
<li class="option" data-value="062" th:classappend="${userInfo.tel1 == '062'?' current':'' }">062</li>
|
||||
<li class="option" data-value="063" th:classappend="${userInfo.tel1 == '063'?' current':'' }">063</li>
|
||||
<li class="option" data-value="064" th:classappend="${userInfo.tel1 == '064'?' current':'' }">064</li>
|
||||
<li class="option" data-value="010" th:classappend="${userInfo.tel1 == '010'?' current':'' }">010</li>
|
||||
<li class="option" data-value="011" th:classappend="${userInfo.tel1 == '011'?' current':'' }">011</li>
|
||||
<li class="option" data-value="111" th:classappend="${userInfo.tel1 == '111'?' current':'' }">111</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -85,13 +85,13 @@
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="text" placeholder=0000 th:field="*{tel2}" maxlength="4"
|
||||
<input type="text" th:field="*{tel2}" maxlength="4"
|
||||
oninput="this.value=this.value.replace(/[^0-9]/g,'')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="text" placeholder=0000 th:field="*{tel3}" maxlength="4"
|
||||
<input type="text" th:field="*{tel3}" maxlength="4"
|
||||
oninput="this.value=this.value.replace(/[^0-9]/g,'')"/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -100,7 +100,7 @@
|
||||
<!-- 휴대폰 번호 -->
|
||||
<div class="input-flex-group type-num">
|
||||
<div class="input-label">
|
||||
<label for="phoneId" class="label-txt">
|
||||
<label for="phone1Id" class="label-txt">
|
||||
휴대폰 번호 <i class="ico-required-mark" role="img" aria-label="필수">*</i>
|
||||
</label>
|
||||
</div>
|
||||
@@ -108,7 +108,7 @@
|
||||
<div class="select-group">
|
||||
|
||||
|
||||
<div id="phoneId" class="component-select bottom-sheet"
|
||||
<div id="phone1Id" class="component-select bottom-sheet"
|
||||
th:data-props-default="${userInfo.phone1}" data-props-type="bottomSheet">
|
||||
<input type="hidden" th:field="*{phone1}" data-type="select">
|
||||
<button type="button" class="select-box">
|
||||
@@ -123,8 +123,8 @@
|
||||
</div>
|
||||
<div class="select-scroll">
|
||||
<ul class="">
|
||||
<li class="option" data-value="010">010</li>
|
||||
<li class="option" data-value="011">011</li>
|
||||
<li class="option" data-value="010" th:classappend="${userInfo.phone1 == '010'?' current':'' }">010</li>
|
||||
<li class="option" data-value="011" th:classappend="${userInfo.phone1 == '011'?' current':'' }">011</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -132,13 +132,13 @@
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="text" id="temp_input_0006" placeholder=0000 th:field="*{phone2}"
|
||||
<input type="text" id="temp_input_0006" th:field="*{phone2}"
|
||||
maxlength="4" oninput="this.value=this.value.replace(/[^0-9]/g,'')">
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="text" id="temp_input_0007" placeholder=0000 th:field="*{phone3}"
|
||||
<input type="text" id="temp_input_0007" th:field="*{phone3}"
|
||||
maxlength="4" oninput="this.value=this.value.replace(/[^0-9]/g,'')">
|
||||
</div>
|
||||
</div>
|
||||
@@ -155,24 +155,26 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div id="regionMainCodeId" class="component-select bottom-sheet" data-props-default="시/도 선택"
|
||||
<div id="regionMainCodeId" class="component-select bottom-sheet" data-props-default="지역 선택"
|
||||
data-props-type="bottomSheet">
|
||||
<input type="hidden" th:field="*{regionMainCode}" data-type="select">
|
||||
<input type="hidden" name="regionMainCode" data-type="select" th:value="${userInfo.regionMainCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt">선택</span>
|
||||
</button>
|
||||
<div class="select-options">
|
||||
<div class="select-header">
|
||||
<p>시/도 선택</p>
|
||||
<p>지역 선택</p>
|
||||
<button type="button" class="select-close">
|
||||
<span class="hide-txt">닫기</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="select-scroll">
|
||||
|
||||
<ul class="">
|
||||
<th:block th:each="item : ${regionMainList}">
|
||||
<li class="option" th:data-value="${item.id}"
|
||||
th:text="${item.codeText}">option1
|
||||
th:text="${item.codeText}"
|
||||
th:classappend="${item.id eq userInfo.regionMainCode ? 'current' : ''}">option1
|
||||
</li>
|
||||
</th:block>
|
||||
</ul>
|
||||
@@ -185,14 +187,14 @@
|
||||
|
||||
<div class="select-group">
|
||||
<div id="regionSubCodeId" class="component-select bottom-sheet"
|
||||
data-props-default="시/군/구 선택" data-props-type="bottomSheet">
|
||||
data-props-default="세부지역 선택" data-props-type="bottomSheet">
|
||||
<input type="hidden" th:field="*{regionSubCode}" data-type="select">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt">선택</span>
|
||||
</button>
|
||||
<div class="select-options">
|
||||
<div class="select-header">
|
||||
<p>시/군/구 선택</p>
|
||||
<p>세부지역 선택</p>
|
||||
<button type="button" class="select-close">
|
||||
<span class="hide-txt">닫기</span>
|
||||
</button>
|
||||
@@ -201,7 +203,9 @@
|
||||
<ul class="">
|
||||
<th:block th:each="item : ${regionSubList}">
|
||||
<li class="option" th:data-value="${item.id}"
|
||||
th:text="${item.codeText}">option1
|
||||
th:text="${item.codeText}"
|
||||
th:classappend="${item.id eq userInfo.regionSubCode ? 'current' : ''}"
|
||||
>option1
|
||||
</li>
|
||||
</th:block>
|
||||
|
||||
@@ -286,20 +290,77 @@
|
||||
module: {
|
||||
confirmPopup: null
|
||||
},
|
||||
select:{
|
||||
select1:null,
|
||||
select2:null,
|
||||
select3:null,
|
||||
select4:null
|
||||
},
|
||||
submitted: false,
|
||||
};
|
||||
|
||||
let formControl = {
|
||||
init() {
|
||||
this._bindUI();
|
||||
ajaxUtil._alert('select 010->10으로 노출\n 최초값 지정 및 값 취득 함수 필요\n 개인정보 작성 필요\n 모달 내부 스크롤 기능 추가 필요', null);
|
||||
console.log("init")
|
||||
setTimeout(function(){
|
||||
formControl._bindUI();
|
||||
},300);
|
||||
|
||||
//ajaxUtil._alert('select 010->10으로 노출\n 최초값 지정 및 값 취득 함수 필요\n 개인정보 작성 필요\n 모달 내부 스크롤 기능 추가 필요', null);
|
||||
ENV.initialOwnerName = document.querySelector('input[name="ownerName"]').value;
|
||||
},
|
||||
_bindUI() {
|
||||
|
||||
console.log("bind")
|
||||
ENV.module.confirmPopup = document.querySelector(".confirmPopup").ui;
|
||||
|
||||
const $select1 = document.querySelector('#regionMainCodeId');
|
||||
ENV.select.select1 = new etUI.components.SelectBox();
|
||||
ENV.select.select1.core.init($select1, {
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
|
||||
document.querySelector('#regionMainCode').value = dataValue;
|
||||
}
|
||||
});
|
||||
|
||||
const $select2 = document.querySelector('#regionSubCodeId');
|
||||
ENV.select.select2 = new etUI.components.SelectBox();
|
||||
ENV.select.select2.core.init($select2, {
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
document.querySelector('#regionSubCode').value = dataValue;
|
||||
}
|
||||
});
|
||||
|
||||
const $select3 = document.querySelector('#tel1Id');
|
||||
ENV.select.select3 = new etUI.components.SelectBox();
|
||||
ENV.select.select3.core.init($select3, {
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
document.querySelector('#tel1').value = dataValue;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
const $select4 = document.querySelector('#phone1Id');
|
||||
ENV.select.select4 = new etUI.components.SelectBox();
|
||||
ENV.select.select4.core.init($select4, {
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
document.querySelector('#phone1').value = dataValue;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// selectboxInstance1.setValue($('input[name=regionMainCode]').val());
|
||||
},
|
||||
confirmPopup() {
|
||||
ENV.module.confirmPopup.open();
|
||||
const currentName = document.querySelector('input[name="ownerName"]').value;
|
||||
|
||||
// 사용자가 이름을 변경했을 경우에만 개인정보 변경 동의서 모달 띄우기
|
||||
if (currentName !== ENV.initialOwnerName) {
|
||||
ENV.module.confirmPopup.open();
|
||||
} else {
|
||||
// 이름 그대로면 바로 저장
|
||||
formControl.updateUserInfo();
|
||||
}
|
||||
},
|
||||
confirmPopupOk() {
|
||||
ENV.module.confirmPopup.close();
|
||||
@@ -311,23 +372,30 @@
|
||||
updateUserInfo() {
|
||||
|
||||
const f = document.reqForm;
|
||||
// TODO 어쩔수 없이 이렇게 하는데..... 콤포넌트값 핸들링 방법 UX에서 지정하면 수정해야함.
|
||||
const tel1Element = document.getElementById('tel1Id');
|
||||
const phone1IdElement = document.getElementById('phone1Id');
|
||||
const regionMainCodeIdElement = document.getElementById('regionMainCodeId');
|
||||
const regionSubCodeIdElement = document.getElementById('regionSubCodeId');
|
||||
if (tel1Element && tel1Element.value) {
|
||||
f.tel1.value = tel1Element.value;
|
||||
}
|
||||
if (phone1IdElement && phone1IdElement.value) {
|
||||
f.phone1.value = phone1IdElement.value;
|
||||
}
|
||||
if (regionMainCodeIdElement && regionMainCodeIdElement.value) {
|
||||
f.regionMainCode.value = regionMainCodeIdElement.value;
|
||||
}
|
||||
if (regionSubCodeIdElement && regionSubCodeIdElement.value) {
|
||||
f.regionSubCode.value = regionSubCodeIdElement.value;
|
||||
}
|
||||
// // TODO 어쩔수 없이 이렇게 하는데..... 콤포넌트값 핸들링 방법 UX에서 지정하면 수정해야함.
|
||||
// const tel1Element = document.getElementById('tel1Id');
|
||||
// const phone1IdElement = document.getElementById('phone1Id');
|
||||
// const regionMainCodeIdElement = document.getElementById('regionMainCodeId');
|
||||
// const regionSubCodeIdElement = document.getElementById('regionSubCodeId');
|
||||
// if (tel1Element && tel1Element.value) {
|
||||
// f.tel1.value = tel1Element.value;
|
||||
// }
|
||||
// if (phone1IdElement && phone1IdElement.value) {
|
||||
// f.phone1.value = phone1IdElement.value;
|
||||
// }
|
||||
// if (regionMainCodeIdElement && regionMainCodeIdElement.value) {
|
||||
// f.regionMainCode.value = regionMainCodeIdElement.value;
|
||||
// }
|
||||
// if (regionSubCodeIdElement && regionSubCodeIdElement.value) {
|
||||
// f.regionSubCode.value = regionSubCodeIdElement.value;
|
||||
// }
|
||||
|
||||
f.regionMainCode.value = ENV.select.select1.getValue();
|
||||
f.regionSubCode.value = ENV.select.select2.getValue();
|
||||
f.tel1.value = ENV.select.select3.getValue();
|
||||
f.phone1.value = ENV.select.select4.getValue();
|
||||
|
||||
|
||||
|
||||
|
||||
const obj = $(f).serializeObject();
|
||||
@@ -342,7 +410,8 @@
|
||||
* TODO
|
||||
* 내정보에서만 들어온다는 가정하에서 back을 하게함 SB에는 내정보로 이동하게 되어 있음.
|
||||
*/
|
||||
history.back()
|
||||
// history.back();
|
||||
location.href = '/info';
|
||||
});
|
||||
} else if (rstData.code === 'ERROR') {
|
||||
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
page content
|
||||
</div>
|
||||
|
||||
<section th:replace="common/components :: floating-totop"></section>
|
||||
<section th:replace="~{common/components :: floating-totop}"></section>
|
||||
|
||||
<div id="bindWrap"><!--/* 공통으로 사용하는 영역 */--></div>
|
||||
<!--/* 공통으로 사용하는 모달 팝업 */-->
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</div>
|
||||
|
||||
<section th:replace="~{common/components :: footer}"></section>
|
||||
<section th:replace="common/components :: floating-totop"></section>
|
||||
<section th:replace="~{common/components :: floating-totop}"></section>
|
||||
|
||||
<div id="bindWrap"><!--/* 공통으로 사용하는 영역 */--></div>
|
||||
<!--/* 공통으로 사용하는 모달 팝업 */-->
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</div>
|
||||
|
||||
<section th:replace="~{common/components :: footer}"></section>
|
||||
<section th:replace="common/components :: floating-totop"></section>
|
||||
<section th:replace="~{common/components :: floating-totop}"></section>
|
||||
|
||||
<div id="bindWrap"><!--/* 공통으로 사용하는 영역 */--></div>
|
||||
<!--/* 공통으로 사용하는 모달 팝업 */-->
|
||||
@@ -34,6 +34,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--/* //공통으로 사용하는 모달 팝업 */-->
|
||||
<!--/* 전체 메뉴 모달 팝업 */-->
|
||||
<th:block th:replace="~{/common/menu-modal}"></th:block>
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</form>
|
||||
|
||||
<div class="component-btns">
|
||||
<div class="btns-row">
|
||||
@@ -40,6 +39,7 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<button type="button" class="modal-close"></button>
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="acco-wrap">
|
||||
<main id="content" role="main">
|
||||
<main id="content" role="main"
|
||||
th:with="btnDisabled=${not dailyRecord.modifiable || #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
@@ -23,11 +25,8 @@
|
||||
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||
<th:block th:if="${#lists.isEmpty(expenseList)}">
|
||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||
th:disabled="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||
<i class=" ico-small" aria-hidden="true"
|
||||
th:classappend="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||
th:disabled="${btnDisabled}">
|
||||
<i class="ico-small" aria-hidden="true" th:classappend="${btnIcoClass}"></i>
|
||||
<span class="btn-txt">추가 등록</span>
|
||||
</button>
|
||||
<div class="component-input align-center">
|
||||
@@ -47,7 +46,8 @@
|
||||
<section class="regist-item-area">
|
||||
<p class="total">
|
||||
<span>총 <strong>[[${#lists.size(expenseList)}]]</strong>건</span>
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()">
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()"
|
||||
th:if="${not btnDisabled}">
|
||||
<i class="ico-reset ico-small" aria-hidden="true"></i>
|
||||
<span>초기화</span>
|
||||
</button>
|
||||
@@ -57,7 +57,8 @@
|
||||
th:each="item, itemStatus : ${expenseList}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.expenseKind}]]</p>
|
||||
<div class="btn-group">
|
||||
<div class="btn-group"
|
||||
th:if="${not btnDisabled}">
|
||||
<button type="button" class="delete" th:onclick="krip.daily.removeConfirm([[${item.id}]])"><span class="hide-txt">삭제</span></button>
|
||||
<button type="button" class="edit" th:onclick="krip.daily.createModal([[${item.id}]])"><span class="hide-txt">수정</span></button>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="acco-wrap">
|
||||
<main id="content" role="main">
|
||||
<main id="content" role="main"
|
||||
th:with="btnDisabled=${not dailyRecord.modifiable || #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
@@ -23,11 +25,8 @@
|
||||
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||
<th:block th:if="${#lists.isEmpty(farmingList)}">
|
||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||
th:disabled="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||
<i class="ico-small" aria-hidden="true"
|
||||
th:classappend="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||
th:disabled="${btnDisabled}">
|
||||
<i class="ico-small" aria-hidden="true" th:classappend="${btnIcoClass}"></i>
|
||||
<span class="btn-txt">추가 등록</span>
|
||||
</button>
|
||||
<div class="component-input align-center">
|
||||
@@ -53,7 +52,8 @@
|
||||
<section class="regist-item-area">
|
||||
<p class="total">
|
||||
<span>총 <strong>[[${#lists.size(farmingList)}]]</strong>건</span>
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()">
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()"
|
||||
th:if="${not btnDisabled}">
|
||||
<i class="ico-reset ico-small" aria-hidden="true"></i>
|
||||
<span>초기화</span>
|
||||
</button>
|
||||
@@ -63,7 +63,8 @@
|
||||
th:each="item, itemStatus : ${farmingList}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.productLabel}]]</p>
|
||||
<div class="btn-group">
|
||||
<div class="btn-group"
|
||||
th:if="${not btnDisabled}">
|
||||
<button type="button" class="delete" th:onclick="krip.daily.removeConfirm([[${item.id}]])"><span class="hide-txt">삭제</span></button>
|
||||
<button type="button" class="edit" th:onclick="krip.daily.createModal([[${item.id}]])"><span class="hide-txt">수정</span></button>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="acco-wrap">
|
||||
<main id="content" role="main">
|
||||
<main id="content" role="main"
|
||||
th:with="btnDisabled=${not dailyRecord.modifiable || #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
@@ -23,11 +25,8 @@
|
||||
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||
<th:block th:if="${#lists.isEmpty(forestryList)}">
|
||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||
th:disabled="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||
<i class="ico-small" aria-hidden="true"
|
||||
th:classappend="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||
th:disabled="${btnDisabled}">
|
||||
<i class="ico-small" aria-hidden="true" th:classappend="${btnIcoClass}"></i>
|
||||
<span class="btn-txt">추가 등록</span>
|
||||
</button>
|
||||
<div class="component-input align-center">
|
||||
@@ -53,7 +52,8 @@
|
||||
<section class="regist-item-area">
|
||||
<p class="total">
|
||||
<span>총 <strong>[[${#lists.size(forestryList)}]]</strong>건</span>
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()">
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()"
|
||||
th:if="${not btnDisabled}">
|
||||
<i class="ico-reset ico-small" aria-hidden="true"></i>
|
||||
<span>초기화</span>
|
||||
</button>
|
||||
@@ -63,7 +63,8 @@
|
||||
th:each="item, itemStatus : ${forestryList}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.productName}]]</p>
|
||||
<div class="btn-group">
|
||||
<div class="btn-group"
|
||||
th:if="${not btnDisabled}">
|
||||
<button type="button" class="delete" th:onclick="krip.daily.removeConfirm([[${item.id}]])"><span class="hide-txt">삭제</span></button>
|
||||
<button type="button" class="edit" th:onclick="krip.daily.createModal([[${item.id}]])"><span class="hide-txt">수정</span></button>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="acco-wrap">
|
||||
<main id="content" role="main">
|
||||
<main id="content" role="main"
|
||||
th:with="btnDisabled=${not dailyRecord.modifiable || #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
@@ -24,11 +26,8 @@
|
||||
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||
<th:block th:if="${#lists.isEmpty(incomeList)}">
|
||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||
th:disabled="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||
<i class=" ico-small" aria-hidden="true"
|
||||
th:classappend="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||
th:disabled="${btnDisabled}">
|
||||
<i class="ico-small" aria-hidden="true" th:classappend="${btnIcoClass}"></i>
|
||||
<span class="btn-txt">추가 등록</span>
|
||||
</button>
|
||||
<div class="component-input align-center">
|
||||
@@ -48,7 +47,8 @@
|
||||
<section class="regist-item-area">
|
||||
<p class="total">
|
||||
<span>총 <strong>[[${#lists.size(incomeList)}]]</strong>건</span>
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()">
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()"
|
||||
th:if="${not btnDisabled}">
|
||||
<i class="ico-reset ico-small" aria-hidden="true"></i>
|
||||
<span>초기화</span>
|
||||
</button>
|
||||
@@ -58,7 +58,8 @@
|
||||
th:each="item, itemStatus : ${incomeList}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.incomeKind}]]</p>
|
||||
<div class="btn-group">
|
||||
<div class="btn-group"
|
||||
th:if="${not btnDisabled}">
|
||||
<button type="button" class="delete" th:onclick="krip.daily.removeConfirm([[${item.id}]])"><span class="hide-txt">삭제</span></button>
|
||||
<button type="button" class="edit" th:onclick="krip.daily.createModal([[${item.id}]])"><span class="hide-txt">수정</span></button>
|
||||
</div>
|
||||
@@ -91,7 +92,9 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
|
||||
|
||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||
th:if="${not btnDisabled}">
|
||||
<i class="ico-add ico-small" aria-hidden="true"></i>
|
||||
<span class="btn-txt">추가 등록</span>
|
||||
</button>
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="acco-wrap">
|
||||
<main id="content" role="main">
|
||||
<main id="content" role="main"
|
||||
th:with="btnDisabled=${not dailyRecord.modifiable || #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
@@ -23,11 +25,8 @@
|
||||
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||
<th:block th:if="${#lists.isEmpty(powerList)}">
|
||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||
th:disabled="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||
<i class="ico-small" aria-hidden="true"
|
||||
th:classappend="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||
th:disabled="${btnDisabled}">
|
||||
<i class="ico-small" aria-hidden="true" th:classappend="${btnIcoClass}"></i>
|
||||
<span class="btn-txt">추가 등록</span>
|
||||
</button>
|
||||
<div class="component-input align-center">
|
||||
@@ -47,7 +46,8 @@
|
||||
<section class="regist-item-area">
|
||||
<p class="total">
|
||||
<span>총 <strong>[[${#lists.size(powerList)}]]</strong>건</span>
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()">
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()"
|
||||
th:if="${not btnDisabled}">
|
||||
<i class="ico-reset ico-small" aria-hidden="true"></i>
|
||||
<span>초기화</span>
|
||||
</button>
|
||||
@@ -57,7 +57,8 @@
|
||||
th:each="item, itemStatus : ${powerList}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.equipmentName}]]</p>
|
||||
<div class="btn-group">
|
||||
<div class="btn-group"
|
||||
th:if="${not btnDisabled}">
|
||||
<button type="button" class="delete" th:onclick="krip.daily.removeConfirm([[${item.id}]])"><span class="hide-txt">삭제</span></button>
|
||||
<button type="button" class="edit" th:onclick="krip.daily.createModal([[${item.id}]])"><span class="hide-txt">수정</span></button>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="acco-wrap">
|
||||
<main id="content" role="main">
|
||||
<main id="content" role="main"
|
||||
th:with="btnDisabled=${not dailyRecord.modifiable || #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|
||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
@@ -23,11 +25,8 @@
|
||||
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||
<th:block th:if="${#lists.isEmpty(workList)}">
|
||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||
th:disabled="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||
<i class="ico-small" aria-hidden="true"
|
||||
th:classappend="${not dailyRecord.modifiable
|
||||
|| #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||
th:disabled="${btnDisabled}">
|
||||
<i class="ico-small" aria-hidden="true" th:classappend="${btnIcoClass}"></i>
|
||||
<span class="btn-txt">추가 등록</span>
|
||||
</button>
|
||||
<div class="component-input align-center">
|
||||
@@ -55,7 +54,8 @@
|
||||
<section class="regist-item-area">
|
||||
<p class="total">
|
||||
<span>총 <strong>[[${#lists.size(workList)}]]</strong>건</span>
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()">
|
||||
<button type="button" class="btn-reset" onclick="krip.daily.resetConfirm()"
|
||||
th:if="${not btnDisabled}">
|
||||
<i class="ico-reset ico-small" aria-hidden="true"></i>
|
||||
<span>초기화</span>
|
||||
</button>
|
||||
@@ -65,7 +65,8 @@
|
||||
th:each="item, itemStatus : ${workList}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.itemName}]]</p>
|
||||
<div class="btn-group">
|
||||
<div class="btn-group"
|
||||
th:if="${not btnDisabled}">
|
||||
<button type="button" class="delete" th:onclick="krip.daily.removeConfirm([[${item.id}]])"><span class="hide-txt">삭제</span></button>
|
||||
<button type="button" class="edit" th:onclick="krip.daily.createModal([[${item.id}]])"><span class="hide-txt">수정</span></button>
|
||||
</div>
|
||||
|
||||
6
pom.xml
6
pom.xml
@@ -88,7 +88,11 @@
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-commons</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.jcraft</groupId>
|
||||
<artifactId>jsch</artifactId>
|
||||
<version>0.1.55</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
|
||||
Reference in New Issue
Block a user