diff --git a/README.md b/README.md index 79c8afe3..f24fe164 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,14 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요. -Dspring.datasource.url=jdbc:postgresql://15.165.180.203:5432/korea_research -Dspring.datasource.username=ko_research -Dspring.datasource.password=koresearch1@#4 +-Daes.secret-key=092HW829O0A0AVR0 +-Dpath.upload.storage=SFTP +-Dpath.upload.sftp.public=/home/etribe/data/upload +-Dpath.upload.sftp.tmpdir=${user.home}/upload/tmpdir +-Dfile.upload.sftp.ip=115.68.193.117 +-Dfile.upload.sftp.id=etribe +-Dfile.upload.sftp.password=Etribe@3415 +-Dfile.upload.sftp.port=22 ``` ## JDBC 및 데이터 핸들링 구성 옵션 diff --git a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java index a9ae6cdc..81288652 100644 --- a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java +++ b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java @@ -1,5 +1,6 @@ package app.module.admin.config.adapters.web.interceptor; +import app.module.admin.config.application.util.AdminUtil; import app.module.core.config.adapters.web.interceptor.model.URITopTierVO; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.exception.NoMatchingURIException; @@ -76,16 +77,16 @@ public class AdminURIInterceptor implements HandlerInterceptor { // 활성 프로파일 가져오기 TODO 2차 오픈시 삭제 예정 modelAndView.addObject("activeProfile", activeProfiles); + String roleId = AdminUtil.getLoginUserRole(); if (!CommonUtil.isAjaxRequest(request)) { - URITopTier topTierOutput = topTierPortIn.connect(AppType.ADMIN); + URITopTier topTierOutput = topTierPortIn.connectRoleId(AppType.ADMIN,roleId); modelAndView.addObject("topNode", recursiveMapping(topTierOutput)); if (modelAndView.getModelMap().getAttribute("currentURI") == null) { modelAndView.addObject("currentURI", request.getAttribute("currentURI")); } - modelAndView.addObject( - "menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI())); + modelAndView.addObject("menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI())); if (cloudFrontDomain != null && bucketFolder != null) { modelAndView.addObject("S3URL", "https://" + cloudFrontDomain + bucketFolder); diff --git a/admin/src/main/java/app/module/admin/config/application/enums/ManagementType.java b/admin/src/main/java/app/module/admin/config/application/enums/ManagementType.java index 24215339..bccd32cf 100644 --- a/admin/src/main/java/app/module/admin/config/application/enums/ManagementType.java +++ b/admin/src/main/java/app/module/admin/config/application/enums/ManagementType.java @@ -1,7 +1,9 @@ package app.module.admin.config.application.enums; +import com.fasterxml.jackson.annotation.JsonCreator; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.springframework.util.StringUtils; @Getter @RequiredArgsConstructor @@ -10,4 +12,10 @@ public enum ManagementType { CALL("전화상담"), ETC("기타"); private final String desc; + + @JsonCreator + public static ManagementType from(String value) { + if (!StringUtils.hasText(value)) return null; + return ManagementType.valueOf(value.toUpperCase()); + } } diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java index 03310069..c308fcdb 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java @@ -65,17 +65,18 @@ public class AdminAuthSuccessEvent { "security.password.change.notify", adminUser.getRemainPasswordDays())); } - // 로그인 활성화 기록 생성 -// loggedInUserSavePortIn.connect( -// LoggedInUserSaveCmd.builder() -// .loggedInUserId( -// LoggedInUserIdSaveCmd.builder() -// .appType(AppType.ADMIN) -// .id(authentication.getName()) -// .build()) -// .clientIP(CommonUtil.getClientIP(request)) -// .lastLoggedInAt(LocalDateTime.now()) -// .build()); + // 로그인 이력 쌓기 + loggedInUserSavePortIn.connect( + LoggedInUserSaveCmd.builder() + .loggedInUserId( + LoggedInUserIdSaveCmd.builder() + .appType(AppType.ADMIN) + .id(authentication.getName()) + .build()) + .clientIP(CommonUtil.getClientIP(request)) + .lastLoggedInAt(LocalDateTime.now()) + .build()); + } @EventListener diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index a883cca1..6b756315 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -46,6 +46,7 @@ public class AdminDetailsService implements UserDetailsService { adminUser.getPassword(), adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null), adminUser.getRegionMainCode(), + adminUser.getLastLoginIp(), !accountDisabled, true, isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()), diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java index 4fabf639..789a447a 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java @@ -10,6 +10,7 @@ public class AdminUser extends User { private Long seq; private String roleId; private String regionMainCode; + private String lastLoginIp; private long remainPasswordDays; public AdminUser( @@ -18,6 +19,7 @@ public class AdminUser extends User { String password, String roleId, String regionMainCode, + String lastLoginIp, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, @@ -35,6 +37,7 @@ public class AdminUser extends User { this.seq = seq; this.roleId = roleId; this.regionMainCode = regionMainCode; + this.lastLoginIp = lastLoginIp; this.remainPasswordDays = remainPasswordDays; } } diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index 0bb07840..27207001 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -53,4 +53,14 @@ public class AdminUtil { AdminUser user = (AdminUser) authentication.getPrincipal(); return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode(); } + + public static String getLoginUserLastIp() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) { + return null; + } + + AdminUser user = (AdminUser) authentication.getPrincipal(); + return user.getLastLoginIp(); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java index 5ea5110a..a8a05235 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java @@ -18,7 +18,6 @@ public class GetDailyExpenseRecords { private String quantity; private String unitCode; private String unitText; - private String unitSelf; private String price; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java index d7593e43..c9bf3e75 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java @@ -15,7 +15,6 @@ public class GetDailyFarmingRecords { private String productName; private String usage; private BigDecimal quantity; - private String unitCode; private String unitText; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java index 9f4a99c8..490c91b4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java @@ -21,7 +21,6 @@ public class GetDailyIncomeRecords { private BigDecimal quantity; private String unitCode; private String unitText; - private String unitSelf; private String price; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java index e057b165..0012c996 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java @@ -14,11 +14,9 @@ public class GetDailyWorkRecords { private String itemName; private String workName; private String workLandArea; - private String areaUnitCodeText; - private String areaUnitSelf; + private String areaUnitText; private String harvestQuantity; - private String harvestUnitCodeText; - private String harvestUnitSelf; + private String harvestUnitText; private String ownerTime; private String spouseTime; private String familyMHours; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java new file mode 100644 index 00000000..a70eed48 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.persistence; + +import app.module.core.config.application.annotation.DeleteCommand; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class RemoveHouseholdVisitInfosDao implements RemoveHouseholdVisitInfosPortOut { + private final RemoveHouseholdVisitInfosMapper mapper; + + @Override + @DeleteCommand + public void operate(RemoveHouseholdVisitInfosCmd cmd) { + mapper.removeHouseholdVisitInfos(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosMapper.java new file mode 100644 index 00000000..6e0b122c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosMapper.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.persistence; + +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveHouseholdVisitInfosMapper { + void removeHouseholdVisitInfos(RemoveHouseholdVisitInfosCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java new file mode 100644 index 00000000..db2ead06 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java @@ -0,0 +1,38 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web; + +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortIn; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +import app.module.core.config.application.util.MessageUtil; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosReqVO; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosResVO; + +@RestController +@RequiredArgsConstructor +class RemoveHouseholdVisitInfosController { + + private final MessageUtil messageUtil; + private final RemoveHouseholdVisitInfosPortIn portIn; + + @DeleteMapping(path = "/api/visitInfo/remove") + ResponseEntity operate( + @Valid @RequestBody RemoveHouseholdVisitInfosReqVO reqVO, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult); + } + + portIn.operate( + new RemoveHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getRemoveIds())); + + return ResponseEntity.status(HttpStatus.OK).body(new RemoveHouseholdVisitInfosResVO( + messageUtil.getMessage("operation.common.remove.done"))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java new file mode 100644 index 00000000..152bedbf --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class RemoveHouseholdVisitInfosReqVO { + private Long householdSeq; + private List removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosResVO.java new file mode 100644 index 00000000..522610ec --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveHouseholdVisitInfosResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortIn.java new file mode 100644 index 00000000..1f4bd74d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports; + +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; + +public interface RemoveHouseholdVisitInfosPortIn { + void operate(RemoveHouseholdVisitInfosCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortOut.java new file mode 100644 index 00000000..0bcc317d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports; + +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; + +public interface RemoveHouseholdVisitInfosPortOut { + void operate(RemoveHouseholdVisitInfosCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java new file mode 100644 index 00000000..622386db --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortIn; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class RemoveHouseholdVisitInfosService implements RemoveHouseholdVisitInfosPortIn { + private final RemoveHouseholdVisitInfosPortOut portOut; + + @Override + public void operate(RemoveHouseholdVisitInfosCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java new file mode 100644 index 00000000..47511d12 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class RemoveHouseholdVisitInfosCmd extends AuditCommand { + private Long householdSeq; + private List removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java new file mode 100644 index 00000000..d008d48e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence; + +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class SaveHouseholdVisitInfoDao implements SaveHouseholdVisitInfoPortOut { + private final SaveHouseholdVisitInfoMapper mapper; + + @Override + @Transactional + public void operate(SaveHouseholdVisitInfoCmd cmd) { + if (cmd.getVisitInfoId() != null) { + mapper.findById(cmd.getHouseholdSeq()) + .ifPresentOrElse( + v -> mapper.updateHouseholdVisitInfo(AuditUtil.update(cmd)), + () -> { throw new IllegalArgumentException("방문정보가 없습니다."); } + ); + } else { + mapper.createHouseholdVisitInfo(AuditUtil.create(cmd)); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java new file mode 100644 index 00000000..294a2f83 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveHouseholdVisitInfoMapper { + Optional findById(Long id); + void createHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd); + void updateHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java new file mode 100644 index 00000000..c3284314 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java @@ -0,0 +1,47 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortIn; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +import app.module.core.config.application.util.MessageUtil; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoResVO; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator.SaveHouseholdVisitInfoValidator; + +@RestController +@RequiredArgsConstructor +class SaveHouseholdVisitInfoController { + private final SaveHouseholdVisitInfoValidator validator; + private final SaveHouseholdVisitInfoPortIn portIn; + private final MessageUtil messageUtil; + + @PostMapping(path = "/api/visitInfo/save") + ResponseEntity operate( + @Valid @RequestBody SaveHouseholdVisitInfoReqVO reqVO, + BindingResult bindingResult) { + validator.validate(reqVO, bindingResult); + + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getAllErrors().get(0).getDefaultMessage()); + } + + portIn.operate(new SaveHouseholdVisitInfoCmd( + reqVO.getVisitInfoId(), + reqVO.getHouseholdSeq(), + reqVO.getVisitDate(), + reqVO.getManagementType().name(), + reqVO.getContent(), + reqVO.getIsGiftSent())); + + return ResponseEntity.status(HttpStatus.OK).body( + new SaveHouseholdVisitInfoResVO(messageUtil.getMessage("operation.common.save.done"))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java new file mode 100644 index 00000000..cd3afaab --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model; + +import app.module.admin.config.application.enums.ManagementType; +import com.fasterxml.jackson.annotation.JsonFormat; +import groovy.transform.NamedParam; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class SaveHouseholdVisitInfoReqVO { + private Long visitInfoId; + private Long householdSeq; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date visitDate; + private ManagementType managementType; + private String content; + private Boolean isGiftSent; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoResVO.java new file mode 100644 index 00000000..30a32a70 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class SaveHouseholdVisitInfoResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java new file mode 100644 index 00000000..20d7dcfb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java @@ -0,0 +1,45 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO; +import java.util.Date; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +public class SaveHouseholdVisitInfoValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return SaveHouseholdVisitInfoReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveHouseholdVisitInfoReqVO vo = (SaveHouseholdVisitInfoReqVO) target; + + if (vo.getHouseholdSeq() == null) { + errors.reject("householdSeq", "임가 정보가 없습니다."); + return; + } + + if (vo.getVisitDate() == null) { + errors.reject("visitDate", "방문일자를 입력해 주세요."); + return; + } + + if (vo.getVisitDate().after(new Date())) { + errors.reject("visitDate", "미래 날짜는 입력할 수 없습니다."); + return; + } + + if (vo.getManagementType() == null) { + errors.reject("managementType", "방문조사 유형을 선택해 주세요."); + } + + if (!StringUtils.hasText(vo.getContent())) { + errors.reject("content", "내용을 입력해 주세요."); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortIn.java new file mode 100644 index 00000000..ed9d50df --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; + +public interface SaveHouseholdVisitInfoPortIn { + void operate(SaveHouseholdVisitInfoCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortOut.java new file mode 100644 index 00000000..930daf06 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; + +public interface SaveHouseholdVisitInfoPortOut { + void operate(SaveHouseholdVisitInfoCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java new file mode 100644 index 00000000..c4304e3b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortIn; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class SaveHouseholdVisitInfoService implements SaveHouseholdVisitInfoPortIn { + private final SaveHouseholdVisitInfoPortOut portOut; + + @Override + public void operate(SaveHouseholdVisitInfoCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java new file mode 100644 index 00000000..3b4ea0ee --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class SaveHouseholdVisitInfoCmd extends AuditCommand { + private Long visitInfoId; + private Long householdSeq; + private Date visitDate; + private String managementType; + private String content; + private Boolean isGiftSent; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index a746c5ad..4b9a68a9 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -54,6 +54,11 @@ public class ResearcherDao implements ResearcherPortOut { return new PageImpl<>(result, pageable, total); } + @Override + public VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO) { + return researcherMapper.selectVisitHouseholdPercentage(reqVO); + } + @Override public Page visitHouseholdList(ResearchersDetailReqVO reqVO) { List result = researcherMapper.visitHouseholdList(reqVO); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java index da23f937..0eb5e6d4 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java @@ -22,6 +22,7 @@ public interface ResearcherMapper { ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id); Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(@Param("selectIds") List selectIds,@Param("deletedBy") String deletedBy); void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy); Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java new file mode 100644 index 00000000..ccb8604e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.researcher.adpaters.persistence.model; + +import lombok.Data; + +@Data +public class VisitHouseholdPercentageDto { + private Integer totalHouseholdCount; + private Integer firstVisitCount; + private Integer secondVisitCount; + private Integer giftSentCount; + private Double firstVisitPercentage; + private Double secondVisitPercentage; + private Double giftSentPercentage; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index d9a4ea86..b96e643f 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -29,6 +29,11 @@ class ResearcherApiController { return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO)); } + @GetMapping(path = "/visitHousehold/percentage") + ResponseEntity selectVisitHouseholdPercentage( @ModelAttribute ResearchersDetailReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.selectVisitHouseholdPercentage(reqVO)); + } + @GetMapping(path = "/visitHousehold/list") ResponseEntity visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO)); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java index 38b7fee2..0c411ee9 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java @@ -14,5 +14,5 @@ public class ResearchersVisitDetailReqVO { private String visitDate; private ManagementType managementType; private String content; - private String isGiftSentFlag; + private String isGiftSent; } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java index e5e2652f..3ac93585 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -11,6 +11,7 @@ public interface ResearcherPortIn { ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); Integer visitHouseholdDelete(List selectIds); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java index caf95b57..161a2971 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java @@ -10,6 +10,7 @@ public interface ResearcherPortOut { Page list(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java index c590aab5..d992bc91 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java @@ -35,6 +35,11 @@ class ResearcherService implements ResearcherPortIn { return portOut.visitHouseholdList(reqVO); } + @Override + public VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO) { + return portOut.selectVisitHouseholdPercentage(reqVO); + } + @Override public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) { return portOut.updateVisitHousehold(reqVO); diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml index 325b8ea5..e7f65e2e 100644 --- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -44,6 +44,7 @@ AND bat.household_seq = #{householdSeq} AND bat.month = #{recordMonth} AND bat.is_deleted = false + ORDER BY bat.created_at \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml index e13f5cca..98d5c62b 100644 --- a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml @@ -68,5 +68,6 @@ WHERE df.household_seq = #{householdSeq} AND df.month = #{recordMonth} AND df.is_deleted = false + ORDER BY df.created_at \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml index 8be8421f..f5186220 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml @@ -16,5 +16,7 @@ FROM household_visit hv WHERE household_seq = #{householdSeq} AND TO_CHAR(visit_date, 'YYYYMM') = #{recordMonth} + AND hv.is_deleted = false + ORDER BY hv.created_at \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/RemoveHouseholdVisitInfosMapper.xml b/admin/src/main/resources/mappers/household/RemoveHouseholdVisitInfosMapper.xml new file mode 100644 index 00000000..d4a0516a --- /dev/null +++ b/admin/src/main/resources/mappers/household/RemoveHouseholdVisitInfosMapper.xml @@ -0,0 +1,15 @@ + + + + + /* removeHouseholdVisitInfos : 임가방문정보 삭제 */ + UPDATE household_visit + SET + WHERE id IN + + #{id} + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml b/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml new file mode 100644 index 00000000..b6f15d51 --- /dev/null +++ b/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml @@ -0,0 +1,47 @@ + + + + + /* createHouseholdVisitInfo : 임가방문정보 등록 */ + INSERT INTO household_visit + ( + household_seq, + visit_date, + management_type, + is_gift_sent, + content, + + ) + VALUES + ( + #{householdSeq}, + #{visitDate}, + #{managementType}, + #{isGiftSent}, + #{content}, + + ) + + + + /* updateHouseholdVisitInfo : 임가방문정보 수정 */ + UPDATE household_visit + SET + visit_date = #{visitDate}, + management_type = #{managementType}, + is_gift_sent = #{isGiftSent}, + content = #{content}, + + WHERE id = #{visitInfoId} + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml b/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml index 30814853..a21fd09b 100644 --- a/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml +++ b/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml @@ -7,13 +7,15 @@ INSERT INTO logged_in_user ( - app_type, id, + app_type, + login_id, clientip, last_logged_in_at ) VALUES ( + nextval('logged_in_user_seq'), #{appType}, #{id}, #{clientIP}, @@ -27,7 +29,7 @@ clientip = #{clientIP}, last_logged_in_at = #{lastLoggedInAt} WHERE app_type = #{appType} - AND id = #{id} + AND login_id = #{id} \ No newline at end of file diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index f5c8a24e..d3fe3f15 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -121,9 +121,8 @@ case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag, rhv.created_at from household_visit rhv - join researcher_has_household rhh on rhh.household_seq = rhv.household_seq - join household h on rhh.household_seq = h.seq - join admin a on a.seq = rhh.admin_seq + join household h on rhv.household_seq = h.seq + join researcher_has_household rhh on rhh.household_seq = h.seq and rhh.is_deleted = false where rhv.is_deleted = false and rhh.admin_seq = #{seq} @@ -134,6 +133,66 @@ LIMIT #{size} OFFSET #{page}*#{size} + + `); + ``);*/ // 업로드 파일 정보 보이기 uiUtil.showFileInfo(input, res, $(input).attr('accept') === 'image/*'); @@ -274,18 +276,16 @@ uiUtil.uploadFile = (fileUploadType, input) => { * @param {boolean} showImg 미리보기 이미지 노출 여부 */ uiUtil.showFileInfo = (input, uploadFile, showImg) => { - const inputGroup = $(input).parent('.input-group'); + const inputGroup = $(input).parent().parent().find('.input-group'); if (!inputGroup.length) { alert( `${input.name} 앨리먼트의 부모가 input-group 클래스를 가져야 showFileInfo 메서드를 실행할 수 있습니다.`); return; } - inputGroup.find('.fileInfo').remove(); + /* inputGroup.find('.fileInfo').remove();*/ - - - inputGroup.append(` +/* inputGroup.append(` - `); + `);*/ + + inputGroup.append(` + `); + const fileInfo = inputGroup.find('.fileInfo'); - if (!showImg) { +/* if (!showImg) { fileInfo.find('img').remove(); - } + }*/ // 파일 삭제 함수 정의 - inputGroup.find('.resetFile').on('click', () => { - let fileInput = inputGroup.find('input[type=file]'); - fileInput.replaceWith(` - - `); - - inputGroup.find('input[name=fileMappingId]').remove(); - inputGroup.find('.fileInfo').fadeOut((evt) => { - $(evt.target).remove(); + inputGroup.find('.resetFile').on('click', function () { + const $fileInfo = $(this).closest('.fileInfo'); + $fileInfo.fadeOut(function () { + $(this).remove(); }); - return false; }); diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index 9555d4d9..842c3d97 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -105,7 +105,7 @@ - 메뉴명 + 메뉴명 @@ -133,7 +133,7 @@

로그인 사용자명님 안녕하세요

- 111.11.111.111 + 111.11.111.111
diff --git a/admin/src/main/resources/templates/common/modal-household-mapping.html b/admin/src/main/resources/templates/common/modal-household-mapping.html index b18e80e6..135bfb87 100644 --- a/admin/src/main/resources/templates/common/modal-household-mapping.html +++ b/admin/src/main/resources/templates/common/modal-household-mapping.html @@ -10,11 +10,11 @@ - - - + diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html index 6eb51c31..9f248ec7 100644 --- a/admin/src/main/resources/templates/communication/notice/{id}.html +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -14,11 +14,11 @@ 제목* -
-
- -
+
+
+
+
@@ -28,20 +28,28 @@ - 첨부파일* + 첨부파일 +
+ +

첨부 가능 파일 형식: 문서(pdf, docx, xlsx, pptx, hwp), 이미지(jpg, jpeg, png, gif), 기타(zip, + csv, txt) / 파일당 최대 5MB까지 등록 가능합니다.

+
    + +
+
+ + - 게시기간* @@ -57,11 +65,9 @@
- - 노출여부* @@ -75,8 +81,6 @@ - - @@ -102,7 +106,6 @@ + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html new file mode 100644 index 00000000..2cf21b68 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html @@ -0,0 +1,175 @@ + + + +
+
+
+
+ +
+
+

수입 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + +
선택재배형태수입의 종류대상수입원수량단위현금(원)
+
+ + +
+
+

지출 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택지출의 종류용도수량단위현금(원)
+
+
+
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html new file mode 100644 index 00000000..0c23edf6 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -0,0 +1,642 @@ + + + +
+
+ +
+
+
+
    +
  • +

    작성완료

    + 6건 +
  • +
  • +

    미작성

    + 6건 +
  • +
  • +

    미완료

    + 6건 +
  • +
  • +

    대기

    + 6건 +
  • +
  • +

    완료율

    + 56.12% +
  • +
+
+ + + + + + + + + + + + + + + + +
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
+
+
+ + + +
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html new file mode 100644 index 00000000..1ce4ce76 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -0,0 +1,121 @@ + + + +
+
+
+
+
+

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
+
+
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/household-visit.html b/admin/src/main/resources/templates/households/tab/household-visit.html new file mode 100644 index 00000000..2afcc4e4 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/household-visit.html @@ -0,0 +1,129 @@ + + + +
+
+
+
+
+

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택방문일관리분야내용최종 수정자답례품 전달
+
+
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}-backup.html b/admin/src/main/resources/templates/households/{seq}-backup.html new file mode 100644 index 00000000..ce1b0380 --- /dev/null +++ b/admin/src/main/resources/templates/households/{seq}-backup.html @@ -0,0 +1,1303 @@ + + + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
임가번호 + 16750 + 경영주 + 홍길동 + 연령 + 75 +
가구 연락처 + 031-0000-0000 + 휴대폰 번호 + 010-0000-0000 +
실사 + 서울 + 지역 + 31.경기도 + 세부 지역 + 9.경기 +
전체 주소 + 경기도 성남시 분당구 산성대로 OOOO +
업종 대분류 + 40. 수실류재배업 + 업종 중분류1 + 42. 대추재배업 + 업종 중분류2 + 52_1. 조경수 +
규모/세부품목 + 52_1_1. 조경수 +
담당 조사원 + 김조사 + 담당조사원 연락처 + 010-0000-0000 + 유지여부 + 1.유지 +
비고 + - +
+ +
+
+ + +
+
+
+ +
+
+
+ + + + + +
+ +
+
+ +
+
+ +
+
+
+
    +
  • +

    작성완료

    + 6건 +
  • +
  • +

    미작성

    + 6건 +
  • +
  • +

    미완료

    + 6건 +
  • +
  • +

    대기

    + 6건 +
  • +
  • +

    완료율

    + 56.12% +
  • +
+
+ + + + + + + + + + + + + + + + +
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
+
+
+ + + +
+ +
+
+
+
+

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
+
+
+
+ +
+
+
+ +
+
+

수입 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + +
선택재배형태수입의 종류대상수입원수량단위현금(원)
+
+ + +
+
+

지출 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택지출의 종류용도수량단위현금(원)
+
+
+
+
+ +
+
+
+
+

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택방문일관리분야내용최종 수정자답례품 전달
+
+
+
+
+
+ +
+
+
+ +
+
+ + +
+
+
+
+
+
+ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index cde589a2..52a1f1a2 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -135,463 +135,20 @@
-
- -
-
-
-
    -
  • -

    작성완료

    - 6건 -
  • -
  • -

    미작성

    - 6건 -
  • -
  • -

    미완료

    - 6건 -
  • -
  • -

    대기

    - 6건 -
  • -
  • -

    완료율

    - 56.12% -
  • -
-
- - - - - - - - - - - - - - + + - -
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
-
-
+ + - - -
- -
-
-
-
-

-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
-
-
-
- -
-
-
- -
-
-

수입 (0건)

-
-
- - -
-
-
- - - - - - - - - - - - - - - - -
선택재배형태수입의 종류대상수입원수량단위현금(원)
-
- - -
-
-

지출 (0건)

-
-
- - -
-
-
- - - - - - - - - - - - - - -
선택지출의 종류용도수량단위현금(원)
-
-
-
-
- -
-
-
-
-

-
-
- - -
-
-
- - - - - - - - - - - - - - -
선택방문일관리분야내용최종 수정자답례품 전달
-
-
-
+ +
- +
@@ -614,14 +171,17 @@ -
+ -
- +
+ + - - - - - - - - @@ -815,7 +818,11 @@ {{include tmpl="#titleTmpl" /}}
    - {{for list tmpl="#basicRowTmpl" /}} + {{if modifiable}} + {{for list tmpl="#basicRowTmpl1" /}} + {{else}} + {{for list tmpl="#basicRowTmpl2" /}} + {{/if}}
{{include tmpl="#etcRowTmpl" /}} @@ -827,24 +834,42 @@

{{:date.start}} ~ {{:date.end}}

{{/if}} - + + +
+ + \ No newline at end of file diff --git a/front/src/main/resources/templates/record/forestry/form.html b/front/src/main/resources/templates/record/forestry/form.html index 273900ef..0596d1a4 100644 --- a/front/src/main/resources/templates/record/forestry/form.html +++ b/front/src/main/resources/templates/record/forestry/form.html @@ -42,7 +42,7 @@
+ th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
  • 예 : 2, 2.5
  • @@ -97,7 +97,7 @@
+ th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요"> 원
    diff --git a/front/src/main/resources/templates/record/forestry/index.html b/front/src/main/resources/templates/record/forestry/index.html index f99ba4de..9c745ac5 100644 --- a/front/src/main/resources/templates/record/forestry/index.html +++ b/front/src/main/resources/templates/record/forestry/index.html @@ -3,7 +3,11 @@ xmlns:th="http://www.thymeleaf.org" lang="ko">
    -
    +

    @@ -13,26 +17,26 @@ [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
    - 임업생산물 중 자가소비량 [[${#lists.isEmpty(forestryList) ? 0 : #lists.size(forestryList)}]]건 등록 + 임업생산물 중 자가소비량 내역 [[${#lists.isEmpty(forestryList) ? 0 : #lists.size(forestryList)}]]건 등록 되었습니다.

    자가임업생산물 중 자가소비량 내역을 등록해 주세요.

    등록 내용을 확인하거나 다음 단계로 이동하세요.

    - +
    - +
    + th:if="${(dailyRecord.registrable && moveStep)}">
    @@ -129,7 +135,7 @@
    - +
    diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index 4b9c87b7..a04258ff 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -110,7 +110,7 @@
+ th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
  • 예 : 2, 2.5
  • @@ -165,7 +165,7 @@
    + th:value="${detail.price}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요"> 원
      @@ -182,7 +182,7 @@
      + th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요"> 원
        diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index ae07406b..8255d5c5 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -3,7 +3,26 @@ xmlns:th="http://www.thymeleaf.org" lang="ko">
        -
        + +
        + reqVO: [[${reqVO}]] +
        +
        + detail: [[${dailyRecord}]] +
        +
        + [[${dailyRecord.registrable}]] + [[${moveStep}]], + [[${dailyRecord.modifiable}]] +
        + //http://localhost:8080/record/income/202505/12?type=step1&target=income +
        +
        +

        @@ -16,22 +35,24 @@ 수입 내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록
        되었습니다.

        -

        수입 내역을 등록해 주세요.

        +

        +

        수입 내역을 등록해 주세요.

        +

        등록 내용을 확인하거나 다음 단계로 이동하세요.

        - +
      - @@ -95,16 +120,16 @@ - +
      + th:if="${(dailyRecord.registrable && moveStep)}">
      @@ -129,7 +154,7 @@
      - + diff --git a/front/src/main/resources/templates/record/power/form.html b/front/src/main/resources/templates/record/power/form.html index d70ba58a..5adb16cd 100644 --- a/front/src/main/resources/templates/record/power/form.html +++ b/front/src/main/resources/templates/record/power/form.html @@ -45,7 +45,8 @@
      - + 시간
      @@ -57,7 +58,8 @@
      - + 시간
      diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html index c254ede7..d4ac84a7 100644 --- a/front/src/main/resources/templates/record/power/index.html +++ b/front/src/main/resources/templates/record/power/index.html @@ -3,7 +3,11 @@ xmlns:th="http://www.thymeleaf.org" lang="ko">
      -
      +

      @@ -16,22 +20,23 @@ 동력 사용내역 [[${#lists.isEmpty(powerList) ? 0 : #lists.size(powerList)}]]건 등록
      되었습니다.

      -

      동력 사용내역을 등록해 주세요.

      +

      동력 사용내역을 등록해 주세요.

      +

      등록 내용을 확인하거나 다음 단계로 이동하세요.

      - +
      - +
      + th:if="${(dailyRecord.registrable && moveStep)}">
      @@ -113,7 +120,7 @@
      - +
      diff --git a/front/src/main/resources/templates/record/work/form.html b/front/src/main/resources/templates/record/work/form.html index b941a2ab..d83cbc1e 100644 --- a/front/src/main/resources/templates/record/work/form.html +++ b/front/src/main/resources/templates/record/work/form.html @@ -52,7 +52,7 @@
      + th:value="${detail.workLandArea}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="작업 면적을 입력해 주세요">
      • 예 : 180, 6
      • @@ -79,7 +79,7 @@
          -
        • + th:value="${detail.harvestQuantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수확량을 입력해 주세요">
        @@ -174,7 +174,7 @@
        + th:value="${detail.ownerTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -187,7 +187,7 @@
        + th:value="${detail.spouseTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -202,7 +202,7 @@
        남 + th:value="${detail.familyMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -210,7 +210,7 @@
        여 + th:value="${detail.familyFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -227,7 +227,7 @@
        남 + th:value="${detail.hiredMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -235,7 +235,7 @@
        여 + th:value="${detail.hiredFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -252,7 +252,7 @@
        남 + th:value="${detail.sharedMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -260,7 +260,7 @@
        여 + th:value="${detail.sharedFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -277,7 +277,7 @@
        남 + th:value="${detail.volunteerMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        @@ -285,7 +285,7 @@
        여 + th:value="${detail.volunteerFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
        diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index fc15303c..7f1a9f11 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -3,7 +3,11 @@ xmlns:th="http://www.thymeleaf.org" lang="ko">
        -
        +

        @@ -16,22 +20,23 @@ 임업노동 투입 내역 [[${#lists.isEmpty(workList) ? 0 : #lists.size(workList)}]]건 등록
        되었습니다.

        -

        임업노동 투입 내역을 등록해 주세요.

        +

        임업노동 투입 내역을 등록해 주세요.

        +

        등록 내용을 확인하거나 다음 단계로 이동하세요.

        - +
        - +
        + th:if="${(dailyRecord.registrable && moveStep)}">
        @@ -174,7 +181,7 @@
        - +
        @@ -253,6 +260,12 @@ function (rstData, status) { location.reload(); }, + function () { + // 노동투입시간 invalid reset + $('.segment-label .guide-info li').eq(2).addClass('invalid'); + $('.type-sub').find('.input-info').remove(); + $('.input-flex-group').find('.input-info').remove(); + } ); }, }; diff --git a/front/src/main/resources/templates/security/login.html b/front/src/main/resources/templates/security/login.html index ef9ae9ae..0a31bbf9 100644 --- a/front/src/main/resources/templates/security/login.html +++ b/front/src/main/resources/templates/security/login.html @@ -21,8 +21,8 @@
        - +