Merge branch 'dev' into 'deploy-dev-front'
Revert "monthly_input_status의 bank_auto_transfer_status 을 두개로 분리" See merge request korea-research/korea-research!18
This commit is contained in:
@@ -7,9 +7,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
||||
import org.springframework.cache.annotation.EnableCaching;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
|
||||
@SpringBootApplication
|
||||
@EnableCaching
|
||||
@EnableScheduling
|
||||
@ComponentScan(basePackages = "app.module")
|
||||
public class AdminApplication extends SpringBootServletInitializer {
|
||||
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.config.application.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum ManagementType {
|
||||
VISIT("방문조사"),
|
||||
CALL("전화상담"),
|
||||
ETC("기타");
|
||||
private final String desc;
|
||||
}
|
||||
@@ -43,6 +43,7 @@ public class AdminDetailsService implements UserDetailsService {
|
||||
return new AdminUser(
|
||||
adminUser.getId(),
|
||||
adminUser.getPassword(),
|
||||
adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null),
|
||||
!accountDisabled,
|
||||
true,
|
||||
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),
|
||||
|
||||
@@ -7,12 +7,13 @@ import org.springframework.security.core.userdetails.User;
|
||||
|
||||
@Getter
|
||||
public class AdminUser extends User {
|
||||
|
||||
private String roleId;
|
||||
private long remainPasswordDays;
|
||||
|
||||
public AdminUser(
|
||||
String username,
|
||||
String password,
|
||||
String roleId,
|
||||
boolean enabled,
|
||||
boolean accountNonExpired,
|
||||
boolean credentialsNonExpired,
|
||||
@@ -27,6 +28,7 @@ public class AdminUser extends User {
|
||||
credentialsNonExpired,
|
||||
accountNonLocked,
|
||||
authorities);
|
||||
this.roleId = roleId;
|
||||
this.remainPasswordDays = remainPasswordDays;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
package app.module.admin.config.application.util;
|
||||
|
||||
import app.module.admin.config.application.security.AdminUser;
|
||||
import app.module.core.config.adapters.web.interceptor.model.URITopTierVO;
|
||||
import java.util.List;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@@ -19,4 +23,14 @@ public class AdminUtil {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static String getLoginUserRole() {
|
||||
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
||||
if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
AdminUser user = (AdminUser) authentication.getPrincipal();
|
||||
return user.getRoleId().isEmpty() ? null : user.getRoleId();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package app.module.admin.config.application.util;
|
||||
|
||||
import app.module.admin.config.application.util.model.MonthOption;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class DateUiUtil {
|
||||
private static final DateTimeFormatter VALUE_FORMAT = DateTimeFormatter.ofPattern("yyyyMM");
|
||||
private static final DateTimeFormatter LABEL_FORMAT = DateTimeFormatter.ofPattern("yyyy년 M월");
|
||||
|
||||
public static List<MonthOption> getRecentMonths(int count) {
|
||||
List<MonthOption> list = new ArrayList<>();
|
||||
LocalDate now = LocalDate.now();
|
||||
|
||||
for (int i = 0; i < count; i++) {
|
||||
LocalDate date = now.minusMonths(i);
|
||||
list.add(new MonthOption(
|
||||
date.format(VALUE_FORMAT),
|
||||
date.format(LABEL_FORMAT)
|
||||
));
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
public static String getCurrentMonthValue() {
|
||||
return LocalDate.now().format(VALUE_FORMAT);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.config.application.util.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class MonthOption {
|
||||
private String value;
|
||||
private String label;
|
||||
}
|
||||
@@ -44,10 +44,8 @@ public class AdminCreatePostController {
|
||||
bindingVO.getSeq(),
|
||||
bindingVO.getId(),
|
||||
bindingVO.getPassword(),
|
||||
bindingVO.getEmail(),
|
||||
bindingVO.getRegionMainCode(),
|
||||
bindingVO.getAccountDisabled(),
|
||||
bindingVO.getAccountLocked(),
|
||||
bindingVO.getRoleIds());
|
||||
|
||||
redirectAttributes.addFlashAttribute(
|
||||
|
||||
@@ -53,12 +53,9 @@ class AdminUpdateGetController {
|
||||
output.getSeq(),
|
||||
output.getId(),
|
||||
null,
|
||||
output.getEmail(),
|
||||
output.getRegionMainCode(),
|
||||
output.getPasswordUpdatedAt(),
|
||||
output.getAccountDisabled(),
|
||||
output.getLoginFailCnt(),
|
||||
output.getAccountLocked(),
|
||||
output.getRoles().stream().map(CoreRole::getId).collect(Collectors.toList()));
|
||||
|
||||
model.addAttribute("bindingVO", bindingVO);
|
||||
|
||||
@@ -44,10 +44,8 @@ class AdminUpdatePostController {
|
||||
bindingVO.getSeq(),
|
||||
bindingVO.getId(),
|
||||
bindingVO.getUpdatePassword(),
|
||||
bindingVO.getEmail(),
|
||||
bindingVO.getRegionMainCode(),
|
||||
bindingVO.getAccountDisabled(),
|
||||
bindingVO.getAccountLocked(),
|
||||
bindingVO.getRoleIds());
|
||||
|
||||
redirectAttributes.addFlashAttribute(
|
||||
|
||||
@@ -15,15 +15,15 @@ public class AdminCreateBindingVO {
|
||||
private String id;
|
||||
private String password;
|
||||
|
||||
@NotBlank(message = "{valid.common.required}")
|
||||
/* @NotBlank(message = "{valid.common.required}")
|
||||
@Pattern(
|
||||
regexp =
|
||||
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
|
||||
message = "{valid.common.email.wrong}")
|
||||
private String email;
|
||||
private String email;*/
|
||||
|
||||
private Boolean accountDisabled;
|
||||
private Boolean accountLocked;
|
||||
/* private Boolean accountLocked;*/
|
||||
private List<String> roleIds;
|
||||
private String regionMainCode;
|
||||
}
|
||||
|
||||
@@ -26,17 +26,17 @@ public class AdminUpdateBindingVO implements AuditOutput {
|
||||
private String id;
|
||||
private String updatePassword;
|
||||
|
||||
@NotBlank(message = "{valid.common.required}")
|
||||
/* @NotBlank(message = "{valid.common.required}")
|
||||
@Pattern(
|
||||
regexp =
|
||||
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
|
||||
message = "{valid.common.email.wrong}")
|
||||
private String email;
|
||||
private String email;*/
|
||||
private String regionMainCode;
|
||||
|
||||
private LocalDateTime passwordUpdatedAt;
|
||||
private Boolean accountDisabled;
|
||||
private Integer loginFailCnt;
|
||||
private Boolean accountLocked;
|
||||
/* private Integer loginFailCnt;
|
||||
private Boolean accountLocked;*/
|
||||
private List<String> roleIds;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class CheckHouseholdNumDao implements CheckHouseholdNumPortOut {
|
||||
private final CheckHouseholdNumMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd) {
|
||||
return mapper.checkHouseholdNum(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface CheckHouseholdNumMapper {
|
||||
Optional<CheckHouseholdNum> checkHouseholdNum(CheckHouseholdNumCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model.CheckHouseholdNumReqVO;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class CheckHouseholdNumController {
|
||||
private final CheckHouseholdNumPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/households/check")
|
||||
ResponseEntity<CheckHouseholdNum> operate(
|
||||
@Valid CheckHouseholdNumReqVO reqVO) {
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(portIn.operate(new CheckHouseholdNumCmd(reqVO.getHouseholdNum())).orElse(null));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model;
|
||||
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CheckHouseholdNumReqVO {
|
||||
@NotEmpty
|
||||
private String householdNum;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package app.module.front.usecase.household.updateFrontHousehold.adapters.web.model;
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -9,5 +9,5 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateFrontHouseholdResVO {
|
||||
public class CheckHouseholdNumResVO {
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
|
||||
|
||||
public interface CheckHouseholdNumPortIn {
|
||||
Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
|
||||
|
||||
public interface CheckHouseholdNumPortOut {
|
||||
Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class CheckHouseholdNumService implements CheckHouseholdNumPortIn {
|
||||
private final CheckHouseholdNumPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CheckHouseholdNum {
|
||||
private Boolean isDuplicated; // 사용여부
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CheckHouseholdNumCmd {
|
||||
private String householdNum;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package app.module.admin.usecase.household.createHousehold.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.annotation.CreateCommand;
|
||||
import app.module.core.config.application.util.AuditUtil;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class CreateHouseholdDao implements CreateHouseholdPortOut {
|
||||
private final CreateHouseholdMapper mapper;
|
||||
|
||||
@Override
|
||||
@CreateCommand
|
||||
public void operate(CreateHouseholdOutCmd outCmd) {
|
||||
mapper.createHousehold(outCmd);
|
||||
|
||||
if(outCmd.getResearcherSeq() != null) {
|
||||
mapper.createHouseholdHasRole(
|
||||
AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds())));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.createHousehold.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface CreateHouseholdMapper {
|
||||
void createHousehold(CreateHouseholdOutCmd outCmd);
|
||||
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package app.module.admin.usecase.household.createHousehold.adapters.web;
|
||||
|
||||
import app.module.core.config.application.util.MessageUtil;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
|
||||
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.createHousehold.adapters.web.model.CreateHouseholdReqVO;
|
||||
import app.module.admin.usecase.household.createHousehold.adapters.web.validator.CreateHouseholdValidator;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class CreateHouseholdController {
|
||||
private final CreateHouseholdValidator validator;
|
||||
private final CreateHouseholdPortIn createHouseholdPortIn;
|
||||
private final MessageUtil messageUtil;
|
||||
|
||||
@PostMapping(path = "/api/household/households/create")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody CreateHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult.getAllErrors().get(0).getDefaultMessage());
|
||||
}
|
||||
|
||||
createHouseholdPortIn.operate(
|
||||
new CreateHouseholdInCmd(
|
||||
reqVO.getHouseholdNum(),
|
||||
reqVO.getOwnerName(),
|
||||
reqVO.getOwnerAge(),
|
||||
reqVO.getTel1(),
|
||||
reqVO.getTel2(),
|
||||
reqVO.getTel3(),
|
||||
reqVO.getPhone1(),
|
||||
reqVO.getPhone2(),
|
||||
reqVO.getPhone3(),
|
||||
reqVO.getRegionMainCode(),
|
||||
reqVO.getRegionSubCode(),
|
||||
reqVO.getRegionDetailCode(),
|
||||
reqVO.getAddress(),
|
||||
reqVO.getIndustryLargeCode(),
|
||||
reqVO.getIndustryMiddleCode(),
|
||||
reqVO.getIndustrySubMiddle(),
|
||||
reqVO.getIndustryDetail(),
|
||||
reqVO.getResearcherSeq(),
|
||||
reqVO.getIsPanel(),
|
||||
reqVO.getMemo()
|
||||
)
|
||||
);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(messageUtil.getMessage("operation.common.save.done"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package app.module.admin.usecase.household.createHousehold.adapters.web.model;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateHouseholdReqVO {
|
||||
private String householdNum;
|
||||
private String ownerName;
|
||||
private Integer ownerAge;
|
||||
private String tel1;
|
||||
private String tel2;
|
||||
private String tel3;
|
||||
private String phone1;
|
||||
private String phone2;
|
||||
private String phone3;
|
||||
private String regionMainCode;
|
||||
private String regionSubCode;
|
||||
private String regionDetailCode;
|
||||
private String address;
|
||||
private String industryLargeCode;
|
||||
private String industryMiddleCode;
|
||||
private String industrySubMiddle;
|
||||
private String industryDetail;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.createHousehold.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateHouseholdResVO {
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package app.module.admin.usecase.household.createHousehold.adapters.web.validator;
|
||||
|
||||
import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdReqVO;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.validation.Errors;
|
||||
import org.springframework.validation.Validator;
|
||||
|
||||
@Component
|
||||
public class CreateHouseholdValidator implements Validator {
|
||||
|
||||
@Override
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return CreateHouseholdReqVO.class.equals(clazz);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void validate(Object target, Errors errors) {
|
||||
CreateHouseholdReqVO vo = (CreateHouseholdReqVO) target;
|
||||
|
||||
// 1. 임가번호
|
||||
if (!StringUtils.hasText(vo.getHouseholdNum())) {
|
||||
errors.reject("householdNum", "임가번호는 필수 입력 항목입니다.");
|
||||
return;
|
||||
}
|
||||
if (StringUtils.hasText(vo.getHouseholdNum()) && vo.getHouseholdNum().length() < 5) {
|
||||
errors.reject("householdNum", "임가번호는 5자리 숫자로 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 2. 경영주명
|
||||
if (!StringUtils.hasText(vo.getOwnerName())) {
|
||||
errors.reject("ownerName", "경영주명을 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
if (vo.getOwnerName().length() > 10) {
|
||||
errors.reject("ownerName", "경영주명은 최대 10자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 3. 연령
|
||||
if (vo.getOwnerAge() == null) {
|
||||
errors.reject("ownerAge", "연령을 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
if (vo.getOwnerAge().toString().length() > 3) {
|
||||
errors.reject("ownerAge", "연령은 최대 3자리 숫자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 4. 가구 연락처
|
||||
// TODO : 필수입력값 맞는지 체크
|
||||
// if (!StringUtils.hasText(vo.getTel1()) || !StringUtils.hasText(vo.getTel2()) || !StringUtils.hasText(vo.getTel3())) {
|
||||
// errors.reject("tel", "가구 연락처를 모두 입력해주세요.");
|
||||
// return;
|
||||
// }
|
||||
// if (vo.getTel2().length() > 4 || vo.getTel3().length() > 4) {
|
||||
// errors.reject("tel", "가구 연락처는 각 4자리까지 입력 가능합니다.");
|
||||
// return;
|
||||
// }
|
||||
if (StringUtils.hasText(vo.getTel2()) || StringUtils.hasText(vo.getTel3())) {
|
||||
if ((vo.getTel2() != null && vo.getTel2().length() > 4) ||
|
||||
(vo.getTel3() != null && vo.getTel3().length() > 4)) {
|
||||
errors.reject("tel", "가구 연락처는 각 4자리까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// 5. 휴대폰 번호
|
||||
if (!StringUtils.hasText(vo.getPhone1()) || !StringUtils.hasText(vo.getPhone2()) || !StringUtils.hasText(vo.getPhone3())) {
|
||||
errors.reject("phone", "휴대폰 번호를 모두 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
if (vo.getPhone2().length() > 4 || vo.getPhone3().length() > 4) {
|
||||
errors.reject("phone", "휴대폰 번호는 각 4자리까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 6. 지역 코드
|
||||
if (!StringUtils.hasText(vo.getRegionMainCode())) {
|
||||
errors.reject("regionMainCode", "실사를 선택해주세요.");
|
||||
return;
|
||||
}
|
||||
if (!StringUtils.hasText(vo.getRegionSubCode())) {
|
||||
errors.reject("regionSubCode", "지역을 선택해주세요.");
|
||||
return;
|
||||
}
|
||||
if (!StringUtils.hasText(vo.getRegionDetailCode())) {
|
||||
errors.reject("regionDetailCode", "세부지역을 선택해주세요.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 7. 주소
|
||||
if (!StringUtils.hasText(vo.getAddress())) {
|
||||
errors.reject("address", "주소를 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
if (StringUtils.hasText(vo.getAddress()) && vo.getAddress().length() > 50) {
|
||||
errors.reject("address", "주소는 최대 50자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 8. 업종 중분류2
|
||||
if (StringUtils.hasText(vo.getIndustrySubMiddle()) && vo.getIndustrySubMiddle().length() > 20) {
|
||||
errors.reject("industrySubMiddle", "업종 중분류는 최대 20자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 9. 업종 세부품목
|
||||
if (StringUtils.hasText(vo.getIndustryDetail()) && vo.getIndustryDetail().length() > 20) {
|
||||
errors.reject("industryDetail", "업종 세부품목은 최대 20자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.admin.usecase.household.createHousehold.ports;
|
||||
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
|
||||
|
||||
public interface CreateHouseholdPortIn {
|
||||
void operate(CreateHouseholdInCmd inCmd);
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.admin.usecase.household.createHousehold.ports;
|
||||
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
|
||||
|
||||
public interface CreateHouseholdPortOut {
|
||||
void operate(CreateHouseholdOutCmd outCmd);
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package app.module.admin.usecase.household.createHousehold.ports.application;
|
||||
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
|
||||
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class CreateHouseholdService implements CreateHouseholdPortIn {
|
||||
|
||||
private final CreateHouseholdPortOut portOut;
|
||||
private final BCryptPasswordEncoder passwordEncoder;
|
||||
private final CheckHouseholdNumPortIn checkHouseholdNumPortIn;
|
||||
|
||||
@Override
|
||||
public void operate(CreateHouseholdInCmd inCmd) {
|
||||
|
||||
// 임가번호 중복체크
|
||||
if (!inCmd.getHouseholdNum().isEmpty()) {
|
||||
checkHouseholdNumPortIn
|
||||
.operate(new CheckHouseholdNumCmd(inCmd.getHouseholdNum()))
|
||||
.filter(CheckHouseholdNum::getIsDuplicated)
|
||||
.ifPresent(result -> {
|
||||
throw new IllegalArgumentException("입력하신 번호는 중복입니다. 다른 임가번호를 입력해주세요.");
|
||||
});
|
||||
}
|
||||
|
||||
portOut.operate(new CreateHouseholdOutCmd(
|
||||
null,
|
||||
inCmd.getHouseholdNum(),
|
||||
inCmd.getOwnerName(),
|
||||
inCmd.getOwnerAge(),
|
||||
(!StringUtils.hasText(inCmd.getTel2()) || !StringUtils.hasText(inCmd.getTel3()))
|
||||
? null
|
||||
: inCmd.getTel1() + "-" + inCmd.getTel2() + "-" + inCmd.getTel3(),
|
||||
inCmd.getPhone1() + "-" + inCmd.getPhone2() + "-" + inCmd.getPhone3(),
|
||||
passwordEncoder.encode(inCmd.getPhone3()), // 비밀번호 핸드폰 뒤 네자리
|
||||
inCmd.getRegionMainCode(),
|
||||
inCmd.getRegionSubCode(),
|
||||
inCmd.getRegionDetailCode(),
|
||||
inCmd.getAddress(),
|
||||
inCmd.getIndustryLargeCode(),
|
||||
inCmd.getIndustryMiddleCode(),
|
||||
inCmd.getIndustrySubMiddle(),
|
||||
inCmd.getIndustryDetail(),
|
||||
inCmd.getResearcherSeq(),
|
||||
inCmd.getIsPanel(),
|
||||
inCmd.getMemo(),
|
||||
List.of("ROLE_GENERAL")
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package app.module.core.usecase.household.createHousehold.ports.application.domain;
|
||||
package app.module.admin.usecase.household.createHousehold.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import java.util.List;
|
||||
@@ -1,4 +1,4 @@
|
||||
package app.module.core.usecase.household.createHousehold.ports.application.domain;
|
||||
package app.module.admin.usecase.household.createHousehold.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -13,18 +13,21 @@ public class CreateHouseholdInCmd {
|
||||
private String householdNum;
|
||||
private String ownerName;
|
||||
private Integer ownerAge;
|
||||
private String tel;
|
||||
private String phone;
|
||||
private String tel1;
|
||||
private String tel2;
|
||||
private String tel3;
|
||||
private String phone1;
|
||||
private String phone2;
|
||||
private String phone3;
|
||||
private String regionMainCode;
|
||||
private String regionSubCode;
|
||||
private String regionDetailCode;
|
||||
private String address;
|
||||
private Integer industryLargeCode;
|
||||
private Integer industryMiddleCode;
|
||||
private Integer industrySubMiddle;
|
||||
private Integer industryDetail;
|
||||
private Integer employmentCode;
|
||||
private String industryLargeCode;
|
||||
private String industryMiddleCode;
|
||||
private String industrySubMiddle;
|
||||
private String industryDetail;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
private String dropReason;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package app.module.core.usecase.household.createHousehold.ports.application.domain;
|
||||
package app.module.admin.usecase.household.createHousehold.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import java.util.List;
|
||||
@@ -23,13 +23,12 @@ public class CreateHouseholdOutCmd extends AuditCommand {
|
||||
private String regionSubCode;
|
||||
private String regionDetailCode;
|
||||
private String address;
|
||||
private Integer industryLargeCode;
|
||||
private Integer industryMiddleCode;
|
||||
private Integer industrySubMiddle;
|
||||
private Integer industryDetail;
|
||||
private Integer employmentCode;
|
||||
private String industryLargeCode;
|
||||
private String industryMiddleCode;
|
||||
private String industrySubMiddle;
|
||||
private String industryDetail;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
private String dropReason;
|
||||
private List<String> roleIds;
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package app.module.admin.usecase.household.createHouseholdUI.adapters.web;
|
||||
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import app.module.admin.usecase.household.createHouseholdUI.adapters.web.model.CreateHouseholdUIReqVO;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class CreateHouseholdUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/create")
|
||||
String operate(
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO) {
|
||||
|
||||
// 실사
|
||||
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
|
||||
// 지역
|
||||
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
|
||||
// 세부지역
|
||||
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
|
||||
// 업종 대분류
|
||||
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
|
||||
return "household/households/create";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.createHouseholdUI.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateHouseholdUIReqVO {
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut {
|
||||
private final GetDailyRecordStatusDetailMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd) {
|
||||
|
||||
GetDailyRecordStatus status = mapper.getDailyRecordStatus(cmd);
|
||||
List<GetDailyIncomeRecords> incomes = mapper.getDailyIncomeRecords(cmd);
|
||||
List<GetDailyWorkRecords> works = mapper.getDailyWorkRecords(cmd);
|
||||
List<GetDailyExpenseRecords> expenses = mapper.getDailyExpenseRecords(cmd);
|
||||
List<GetDailyPowerRecords> powers = mapper.getDailyPowerRecords(cmd);
|
||||
List<GetDailyForestryRecords> forestries = mapper.getDailyForestryRecords(cmd);
|
||||
List<GetDailyFarmingRecords> farmings = mapper.getDailyFarmingRecords(cmd);
|
||||
|
||||
return Optional.of(
|
||||
new GetDailyRecordStatusDetail(status, incomes, works, expenses, powers, forestries,
|
||||
farmings));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetDailyRecordStatusDetailMapper {
|
||||
GetDailyRecordStatus getDailyRecordStatus(GetDailyRecordStatusCmd cmd);
|
||||
List<GetDailyIncomeRecords> getDailyIncomeRecords(GetDailyRecordStatusCmd cmd);
|
||||
List<GetDailyWorkRecords> getDailyWorkRecords(GetDailyRecordStatusCmd cmd);
|
||||
List<GetDailyExpenseRecords> getDailyExpenseRecords(GetDailyRecordStatusCmd cmd);
|
||||
List<GetDailyPowerRecords> getDailyPowerRecords(GetDailyRecordStatusCmd cmd);
|
||||
List<GetDailyForestryRecords> getDailyForestryRecords(GetDailyRecordStatusCmd cmd);
|
||||
List<GetDailyFarmingRecords> getDailyFarmingRecords(GetDailyRecordStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model.GetDailyRecordStatusDetailReqVO;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordStatusDetailController {
|
||||
private final GetDailyRecordStatusDetailPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/dailyRecordStatus")
|
||||
ResponseEntity<GetDailyRecordStatusDetail> operate(
|
||||
GetDailyRecordStatusDetailReqVO reqVO) {
|
||||
|
||||
GetDailyRecordStatusDetail recordView =
|
||||
portIn.operate(new GetDailyRecordStatusCmd(reqVO.getRecordSeq())).orElse(null);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(recordView);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordStatusDetailReqVO {
|
||||
private Long recordSeq;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordStatusDetailResVO {
|
||||
List<GetDailyIncomeRecords> incomes; // 수입
|
||||
List<GetDailyExpenseRecords> expenses; // 지출
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd;
|
||||
|
||||
public interface GetDailyRecordStatusDetailPortIn {
|
||||
Optional<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd;
|
||||
|
||||
public interface GetDailyRecordStatusDetailPortOut {
|
||||
Optional<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordStatusDetailService implements GetDailyRecordStatusDetailPortIn {
|
||||
private final GetDailyRecordStatusDetailPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyExpenseRecords {
|
||||
private Long id;
|
||||
private String inputType;
|
||||
private Boolean isCredit;
|
||||
private String categoryCode;
|
||||
private String categorySelf;
|
||||
private String sourcePurpose;
|
||||
private BigDecimal quantity;
|
||||
private String unitCode;
|
||||
private String unitText;
|
||||
private String price;
|
||||
private String estimatedValue;
|
||||
private String updatedBy;
|
||||
private String updatedAt;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyFarmingRecords {
|
||||
private Long id;
|
||||
private String productName;
|
||||
private String usage;
|
||||
private BigDecimal quantity;
|
||||
private String unitCode;
|
||||
private String unitText;
|
||||
private String estimatedValue;
|
||||
private String updatedBy;
|
||||
private String updatedAt;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyForestryRecords {
|
||||
private Long id;
|
||||
private String productName;
|
||||
private String usage;
|
||||
private BigDecimal quantity;
|
||||
private String unitCode;
|
||||
private String unitText;
|
||||
private String estimatedValue;
|
||||
private String updatedBy;
|
||||
private String updatedAt;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyIncomeRecords {
|
||||
private Long id;
|
||||
private String inputType;
|
||||
private Boolean isCredit;
|
||||
private String cropCode;
|
||||
private String cropText;
|
||||
private String categoryCode;
|
||||
private String categorySelf;
|
||||
private String sourcePurpose;
|
||||
private BigDecimal quantity;
|
||||
private String unitCode;
|
||||
private String unitText;
|
||||
private String price;
|
||||
private String estimatedValue;
|
||||
private String updatedBy;
|
||||
private String updatedAt;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyPowerRecords {
|
||||
private Long id;
|
||||
private String powerStatus;
|
||||
private String equipmentName;
|
||||
private BigDecimal ownedHours;
|
||||
private BigDecimal leasedHours;
|
||||
private String updatedBy;
|
||||
private String updatedAt;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordStatus {
|
||||
private String incomeStatus;
|
||||
private String workStatus;
|
||||
private String expenseStatus;
|
||||
private String powerStatus;
|
||||
private String forestryStatus;
|
||||
private String farmingStatus;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordStatusCmd {
|
||||
private Long recordSeq;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordStatusDetail {
|
||||
GetDailyRecordStatus status;
|
||||
List<GetDailyIncomeRecords> incomes; // 수입
|
||||
List<GetDailyWorkRecords> works; // 임업노동
|
||||
List<GetDailyExpenseRecords> expenses; // 지출
|
||||
List<GetDailyPowerRecords> powers; // 동력사용시간
|
||||
List<GetDailyForestryRecords> forestries; // 자가임업
|
||||
List<GetDailyFarmingRecords> farmings; // 자가농업
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyWorkRecords {
|
||||
private Long id;
|
||||
private String itemCode;
|
||||
private String workCode;
|
||||
private String workLandArea;
|
||||
private String harvestQuantity;
|
||||
private String unitCode;
|
||||
private String cropText;
|
||||
private String ownerTime;
|
||||
private String spouseTime;
|
||||
private String familyMHours;
|
||||
private String familyFHours;
|
||||
private String hiredMHours;
|
||||
private String hiredFHours;
|
||||
private String sharedMHours;
|
||||
private String sharedFHours;
|
||||
private String volunteerMHours;
|
||||
private String volunteerFHours;
|
||||
private String updatedBy;
|
||||
private String updatedAt;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsCountDao implements GetDailyRecordsCountPortOut {
|
||||
private final GetDailyRecordsCountMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd) {
|
||||
return mapper.getDailyRecordsCount(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetDailyRecordsCountMapper {
|
||||
Optional<GetDailyRecordsCount> getDailyRecordsCount(GetDailyRecordsCountCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
|
||||
public interface GetDailyRecordsCountPortIn {
|
||||
Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
|
||||
public interface GetDailyRecordsCountPortOut {
|
||||
Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsCountService implements GetDailyRecordsCountPortIn {
|
||||
private final GetDailyRecordsCountPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsCount {
|
||||
private Integer doneCount;
|
||||
private Integer emptyCount;
|
||||
private Integer incompleteCount;
|
||||
private Integer waitingCount;
|
||||
private Double progressPercent;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsCountCmd {
|
||||
private Long householdSeq;
|
||||
private String recordMonth;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsStatusDao implements GetDailyRecordsStatusPortOut {
|
||||
private final GetDailyRecordsStatusMapper mapper;
|
||||
|
||||
@Override
|
||||
public List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd) {
|
||||
return mapper.getDailyRecordsStatus(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetDailyRecordsStatusMapper {
|
||||
List<GetDailyRecordsStatus> getDailyRecordsStatus(GetDailyRecordsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusReqVO;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsStatusController {
|
||||
private final GetDailyRecordsStatusPortIn getDailyRecordsStatusPortIn;
|
||||
private final GetDailyRecordsCountPortIn getDailyRecordsCountPortIn;
|
||||
|
||||
@GetMapping(path = "/api/household/dailyRecordsStatus")
|
||||
ResponseEntity<?> operate(
|
||||
GetDailyRecordsStatusReqVO reqVO) {
|
||||
|
||||
List<GetDailyRecordsStatus> dailyRecords =
|
||||
getDailyRecordsStatusPortIn.operate(
|
||||
new GetDailyRecordsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth()));
|
||||
|
||||
GetDailyRecordsCount summary =
|
||||
getDailyRecordsCountPortIn.operate(
|
||||
new GetDailyRecordsCountCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth())).orElse(null);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(new GetDailyRecordsStatusResVO(summary, dailyRecords));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsStatusReqVO {
|
||||
private Long householdSeq;
|
||||
private String recordMonth;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsStatusResVO {
|
||||
private GetDailyRecordsCount summary; // 등록 현황 요약
|
||||
private List<GetDailyRecordsStatus> dailyRecords; // 일계부 등록 현황
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
|
||||
public interface GetDailyRecordsStatusPortIn {
|
||||
List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
|
||||
public interface GetDailyRecordsStatusPortOut {
|
||||
List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut;
|
||||
import java.util.List;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsStatusService implements GetDailyRecordsStatusPortIn {
|
||||
private final GetDailyRecordsStatusPortOut portOut;
|
||||
|
||||
@Override
|
||||
public List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsStatus {
|
||||
private Long id;
|
||||
private String dayGroup;
|
||||
private RecordStatusType allStatusType;
|
||||
private String incomeStatus;
|
||||
private String workStatus;
|
||||
private String expenseStatus;
|
||||
private String powerStatus;
|
||||
private String forestryStatus;
|
||||
private String farmingStatus;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsStatusCmd {
|
||||
private Long householdSeq;
|
||||
private String recordMonth;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum RecordStatusType {
|
||||
WAITING("대기"),
|
||||
DONE("작성완료"),
|
||||
INCOMPLETE("미완료"),
|
||||
EMPTY("미작성");
|
||||
|
||||
private final String desc;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetForestProductsStatusDao implements GetForestProductsStatusPortOut {
|
||||
private final GetForestProductsStatusMapper mapper;
|
||||
|
||||
@Override
|
||||
public List<GetForestProductsStatus> operate(GetForestProductsStatusCmd cmd) {
|
||||
return mapper.getForestProductsStatus(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetForestProductsStatusMapper {
|
||||
List<GetForestProductsStatus> getForestProductsStatus(GetForestProductsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortIn;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model.GetForestProductsStatusReqVO;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model.GetForestProductsStatusResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetForestProductsStatusController {
|
||||
private final GetForestProductsStatusPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/forestProducts")
|
||||
ResponseEntity<List<GetForestProductsStatus>> operate(
|
||||
GetForestProductsStatusReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(portIn.operate(
|
||||
new GetForestProductsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getMonth())));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetForestProductsStatusReqVO {
|
||||
private Long householdSeq;
|
||||
private String month;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetForestProductsStatusResVO {
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
|
||||
import java.util.List;
|
||||
|
||||
public interface GetForestProductsStatusPortIn {
|
||||
List<GetForestProductsStatus> operate(GetForestProductsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
|
||||
import java.util.List;
|
||||
|
||||
public interface GetForestProductsStatusPortOut {
|
||||
List<GetForestProductsStatus> operate(GetForestProductsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortIn;
|
||||
import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut;
|
||||
import java.util.List;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetForestProductsStatusService implements GetForestProductsStatusPortIn {
|
||||
private final GetForestProductsStatusPortOut portOut;
|
||||
|
||||
@Override
|
||||
public List<GetForestProductsStatus> operate(GetForestProductsStatusCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetForestProductsStatus {
|
||||
private Long id;
|
||||
private String streetNum;
|
||||
private String landType;
|
||||
private String town;
|
||||
private String availableArea;
|
||||
private String cropName;
|
||||
private String landArea;
|
||||
private String mainYield;
|
||||
private String mainYieldText;
|
||||
private String mainSaleAmount;
|
||||
private String mainSaleAmountText;
|
||||
private String subYield;
|
||||
private String subYieldText;
|
||||
private String subSaleAmount;
|
||||
private String subSaleAmountText;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetForestProductsStatusCmd {
|
||||
private Long householdSeq;
|
||||
private String month;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortOut;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdStatusDao implements GetHouseholdStatusPortOut {
|
||||
|
||||
private final GetHouseholdStatusMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd) {
|
||||
return mapper.getHouseholdStatusById(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetHouseholdStatusMapper {
|
||||
Optional<GetHouseholdStatus> getHouseholdStatusById(GetHouseholdStatusCmd cmd);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface GetHouseholdStatusPortIn {
|
||||
Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface GetHouseholdStatusPortOut {
|
||||
Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.ports.application;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortOut;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdStatusService implements GetHouseholdStatusPortIn {
|
||||
private final GetHouseholdStatusPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain;
|
||||
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdStatus {
|
||||
// 가구 일련번후
|
||||
private Integer householdSeq;
|
||||
// 임가번후
|
||||
private String householdNum;
|
||||
// 경영주명
|
||||
private String householdName;
|
||||
// 연령
|
||||
private String householdAge;
|
||||
// 가구 연락처
|
||||
private String householdTel;
|
||||
// 휴대폰번호
|
||||
private String householdPhone;
|
||||
// 실사
|
||||
private String regionMainName;
|
||||
// 지역
|
||||
private String regionSubName;
|
||||
// 세부지역
|
||||
private String regionDetailName;
|
||||
// 주소
|
||||
private String address;
|
||||
// 업종 대분류
|
||||
private String industryLargeName;
|
||||
// 업종 중분류1
|
||||
private String industryMiddleName;
|
||||
// 업종 중분류2
|
||||
private String industrySubMiddleName;
|
||||
// 규모/세부품목
|
||||
private String industryDetailName;
|
||||
// 유지여부
|
||||
private Boolean isPanel;
|
||||
// 비고
|
||||
private String memo;
|
||||
// 조사원
|
||||
private String researcherName;
|
||||
// 조사원 연락처
|
||||
private String researcherPhone;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdStatusCmd {
|
||||
private Long seq;
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatusUI;
|
||||
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import app.module.admin.usecase.household.getHouseholdStatusUI.model.GetHouseholdStatusUIReqVO;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/{seq}")
|
||||
String operate(
|
||||
@PathVariable Long seq,
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) {
|
||||
|
||||
model.addAttribute("seq", seq);
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
|
||||
// 임가 상세 정보
|
||||
model.addAttribute("householdInfo",
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
|
||||
return "household/households/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package app.module.front.usecase.user.createUserUI.adapters.web.model;
|
||||
package app.module.admin.usecase.household.getHouseholdStatusUI.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -9,6 +9,5 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateUserUIReqVO {
|
||||
|
||||
public class GetHouseholdStatusUIReqVO {
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence;
|
||||
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd;
|
||||
@@ -12,9 +13,14 @@ import org.springframework.stereotype.Repository;
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdsStatusDao implements GetHouseholdsStatusPortOut {
|
||||
private final GetHouseholdsStatusMapper mapper;
|
||||
|
||||
@Override
|
||||
public Page<GetHouseholdsStatus> operate(Pageable pageable, GetHouseholdsStatusCmd cmd) {
|
||||
return new PageImpl<>(null, null, 0);
|
||||
|
||||
List<GetHouseholdsStatus> householdsStatus = mapper.getHouseholdsStatus(pageable, cmd);
|
||||
|
||||
return new PageImpl<>(householdsStatus, pageable,
|
||||
householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,6 @@ import org.springframework.data.domain.Pageable;
|
||||
|
||||
@Mapper
|
||||
public interface GetHouseholdsStatusMapper {
|
||||
List<GetHouseholdsStatus> getHouseholdsStatus(@Param("pageable")Pageable pageable, @Param("cmd") GetHouseholdsStatusCmd cmd);
|
||||
|
||||
List<GetHouseholdsStatus> getHouseholdsStatus(@Param("pageable") Pageable pageable,
|
||||
@Param("cmd") GetHouseholdsStatusCmd cmd);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.web.PageableDefault;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model.GetHouseholdsStatusReqVO;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model.GetHouseholdsStatusResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdsStatusController {
|
||||
private final GetHouseholdsStatusPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/households")
|
||||
ResponseEntity<Page<GetHouseholdsStatus>> operate(
|
||||
@PageableDefault(size = 10) Pageable pageable,
|
||||
GetHouseholdsStatusReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(
|
||||
|
||||
portIn.operate(pageable,
|
||||
new GetHouseholdsStatusCmd(
|
||||
reqVO.getRecordMonth(),
|
||||
reqVO.getOwnerField(),
|
||||
reqVO.getOwnerValue(),
|
||||
reqVO.getRegionMainCode(),
|
||||
reqVO.getRegionSubCode(),
|
||||
reqVO.getRegionDetailCode(),
|
||||
reqVO.getIndustryLargeCode(),
|
||||
reqVO.getIndustryMiddleCode(),
|
||||
reqVO.getProgressType() != null ? reqVO.getProgressType().name() : null,
|
||||
reqVO.getIsFirstVisited(),
|
||||
reqVO.getIsSecondVisited(),
|
||||
reqVO.getIsGiftSent(),
|
||||
reqVO.getResearcherField(),
|
||||
reqVO.getResearcherValue(),
|
||||
reqVO.getIsPanel(),
|
||||
reqVO.getUserRole(),
|
||||
reqVO.getUserRegionMainCode()
|
||||
))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.ProgressType;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdsStatusReqVO {
|
||||
// 연월
|
||||
private String recordMonth;
|
||||
// 경영주 검색 필드 (전체, 경영주명, 전화번호)
|
||||
private String ownerField;
|
||||
// 경영주 검색어
|
||||
private String ownerValue;
|
||||
// 실사
|
||||
private String regionMainCode;
|
||||
// 지역
|
||||
private String regionSubCode;
|
||||
// 세부지역
|
||||
private String regionDetailCode;
|
||||
// 업종 대분류
|
||||
private String industryLargeCode;
|
||||
// 업종 중분류1
|
||||
private String industryMiddleCode;
|
||||
// 당월 일계부 현황 (전체, 25% 미만, 25~50% 미만, 50~75% 미만, 75% 이상, 100% 완료)
|
||||
private ProgressType progressType;
|
||||
// 당월 1차 방문 여부
|
||||
private Boolean isFirstVisited;
|
||||
// 당월 2차 방문 여부
|
||||
private Boolean isSecondVisited;
|
||||
// 답례품 전달
|
||||
private Boolean isGiftSent;
|
||||
// 조사원 검색 필드 (전체, 이름, 전화번호)
|
||||
private String researcherField;
|
||||
// 조사원 검색어
|
||||
private String researcherValue;
|
||||
// 패널 유지 여부
|
||||
private Boolean isPanel;
|
||||
// 로그인한 유저 역할
|
||||
private String userRole;
|
||||
// 로그인한 유저 실사 지역
|
||||
private String userRegionMainCode;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdsStatusResVO {
|
||||
}
|
||||
@@ -3,11 +3,12 @@ package app.module.admin.usecase.household.getHouseholdsStatus.ports.application
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdsStatus {
|
||||
private Integer householdSeq;
|
||||
@@ -19,9 +20,12 @@ public class GetHouseholdsStatus {
|
||||
private String regionDetailName;
|
||||
private String industryLargeName;
|
||||
private String industryMiddleName;
|
||||
private Boolean isPanel;
|
||||
private Double progressPercent;
|
||||
private String firstVisitDate;
|
||||
private String secondVisitDate;
|
||||
private Boolean isGiftSent;
|
||||
private String researcherName;
|
||||
private String researcherPhone;
|
||||
private Integer total;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import lombok.Setter;
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdsStatusCmd {
|
||||
// 연월
|
||||
private String month;
|
||||
private String recordMonth;
|
||||
// 경영주 검색 필드 (전체, 경영주명, 전화번호)
|
||||
private String ownerField;
|
||||
// 경영주 검색어
|
||||
@@ -27,7 +27,7 @@ public class GetHouseholdsStatusCmd {
|
||||
// 업종 중분류1
|
||||
private String industryMiddleCode;
|
||||
// 당월 일계부 현황 (전체, 25% 미만, 25~50% 미만, 50~75% 미만, 75% 이상, 100% 완료)
|
||||
private ProgressType progress;
|
||||
private String progressType;
|
||||
// 당월 1차 방문 여부
|
||||
private Boolean isFirstVisited;
|
||||
// 당월 2차 방문 여부
|
||||
@@ -38,4 +38,10 @@ public class GetHouseholdsStatusCmd {
|
||||
private String researcherField;
|
||||
// 조사원 검색어
|
||||
private String researcherValue;
|
||||
// 패널 유지 여부
|
||||
private Boolean isPanel;
|
||||
// 로그인한 유저 역할
|
||||
private String userRole;
|
||||
// 로그인한 유저 실사 지역
|
||||
private String userRegionMainCode;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
package app.module.admin.usecase.household.getHouseholdsStatusUI;
|
||||
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatusUI.model.GetHouseholdsUIReqVO;
|
||||
import app.module.core.config.adapters.persistence.entity.Admin;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
@@ -10,12 +17,45 @@ import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdsStatusUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households")
|
||||
String operate(
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) {
|
||||
|
||||
AdminView admin =
|
||||
adminViewPortIn.connect(CommonUtil.getLoginUsername()).orElse(null);
|
||||
|
||||
// 로그인한 관리자 역할
|
||||
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
|
||||
model.addAttribute("userRegionMainCode", admin.getRegionMainCode());
|
||||
|
||||
// 실사 코드 목록
|
||||
// 지방실사와 조사원은 담당실사 지역만 조회
|
||||
if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole()) && admin.getRegionMainCode() != null) {
|
||||
model.addAttribute("regionMainList",
|
||||
uiCodeListPortIn.connect("code.region.main").stream()
|
||||
.filter(code -> admin.getRegionMainCode().equals(code.getId()))
|
||||
.toList());
|
||||
} else {
|
||||
// 관리자면 전체
|
||||
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
|
||||
}
|
||||
|
||||
// 지역
|
||||
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
|
||||
// 세부지역
|
||||
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
|
||||
// 업종 대분류
|
||||
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
|
||||
return "household/households";
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.household.getHouseholdsStatusUI.model;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.ProgressType;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
@@ -10,4 +11,32 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdsUIReqVO {
|
||||
private Integer page;
|
||||
private String sort;
|
||||
private Integer size;
|
||||
private String recordMonth;
|
||||
private String ownerField;
|
||||
private String ownerValue;
|
||||
private String regionMainCode;
|
||||
private String regionSubCode;
|
||||
private String regionDetailCode;
|
||||
private String industryLargeCode;
|
||||
private String industryMiddleCode;
|
||||
private ProgressType progressType;
|
||||
private Boolean isFirstVisited;
|
||||
private Boolean isSecondVisited;
|
||||
private Boolean isGiftSent;
|
||||
private String researcherField;
|
||||
private String researcherValue;
|
||||
private Boolean isPanel;
|
||||
|
||||
public Integer getPage() {
|
||||
// 요청 페이지 넘버 - 초기값 `0`
|
||||
return page != null ? page : 0;
|
||||
}
|
||||
|
||||
public Integer getSize() {
|
||||
// 페이지 당 아이템 수 - 초기값 `10`
|
||||
return size != null ? size : 10;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package app.module.admin.usecase.household.getRegionMainCodes;
|
||||
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import app.module.admin.usecase.household.getRegionMainCodes.model.GetRegionMainCodesReqVO;
|
||||
import app.module.admin.usecase.household.getRegionMainCodes.model.GetRegionMainCodesResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetRegionMainCodesController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/api/regionMainCodes")
|
||||
ResponseEntity<List<UICodeElement>> operate() {
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(uiCodeListPortIn.connect("code.region.main"));
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user