From 6c78438d7cc8a7c9a276e098ce87399c1025afce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 11 Jul 2025 14:10:11 +0900 Subject: [PATCH 01/16] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=20=EC=84=9C=EB=B2=84?= =?UTF-8?q?=20=EC=A4=80=EB=B9=84=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/home.html | 8 +- .../templates/households/households.html | 124 +++++++----------- .../templates/researcher/detail.html | 6 +- 3 files changed, 57 insertions(+), 81 deletions(-) diff --git a/admin/src/main/resources/templates/home.html b/admin/src/main/resources/templates/home.html index 8855b4da..fb321878 100644 --- a/admin/src/main/resources/templates/home.html +++ b/admin/src/main/resources/templates/home.html @@ -4,7 +4,7 @@ xmlns:sec="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"> -
+

@@ -402,10 +402,12 @@ null ); } + const activeProfile = '[[${activeProfile}]]'; // 페이지 로드 시 호출 $(document).ready(function() { - getTotalPercentage(); - + if(activeProfile === 'local'){ + getTotalPercentage(); + } $('#usageType').change(function() { getTotalPercentage(); }); diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index fd5b5b5c..f0c8bab6 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -137,47 +137,46 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+
+

+ 당일 1차 방문 +

+
+ +
+
+
+

+ 당월 2차 방문 +

+
+ +
+
+
+

+ 답례품 방문 +

+
+ +
+
+
@@ -253,10 +252,9 @@ 업종(대분류) 업종(중분류) 당월 일계부 현황 - - - - + 당월 1차 임가방문 + 당월 2차 임가방문 + 답례품 전달 조사원 조사원 휴대전화 @@ -270,12 +268,12 @@
-
+
- @@ -366,6 +364,9 @@ ${ct.regionDetailName} ${ifNullHyphen(ct.industryLargeName)} ${ifNullHyphen(ct.industryMiddleName)} + ${ifNullHyphen(ct.firstVisitDate)} + ${ifNullHyphen(ct.secondVisitDate)} + ${ct.isGiftSent ? "전달" : "미전달"} ${ct.progressPercent}% ${ifNullHyphen(ct.researcherName)} ${ifNullHyphen(ct.researcherPhone)} @@ -374,37 +375,10 @@ ); }); - - // ` - // - // - //
- // - //
- // - // ${ct.householdNum} - // ${ct.householdName} - // ${ct.householdPhone} - // ${ct.regionMainName} - // ${ct.regionSubName} - // ${ct.regionDetailName} - // ${ifNullHyphen(ct.industryLargeName)} - // ${ifNullHyphen(ct.industryMiddleName)} - // ${ct.progressPercent}% - // ${ifNullHyphen(ct.firstVisitDate)} - // ${ifNullHyphen(ct.secondVisitDate)} - // ${ct.isGiftSent ? "전달" : "미전달"} - // ${ifNullHyphen(ct.researcherName)} - // ${ifNullHyphen(ct.researcherPhone)} - // - // ` // 현재 로그인한 유저의 역할 const isResearcher = f.userRole.value === 'ROLE_RESEARCHER'; - // const colspanLength = isResearcher ? 13 : 15; - const colspanLength = isResearcher ? 10 : 12; + const colspanLength = isResearcher ? 13 : 15; // 조사원일 경우 조사원이름, 번호 칼럼 hide $('.hide-role-researcher').toggle(!isResearcher); diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 61ac3b8a..b2e5eebb 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -56,7 +56,7 @@
- + - - - - @@ -74,8 +76,6 @@ - - @@ -164,7 +164,8 @@ }, // validation fail 422: function (res) { - alert("error"); + debugger + alert(res.responseJSON[0].defaultMessage); // $(res.responseJSON).each((idx, oj) => { // let target = $(f).find('[name=' + oj.field + ']'); // target.addClass('is-invalid'); diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html index 9f248ec7..59487c1a 100644 --- a/admin/src/main/resources/templates/communication/notice/{id}.html +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -220,7 +220,7 @@ }, // validation fail 422: function (res) { - alert('error'); + alert(res.responseJSON[0].defaultMessage); // $(res.responseJSON).each((idx, oj) => { // let target = $(f).find('[name=' + oj.field + ']'); // target.addClass('is-invalid'); From 3f3577ca4b8f284effaa4f1635eef5b218cd84f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 11 Jul 2025 16:34:06 +0900 Subject: [PATCH 06/16] =?UTF-8?q?[=EC=82=AD=EC=A0=9C]=20=EB=AF=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C=20-=20Front?= =?UTF-8?q?=20SocialUser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/entity/FrontUserSocial.java | 29 ---- .../web/security/domain/SocialUser.java | 43 ------ .../config/application/enums/SignUpType.java | 3 +- .../config/application/enums/SocialType.java | 15 -- .../config/application/util/CommonUtil.java | 19 +-- .../security/CustomOAuth2UserService.java | 48 ------- .../security/FrontSecurityConfig.java | 9 +- .../config/application/util/AuthUtil.java | 2 - .../ports/ParseSocialUserPortIn.java | 10 -- .../application/ParseSocialUserService.java | 45 ------ .../application/domain/KakaoUserInfo.java | 116 ---------------- .../application/domain/NaverUserInfo.java | 60 -------- .../domain/ParseSocialUserCmd.java | 19 --- .../application/domain/ParsedUserInfo.java | 18 --- .../persistence/FrontUserSocialRepo.java | 12 -- .../persistence/ProcessSocialLoginDao.java | 66 --------- .../ports/ProcessSocialLoginPortIn.java | 10 -- .../ports/ProcessSocialLoginPortOut.java | 17 --- .../ProcessSocialLoginService.java | 131 ------------------ .../domain/CreateUserSocialCmd.java | 26 ---- .../application/domain/GetUserSocial.java | 28 ---- .../application/domain/GetUserSocialCmd.java | 17 --- .../domain/ProcessSocialLogin.java | 14 -- .../domain/ProcessSocialLoginCmd.java | 19 --- 24 files changed, 8 insertions(+), 768 deletions(-) delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserSocial.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/web/security/domain/SocialUser.java delete mode 100644 core/src/main/java/app/module/core/config/application/enums/SocialType.java delete mode 100644 front/src/main/java/app/module/front/config/application/security/CustomOAuth2UserService.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/ParseSocialUserPortIn.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/ParseSocialUserService.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/KakaoUserInfo.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/NaverUserInfo.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParseSocialUserCmd.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParsedUserInfo.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/FrontUserSocialRepo.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/ProcessSocialLoginDao.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortIn.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortOut.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/ProcessSocialLoginService.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/CreateUserSocialCmd.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocial.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocialCmd.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLogin.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLoginCmd.java diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserSocial.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserSocial.java deleted file mode 100644 index 417c2159..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserSocial.java +++ /dev/null @@ -1,29 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import app.module.core.config.application.enums.SocialType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class FrontUserSocial extends AuditEntity { - - private Integer seq; - - private String userId; - - private SocialType socialType; - - private String socialId; - - private String email; - - private String name; - - private String ci; -} diff --git a/core/src/main/java/app/module/core/config/adapters/web/security/domain/SocialUser.java b/core/src/main/java/app/module/core/config/adapters/web/security/domain/SocialUser.java deleted file mode 100644 index 3fa962cf..00000000 --- a/core/src/main/java/app/module/core/config/adapters/web/security/domain/SocialUser.java +++ /dev/null @@ -1,43 +0,0 @@ -package app.module.core.config.adapters.web.security.domain; - -import java.util.Collection; -import java.util.Map; -import lombok.Getter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.oauth2.core.user.DefaultOAuth2User; - -@Getter -public class SocialUser extends DefaultOAuth2User { - - private final String username; - private final String password; - private final boolean enabled; - private final boolean accountNonExpired; - private final boolean credentialsNonExpired; - private final boolean accountNonLocked; - private final String nickname; - private final long remainPasswordDays; - - public SocialUser( - Collection authorities, - Map attributes, - String nameAttributeKey, - String username, - String password, - boolean enabled, - boolean accountNonExpired, - boolean credentialsNonExpired, - boolean accountNonLocked, - String nickname, - long remainPasswordDays) { - super(authorities, attributes, nameAttributeKey); - this.username = username; - this.password = password; - this.enabled = enabled; - this.accountNonExpired = accountNonExpired; - this.credentialsNonExpired = credentialsNonExpired; - this.accountNonLocked = accountNonLocked; - this.nickname = nickname; - this.remainPasswordDays = remainPasswordDays; - } -} diff --git a/core/src/main/java/app/module/core/config/application/enums/SignUpType.java b/core/src/main/java/app/module/core/config/application/enums/SignUpType.java index adef1f9c..aabee922 100644 --- a/core/src/main/java/app/module/core/config/application/enums/SignUpType.java +++ b/core/src/main/java/app/module/core/config/application/enums/SignUpType.java @@ -6,8 +6,7 @@ import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor public enum SignUpType { - NORMAL("일반 회원가입"), - SOCIAL("소셜 로그인 회원가입"); + NORMAL("일반 회원가입"); private final String desc; } diff --git a/core/src/main/java/app/module/core/config/application/enums/SocialType.java b/core/src/main/java/app/module/core/config/application/enums/SocialType.java deleted file mode 100644 index 0708a006..00000000 --- a/core/src/main/java/app/module/core/config/application/enums/SocialType.java +++ /dev/null @@ -1,15 +0,0 @@ -package app.module.core.config.application.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum SocialType { - KAKAO("카카오 로그인", "kakao"), - NAVER("네이버 로그인", "naver"), - APPLE("애플 로그인", "apple"); - - private final String desc; - private final String registrationId; -} diff --git a/core/src/main/java/app/module/core/config/application/util/CommonUtil.java b/core/src/main/java/app/module/core/config/application/util/CommonUtil.java index cc4f3f0e..4d29033f 100644 --- a/core/src/main/java/app/module/core/config/application/util/CommonUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/CommonUtil.java @@ -1,8 +1,13 @@ 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 lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import java.io.File; import java.io.IOException; @@ -12,15 +17,6 @@ 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; -import org.springframework.security.core.userdetails.UserDetails; -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 { @@ -88,9 +84,6 @@ public class CommonUtil { if (principal instanceof UserDetails) { username = ((UserDetails) principal).getUsername(); - } else if (principal instanceof DefaultOAuth2User) { - SocialUser socialUser = (SocialUser) principal; - username = socialUser.getUsername(); } return username; diff --git a/front/src/main/java/app/module/front/config/application/security/CustomOAuth2UserService.java b/front/src/main/java/app/module/front/config/application/security/CustomOAuth2UserService.java deleted file mode 100644 index 8e2e33db..00000000 --- a/front/src/main/java/app/module/front/config/application/security/CustomOAuth2UserService.java +++ /dev/null @@ -1,48 +0,0 @@ -package app.module.front.config.application.security; - -import app.module.core.config.application.enums.SocialType; -import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortIn; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Arrays; -import java.util.Map; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; -import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; -import org.springframework.security.oauth2.client.userinfo.OAuth2UserService; -import org.springframework.security.oauth2.core.OAuth2AuthenticationException; -import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -@Slf4j -public class CustomOAuth2UserService implements OAuth2UserService { - - private final ProcessSocialLoginPortIn processSocialLoginPortIn; - - @Override - public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException { - OAuth2UserService delegate = new DefaultOAuth2UserService(); - OAuth2User oAuth2User = delegate.loadUser(userRequest); - - String registrationId = userRequest.getClientRegistration().getRegistrationId(); - SocialType socialType = - Arrays.stream(SocialType.values()) - .filter(type -> type.getRegistrationId().equals(registrationId)) - .findFirst() - .orElseThrow(() -> new RuntimeException("Social type not found")); - String userNameAttributeName = - userRequest - .getClientRegistration() - .getProviderDetails() - .getUserInfoEndpoint() - .getUserNameAttributeName(); - - Map attributes = oAuth2User.getAttributes(); - - return processSocialLoginPortIn - .operate(new ProcessSocialLoginCmd(socialType, userNameAttributeName, attributes)) - .orElseThrow(); - } -} diff --git a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java index db82a261..28aeec36 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java @@ -31,7 +31,6 @@ public class FrontSecurityConfig { private final FrontDetailService frontDetailService; private final DataSource dataSource; private final BCryptPasswordEncoder passwordEncoder; - private final CustomOAuth2UserService customOAuth2UserService; private final CustomAuthenticationEntryPoint customAuthenticationEntryPoint; @Value("${app.front.session.maximum.num}") private Integer maxSessionNum; @@ -104,13 +103,7 @@ public class FrontSecurityConfig { session -> session.maximumSessions(maxSessionNum).maxSessionsPreventsLogin(false).expiredUrl("/login")) .sessionManagement( session -> session.invalidSessionUrl("/login")) - .oauth2Login( - config -> - config - .loginPage("/login") - .userInfoEndpoint( - userInfoEndpointConfig -> - userInfoEndpointConfig.userService(customOAuth2UserService))); + ; return http.build(); } diff --git a/front/src/main/java/app/module/front/config/application/util/AuthUtil.java b/front/src/main/java/app/module/front/config/application/util/AuthUtil.java index 59d3fc2f..d6b6b76c 100644 --- a/front/src/main/java/app/module/front/config/application/util/AuthUtil.java +++ b/front/src/main/java/app/module/front/config/application/util/AuthUtil.java @@ -1,11 +1,9 @@ package app.module.front.config.application.util; -import app.module.core.config.adapters.web.security.domain.SocialUser; import app.module.front.config.application.security.FrontHouseholdUser; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.oauth2.core.user.DefaultOAuth2User; import org.springframework.stereotype.Component; @Component diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/ParseSocialUserPortIn.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/ParseSocialUserPortIn.java deleted file mode 100644 index 437c4706..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/ParseSocialUserPortIn.java +++ /dev/null @@ -1,10 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports; - -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo; -import java.util.Optional; - -public interface ParseSocialUserPortIn { - - Optional operate(ParseSocialUserCmd cmd); -} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/ParseSocialUserService.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/ParseSocialUserService.java deleted file mode 100644 index 00ce8e3a..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/ParseSocialUserService.java +++ /dev/null @@ -1,45 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application; - -import app.module.front.usecase.user.social.parseSocialUser.ports.ParseSocialUserPortIn; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.KakaoUserInfo; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.NaverUserInfo; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -@Slf4j -class ParseSocialUserService implements ParseSocialUserPortIn { - - @Override - public Optional operate(ParseSocialUserCmd cmd) { - ParsedUserInfo parsedUserInfo = null; - - switch (cmd.getSocialType()) { - case KAKAO -> { - parsedUserInfo = new KakaoUserInfo(cmd.getUserNameAttributeName(), - cmd.getAttributes()); - } - case NAVER -> { - parsedUserInfo = new NaverUserInfo(cmd.getUserNameAttributeName(), - cmd.getAttributes()); - } - } - - if (parsedUserInfo != null) { - log.info("socialId: {}", parsedUserInfo.getSocialId()); - log.info("nickname: {}", parsedUserInfo.getNickName()); - log.info("name: {}", parsedUserInfo.getName()); - log.info("ci: {}", parsedUserInfo.getCi()); - log.info("birthday: {}", parsedUserInfo.getBirthday()); - log.info("email: {}", parsedUserInfo.getEmail()); - log.info("phone: {}", parsedUserInfo.getPhone()); - } - - return Optional.ofNullable(parsedUserInfo); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/KakaoUserInfo.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/KakaoUserInfo.java deleted file mode 100644 index 2f0d1958..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/KakaoUserInfo.java +++ /dev/null @@ -1,116 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain; - -import java.util.Map; -import java.util.Objects; - -public class KakaoUserInfo implements ParsedUserInfo { - - private final String userNameAttribute; - private final Map attributes; - - public KakaoUserInfo(String userNameAttribute, Map attributes) { - this.userNameAttribute = userNameAttribute; - this.attributes = attributes; - } - - @Override - public String getSocialId() { - return String.valueOf(attributes.get(userNameAttribute)); - } - - @Override - @SuppressWarnings("unchecked") - public String getNickName() { - Map account = (Map) attributes.get("kakao_account"); - Map profile = (Map) account.get("profile"); - - return (String) profile.get("nickname"); - } - - @Override - @SuppressWarnings("unchecked") - public String getName() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - // 카카오 로그인 서비스 인증 전에 이름 정보는 전달되지 않는다. - if (account.get("name") == null) { - return null; - } - - return (String) account.get("name"); - } - - @Override - @SuppressWarnings("unchecked") - public String getEmail() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - String email = (String) account.get("email"); - - // 카카오 로그인 서비스 인증 전에 이메일 정보는 전달되지 않는다. - return Objects.requireNonNullElse(email, "NO-KAKAO-EMAIL@noemail.com"); - } - - @Override - @SuppressWarnings("unchecked") - public String getPhone() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - // 카카오 로그인 서비스 인증 전에 phone 정보는 전달되지 않는다. - if (account.get("phone_number") == null) { - return null; - } - - // "0" + s.replaceAll("^\\+\\d{1,3}-?|-", "").trim(); - return (String) account.get("phone_number"); - } - - @Override - @SuppressWarnings("unchecked") - public String getBirthday() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - String birthyear = (String) account.get("birthyear"); - String birthday = (String) account.get("birthday"); - - // 카카오 로그인 서비스 인증 전에 생년월일 정보는 전달되지 않는다. - if (birthyear == null || birthday == null) { - return null; - } - - return birthyear + birthday; - } - - @Override - @SuppressWarnings("unchecked") - public String getCi() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - // 카카오 로그인 서비스 인증 전에 CI 정보는 전달되지 않는다. - if (account.get("ci") == null || ((String) account.get("ci")).equals("")) { - return null; - } - - return (String) account.get("ci"); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/NaverUserInfo.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/NaverUserInfo.java deleted file mode 100644 index 8ec48f80..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/NaverUserInfo.java +++ /dev/null @@ -1,60 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain; - -import java.util.Map; -import lombok.ToString; - -@ToString -public class NaverUserInfo implements ParsedUserInfo { - - private final String userNameAttribute; - private final Map attributes; - - public NaverUserInfo(String userNameAttribute, Map attributes) { - this.userNameAttribute = userNameAttribute; - this.attributes = attributes; - } - - @Override - public String getSocialId() { - return (String) getAttrs().get("id"); - } - - @Override - public String getNickName() { - return (String) getAttrs().get("nickname"); - } - - @Override - public String getName() { - return (String) getAttrs().get("name"); - } - - @Override - public String getEmail() { - return (String) getAttrs().get("email"); - } - - @Override - public String getPhone() { - String phone = (String) getAttrs().get("mobile"); - return phone != null ? phone.replaceAll("-", "") : null; - } - - @Override - public String getBirthday() { - String birthYear = (String) getAttrs().get("birthyear"); - String birthday = (String) getAttrs().get("birthday"); - return (birthYear + birthday).replaceAll("-", ""); - } - - @Override - public String getCi() { - // 네이버 로그인 서비스 인증 전에 CI 정보는 전달되지 않는다. - return (String) getAttrs().get("ci"); - } - - @SuppressWarnings("unchecked") - private Map getAttrs() { - return (Map) attributes.get(userNameAttribute); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParseSocialUserCmd.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParseSocialUserCmd.java deleted file mode 100644 index 60de9f20..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParseSocialUserCmd.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import java.util.Map; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class ParseSocialUserCmd { - - private SocialType socialType; - private String userNameAttributeName; - private Map attributes; -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParsedUserInfo.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParsedUserInfo.java deleted file mode 100644 index 21361129..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParsedUserInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain; - -public interface ParsedUserInfo { - - String getSocialId(); - - String getNickName(); - - String getName(); - - String getEmail(); - - String getPhone(); - - String getBirthday(); - - String getCi(); -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/FrontUserSocialRepo.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/FrontUserSocialRepo.java deleted file mode 100644 index e115fb7a..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/FrontUserSocialRepo.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUserSocial; -import app.module.core.config.application.enums.SocialType; -import java.util.Optional; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface FrontUserSocialRepo { - - Optional findBySocialTypeAndSocialId(SocialType socialType, String socialId); -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/ProcessSocialLoginDao.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/ProcessSocialLoginDao.java deleted file mode 100644 index c18963fa..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/ProcessSocialLoginDao.java +++ /dev/null @@ -1,66 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUserSocial; -import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortOut; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocial; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLogin; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class ProcessSocialLoginDao implements ProcessSocialLoginPortOut { - - private final FrontUserSocialRepo frontUserSocialRepo; - - @Override - public Optional operate(ProcessSocialLoginCmd cmd) { - return Optional.empty(); - } - - @Override - public Optional findUserSocial(GetUserSocialCmd cmd) { - return frontUserSocialRepo - .findBySocialTypeAndSocialId(cmd.getSocialType(), cmd.getSocialId()) - .flatMap( - frontSocialUser -> - Optional.of( - new GetUserSocial( - frontSocialUser.getSeq(), - frontSocialUser.getUserId(), - frontSocialUser.getSocialType(), - frontSocialUser.getSocialId(), - frontSocialUser.getEmail(), - frontSocialUser.getName(), - frontSocialUser.getCi()))); - } - - @Override - public Optional createUserSocial(CreateUserSocialCmd cmd) { -// FrontUserSocial createUserSocial = -// frontUserSocialRepo.save( -// new FrontUserSocial( -// null, -// cmd.getUserId(), -// cmd.getSocialType(), -// cmd.getSocialId(), -// cmd.getEmail(), -// cmd.getName(), -// cmd.getCi())); -// -// return Optional.of( -// new GetUserSocial( -// createUserSocial.getSeq(), -// createUserSocial.getUserId(), -// createUserSocial.getSocialType(), -// createUserSocial.getSocialId(), -// createUserSocial.getEmail(), -// createUserSocial.getName(), -// createUserSocial.getCi())); - return null; - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortIn.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortIn.java deleted file mode 100644 index ee7aeac5..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortIn.java +++ /dev/null @@ -1,10 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports; - -import app.module.core.config.adapters.web.security.domain.SocialUser; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Optional; - -public interface ProcessSocialLoginPortIn { - - Optional operate(ProcessSocialLoginCmd cmd); -} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortOut.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortOut.java deleted file mode 100644 index 15fc7b20..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortOut.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports; - -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocial; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLogin; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Optional; - -public interface ProcessSocialLoginPortOut { - - Optional operate(ProcessSocialLoginCmd cmd); - - Optional findUserSocial(GetUserSocialCmd cmd); - - Optional createUserSocial(CreateUserSocialCmd cmd); -} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/ProcessSocialLoginService.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/ProcessSocialLoginService.java deleted file mode 100644 index 2d05a449..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/ProcessSocialLoginService.java +++ /dev/null @@ -1,131 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application; - -import app.module.core.config.adapters.web.security.domain.CorePrivilege; -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.adapters.web.security.domain.SocialUser; -import app.module.core.config.application.enums.SignUpType; -import app.module.core.usecase.user.createUser.ports.CreateUserPortIn; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import app.module.core.usecase.user.findUser.ports.FindUserPortIn; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import app.module.front.usecase.user.social.parseSocialUser.ports.ParseSocialUserPortIn; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo; -import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortIn; -import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortOut; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Collection; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import lombok.RequiredArgsConstructor; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class ProcessSocialLoginService implements ProcessSocialLoginPortIn { - - private final ProcessSocialLoginPortOut portOut; - private final ParseSocialUserPortIn parseSocialUserPortIn; - private final FindUserPortIn findUserPortIn; - private final CreateUserPortIn createUserPortIn; - - @Override - public Optional operate(ProcessSocialLoginCmd cmd) { - - // SNS Login Provider 가 제공하는 사용자 정보 파싱 - Optional parsedUserInfo = - parseSocialUserPortIn.operate( - new ParseSocialUserCmd( - cmd.getSocialType(), cmd.getUserNameAttributeName(), cmd.getAttributes())); - - if (parsedUserInfo.isPresent()) { - ParsedUserInfo parsedUser = parsedUserInfo.get(); - - return portOut - .findUserSocial(new GetUserSocialCmd(cmd.getSocialType(), parsedUser.getSocialId())) - .flatMap( - getUserSocial -> - findUserPortIn - .operate(new FindUserCmd(getUserSocial.getUserId())) - .flatMap(findUser -> getSocialUserOpt(findUser, cmd))) - .or( - () -> { - // 신규 회원인 경우, - String uuid = UUID.randomUUID().toString(); - - return createUserPortIn - .operate( - new CreateUserCmd( - uuid, - "NO_PASSWD", - parsedUser.getEmail(), - parsedUser.getNickName(), - SignUpType.SOCIAL, - false, - 0, - false, - Set.of("ROLE_GENERAL"))) - .flatMap( - createUser -> - portOut.createUserSocial( - new CreateUserSocialCmd( - createUser.getId(), - cmd.getSocialType(), - parsedUser.getSocialId(), - createUser.getEmail(), - parsedUser.getName(), - parsedUser.getCi()))) - .flatMap( - getUserSocial -> - findUserPortIn - .operate(new FindUserCmd(getUserSocial.getUserId())) - .flatMap(findUser -> getSocialUserOpt(findUser, cmd))); - }); - } - - return Optional.empty(); - } - - private Optional getSocialUserOpt(FindUser findUser, ProcessSocialLoginCmd cmd) { - boolean accountLocked = Optional.ofNullable(findUser.getAccountLocked()).orElse(false); - boolean accountDisabled = Optional.ofNullable(findUser.getAccountDisabled()).orElse(false); - - return Optional.of( - new SocialUser( - getAuthorities(findUser.getRoles()), - cmd.getAttributes(), - cmd.getUserNameAttributeName(), - findUser.getId(), - findUser.getPassword(), - !accountDisabled, - true, - true, - !accountLocked, - findUser.getNickname(), - 0L)); - } - - private Collection getAuthorities(Collection roles) { - return Stream.concat(getRoles(roles), getPrivileges(roles)) - .map(SimpleGrantedAuthority::new) - .collect(Collectors.toList()); - } - - private Stream getRoles(Collection roles) { - return roles.stream().map(CoreRole::getId); - } - - private Stream getPrivileges(Collection roles) { - return roles.stream() - .flatMap(roleOutput -> roleOutput.getPrivileges().stream()) - .map(CorePrivilege::getId); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/CreateUserSocialCmd.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/CreateUserSocialCmd.java deleted file mode 100644 index bf508316..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/CreateUserSocialCmd.java +++ /dev/null @@ -1,26 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateUserSocialCmd { - - private String userId; - - private SocialType socialType; - - private String socialId; - - private String email; - - private String name; - - private String ci; -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocial.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocial.java deleted file mode 100644 index b3f43186..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocial.java +++ /dev/null @@ -1,28 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetUserSocial { - - private Integer seq; - - private String userId; - - private SocialType socialType; - - private String socialId; - - private String email; - - private String name; - - private String ci; -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocialCmd.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocialCmd.java deleted file mode 100644 index 37caad42..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocialCmd.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetUserSocialCmd { - - private SocialType socialType; - private String socialId; -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLogin.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLogin.java deleted file mode 100644 index 7ff7d37e..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLogin.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class ProcessSocialLogin { - -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLoginCmd.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLoginCmd.java deleted file mode 100644 index e297c7f8..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLoginCmd.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import java.util.Map; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class ProcessSocialLoginCmd { - - private SocialType socialType; - private String userNameAttributeName; - private Map attributes; -} From 8e03d434eedd570191b101d0233dcd241c45aa34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 11 Jul 2025 16:46:49 +0900 Subject: [PATCH 07/16] =?UTF-8?q?[DB]=20=EC=98=A4=ED=94=88=20=EB=8C=80?= =?UTF-8?q?=EB=B9=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/data/04_second_open.sql | 87 ++- .../main/resources/sql/schema/01_drop-all.sql | 29 +- .../resources/sql/schema/02_create-all.sql | 671 ------------------ 3 files changed, 66 insertions(+), 721 deletions(-) diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index 006ccd85..09c4bffc 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -1,5 +1,68 @@ +-- ==================================================================================================================== +-- 미사용파일 메뉴 삭제 +-- ==================================================================================================================== +delete from uri_has_role where uri_id in ( + 'uri.admin.settings.user.update', + 'uri.admin.settings.user.privilege', + 'uri.admin.settings.user.role', + 'uri.admin.settings.user.group', + 'uri.admin.settings.user', + 'uri.admin.settings.admins.group', + 'uri.admin.settings.adminPrivilege', + 'uri.admin.settings.adminRoles' +); +delete from uri where id in ( + 'uri.admin.settings.user.update', + 'uri.admin.settings.user.privilege' + 'uri.admin.settings.user.role', + 'uri.admin.settings.user', + 'uri.admin.settings.admins.group', + 'uri.admin.settings.adminPrivilege', + 'uri.admin.settings.adminRoles' +); + +-- front_user +DROP TABLE IF EXISTS front_user_has_upload_file; +DROP TABLE IF EXISTS front_user_has_role; +DROP TABLE IF EXISTS front_user_social; +DROP TABLE IF EXISTS front_user; + +DROP SEQUENCE IF EXISTS front_user_seq; +DROP SEQUENCE IF EXISTS front_user_has_upload_file_seq; +DROP SEQUENCE IF EXISTS front_user_has_role_seq; +DROP SEQUENCE IF EXISTS front_user_social_seq ; + +DROP TABLE IF EXISTS input_day_group; +DROP TABLE IF EXISTS daily_input_status; +DROP TABLE IF EXISTS income_expense_record; +DROP TABLE IF EXISTS power_equipment_usage; +DROP TABLE IF EXISTS work_input_time; +DROP TABLE IF EXISTS work_input; +DROP TABLE IF EXISTS forestry_self_consumption; +DROP TABLE IF EXISTS agriculture_self_consumption; + +DROP SEQUENCE IF EXISTS input_day_group_seq; +DROP SEQUENCE IF EXISTS daily_input_status_seq; +DROP SEQUENCE IF EXISTS income_expense_record_seq; +DROP SEQUENCE IF EXISTS power_equipment_usage_seq; +DROP SEQUENCE IF EXISTS work_input_time_seq; +DROP SEQUENCE IF EXISTS work_input_seq; +DROP SEQUENCE IF EXISTS forestry_self_consumption_seq; +DROP SEQUENCE IF EXISTS agriculture_self_consumption_seq; + + + + + + + + + +-- ==================================================================================================================== +-- 메뉴 추가/변경 +-- ==================================================================================================================== -- 입력현황 메뉴 링크 update uri set uri = '/status/daily', show_on_navi = true, order_no = 1, updated_at = now(), updated_by = 'INIT_DATA' where id = 'uri.front.status' ; -- 입력현황 상세 등록 @@ -21,30 +84,8 @@ update uri set show_on_navi = true, updated_at = now(), updated_by = 'INIT_DATA' -- ==================================================================================================================== --- 미사용파일 메뉴 삭제 +-- 문자 발송 -- ==================================================================================================================== -delete from uri_has_role where uri_id in ( - 'uri.admin.settings.user.update', - 'uri.admin.settings.user.privilege', - 'uri.admin.settings.user.role', - 'uri.admin.settings.user.group', - 'uri.admin.settings.user', - 'uri.admin.settings.admins.group', - 'uri.admin.settings.adminPrivilege', - 'uri.admin.settings.adminRoles' -); -delete from uri where id in ( - 'uri.admin.settings.user.update', - 'uri.admin.settings.user.privilege' - 'uri.admin.settings.user.role', - 'uri.admin.settings.user', - 'uri.admin.settings.admins.group', - 'uri.admin.settings.adminPrivilege', - 'uri.admin.settings.adminRoles' -); --- ==================================================================================================================== - - -- 문자 자동 발송 초기 데이터 등록 insert into sms_auto_status ( active, diff --git a/core/src/main/resources/sql/schema/01_drop-all.sql b/core/src/main/resources/sql/schema/01_drop-all.sql index dbcbad23..7beb6245 100644 --- a/core/src/main/resources/sql/schema/01_drop-all.sql +++ b/core/src/main/resources/sql/schema/01_drop-all.sql @@ -5,7 +5,7 @@ DROP TABLE IF EXISTS logged_in_user; DROP TABLE IF EXISTS persistent_logins; DROP TABLE IF EXISTS address; -DROP TABLE IF EXISTS input_day_group; + -- 게시판 연관 테이블 DROP TABLE IF EXISTS notice_has_upload_file; @@ -37,16 +37,10 @@ DROP SEQUENCE IF EXISTS daily_record_seq; -- household 연관 테이블 DROP TABLE IF EXISTS suggestion; DROP TABLE IF EXISTS upload_receipt_files; -DROP TABLE IF EXISTS agriculture_self_consumption; -DROP TABLE IF EXISTS forestry_self_consumption; DROP TABLE IF EXISTS forest_product_yield; DROP TABLE IF EXISTS forest_product; -DROP TABLE IF EXISTS power_equipment_usage; -DROP TABLE IF EXISTS work_input_time; -DROP TABLE IF EXISTS work_input; DROP TABLE IF EXISTS monthly_carryover; -DROP TABLE IF EXISTS income_expense_record; ---DROP TABLE IF EXISTS daily_input_status; + DROP TABLE IF EXISTS bank_auto_transfer; DROP TABLE IF EXISTS monthly_input_status; @@ -54,12 +48,6 @@ DROP TABLE IF EXISTS monthly_input_status; DROP TABLE IF EXISTS admin_has_role; DROP TABLE IF EXISTS admin; --- front_user -DROP TABLE IF EXISTS front_user_has_upload_file; -DROP TABLE IF EXISTS front_user_has_role; -DROP TABLE IF EXISTS front_user_social; -DROP TABLE IF EXISTS front_user; - -- household DROP TABLE IF EXISTS household_has_role; DROP TABLE IF EXISTS household; @@ -87,7 +75,6 @@ DROP TABLE IF EXISTS upload_file; DROP SEQUENCE IF EXISTS notice_seq; DROP SEQUENCE IF EXISTS suggestion_seq; DROP SEQUENCE IF EXISTS address_seq; -DROP SEQUENCE IF EXISTS input_day_group_seq; DROP SEQUENCE IF EXISTS operation_log_seq; DROP SEQUENCE IF EXISTS researcher_has_household_seq; @@ -95,17 +82,10 @@ DROP SEQUENCE IF EXISTS researcher_has_area_seq; DROP SEQUENCE IF EXISTS research_area_seq; DROP SEQUENCE IF EXISTS upload_receipt_files_seq; -DROP SEQUENCE IF EXISTS agriculture_self_consumption_seq; -DROP SEQUENCE IF EXISTS forestry_self_consumption_seq; DROP SEQUENCE IF EXISTS forest_product_yield_seq; DROP SEQUENCE IF EXISTS forest_product_seq; -DROP SEQUENCE IF EXISTS power_equipment_usage_seq; -DROP SEQUENCE IF EXISTS work_input_time_seq; -DROP SEQUENCE IF EXISTS work_input_seq; DROP SEQUENCE IF EXISTS monthly_carryover_seq; -DROP SEQUENCE IF EXISTS income_expense_record_seq; -DROP SEQUENCE IF EXISTS daily_input_status_seq; DROP SEQUENCE IF EXISTS bank_auto_transfer_seq; DROP SEQUENCE IF EXISTS monthly_input_status_seq; @@ -113,11 +93,6 @@ DROP SEQUENCE IF EXISTS monthly_input_status_seq; DROP SEQUENCE IF EXISTS admin_seq; DROP SEQUENCE IF EXISTS admin_has_role_seq; -DROP SEQUENCE IF EXISTS front_user_seq; -DROP SEQUENCE IF EXISTS front_user_has_upload_file_seq; -DROP SEQUENCE IF EXISTS front_user_has_role_seq; -DROP SEQUENCE IF EXISTS front_user_social_seq; - DROP SEQUENCE IF EXISTS household_seq; DROP SEQUENCE IF EXISTS household_has_role_seq; DROP SEQUENCE IF EXISTS household_visit_seq; diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index ba008910..d02ea993 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -461,285 +461,6 @@ COMMENT ON COLUMN uri_has_role.deleted_by IS '삭제자'; COMMENT ON COLUMN uri_has_role.is_deleted IS '삭제여부'; --- 5. front_user → front_user_has_role, front_user_has_upload_file, front_user_social --- ============================================ --- TODO : 추후 삭제 예정 --- TABLE : front_user --- DESC : 프론트 사용자 계정 테이블 --- ============================================ -CREATE TABLE front_user ( - id varchar(255) NOT NULL, -- 사용자 ID (PK) - email varchar(255) NOT NULL, -- 이메일 - password varchar(255), -- 비밀번호 - nickname varchar(255) NOT NULL, -- 닉네임 - sign_up_type varchar(255), -- 가입 유형 (NORMAL / SOCIAL) - password_updated_at timestamp(6) NOT NULL, -- 비밀번호 수정일시 - account_disabled boolean, -- 계정 비활성화 여부 - account_locked boolean, -- 계정 잠김 여부 - login_fail_cnt integer, -- 로그인 실패 횟수 - created_at timestamp(6), -- 생성일시 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일시 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일시 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제 여부 - - CONSTRAINT front_user_pkey PRIMARY KEY (id), - CONSTRAINT front_user_sign_up_type_check - CHECK (sign_up_type::text = ANY (ARRAY['NORMAL', 'SOCIAL'])) -); - -COMMENT ON TABLE front_user IS '프론트 사용자 계정 테이블'; - -COMMENT ON COLUMN front_user.id IS '사용자 ID (PK)'; -COMMENT ON COLUMN front_user.email IS '이메일'; -COMMENT ON COLUMN front_user.password IS '비밀번호'; -COMMENT ON COLUMN front_user.nickname IS '닉네임'; -COMMENT ON COLUMN front_user.sign_up_type IS '가입 유형 (NORMAL / SOCIAL)'; -COMMENT ON COLUMN front_user.password_updated_at IS '비밀번호 수정일시'; -COMMENT ON COLUMN front_user.account_disabled IS '계정 비활성화 여부'; -COMMENT ON COLUMN front_user.account_locked IS '계정 잠김 여부'; -COMMENT ON COLUMN front_user.login_fail_cnt IS '로그인 실패 횟수'; -COMMENT ON COLUMN front_user.created_at IS '생성일시'; -COMMENT ON COLUMN front_user.created_by IS '생성자'; -COMMENT ON COLUMN front_user.updated_at IS '수정일시'; -COMMENT ON COLUMN front_user.updated_by IS '수정자'; -COMMENT ON COLUMN front_user.deleted_at IS '삭제일시'; -COMMENT ON COLUMN front_user.deleted_by IS '삭제자'; -COMMENT ON COLUMN front_user.is_deleted IS '삭제여부'; - - --- ============================================ --- TODO : 추후 삭제 예정 --- TABLE : front_user_has_role --- DESC : 프론트 사용자 역할 매핑 테이블 --- ============================================ -CREATE SEQUENCE front_user_has_role_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE front_user_has_role ( - id bigint DEFAULT nextval('front_user_has_role_seq') NOT NULL, -- 매핑 ID (PK) - front_user_id varchar(255) NOT NULL, -- 프론트 사용자 ID (FK) - role_id varchar(255) NOT NULL, -- 역할 ID (FK) - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제 여부 - - CONSTRAINT front_user_has_role_pkey PRIMARY KEY (id) -); - -ALTER TABLE front_user_has_role ADD CONSTRAINT fk_front_user_has_role__front_user FOREIGN KEY (front_user_id) REFERENCES front_user(id); -ALTER TABLE front_user_has_role ADD CONSTRAINT fk_front_user_has_role__role FOREIGN KEY (role_id) REFERENCES role(id); - -COMMENT ON TABLE front_user_has_role IS '프론트 사용자 역할 매핑 테이블'; - -COMMENT ON COLUMN front_user_has_role.id IS '매핑 ID'; -COMMENT ON COLUMN front_user_has_role.front_user_id IS '프론트 사용자 ID'; -COMMENT ON COLUMN front_user_has_role.role_id IS '역할 ID'; -COMMENT ON COLUMN front_user_has_role.created_at IS '생성일'; -COMMENT ON COLUMN front_user_has_role.created_by IS '생성자'; -COMMENT ON COLUMN front_user_has_role.updated_at IS '수정일'; -COMMENT ON COLUMN front_user_has_role.updated_by IS '수정자'; -COMMENT ON COLUMN front_user_has_role.deleted_at IS '삭제일'; -COMMENT ON COLUMN front_user_has_role.deleted_by IS '삭제자'; -COMMENT ON COLUMN front_user_has_role.is_deleted IS '삭제여부'; - - --- ============================================ --- TODO : 추후 삭제 예정 --- TABLE : front_user_has_upload_file --- DESC : 프론트 사용자 파일 매핑 테이블 --- ============================================ -CREATE TABLE front_user_has_upload_file ( - upload_files_id bigint NOT NULL, -- 업로드 파일 ID (FK) - front_user_id varchar(255) NOT NULL, -- 프론트 사용자 ID (FK) - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL -- 삭제 여부 -); - -ALTER TABLE front_user_has_upload_file ADD CONSTRAINT fk_front_user_has_upload_file__front_user FOREIGN KEY (front_user_id) REFERENCES front_user(id); -ALTER TABLE front_user_has_upload_file ADD CONSTRAINT fk_front_user_has_upload_file__upload_file FOREIGN KEY (upload_files_id) REFERENCES upload_file(id); - -COMMENT ON TABLE front_user_has_upload_file IS '프론트 사용자 파일 매핑 테이블'; - -COMMENT ON COLUMN front_user_has_upload_file.upload_files_id IS '업로드 파일 ID'; -COMMENT ON COLUMN front_user_has_upload_file.front_user_id IS '프론트 사용자 ID'; -COMMENT ON COLUMN front_user_has_upload_file.created_at IS '생성일'; -COMMENT ON COLUMN front_user_has_upload_file.created_by IS '생성자'; -COMMENT ON COLUMN front_user_has_upload_file.updated_at IS '수정일'; -COMMENT ON COLUMN front_user_has_upload_file.updated_by IS '수정자'; -COMMENT ON COLUMN front_user_has_upload_file.deleted_at IS '삭제일'; -COMMENT ON COLUMN front_user_has_upload_file.deleted_by IS '삭제자'; -COMMENT ON COLUMN front_user_has_upload_file.is_deleted IS '삭제여부'; - - --- ============================================ --- TODO : 추후 삭제 예정 --- TABLE : front_user_social --- DESC : 프론트 사용자 소셜 연동 테이블 --- ============================================ -CREATE SEQUENCE front_user_social_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE front_user_social ( - seq integer DEFAULT nextval('front_user_social_seq') NOT NULL, -- 일련번호 (PK) - user_id varchar(255), -- 사용자 ID - name varchar(255), -- 사용자 이름 - email varchar(255), -- 이메일 - ci varchar(255), -- CI (연계정보) - social_id varchar(255), -- 소셜 사용자 ID - social_type varchar(255), -- 소셜 타입 (KAKAO / NAVER / APPLE) - created_at timestamp(6), -- 생성일시 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부 - - CONSTRAINT front_user_social_pkey PRIMARY KEY (seq), - CONSTRAINT front_user_social_social_type_check - CHECK (social_type::text = ANY (ARRAY['KAKAO', 'NAVER', 'APPLE'])) -); - -COMMENT ON TABLE front_user_social IS '사용자 Social 로그인 정보'; - -COMMENT ON COLUMN front_user_social.seq IS '계정 시퀀스'; -COMMENT ON COLUMN front_user_social.user_id IS '사용자 ID'; -COMMENT ON COLUMN front_user_social.name IS '소셜 네임'; -COMMENT ON COLUMN front_user_social.email IS '소셜 이메일'; -COMMENT ON COLUMN front_user_social.ci IS '소셜 CI'; -COMMENT ON COLUMN front_user_social.social_id IS '소셜 로그인 provider 별 식별 ID'; -COMMENT ON COLUMN front_user_social.social_type IS '소셜 타입'; -COMMENT ON COLUMN front_user_social.created_at IS '생성일'; -COMMENT ON COLUMN front_user_social.created_by IS '생성자 아이디'; -COMMENT ON COLUMN front_user_social.updated_at IS '수정일'; -COMMENT ON COLUMN front_user_social.updated_by IS '수정자 아이디'; -COMMENT ON COLUMN front_user_social.deleted_at IS '삭제일'; -COMMENT ON COLUMN front_user_social.deleted_by IS '삭제자 아이디'; -COMMENT ON COLUMN front_user_social.is_deleted IS '삭제여부'; - - --- 6. article → article_comment, article_has_upload_file --- ============================================ --- TABLE : article --- DESC : 예제게시판 테이블 --- ============================================ -CREATE SEQUENCE article_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE article ( - id bigint DEFAULT nextval('article_seq') NOT NULL, -- 게시글 ID (PK) - title varchar(255), -- 제목 - content text, -- 내용 - visible boolean, -- 노출 여부 - order_no integer, -- 정렬 순서 - start_date timestamp(6), -- 게시 시작일 - end_date timestamp(6), -- 게시 종료일 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제 여부 - - CONSTRAINT article_pkey PRIMARY KEY (id) -); - -COMMENT ON TABLE article IS '게시글 테이블'; - -COMMENT ON COLUMN article.id IS '게시글 ID'; -COMMENT ON COLUMN article.title IS '제목'; -COMMENT ON COLUMN article.content IS '내용'; -COMMENT ON COLUMN article.visible IS '노출 여부'; -COMMENT ON COLUMN article.order_no IS '정렬 순서'; -COMMENT ON COLUMN article.start_date IS '게시 시작일'; -COMMENT ON COLUMN article.end_date IS '게시 종료일'; -COMMENT ON COLUMN article.created_at IS '생성일시'; -COMMENT ON COLUMN article.created_by IS '생성자'; -COMMENT ON COLUMN article.updated_at IS '수정일시'; -COMMENT ON COLUMN article.updated_by IS '수정자'; -COMMENT ON COLUMN article.deleted_at IS '삭제일시'; -COMMENT ON COLUMN article.deleted_by IS '삭제자'; -COMMENT ON COLUMN article.is_deleted IS '삭제여부'; - - --- ============================================ --- TABLE : article_comment --- DESC : 예제게시판 댓글 테이블 --- ============================================ -CREATE SEQUENCE article_comment_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE article_comment ( - id bigint DEFAULT nextval('article_comment_seq') NOT NULL, -- 댓글 ID (PK) - article_id bigint NOT NULL, -- 게시글 ID (FK) - content text, -- 댓글 내용 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제 여부 - - CONSTRAINT article_comment_pkey PRIMARY KEY (id) -); - -ALTER TABLE article_comment ADD CONSTRAINT fk_article_comment__article FOREIGN KEY (article_id) REFERENCES article(id); - -COMMENT ON TABLE article_comment IS '게시글 댓글 테이블'; - -COMMENT ON COLUMN article_comment.id IS '댓글 ID'; -COMMENT ON COLUMN article_comment.article_id IS '게시글 ID'; -COMMENT ON COLUMN article_comment.content IS '댓글 내용'; -COMMENT ON COLUMN article_comment.created_at IS '생성일'; -COMMENT ON COLUMN article_comment.created_by IS '생성자'; -COMMENT ON COLUMN article_comment.updated_at IS '수정일'; -COMMENT ON COLUMN article_comment.updated_by IS '수정자'; -COMMENT ON COLUMN article_comment.deleted_at IS '삭제일'; -COMMENT ON COLUMN article_comment.deleted_by IS '삭제자'; -COMMENT ON COLUMN article_comment.is_deleted IS '삭제여부'; - - --- ============================================ --- TABLE : article_has_upload_file --- DESC : 예제게시판 파일 매핑 테이블 --- ============================================ -CREATE TABLE article_has_upload_file ( - article_id bigint NOT NULL, -- 게시글 ID (FK) - upload_files_id bigint NOT NULL, -- 업로드 파일 ID (FK) - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL -- 삭제 여부 -); - -ALTER TABLE article_has_upload_file ADD CONSTRAINT fk_article_has_upload_file__upload_file FOREIGN KEY (upload_files_id) REFERENCES upload_file(id); -ALTER TABLE article_has_upload_file ADD CONSTRAINT fk_article_has_upload_file__article FOREIGN KEY (article_id) REFERENCES article(id); - -COMMENT ON TABLE article_has_upload_file IS '게시글 파일 매핑 테이블'; - -COMMENT ON COLUMN article_has_upload_file.article_id IS '게시글 ID'; -COMMENT ON COLUMN article_has_upload_file.upload_files_id IS '업로드 파일 ID'; -COMMENT ON COLUMN article_has_upload_file.created_at IS '생성일'; -COMMENT ON COLUMN article_has_upload_file.created_by IS '생성자'; -COMMENT ON COLUMN article_has_upload_file.updated_at IS '수정일'; -COMMENT ON COLUMN article_has_upload_file.updated_by IS '수정자'; -COMMENT ON COLUMN article_has_upload_file.deleted_at IS '삭제일'; -COMMENT ON COLUMN article_has_upload_file.deleted_by IS '삭제자'; -COMMENT ON COLUMN article_has_upload_file.is_deleted IS '삭제여부'; - -- 7. uicode (독립 테이블) -- ============================================ @@ -1061,40 +782,6 @@ COMMENT ON COLUMN household_visit.is_deleted IS '삭제여부'; -- 임가 일계부 입력 관련 테이블 시작 --- 1. input_day_group --- ============================================ --- TABLE : input_day_group --- DESC : 일계부 작성일자 그룹 테이블 --- ============================================ -CREATE TABLE input_day_group ( - group_no smallint NOT NULL, -- 그룹번호 - start_day smallint, -- 시작일자 - end_day smallint, -- 종료일자 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 - - CONSTRAINT input_day_group_pkey PRIMARY KEY (group_no) -); - -COMMENT ON TABLE input_day_group IS '일계부 작성일자 그룹 테이블'; - -COMMENT ON COLUMN input_day_group.group_no IS '그룹번호'; -COMMENT ON COLUMN input_day_group.start_day IS '시작일자'; -COMMENT ON COLUMN input_day_group.end_day IS '종료일자'; -COMMENT ON COLUMN input_day_group.created_at IS '생성일'; -COMMENT ON COLUMN input_day_group.created_by IS '생성자'; -COMMENT ON COLUMN input_day_group.updated_at IS '수정일'; -COMMENT ON COLUMN input_day_group.updated_by IS '수정자'; -COMMENT ON COLUMN input_day_group.deleted_at IS '삭제일'; -COMMENT ON COLUMN input_day_group.deleted_by IS '삭제자'; -COMMENT ON COLUMN input_day_group.is_deleted IS '삭제여부'; - - -- 2. monthly_input_status -- ============================================ -- TABLE : monthly_input_status @@ -1143,60 +830,6 @@ COMMENT ON COLUMN monthly_input_status.deleted_by IS '삭제자'; COMMENT ON COLUMN monthly_input_status.is_deleted IS '삭제여부'; --- 3. daily_input_status --- ============================================ --- TABLE : daily_input_status --- DESC : 일계부 일별 작성상태 --- ============================================ -/* -CREATE SEQUENCE daily_input_status_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE daily_input_status ( - id bigint DEFAULT nextval('daily_input_status_seq') NOT NULL, -- 일계부 작성상태 ID - household_seq bigint NOT NULL, -- 임가 일련번호 (FK) - month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) - start_date date, -- 작성시작일(yyyy-mm-dd) - end_date date, -- 작성종료일(yyyy-mm-dd) - all_status varchar(15), -- 전체 입력상태 - income_status varchar(15), -- 수입 입력상태 - work_input_status varchar(15), -- 임업노동 투입내역 입력상태 - expense_status varchar(15), -- 지출 입력상태 - power_status varchar(15), -- 동력사용시간 입력상태 - forestry_status varchar(15), -- 자가임업 생산물 중 자가소비량 입력상태 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 - - CONSTRAINT daily_input_status_pkey PRIMARY KEY (id), - CONSTRAINT fk_daily_input_status__household FOREIGN KEY (household_seq) REFERENCES household(seq) -); - -COMMENT ON TABLE daily_input_status IS '일계부 일별 작성상태'; - -COMMENT ON COLUMN daily_input_status.id IS '일계부 작성상태 ID'; -COMMENT ON COLUMN daily_input_status.household_seq IS '임가 일련번호'; -COMMENT ON COLUMN daily_input_status.month IS '조사시행 월 (yyyy-mm)'; -COMMENT ON COLUMN daily_input_status.start_date IS '작성시작일(yyyy-mm-dd)'; -COMMENT ON COLUMN daily_input_status.end_date IS '작성종료일(yyyy-mm-dd)'; -COMMENT ON COLUMN daily_input_status.all_status IS '전체 입력상태'; -COMMENT ON COLUMN daily_input_status.income_status IS '수입 입력상태'; -COMMENT ON COLUMN daily_input_status.work_input_status IS '임업노동 투입내역 입력상태'; -COMMENT ON COLUMN daily_input_status.expense_status IS '지출 입력상태'; -COMMENT ON COLUMN daily_input_status.power_status IS '동력사용시간 입력상태'; -COMMENT ON COLUMN daily_input_status.forestry_status IS '자가임업 생산물 중 자가소비량 입력상태'; -COMMENT ON COLUMN daily_input_status.created_at IS '생성일'; -COMMENT ON COLUMN daily_input_status.created_by IS '생성자'; -COMMENT ON COLUMN daily_input_status.updated_at IS '수정일'; -COMMENT ON COLUMN daily_input_status.updated_by IS '수정자'; -COMMENT ON COLUMN daily_input_status.deleted_at IS '삭제일'; -COMMENT ON COLUMN daily_input_status.deleted_by IS '삭제자'; -COMMENT ON COLUMN daily_input_status.is_deleted IS '삭제여부'; -*/ - -- 4. forest_product → forest_product_yield -- ============================================ @@ -1424,310 +1057,6 @@ COMMENT ON COLUMN monthly_carryover.deleted_by IS '삭제자'; COMMENT ON COLUMN monthly_carryover.is_deleted IS '삭제여부'; --- 7. income_expense_record --- ============================================ --- TABLE : income_expense_record --- DESC : 수입/지출 테이블 --- ============================================ -CREATE SEQUENCE income_expense_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE income_expense_record ( - id bigint DEFAULT nextval('income_expense_record_seq') NOT NULL, -- 수입/지출 ID - household_seq bigint NOT NULL, -- 임가정보 일련번호 (FK) - record_type varchar(7) NOT NULL, -- 수입/지출 유형 (enum) - record_code varchar(255), -- 수입/지출 코드 (매핑코드) - crop_code varchar(255), -- 재배형태 코드 (매핑코드) - record_category varchar(30) NOT NULL, -- 수입/지출 종류 - source_purpose varchar(10), -- 수입원(용도) - quantity decimal(6,2) NOT NULL, -- 수량 - unit_code varchar(10) NOT NULL, -- 단위 (매핑코드) - price integer NOT NULL, -- 현금(원) - estimated_value integer NOT NULL, -- 현물(평가액) - month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) - day_group_no smallint, -- 일계부 작성일자 그룹 번호 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 - - CONSTRAINT income_expense_record_pkey PRIMARY KEY (id), - CONSTRAINT fk_income_expense_record__household FOREIGN KEY (household_seq) REFERENCES household(seq) - -- CONSTRAINT chk_income_expense_record__type CHECK (record_type IN ('INCOME', 'EXPENSE')) -- 필요 시 사용 -); - -COMMENT ON TABLE income_expense_record IS '수입/지출'; - -COMMENT ON COLUMN income_expense_record.id IS '수입/지출 ID'; -COMMENT ON COLUMN income_expense_record.household_seq IS '임가정보 일련번호'; -COMMENT ON COLUMN income_expense_record.record_type IS '수입/지출 유형 (enum)'; -COMMENT ON COLUMN income_expense_record.record_code IS '수입/지출 코드 (매핑코드)'; -COMMENT ON COLUMN income_expense_record.crop_code IS '재배형태 코드 (매핑코드)'; -COMMENT ON COLUMN income_expense_record.record_category IS '수입/지출 종류'; -COMMENT ON COLUMN income_expense_record.source_purpose IS '수입원(용도)'; -COMMENT ON COLUMN income_expense_record.quantity IS '수량'; -COMMENT ON COLUMN income_expense_record.unit_code IS '단위 (매핑코드)'; -COMMENT ON COLUMN income_expense_record.price IS '현금(원)'; -COMMENT ON COLUMN income_expense_record.estimated_value IS '현물(평가액)'; -COMMENT ON COLUMN income_expense_record.month IS '조사시행 월 (yyyy-mm)'; -COMMENT ON COLUMN income_expense_record.day_group_no IS '일계부 작성일자 그룹 번호'; -COMMENT ON COLUMN income_expense_record.created_at IS '생성일'; -COMMENT ON COLUMN income_expense_record.created_by IS '생성자'; -COMMENT ON COLUMN income_expense_record.updated_at IS '수정일'; -COMMENT ON COLUMN income_expense_record.updated_by IS '수정자'; -COMMENT ON COLUMN income_expense_record.deleted_at IS '삭제일'; -COMMENT ON COLUMN income_expense_record.deleted_by IS '삭제자'; -COMMENT ON COLUMN income_expense_record.is_deleted IS '삭제여부'; - - --- 8. power_equipment_usage --- ============================================ --- TABLE : power_equipment_usage --- DESC : 동력 사용 시간 --- ============================================ -CREATE SEQUENCE power_equipment_usage_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE power_equipment_usage ( - id bigint DEFAULT nextval('power_equipment_usage_seq') NOT NULL, -- 동력사용시간 ID - household_seq bigint NOT NULL, -- 임가 일련번호 (FK) - equipment_name varchar(15), -- 명칭 - equipment_code varchar(255), -- 명칭 부호 (매핑코드) - owned_hours decimal(5,2), -- 자가 시간 - leased_hours decimal(5,2), -- 임차 시간 - month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) - day_group_no smallint, -- 일계부 작성일자 그룹 번호 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 - - CONSTRAINT power_equipment_usage_pkey PRIMARY KEY (id), - CONSTRAINT fk_power_equipment_usage__household FOREIGN KEY (household_seq) REFERENCES household(seq) -); - -COMMENT ON TABLE power_equipment_usage IS '동력 사용 시간'; - -COMMENT ON COLUMN power_equipment_usage.id IS '동력사용시간 ID'; -COMMENT ON COLUMN power_equipment_usage.household_seq IS '임가 일련번호'; -COMMENT ON COLUMN power_equipment_usage.equipment_name IS '명칭'; -COMMENT ON COLUMN power_equipment_usage.equipment_code IS '명칭 부호 (매핑코드)'; -COMMENT ON COLUMN power_equipment_usage.owned_hours IS '자가 시간'; -COMMENT ON COLUMN power_equipment_usage.leased_hours IS '임차 시간'; -COMMENT ON COLUMN power_equipment_usage.month IS '조사시행 월 (yyyy-mm)'; -COMMENT ON COLUMN power_equipment_usage.day_group_no IS '일계부 작성일자 그룹 번호'; -COMMENT ON COLUMN power_equipment_usage.created_at IS '생성일'; -COMMENT ON COLUMN power_equipment_usage.created_by IS '생성자'; -COMMENT ON COLUMN power_equipment_usage.updated_at IS '수정일'; -COMMENT ON COLUMN power_equipment_usage.updated_by IS '수정자'; -COMMENT ON COLUMN power_equipment_usage.deleted_at IS '삭제일'; -COMMENT ON COLUMN power_equipment_usage.deleted_by IS '삭제자'; -COMMENT ON COLUMN power_equipment_usage.is_deleted IS '삭제여부'; - - --- 9. work_input → work_input_time --- ============================================ --- TABLE : work_input --- DESC : 임업노동 투입내역 --- ============================================ -CREATE SEQUENCE work_input_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE work_input ( - id bigint DEFAULT nextval('work_input_seq') NOT NULL, - household_seq bigint NOT NULL, - item_name varchar(15) NOT NULL, - item_code varchar(255), - work_name varchar(30) NOT NULL, - work_code varchar(255), - work_land_area int, - harvest_quantity decimal(7,2), - unit_code varchar(10), - month varchar(7) NOT NULL, - day_group_no smallint, - created_at timestamp(6), - created_by varchar(255), - updated_at timestamp(6), - updated_by varchar(255), - deleted_at timestamp(6), - deleted_by varchar(255), - is_deleted boolean NOT NULL DEFAULT false, - - CONSTRAINT work_input_pkey PRIMARY KEY (id), - CONSTRAINT fk_work_input__household FOREIGN KEY (household_seq) REFERENCES household(seq) -); - -COMMENT ON TABLE work_input IS '임업노동 투입내역'; -COMMENT ON COLUMN work_input.id IS '투입내역 내부키'; -COMMENT ON COLUMN work_input.household_seq IS '임가정보내부키'; -COMMENT ON COLUMN work_input.item_name IS '품목명'; -COMMENT ON COLUMN work_input.item_code IS '품목부호 (매핑코드)'; -COMMENT ON COLUMN work_input.work_name IS '작업명'; -COMMENT ON COLUMN work_input.work_code IS '작업부호 (매핑코드)'; -COMMENT ON COLUMN work_input.work_land_area IS '작업면적'; -COMMENT ON COLUMN work_input.harvest_quantity IS '수확량'; -COMMENT ON COLUMN work_input.unit_code IS '단위 (코드매핑)'; -COMMENT ON COLUMN work_input.month IS '조사시행 월 (yyyy-mm)'; -COMMENT ON COLUMN work_input.day_group_no IS '일계부 작성일자 그룹 번호'; -COMMENT ON COLUMN work_input.created_at IS '생성일'; -COMMENT ON COLUMN work_input.created_by IS '생성자'; -COMMENT ON COLUMN work_input.updated_at IS '수정일'; -COMMENT ON COLUMN work_input.updated_by IS '수정자'; -COMMENT ON COLUMN work_input.deleted_at IS '삭제일'; -COMMENT ON COLUMN work_input.deleted_by IS '삭제자'; -COMMENT ON COLUMN work_input.is_deleted IS '삭제여부'; - - --- ============================================ --- TABLE : work_input_time --- DESC : 임업노동 노동투입시간 --- ============================================ -CREATE SEQUENCE work_input_time_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE work_input_time ( - id bigint DEFAULT nextval('work_input_time_seq') NOT NULL, - work_input_id bigint NOT NULL, - labor_type varchar(10), - gender_code smallint, - hours decimal(5,2), - created_at timestamp(6), - created_by varchar(255), - updated_at timestamp(6), - updated_by varchar(255), - deleted_at timestamp(6), - deleted_by varchar(255), - is_deleted boolean NOT NULL DEFAULT false, - - CONSTRAINT work_input_time_pkey PRIMARY KEY (id), - CONSTRAINT fk_work_input_time__work_input FOREIGN KEY (work_input_id) REFERENCES work_input(id) -); - -COMMENT ON TABLE work_input_time IS '임업노동 노동투입시간'; -COMMENT ON COLUMN work_input_time.id IS '노동투입시간 내부키'; -COMMENT ON COLUMN work_input_time.work_input_id IS '투입내역 내부키'; -COMMENT ON COLUMN work_input_time.labor_type IS '노동유형(OWNER, SPOUSE, FAMILY, HIRED, SHARED, VOLUNTEER)'; -COMMENT ON COLUMN work_input_time.gender_code IS '성별 코드 (매핑코드)'; -COMMENT ON COLUMN work_input_time.hours IS '투입 시간'; -COMMENT ON COLUMN work_input_time.created_at IS '생성일'; -COMMENT ON COLUMN work_input_time.created_by IS '생성자'; -COMMENT ON COLUMN work_input_time.updated_at IS '수정일'; -COMMENT ON COLUMN work_input_time.updated_by IS '수정자'; -COMMENT ON COLUMN work_input_time.deleted_at IS '삭제일'; -COMMENT ON COLUMN work_input_time.deleted_by IS '삭제자'; -COMMENT ON COLUMN work_input_time.is_deleted IS '삭제여부'; - - --- 10. forestry_self_consumption --- ============================================ --- TABLE : forestry_self_consumption --- DESC : 자가임업 생산물 중 자가소비량 --- ============================================ -CREATE SEQUENCE forestry_self_consumption_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE forestry_self_consumption ( - id bigint DEFAULT nextval('forestry_self_consumption_seq') NOT NULL, -- 임업 자가소비량 일련번호 - household_seq bigint NOT NULL, -- 임가 일련번호 - income_code varchar(255), -- 수입 코드 (매핑코드) - expense_code varchar(255), -- 지출 코드 (매핑코드) - product_name varchar(15), -- 생산물 - usage varchar(20), -- 용도 - quantity decimal(6,2), -- 수량 - unit_code varchar(10), -- 단위 (매핑코드) - estimated_value integer, -- 현물평가 - month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) - day_group_no smallint, -- 일계부 작성일자 그룹 번호 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부 - - CONSTRAINT forestry_self_consumption_pkey PRIMARY KEY (id), - CONSTRAINT fk_forestry_self_consumption__household FOREIGN KEY (household_seq) REFERENCES household(seq) -); - -COMMENT ON TABLE forestry_self_consumption IS '자가임업 생산물 중 자가소비량'; - -COMMENT ON COLUMN forestry_self_consumption.id IS '임가 일련번호'; -COMMENT ON COLUMN forestry_self_consumption.household_seq IS '임가정보내부키'; -COMMENT ON COLUMN forestry_self_consumption.income_code IS '수입 코드(매핑코드)'; -COMMENT ON COLUMN forestry_self_consumption.expense_code IS '지출 코드(매핑코드)'; -COMMENT ON COLUMN forestry_self_consumption.product_name IS '생산물'; -COMMENT ON COLUMN forestry_self_consumption.usage IS '용도'; -COMMENT ON COLUMN forestry_self_consumption.quantity IS '수량'; -COMMENT ON COLUMN forestry_self_consumption.unit_code IS '단위(매핑코드)'; -COMMENT ON COLUMN forestry_self_consumption.estimated_value IS '현물평가'; -COMMENT ON COLUMN forestry_self_consumption.month IS '조사시행 월(yyyy-mm)'; -COMMENT ON COLUMN forestry_self_consumption.day_group_no IS '일계부 작성일자 그룹 번호'; -COMMENT ON COLUMN forestry_self_consumption.created_at IS '생성일'; -COMMENT ON COLUMN forestry_self_consumption.created_by IS '생성자'; -COMMENT ON COLUMN forestry_self_consumption.updated_at IS '수정일'; -COMMENT ON COLUMN forestry_self_consumption.updated_by IS '수정자'; -COMMENT ON COLUMN forestry_self_consumption.deleted_at IS '삭제일'; -COMMENT ON COLUMN forestry_self_consumption.deleted_by IS '삭제자'; -COMMENT ON COLUMN forestry_self_consumption.is_deleted IS '삭제여부'; - - --- 11. agriculture_self_consumption --- ============================================ --- TABLE : agriculture_self_consumption --- DESC : 자가농업 생산물 중 자가소비량 --- ============================================ -CREATE SEQUENCE agriculture_self_consumption_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; - -CREATE TABLE agriculture_self_consumption ( - id bigint DEFAULT nextval('agriculture_self_consumption_seq') NOT NULL, -- 농업 자가소비량 내부키 - household_seq bigint NOT NULL, -- 임가정보내부키 - income_code varchar(255), -- 수입 코드 (매핑코드) - expense_code varchar(255), -- 지출 코드 (매핑코드) - product_name varchar(15), -- 생산물 - product_detail varchar(20), -- 생산물 상세 - usage varchar(20), -- 용도 - quantity decimal(6,2), -- 수량 - unit_code varchar(10), -- 단위 (매핑코드) - estimated_value integer, -- 현물평가액 - month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) - week smallint, -- 입력차수(1,2,3,4) - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부 - - CONSTRAINT agriculture_self_consumption_pkey PRIMARY KEY (id), - CONSTRAINT fk_agriculture_self_consumption__household FOREIGN KEY (household_seq) REFERENCES household(seq) -); - -COMMENT ON TABLE agriculture_self_consumption IS '자가농업 생산물 중 자가소비량'; - -COMMENT ON COLUMN agriculture_self_consumption.id IS '농업 자가소비량 내부키'; -COMMENT ON COLUMN agriculture_self_consumption.household_seq IS '임가정보내부키'; -COMMENT ON COLUMN agriculture_self_consumption.income_code IS '수입 코드(매핑코드)'; -COMMENT ON COLUMN agriculture_self_consumption.expense_code IS '지출 코드(매핑코드)'; -COMMENT ON COLUMN agriculture_self_consumption.product_name IS '생산물'; -COMMENT ON COLUMN agriculture_self_consumption.product_detail IS '생산물 상세'; -COMMENT ON COLUMN agriculture_self_consumption.usage IS '용도'; -COMMENT ON COLUMN agriculture_self_consumption.quantity IS '수량'; -COMMENT ON COLUMN agriculture_self_consumption.unit_code IS '단위(매핑코드)'; -COMMENT ON COLUMN agriculture_self_consumption.estimated_value IS '현물평가'; -COMMENT ON COLUMN agriculture_self_consumption.month IS '조사시행 월(yyyy-mm)'; -COMMENT ON COLUMN agriculture_self_consumption.week IS '입력차수(1,2,3,4)'; -COMMENT ON COLUMN agriculture_self_consumption.created_at IS '생성일'; -COMMENT ON COLUMN agriculture_self_consumption.created_by IS '생성자'; -COMMENT ON COLUMN agriculture_self_consumption.updated_at IS '수정일'; -COMMENT ON COLUMN agriculture_self_consumption.updated_by IS '수정자'; -COMMENT ON COLUMN agriculture_self_consumption.deleted_at IS '삭제일'; -COMMENT ON COLUMN agriculture_self_consumption.deleted_by IS '삭제자'; -COMMENT ON COLUMN agriculture_self_consumption.is_deleted IS '삭제여부'; - - -- 12. upload_receipt_files -- ============================================ -- TABLE : upload_receipt_files From 5b50fe92a802a4ee3aa6c6cb24fab2af1766b4ef Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 11 Jul 2025 16:39:52 +0900 Subject: [PATCH 08/16] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/batch/BatchLogRunner.java | 35 +++++++++ .../adapters/persistence/BatchLogDao.java | 31 ++++++++ .../adapters/persistence/BatchLogMapper.java | 11 +++ .../batchLog/ports/BatchLogPortIn.java | 9 +++ .../batchLog/ports/BatchLogPortOut.java | 9 +++ .../ports/application/BatchLogService.java | 28 +++++++ .../ports/application/domain/BatchLog.java | 21 +++++ .../ports/application/domain/BatchLogCmd.java | 18 +++++ .../application/domain/BatchLogType.java | 12 +++ .../persistence/AutoSchedulesDao.java | 26 +------ .../persistence/AutoSchedulesMapper.java | 4 +- .../adapters/web/AutoSchedulesController.java | 23 ++---- .../ports/AutoSchedulesPortIn.java | 1 - .../ports/AutoSchedulesPortOut.java | 2 - .../application/AutoSchedulesService.java | 76 +++++++------------ .../domain/CreateSmsAutoSendCmd.java | 18 ----- .../mms/adapters/persistence/MMSDao.java | 7 +- .../mappers/batchLog/BatchLogMapper.xml | 34 +++++++++ .../mappers/schedule/AutoSchedulesMapper.xml | 33 +------- 19 files changed, 255 insertions(+), 143 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java create mode 100644 admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml diff --git a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java new file mode 100644 index 00000000..7b5ffb8f --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -0,0 +1,35 @@ +package app.module.admin.config.application.batch; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +@Slf4j +public class BatchLogRunner { + private final BatchLogPortIn batchLogPortIn; + + public void run(BatchLogType batchType, Runnable action) { + // 이미 실행 중인지 확인 + if (batchLogPortIn.exists(batchType)) { + log.warn("[{}] 배치가 이미 실행 중 입니다.", batchType.name()); + return; + } + + // 실행 로그 insert (RUNNING) + Long logId = batchLogPortIn.create(batchType); + + try { + action.run(); + // 성공 처리 + batchLogPortIn.update(logId, "SUCCESS", null); + } catch (Exception e) { + // 실패 처리 + batchLogPortIn.update(logId, "FAIL", e.getMessage()); + log.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java new file mode 100644 index 00000000..0388b1f6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.batchLog.adapters.persistence; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortOut; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class BatchLogDao implements BatchLogPortOut { + private final BatchLogMapper mapper; + + @Override + public boolean exists(BatchLogType type) { + return mapper.exists(type.name()); + } + + @Override + public Long create(BatchLogType type) { + BatchLogCmd cmd = new BatchLogCmd(null, type.name(), "RUNNING", LocalDateTime.now()); + mapper.create(cmd); + return cmd.getId(); + } + + @Override + public void update(Long id, String status, String errorMessage) { + mapper.update(id, status, errorMessage); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java new file mode 100644 index 00000000..cf204385 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.batchLog.adapters.persistence; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BatchLogMapper { + boolean exists(String type); + Long create(BatchLogCmd cmd); + void update(Long id, String status, String errorMessage); +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java new file mode 100644 index 00000000..1c2d1947 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.batchLog.ports; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; + +public interface BatchLogPortIn { + boolean exists(BatchLogType type); + Long create(BatchLogType type); + void update(Long id, String status, String errorMessage); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java new file mode 100644 index 00000000..916ff343 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.batchLog.ports; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; + +public interface BatchLogPortOut { + boolean exists(BatchLogType type); + Long create(BatchLogType type); + void update(Long id, String status, String errorMessage); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java new file mode 100644 index 00000000..426060aa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.batchLog.ports.application; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; +import app.module.admin.usecase.batchLog.ports.BatchLogPortOut; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class BatchLogService implements BatchLogPortIn { + private final BatchLogPortOut portOut; + + @Override + public boolean exists(BatchLogType type) { + return portOut.exists(type); + } + + @Override + public Long create(BatchLogType type) { + return portOut.create(type); + } + + @Override + public void update(Long id, String status, String errorMessage) { + portOut.update(id, status, errorMessage); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java new file mode 100644 index 00000000..fc4d1d75 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class BatchLog { + private Long id; + private String type; + private String status; + private LocalDateTime startAt; + private LocalDateTime endAt; + private String errorMessage; + private LocalDateTime createdAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java new file mode 100644 index 00000000..5074fe5b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class BatchLogCmd { + private Long id; + private String type; + private String status; + private LocalDateTime startAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java new file mode 100644 index 00000000..5e7f5a24 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum BatchLogType { + AUTO_SMS, + MONTHLY_STATUS, + CARRYOVER; +} diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java index 420526d7..43a8cab0 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java @@ -1,14 +1,12 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; +import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; - @Slf4j @Repository @RequiredArgsConstructor @@ -24,24 +22,9 @@ class AutoSchedulesDao implements AutoSchedulesPortOut { return Optional.of(true); } catch (Exception e) { - // 예외 발생 시 false 반환 - return Optional.of(false); - } + log.error("[AutoSchedule][createMonthlyInputStatus] message: {}", e.getMessage(), e); - } - - @Override - @Transactional - public Optional sendAutoSms(CreateSmsAutoSendCmd cmd) { - try { - mapper.createSmsAutoSend(cmd); - - return Optional.of(true); - } catch (Exception e) { - log.info(e.getMessage()); - - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("월별 입력 항목 관리 생성 중 오류: " + e.getMessage(), e); } } @@ -55,8 +38,7 @@ class AutoSchedulesDao implements AutoSchedulesPortOut { } catch (Exception e) { log.error("[AutoSchedule][monthlyCarryOver] message: {}", e.getMessage(), e); - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("일계부 월초이월금 생성 중 오류: " + e.getMessage(), e); } } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java index 984ccafd..5c6abc8a 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java @@ -1,11 +1,9 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface AutoSchedulesMapper { - void createMonthlyInputStatus(); - void createSmsAutoSend(CreateSmsAutoSendCmd cmd); + String createMonthlyInputStatus(); String createMonthlyCarryOver(); } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java index 5ee03e7a..c2d9d35a 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java @@ -1,9 +1,6 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.web; -import app.module.admin.config.application.util.DateUiUtil; -import app.module.admin.config.application.util.model.DayRange; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; -import java.time.LocalDate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -17,13 +14,19 @@ public class AutoSchedulesController { this.portIn = portIn; } - // 매 월 1일 1초 마다 실행되는 스케줄러 + /** + * 월별입력상태 등록 + * 매 월 1일 1초 마다 실행되는 스케줄러 + */ @Scheduled(cron = "1 0 0 1 * *") public void fetchArticlesPeriodically() { portIn.operate(); } - // 매일 오후 5시 마다 실행되는 스케줄러 + /** + * 문자자동발송 등록 + * 매일 오후 5시 마다 실행되는 스케줄러 + */ @Scheduled(cron = "0 0 17 * * ?") public void fetchSmsAutoSend() { portIn.sendAutoSms(); @@ -37,14 +40,4 @@ public class AutoSchedulesController { public void fetchMonthlyCarryOver() { portIn.monthlyCarryOver(); } - - /** - * TODO 스케쥴 있다면.. 추가. - */ - - // 매일 오후 5시 마다 실행되는 스케줄러 - @Scheduled(cron = "0 1 * * * ?") - public void fetchSmsAutoSenTest() { - portIn.sendAutoSmsTest(); - } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java index 4317bf4b..7720745e 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java @@ -7,5 +7,4 @@ public interface AutoSchedulesPortIn { Optional operate(); Optional sendAutoSms(); Optional monthlyCarryOver(); - Optional sendAutoSmsTest(); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java index c91b9179..1d9b5328 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java @@ -1,11 +1,9 @@ package app.module.admin.usecase.schedule.autoSchedules.ports; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import java.util.Optional; public interface AutoSchedulesPortOut { Optional operate(); - Optional sendAutoSms(CreateSmsAutoSendCmd cmd); Optional monthlyCarryOver(); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java index e5626845..e74033ea 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java @@ -1,38 +1,42 @@ package app.module.admin.usecase.schedule.autoSchedules.ports.application; +import app.module.admin.config.application.batch.BatchLogRunner; import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.config.application.util.model.DayRange; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortIn; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; +import app.module.mms.ports.MMSPortIn; +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import java.time.LocalDate; import java.util.List; - -import app.module.mms.ports.MMSPortIn; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - import java.util.Optional; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @Service @RequiredArgsConstructor +@Slf4j class AutoSchedulesService implements AutoSchedulesPortIn { private final AutoSchedulesPortOut portOut; private final MMSPortIn mmsPortIn; private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn; private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn; + private final BatchLogRunner batchLogRunner; @Override public Optional operate() { - return portOut.operate(); + batchLogRunner.run(BatchLogType.MONTHLY_STATUS, portOut::operate); + return Optional.of(true); } @Override @@ -40,63 +44,40 @@ class AutoSchedulesService implements AutoSchedulesPortIn { public Optional sendAutoSms() { GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); - // 문자 자동 발송 활성화 상태 체크 if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) { - System.out.println("문자 발송 비활성화 상태"); + log.info("문자 발송 비활성화 상태"); return Optional.of(false); } LocalDate today = LocalDate.now(); int day = today.getDayOfMonth(); - // 발송일 조건: 8일, 15일, 22일, 1일(다음 달 대상자) if (day == 8 || day == 15 || day == 22 || day == 1) { - // 발송 대상 날짜 범위 구하기 DayRange dayRange = DateUiUtil.getDayRange(today).orElse(null); - if (dayRange == null) return Optional.of(false); + if (dayRange == null) { + log.error("잘못된 날짜({})에 문자 자동 발송 로직이 실행됨 - 발송 대상일이 아님", today); + return Optional.of(false); + } - // 대상 월 계산 (1일 이면 이전 달 / 1일이 아니면 현재 달 yyyyMM 을 가져온다.) LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today; String targetMonth = DateUiUtil.getMonthValue(baseDate); - // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) ); - // 미등록 임가가 있을 경우에만 실행 - if(!CollectionUtils.isEmpty(incompleteHouseholds)) { - portOut.sendAutoSms(new CreateSmsAutoSendCmd( - incompleteHouseholds, - getSmsAutoStatus.getSendPhone(), - getSmsAutoStatus.getMessage() - )); + if (!CollectionUtils.isEmpty(incompleteHouseholds)) { + batchLogRunner.run(BatchLogType.AUTO_SMS, () -> { + mmsPortIn.sendAutoSms(new CreateSmsAutoSendCmd( + incompleteHouseholds, + getSmsAutoStatus.getSendPhone(), + getSmsAutoStatus.getMessage() + )); + }); } - } - - return Optional.of(true); - } - - @Override - public Optional sendAutoSmsTest() { - String targetMonth = "202507"; - DayRange dayRange = new DayRange(1, 7); - GetSmsAutoStatus getSmsAutoStatus = new GetSmsAutoStatus(true, "테스트", "01012345678", null, null); - - // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 - List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( - new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) - ); - - System.out.println(incompleteHouseholds); - - // 미등록 임가가 있을 경우에만 실행 - if(!CollectionUtils.isEmpty(incompleteHouseholds)) { - mmsPortIn.sendAutoSms(new app.module.mms.ports.application.domain.CreateSmsAutoSendCmd( - incompleteHouseholds, - getSmsAutoStatus.getSendPhone(), - getSmsAutoStatus.getMessage() - )); + } else { + log.info("문자 발송 날짜 아님."); + return Optional.of(false); } return Optional.of(true); @@ -104,6 +85,7 @@ class AutoSchedulesService implements AutoSchedulesPortIn { @Override public Optional monthlyCarryOver() { - return portOut.monthlyCarryOver(); + batchLogRunner.run(BatchLogType.CARRYOVER, portOut::monthlyCarryOver); + return Optional.of(true); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java deleted file mode 100644 index 4fc03a07..00000000 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.admin.usecase.schedule.autoSchedules.ports.application.domain; - -import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateSmsAutoSendCmd { - private List sendHouseholds; - private String sendPhone; - private String message; -} diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java index 7dbc2379..25a9b065 100644 --- a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java @@ -19,16 +19,13 @@ public class MMSDao implements MMSPortOut { @Transactional public Optional sendAutoSms(CreateSmsAutoSendCmd cmd) { try { - log.debug("@@@ sendAutoSmsTest"); - mapper.createSmsAutoSend(cmd); return Optional.of(true); } catch (Exception e) { - log.info(e.getMessage()); + log.error(e.getMessage()); - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("문자 자동 발송 생성 중 오류: " + e.getMessage(), e); } } } diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml new file mode 100644 index 00000000..f974fba9 --- /dev/null +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + SELECT nextval('batch_log_id_seq') + + + INSERT INTO batch_log (id, type, status, start_at, created_at) + VALUES (#{id}, #{type}, #{status}, #{startAt}, now()) + + + + + UPDATE batch_log + SET status = #{status}, + error_message = #{errorMessage}, + end_at = now() + WHERE id = #{id} + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml index 5c862315..cfda9212 100644 --- a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml +++ b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml @@ -3,38 +3,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - select fn_monthly_input_status() - - /* createSmsAutoSend : 문자 발송 insert */ - INSERT INTO biz_msg - ( - MSG_TYPE, - CMID, - REQUEST_TIME, - SEND_TIME, - DEST_PHONE, - SEND_PHONE, - MSG_BODY - ) - VALUES - - ( - 5, - TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum}, - NOW(), - NOW(), - #{item.phone}, - #{sendPhone}, - #{message} - ) - - - - select fn_monthly_carry_over(null) - - + \ No newline at end of file From 1d5e7e89f8fbe3897f5d1507daf8e661905b9684 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 11 Jul 2025 17:09:45 +0900 Subject: [PATCH 09/16] =?UTF-8?q?batch=5Flog=5Fseq=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml index f974fba9..cf760fd7 100644 --- a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -16,7 +16,7 @@ - SELECT nextval('batch_log_id_seq') + SELECT nextval('batch_log_seq') INSERT INTO batch_log (id, type, status, start_at, created_at) From 9fd4cb910f27e10eb2d62342ceed6fecd1430bbd Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 11 Jul 2025 17:15:36 +0900 Subject: [PATCH 10/16] =?UTF-8?q?[DB]=20=EC=98=A4=ED=94=88=20=EB=8C=80?= =?UTF-8?q?=EB=B9=84=20=EC=88=98=EC=A0=95=20-=20table=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?,=20view=20=EC=83=9D=EC=84=B1,=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20delete,=20=EC=B9=BC=EB=9F=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/data/04_second_open.sql | 350 ++++++++++++++++++ .../resources/sql/schema/02_create-all.sql | 24 +- 2 files changed, 351 insertions(+), 23 deletions(-) diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index 09c4bffc..9f17b874 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -82,10 +82,35 @@ VALUES('uri.front.guide', '이용안내', '/guide', 'FRONT', 2, true, 'uri.front update uri set show_on_navi = true, updated_at = now(), updated_by = 'INIT_DATA' where id ='uri.front.info.notice' ; update uri set show_on_navi = true, updated_at = now(), updated_by = 'INIT_DATA' where id = 'uri.front.info.user.password' ; +-- 임가정보 테이블 -> 칼럼명 update +ALTER TABLE household RENAME COLUMN employment_code TO employment_type; + +-- 문자발송 메뉴 삭제 +DELETE FROM uri_has_role WHERE uri_id = 'uri.admin.communication.sms'; +DELETE FROM uri WHERE id = 'uri.admin.communication.sms'; +-- 문자발송 메뉴 숨기기 +-- update uri set show_on_navi = false, updated_at = now(), updated_by = 'INIT_DATA' where id ='uri.admin.communication.sms' ; + -- ==================================================================================================================== -- 문자 발송 -- ==================================================================================================================== +CREATE TABLE sms_auto_status ( + active boolean NOT null, + message text, + send_phone varchar(255), + updated_at timestamp(6), + updated_by varchar(255) +); + +COMMENT ON TABLE sms_auto_status IS '문자 자동 발송 활성화 테이블'; + +COMMENT ON COLUMN sms_auto_status.active IS '자동 발송 기능 ON/OFF 여부'; +COMMENT ON COLUMN sms_auto_status.message IS '메세지'; +COMMENT ON COLUMN sms_auto_status.send_phone IS '발송번호'; +COMMENT ON COLUMN sms_auto_status.updated_at IS '수정일'; +COMMENT ON COLUMN sms_auto_status.updated_by IS '수정자'; + -- 문자 자동 발송 초기 데이터 등록 insert into sms_auto_status ( active, @@ -242,3 +267,328 @@ $function$ +-- ==================================================================================================================== +-- 배치 실행 이력 로그 +-- ==================================================================================================================== +/* +DROP TABLE IF EXISTS batch_log; +DROP SEQUENCE IF EXISTS batch_log_seq; +*/ +CREATE SEQUENCE batch_log_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; + +CREATE TABLE batch_log ( + id int8 DEFAULT nextval('batch_log_seq'::regclass) NOT NULL, + type VARCHAR(50) NOT NULL, + status VARCHAR(20) NOT NULL, + start_at TIMESTAMP NOT NULL, + end_at TIMESTAMP, + error_message VARCHAR(2000), + created_at TIMESTAMP DEFAULT now(), + + CONSTRAINT batch_log_pkey PRIMARY KEY (id) +); + +COMMENT ON TABLE batch_log IS '배치 실행 이력 로그 테이블'; +COMMENT ON COLUMN batch_log.type IS '배치 유형 (AUTO_SMS, MONTHLY_STATUS, CARRYOVER)'; +COMMENT ON COLUMN batch_log.status IS '상태 (SUCCESS, FAIL, RUNNING)'; +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 '생성일'; + + + + +-- ==================================================================================================================== +-- 엑셀용 view 생성 +-- ==================================================================================================================== + +-- ============================================ +-- VIEW : v_household_all +-- DESC : 임가 정보 (엑셀용) +-- ============================================ +-- DROP VIEW public.v_household_all; +CREATE OR REPLACE VIEW public.v_household_all +AS SELECT h.seq, + h.household_num, + h.owner_name, + h.owner_age, + h.tel, + h.phone, + h.region_main_code, + fn_uicode_text(h.region_main_code) AS region_main_code_text, + h.region_sub_code, + fn_uicode_text(h.region_sub_code) AS region_sub_code_text, + h.region_detail_code, + fn_uicode_text(h.region_detail_code) AS region_detail_code_text, + h.address, + h.industry_large_code, + fn_uicode_text(h.industry_large_code) AS industry_large_code_text, + h.industry_middle_code, + fn_uicode_text(h.industry_middle_code) AS industry_middle_code_text, + h.industry_sub_middle, + h.industry_detail, + vhr.researcher_name, + vhr.researcher_phone, + CASE + WHEN h.is_panel = true THEN '1.유지'::text + ELSE '2.탈락'::text + END AS is_panel, + h.usage_type + FROM household h + LEFT JOIN v_household_researcher vhr ON vhr.household_seq = h.seq + WHERE h.is_deleted = false + ORDER BY h.household_num; + + +-- ============================================ +-- VIEW : v_household_all_visit +-- DESC : 임가 방문 정보 (엑셀용) +-- ============================================ +-- DROP VIEW public.v_household_all_visit; +CREATE OR REPLACE VIEW public.v_household_all_visit +AS SELECT vha.seq, + vha.household_num, + vha.owner_name, + vha.owner_age, + vha.tel, + vha.phone, + vha.region_main_code_text, + vha.region_sub_code_text, + vha.region_detail_code_text, + vha.researcher_name, + vha.researcher_phone, + to_char(hv.visit_date::timestamp with time zone, 'YYYYMM'::text) AS visit_month, + hv.visit_date, + hv.management_type, + hv.content, + CASE + WHEN hv.updated_by IS NULL THEN hv.created_by + ELSE hv.updated_by + END AS updated_by, + CASE + WHEN hv.updated_at IS NULL THEN hv.created_at + ELSE hv.updated_at + END AS updated_at, + hv.created_at, + hv.is_gift_sent + FROM v_household_all vha + JOIN household_visit hv ON hv.household_seq = vha.seq AND hv.is_deleted = false + ORDER BY vha.household_num, hv.visit_date; + + +-- ============================================ +-- VIEW : v_household_day +-- ============================================ +-- DROP VIEW public.v_household_day; +CREATE OR REPLACE VIEW public.v_household_day +AS SELECT vha.seq, + vha.household_num, + vha.owner_name, + vha.owner_age, + vha.tel, + vha.phone, + vha.region_main_code_text, + vha.region_sub_code_text, + vha.region_detail_code_text, + vha.researcher_name, + vha.researcher_phone, + dr.record_month, + CASE + WHEN ddg.start_day = ddg.end_day THEN concat(ddg.start_day, '') + ELSE concat(ddg.start_day, '-', ddg.end_day) + END AS input_day, + dr.all_status, + dr.income_status, + ( SELECT count(*) AS count + FROM daily_income di + WHERE di.daily_record_seq = dr.id AND di.is_deleted = false) AS income_count, + dr.work_status, + ( SELECT count(*) AS count + FROM daily_work dw + WHERE dw.daily_record_seq = dr.id AND dw.is_deleted = false) AS work_count, + dr.expense_status, + ( SELECT count(*) AS count + FROM daily_expense de + WHERE de.daily_record_seq = dr.id AND de.is_deleted = false) AS expensecount, + dr.power_status, + ( SELECT count(*) AS count + FROM daily_power dp + WHERE dp.daily_record_seq = dr.id AND dp.is_deleted = false) AS power_count, + dr.forestry_status, + ( SELECT count(*) AS count + FROM daily_forestry df + WHERE df.daily_record_seq = dr.id AND df.is_deleted = false) AS forestry_count, + dr.farming_status, + ( SELECT count(*) AS count + FROM daily_farming df2 + WHERE df2.daily_record_seq = dr.id AND df2.is_deleted = false) AS farming_count + FROM v_household_all vha + JOIN daily_record dr ON vha.seq = dr.household_seq AND dr.is_deleted = false + LEFT JOIN daily_day_group ddg ON ddg.group_no = dr.day_group_no AND ddg.is_deleted = false + ORDER BY vha.household_num, dr.record_month, dr.day_group_no; + + +-- ============================================ +-- VIEW : v_household_monthly_completed_days +-- ============================================ +-- DROP VIEW public.v_household_monthly_completed_days; +CREATE OR REPLACE VIEW public.v_household_monthly_completed_days +AS SELECT daily_record.household_seq, + daily_record.record_month, + count(*) AS completed_day_groups + FROM daily_record + WHERE daily_record.is_deleted = false AND (daily_record.all_status::text = ANY (ARRAY['DONE'::character varying, 'TODAY_NONE'::character varying]::text[])) + GROUP BY daily_record.household_seq, daily_record.record_month; + + +-- ============================================ +-- VIEW : v_household_monthly_target_days +-- ============================================ +-- DROP VIEW public.v_household_monthly_target_days; +CREATE OR REPLACE VIEW public.v_household_monthly_target_days +AS WITH param_matrix AS ( + SELECT h.seq AS household_seq, + r.record_month, + EXTRACT(day FROM date_trunc('month'::text, to_date(r.record_month::text, 'YYYYMM'::text)::timestamp with time zone) + '1 mon -1 days'::interval)::integer AS last_day + FROM household h + CROSS JOIN ( SELECT DISTINCT daily_record.record_month + FROM daily_record + WHERE daily_record.is_deleted = false) r +) + SELECT p.household_seq, + p.record_month, + count(*) AS total_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; + + +-- ============================================ +-- VIEW : v_household_visit_summary +-- ============================================ +-- DROP VIEW public.v_household_visit_summary; +CREATE OR REPLACE VIEW public.v_household_visit_summary +AS WITH ranked_visits AS ( + SELECT household_visit.household_seq, + to_char(household_visit.visit_date::timestamp with time zone, 'YYYYMM'::text) AS visit_month, + household_visit.visit_date, + household_visit.content, + household_visit.is_gift_sent, + household_visit.management_type, + row_number() OVER (PARTITION BY household_visit.household_seq, (to_char(household_visit.visit_date::timestamp with time zone, 'YYYYMM'::text)) ORDER BY household_visit.visit_date, household_visit.id) AS rn + FROM household_visit + WHERE household_visit.is_deleted = false +), pivoted AS ( + SELECT ranked_visits.household_seq, + ranked_visits.visit_month, + max( + CASE + WHEN ranked_visits.rn = 1 THEN ranked_visits.visit_date + ELSE NULL::date + END) AS first_visit_date, + max( + CASE + WHEN ranked_visits.rn = 1 THEN ranked_visits.content + ELSE NULL::character varying + END::text) AS first_content, + max( + CASE + WHEN ranked_visits.rn = 1 THEN ranked_visits.is_gift_sent::integer + ELSE NULL::integer + END) = 1 AS first_is_gift_sent, + max( + CASE + WHEN ranked_visits.rn = 1 THEN ranked_visits.management_type + ELSE NULL::character varying + END::text) AS first_management_type, + max( + CASE + WHEN ranked_visits.rn = 2 THEN ranked_visits.visit_date + ELSE NULL::date + END) AS second_visit_date, + max( + CASE + WHEN ranked_visits.rn = 2 THEN ranked_visits.content + ELSE NULL::character varying + END::text) AS second_content, + max( + CASE + WHEN ranked_visits.rn = 2 THEN ranked_visits.is_gift_sent::integer + ELSE NULL::integer + END) = 1 AS second_is_gift_sent, + max( + CASE + WHEN ranked_visits.rn = 2 THEN ranked_visits.management_type + ELSE NULL::character varying + END::text) AS second_management_type + FROM ranked_visits + WHERE ranked_visits.rn = ANY (ARRAY[1::bigint, 2::bigint]) + GROUP BY ranked_visits.household_seq, ranked_visits.visit_month +), final AS ( + SELECT pivoted.household_seq, + pivoted.visit_month, + pivoted.first_visit_date, + pivoted.first_content, + pivoted.first_is_gift_sent, + pivoted.first_management_type, + pivoted.second_visit_date, + pivoted.second_content, + pivoted.second_is_gift_sent, + pivoted.second_management_type, + pivoted.first_is_gift_sent OR pivoted.second_is_gift_sent AS gift_send + FROM pivoted +) + SELECT final.household_seq, + final.visit_month, + final.first_visit_date, + final.first_content, + final.first_is_gift_sent, + final.first_management_type, + final.second_visit_date, + final.second_content, + final.second_is_gift_sent, + final.second_management_type, + final.gift_send + FROM final; + + +-- ============================================ +-- VIEW : v_monthly_completion_rate +-- ============================================ +-- DROP VIEW public.v_monthly_completion_rate; +CREATE OR REPLACE VIEW public.v_monthly_completion_rate +AS SELECT d.household_seq, + d.record_month, + COALESCE(c.completed_day_groups, 0::bigint) AS completed_day_groups, + d.total_day_groups, + round(COALESCE(c.completed_day_groups, 0::bigint)::numeric * 100::numeric / NULLIF(d.total_day_groups, 0)::numeric, 3) AS completion_rate + FROM v_household_monthly_target_days d + LEFT JOIN v_household_monthly_completed_days c ON d.household_seq = c.household_seq AND d.record_month::text = c.record_month::text + ORDER BY d.household_seq, d.record_month; + + +-- ============================================ +-- VIEW : v_researcher_count +-- ============================================ +-- DROP VIEW public.v_researcher_count; +CREATE OR REPLACE VIEW public.v_researcher_count +AS SELECT a.seq, + a.id, + count(rhh.id) AS household_count, + a.name, + a.phone, + a.region_main_code, + fn_uicode_text(a.region_main_code) AS region_main_code_text, + a.account_disabled, + CASE a.account_disabled + WHEN false THEN '사용'::text + WHEN true THEN '미사용'::text + ELSE NULL::text + END AS account_disabled_flag + FROM admin a + JOIN admin_has_role ahr ON a.seq = ahr.admin_seq AND ahr.is_deleted = false + LEFT JOIN researcher_has_household rhh ON rhh.admin_seq = a.seq AND rhh.is_deleted = false + LEFT JOIN household h ON h.seq = rhh.household_seq AND h.is_panel IS TRUE AND h.is_deleted = false + WHERE ahr.role_id::text = 'ROLE_RESEARCHER'::text + GROUP BY a.seq, a.id, a.name, a.phone, a.account_disabled; \ No newline at end of file diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index d02ea993..01c38404 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -1233,26 +1233,4 @@ COMMENT ON COLUMN address.updated_at IS '수정일'; COMMENT ON COLUMN address.updated_by IS '수정자'; COMMENT ON COLUMN address.deleted_at IS '삭제일'; COMMENT ON COLUMN address.deleted_by IS '삭제자'; -COMMENT ON COLUMN address.is_deleted IS '삭제여부'; - - - --- ============================================ --- TABLE : sms_auto_send --- DESC : 문자 자동 발송 활성화 테이블 --- ============================================ -CREATE TABLE sms_auto_status ( - active boolean NOT null, - message text, - send_phone varchar(255), - updated_at timestamp(6), - updated_by varchar(255) -); - -COMMENT ON TABLE sms_auto_status IS '문자 자동 발송 활성화 테이블'; - -COMMENT ON COLUMN sms_auto_status.active IS '자동 발송 기능 ON/OFF 여부'; -COMMENT ON COLUMN sms_auto_status.message IS '메세지'; -COMMENT ON COLUMN sms_auto_status.send_phone IS '발송번호'; -COMMENT ON COLUMN sms_auto_status.updated_at IS '수정일'; -COMMENT ON COLUMN sms_auto_status.updated_by IS '수정자'; \ No newline at end of file +COMMENT ON COLUMN address.is_deleted IS '삭제여부'; \ No newline at end of file From 3586a22f556c46f4ad2faa9144d298b484fa1042 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 14 Jul 2025 09:34:49 +0900 Subject: [PATCH 11/16] =?UTF-8?q?[BO]=20=EC=A1=B0=EC=82=AC=EC=9B=90?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EC=A0=95=EB=B3=B4=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=A7=81=ED=81=AC=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/researcher/detail.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index b2e5eebb..55d9e3c7 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -42,9 +42,11 @@
- + + +
From 7484d37ee4573388a9cf2b6ba01b521f9aef7756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 14 Jul 2025 09:43:46 +0900 Subject: [PATCH 12/16] =?UTF-8?q?[FO]=20=EC=9E=85=EB=A0=A5=ED=98=84?= =?UTF-8?q?=ED=99=A9=20all=5Fstatus=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/mappers/daily/DailyStatusMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/main/resources/mappers/daily/DailyStatusMapper.xml b/front/src/main/resources/mappers/daily/DailyStatusMapper.xml index 6a9e1d63..2d198651 100644 --- a/front/src/main/resources/mappers/daily/DailyStatusMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyStatusMapper.xml @@ -13,7 +13,7 @@ where only_day.day <= DATE_PART('day', (date_trunc('MONTH', TO_DATE(#{recordMonth}, 'YYYYMM')) + INTERVAL '1 MONTH - 1 day')) ) select count(dg.day) as day_count - , (count(dg.day) filter (where dr.all_status = 'DONE')) as done_count + , (count(dg.day) filter (where dr.all_status = 'DONE' or dr.all_status = 'TODAY_NONE')) as done_count from day_gorup dg left join daily_record dr on dr.day_group_no = dg.group_no and dr.record_month = to_char(TO_DATE(#{recordMonth}, 'YYYYMM'), 'YYYYMM') and dr.household_seq = #{householdSeq} From 36b2f7302a92f6c8557b4262d8afff40b2e56e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 14 Jul 2025 10:37:09 +0900 Subject: [PATCH 13/16] =?UTF-8?q?[FO]=20=EC=9E=85=EB=A0=A5=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EC=83=81=EC=84=B8=EC=97=90=EC=84=9C=20=EA=B7=B8?= =?UTF-8?q?=EB=A3=B9Count=20=EB=8C=80=EC=8B=A0=20childrenCount=20=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/DailyExpenseMonthDto.java | 3 +- .../model/DailyFarmingMonthDto.java | 3 +- .../model/DailyForestryMonthDto.java | 3 +- .../model/DailyIncomeMonthDto.java | 3 +- .../persistence/model/DailyPowerMonthDto.java | 3 +- .../adapters/web/DailyStatusUIController.java | 70 +++++++++++++------ .../status/ports/DailyStatusHasChildren.java | 7 ++ .../persistence/model/DailyWorkMonthDto.java | 6 +- .../status/daily/detail-expense.html | 2 +- .../status/daily/detail-farming.html | 2 +- .../status/daily/detail-forestry.html | 2 +- .../templates/status/daily/detail-income.html | 2 +- .../templates/status/daily/detail-power.html | 2 +- .../templates/status/daily/detail-work.html | 2 +- 14 files changed, 75 insertions(+), 35 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusHasChildren.java diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java index 4d279872..6d716083 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.expense.adapters.persistence.model; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; @@ -8,7 +9,7 @@ import java.util.List; @Getter @Setter -public class DailyExpenseMonthDto { +public class DailyExpenseMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java index 536adebb..87faf87f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.farming.adapters.persistence.model; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; @@ -9,7 +10,7 @@ import java.util.List; @Getter @Setter -public class DailyFarmingMonthDto { +public class DailyFarmingMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java index ed1bff85..447dc5f1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.forestry.adapters.persistence.model; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; @@ -9,7 +10,7 @@ import java.util.List; @Getter @Setter -public class DailyForestryMonthDto { +public class DailyForestryMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java index c07ba2a7..cb8b9eab 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.income.adapters.persistence.model; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -10,7 +11,7 @@ import java.util.List; @Getter @Setter @ToString -public class DailyIncomeMonthDto { +public class DailyIncomeMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java index c7e18d93..564dc560 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.power.adapters.persistence.model; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; @@ -8,7 +9,7 @@ import java.util.List; @Getter @Setter -public class DailyPowerMonthDto { +public class DailyPowerMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java index 340e81f0..c2c4a27e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java @@ -2,12 +2,14 @@ package app.module.front.usecase.daily.status.adapters.web; import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoMatchingURIException; +import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn; import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; @@ -25,6 +27,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; +import java.util.Objects; + @Slf4j @Controller @RequiredArgsConstructor @@ -63,29 +68,54 @@ public class DailyStatusUIController { */ @GetMapping(path = "/{step}/{searchMonth}") public String detail(Model model, @PathVariable("step") String step, @PathVariable("searchMonth") String searchMonth) { - if (DailySort.INCOME.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.INCOME); - model.addAttribute("list", dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""))); - } else if (DailySort.WORK.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.WORK); - model.addAttribute("list", dailyWorkPortIn.monthList(new DailyWorkUIReqVO(searchMonth, ""))); - } else if (DailySort.EXPENSE.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.EXPENSE); - model.addAttribute("list", dailyExpensePortIn.monthList(new DailyExpenseUIReqVO(searchMonth, ""))); - } else if (DailySort.POWER.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.POWER); - model.addAttribute("list", dailyPowerPortIn.monthList(new DailyPowerUIReqVO(searchMonth, ""))); - } else if (DailySort.FORESTRY.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.FORESTRY); - model.addAttribute("list", dailyForestryPortIn.monthList(new DailyForestryUIReqVO(searchMonth, ""))); - } else if (DailySort.FARMING.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.FARMING); - model.addAttribute("list", dailyFarmingPortIn.monthList(new DailyFarmingUIReqVO(searchMonth, ""))); - } else { - throw new NoMatchingURIException("잘못된 접근"); + switch (DailySort.valueOf(step.toUpperCase())) { + case INCOME -> { + processStep(model, DailySort.INCOME, + dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""))); + } + case WORK -> { + processStep(model, DailySort.WORK, + dailyWorkPortIn.monthList(new DailyWorkUIReqVO(searchMonth, ""))); + } + case EXPENSE -> { + processStep(model, DailySort.EXPENSE, + dailyExpensePortIn.monthList(new DailyExpenseUIReqVO(searchMonth, ""))); + } + case POWER -> { + processStep(model, DailySort.POWER, + dailyPowerPortIn.monthList(new DailyPowerUIReqVO(searchMonth, ""))); + } + case FORESTRY -> { + processStep(model, DailySort.EXPENSE, + dailyForestryPortIn.monthList(new DailyForestryUIReqVO(searchMonth, ""))); + } + case FARMING -> { + processStep(model, DailySort.FARMING, + dailyFarmingPortIn.monthList(new DailyFarmingUIReqVO(searchMonth, ""))); + } + default -> throw new NoMatchingURIException("잘못된 접근"); } model.addAttribute("searchMonth", searchMonth); return String.format("status/daily/detail-%s", step); } + + /** + * 일계부 입력 현황 상세 화면 처리 + * + * @param model Model + * @param step 단계 + * @param list 데이터 목록 + * @param 데이터 Model + */ + private void processStep(Model model, DailySort step, List list) { + int childrenCount = list.stream() + .filter(Objects::nonNull) + .mapToInt(dto -> dto.getChildren() != null ? dto.getChildren().size() : 0) + .sum(); + + model.addAttribute("step", step); + model.addAttribute("list", list); + model.addAttribute("childrenCount", childrenCount); + } } diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusHasChildren.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusHasChildren.java new file mode 100644 index 00000000..54b3eff1 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusHasChildren.java @@ -0,0 +1,7 @@ +package app.module.front.usecase.daily.status.ports; + +import java.util.List; + +public interface DailyStatusHasChildren { + List getChildren(); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java index 7adfef0d..d6c99877 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java @@ -1,19 +1,17 @@ package app.module.front.usecase.daily.work.adapters.persistence.model; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; @Slf4j @Getter @Setter -public class DailyWorkMonthDto { +public class DailyWorkMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/resources/templates/status/daily/detail-expense.html b/front/src/main/resources/templates/status/daily/detail-expense.html index 5633aedf..d25e5b7f 100644 --- a/front/src/main/resources/templates/status/daily/detail-expense.html +++ b/front/src/main/resources/templates/status/daily/detail-expense.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-farming.html b/front/src/main/resources/templates/status/daily/detail-farming.html index 5e26e968..60370c07 100644 --- a/front/src/main/resources/templates/status/daily/detail-farming.html +++ b/front/src/main/resources/templates/status/daily/detail-farming.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-forestry.html b/front/src/main/resources/templates/status/daily/detail-forestry.html index 446ed63a..7337cfe0 100644 --- a/front/src/main/resources/templates/status/daily/detail-forestry.html +++ b/front/src/main/resources/templates/status/daily/detail-forestry.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-income.html b/front/src/main/resources/templates/status/daily/detail-income.html index d8f41789..14e38ae8 100644 --- a/front/src/main/resources/templates/status/daily/detail-income.html +++ b/front/src/main/resources/templates/status/daily/detail-income.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-power.html b/front/src/main/resources/templates/status/daily/detail-power.html index a7808e4d..d1a18c93 100644 --- a/front/src/main/resources/templates/status/daily/detail-power.html +++ b/front/src/main/resources/templates/status/daily/detail-power.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-work.html b/front/src/main/resources/templates/status/daily/detail-work.html index bbe6bd07..05f65d2b 100644 --- a/front/src/main/resources/templates/status/daily/detail-work.html +++ b/front/src/main/resources/templates/status/daily/detail-work.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

From 51b36879dd226c7549022ddd774c35ebfc472917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 14 Jul 2025 11:20:58 +0900 Subject: [PATCH 14/16] =?UTF-8?q?[FO]=20=EA=B3=B5=EC=A7=80=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EA=B2=8C=EC=8B=9C=EA=B8=B0=EA=B0=84=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/mappers/notice/GetNoticesMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/front/src/main/resources/mappers/notice/GetNoticesMapper.xml b/front/src/main/resources/mappers/notice/GetNoticesMapper.xml index e000fa3d..589b4707 100644 --- a/front/src/main/resources/mappers/notice/GetNoticesMapper.xml +++ b/front/src/main/resources/mappers/notice/GetNoticesMapper.xml @@ -21,7 +21,8 @@ COUNT(*) OVER () AS total FROM notice a WHERE a.is_deleted = false - + AND now() between a.start_date and a.end_date + From 78589975e5bd827ced3c8a6db734d0eff3f68f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 14 Jul 2025 11:32:07 +0900 Subject: [PATCH 15/16] =?UTF-8?q?[BO]=20=EC=A1=B0=EC=82=AC=EC=9B=90=20?= =?UTF-8?q?=EA=B3=84=EC=A0=95=EC=82=AC=EC=9A=A9=EC=97=AC=EB=B6=80=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=98=A4=EB=A5=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mappers/researcher/ResearcherMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 2df460ba..c09e4ffe 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -32,7 +32,7 @@ and a.region_main_code = #{searchArea} - and a.account_disabled = #{searchAccountDisabled} + and a.account_disabled = #{searchAccountDisabled}::boolean group by a.seq @@ -62,7 +62,7 @@ and a.region_main_code = #{searchArea} - and a.account_disabled = #{searchAccountDisabled} + and a.account_disabled = #{searchAccountDisabled}::boolean From e9c24911e46e167f5be6023adf4d72569db04df2 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 14 Jul 2025 11:36:26 +0900 Subject: [PATCH 16/16] =?UTF-8?q?[BO]=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EC=85=98=20=EC=88=98=EC=A0=95=20+=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94,=20=EA=B2=80=EC=83=89=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/admin/adminList.html | 35 +++++++++-------- .../admin/modal/modal-admin-excel.html | 8 ++-- .../templates/common/list-components.html | 38 +++++++++++++++---- 3 files changed, 54 insertions(+), 27 deletions(-) diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 0af4808b..0eeccb8a 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -7,7 +7,7 @@
-
+ @@ -20,7 +20,7 @@

권한

- @@ -33,7 +33,7 @@
- @@ -53,7 +53,7 @@

실사

- @@ -65,7 +65,7 @@

계정사용여부

- @@ -113,7 +113,7 @@ type="checkbox"/> 아이디 - 이름 + 이름 @@ -131,12 +131,14 @@ - +
+ +
@@ -161,6 +163,8 @@ f.searchRole.value = ''; f.searchArea.value = ''; f.searchDisabled.value = ''; + + goSearch(); } function goUpdate(adminId) { @@ -202,20 +206,20 @@ } } - function goExcel() { - const f = document.adminParamForm; - f.action = '/settings/admins/excel'; - f.sort.value = convertToPageableSortValue(f.sort.value); - f.method = 'post'; - f.submit(); - } - + // function goExcel() { + // const f = document.adminParamForm; + // f.action = '/settings/admins/excel'; + // f.sort.value = convertToPageableSortValue(f.sort.value); + // f.method = 'post'; + // f.submit(); + // } function showAdminExcelUploadModal() { const modal = document.querySelector(".modal02"); modal.ui.open(); } + const uploadAdminExcel = () => { event.preventDefault(); @@ -256,7 +260,6 @@ const closeModal = () => { document.querySelector(".modal02").ui.close(); }; - diff --git a/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html b/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html index 8d17589a..dff7f615 100644 --- a/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html +++ b/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html @@ -33,10 +33,10 @@ -
- -
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/common/list-components.html b/admin/src/main/resources/templates/common/list-components.html index a9ef7c4b..0c486e49 100644 --- a/admin/src/main/resources/templates/common/list-components.html +++ b/admin/src/main/resources/templates/common/list-components.html @@ -12,19 +12,43 @@