[BO] 임가현황 작업 중 (10)

This commit is contained in:
kangsunlee
2025-06-18 21:21:06 +09:00
parent 693de9259f
commit ecf2dd8dbe
42 changed files with 878 additions and 235 deletions

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.household.createHousehold.adapters.persistence;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd;
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;
@@ -7,6 +8,7 @@ import app.module.admin.usecase.household.createHousehold.ports.application.doma
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@Repository
@RequiredArgsConstructor
@@ -14,13 +16,22 @@ class CreateHouseholdDao implements CreateHouseholdPortOut {
private final CreateHouseholdMapper mapper;
@Override
@Transactional
@CreateCommand
public void operate(CreateHouseholdOutCmd outCmd) {
// 임가 등록
mapper.createHousehold(outCmd);
if(outCmd.getResearcherSeq() != null) {
// 임가 역할 등록
if(outCmd.getRoleIds() != null && !outCmd.getRoleIds().isEmpty()) {
mapper.createHouseholdHasRole(
AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds())));
}
// 임가 담당 조사원 등록
if(outCmd.getAdminSeq() != null) {
mapper.createResearcherHasHousehold(
AuditUtil.create(new CreateResearcherHasHouseholdCmd(outCmd.getSeq(), outCmd.getAdminSeq())));
}
}
}

View File

@@ -2,10 +2,12 @@ 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 app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateHouseholdMapper {
void createHousehold(CreateHouseholdOutCmd outCmd);
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd);
}

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.household.createHousehold.adapters.web;
import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdResVO;
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;
@@ -50,13 +51,13 @@ class CreateHouseholdController {
reqVO.getIndustryMiddleCode(),
reqVO.getIndustrySubMiddle(),
reqVO.getIndustryDetail(),
reqVO.getResearcherSeq(),
reqVO.getAdminSeq(),
reqVO.getIsPanel(),
reqVO.getMemo()
)
);
return ResponseEntity.status(HttpStatus.OK)
.body(messageUtil.getMessage("operation.common.save.done"));
.body(new CreateHouseholdResVO(reqVO.getHouseholdNum()));
}
}

View File

@@ -31,7 +31,7 @@ public class CreateHouseholdReqVO {
private String industryMiddleCode;
private String industrySubMiddle;
private String industryDetail;
private Long researcherSeq;
private Long adminSeq;
private Boolean isPanel;
private String memo;
}

View File

@@ -10,4 +10,5 @@ import lombok.Setter;
@AllArgsConstructor
@EqualsAndHashCode
public class CreateHouseholdResVO {
private String householdNum;
}

View File

@@ -27,7 +27,7 @@ public class CreateHouseholdOutCmd extends AuditCommand {
private String industryMiddleCode;
private String industrySubMiddle;
private String industryDetail;
private Long researcherSeq;
private Long adminSeq;
private Boolean isPanel;
private String memo;
private List<String> roleIds;

View File

@@ -0,0 +1,17 @@
package app.module.admin.usecase.household.createHousehold.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateResearcherHasHouseholdCmd extends AuditCommand {
private Long householdSeq;
private Long adminSeq;
}

View File

@@ -0,0 +1,27 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd;
import app.module.core.config.application.util.AuditUtil;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@Repository
@RequiredArgsConstructor
class CreateResearcherMappingDao implements CreateResearcherMappingPortOut {
private final CreateResearcherMappingMapper mapper;
@Override
@Transactional
public void operate(CreateResearcherMappingCmd cmd) {
// 조사원 임가 매핑 되어있던 것 delete
mapper.deleteResearcherMapping(
AuditUtil.delete(new DeleteResearcherMappingCmd(cmd.getHouseholdSeqs())));
// 조사원 임가 매핑 새로 insert
mapper.createResearcherMapping(
AuditUtil.create(new CreateResearcherMappingCmd(cmd.getAdminSeq(), cmd.getHouseholdSeqs())));
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateResearcherMappingMapper {
void deleteResearcherMapping(DeleteResearcherMappingCmd cmd);
void createResearcherMapping(CreateResearcherMappingCmd cmd);
}

View File

@@ -0,0 +1,38 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.web;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import app.module.core.config.application.util.MessageUtil;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingReqVO;
import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingResVO;
@RestController
@RequiredArgsConstructor
class CreateResearcherMappingController {
private final CreateResearcherMappingPortIn portIn;
private final MessageUtil messageUtil;
@PostMapping(path = "/api/household/researcherMapping/create")
ResponseEntity<?> operate(@Valid @RequestBody CreateResearcherMappingReqVO reqVO,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult);
}
// 등록
portIn.operate(
new CreateResearcherMappingCmd(reqVO.getAdminSeq(), reqVO.getHouseholdSeqs()));
return ResponseEntity.status(HttpStatus.OK)
.body(new CreateResearcherMappingResVO(reqVO.getAdminSeq(), reqVO.getHouseholdSeqs()));
}
}

View File

@@ -0,0 +1,17 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
public class CreateResearcherMappingReqVO {
private Long adminSeq;
private List<Long> householdSeqs;
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateResearcherMappingResVO {
private Long adminSeq;
private List<Long> householdSeqs;
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.household.createResearcherMapping.ports;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
public interface CreateResearcherMappingPortIn {
void operate(CreateResearcherMappingCmd cmd);
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.household.createResearcherMapping.ports;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
public interface CreateResearcherMappingPortOut {
void operate(CreateResearcherMappingCmd cmd);
}

View File

@@ -0,0 +1,18 @@
package app.module.admin.usecase.household.createResearcherMapping.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class CreateResearcherMappingService implements CreateResearcherMappingPortIn {
private final CreateResearcherMappingPortOut portOut;
@Override
public void operate(CreateResearcherMappingCmd cmd) {
portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,17 @@
package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateResearcherMappingCmd extends AuditCommand {
private Long adminSeq;
private List<Long> householdSeqs;
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class DeleteResearcherMappingCmd extends AuditCommand {
private List<Long> householdSeqs;
}

View File

@@ -12,7 +12,6 @@ import lombok.Setter;
public class GetBankAutoTransferExpenseRecords {
private Long id;
private String categoryText;
private String categorySelf;
private String sourcePurpose;
private Integer count;
private String unitText;

View File

@@ -13,7 +13,7 @@ public class GetBankAutoTransferIncomeRecords {
private Long id;
private String cropText;
private String categoryText;
private String categorySelf;
private String target;
private String sourcePurpose;
private Integer count;
private String unitText;

View File

@@ -18,11 +18,11 @@ public class GetForestProductsStatus {
private String cropName;
private String landArea;
private String mainYield;
private String mainYieldText;
private String mainYieldUnitText;
private String mainSaleAmount;
private String mainSaleAmountText;
private String mainSaleAmountUnitText;
private String subYield;
private String subYieldText;
private String subYieldUnitText;
private String subSaleAmount;
private String subSaleAmountText;
private String subSaleAmountUnitText;
}

View File

@@ -0,0 +1,24 @@
package app.module.admin.usecase.household.getPopupResearchers.adapters.persistence;
import java.util.List;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd;
import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.PageImpl;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetPopupResearchersDao implements GetPopupResearchersPortOut {
private final GetPopupResearchersMapper mapper;
@Override
public Page<GetPopupResearchers> operate(Pageable pageable, GetPopupResearchersCmd cmd) {
List<GetPopupResearchers> result = mapper.getPopupResearchers(pageable, cmd);
return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getTotal());
}
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.getPopupResearchers.adapters.persistence;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
@Mapper
public interface GetPopupResearchersMapper {
List<GetPopupResearchers> getPopupResearchers(@Param("pageable") Pageable pageable,
@Param("cmd") GetPopupResearchersCmd cmd);
}

View File

@@ -0,0 +1,29 @@
package app.module.admin.usecase.household.getPopupResearchers.adapters.web;
import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortIn;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.context.properties.bind.DefaultValue;
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.getPopupResearchers.adapters.web.model.GetPopupResearchersReqVO;
import app.module.admin.usecase.household.getPopupResearchers.adapters.web.model.GetPopupResearchersResVO;
@RestController
@RequiredArgsConstructor
class GetPopupResearchersController {
private final GetPopupResearchersPortIn portIn;
@GetMapping(path = "/api/popupResearchers")
ResponseEntity<?> operate(
@PageableDefault(size = 10) Pageable pageable, GetPopupResearchersReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(portIn.operate(pageable,
new GetPopupResearchersCmd(reqVO.getSearchField(), reqVO.getSearchValue(),
reqVO.getRegionMainCode())));
}
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.getPopupResearchers.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetPopupResearchersReqVO {
private String searchField;
private String searchValue;
private String regionMainCode;
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.getPopupResearchers.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetPopupResearchersResVO {
}

View File

@@ -0,0 +1,10 @@
package app.module.admin.usecase.household.getPopupResearchers.ports;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface GetPopupResearchersPortIn {
Page<GetPopupResearchers> operate(Pageable pageable, GetPopupResearchersCmd cmd);
}

View File

@@ -0,0 +1,10 @@
package app.module.admin.usecase.household.getPopupResearchers.ports;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface GetPopupResearchersPortOut {
Page<GetPopupResearchers> operate(Pageable pageable, GetPopupResearchersCmd cmd);
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.household.getPopupResearchers.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers;
import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd;
import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortIn;
import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetPopupResearchersService implements GetPopupResearchersPortIn {
private final GetPopupResearchersPortOut portOut;
@Override
public Page<GetPopupResearchers> operate(Pageable pageable, GetPopupResearchersCmd cmd) {
return portOut.operate(pageable, cmd);
}
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.getPopupResearchers.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetPopupResearchers {
private Long adminSeq;
private String name;
private String phone;
private String regionMainName;
private Integer householdCount;
private Integer total;
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.getPopupResearchers.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetPopupResearchersCmd {
private String searchField;
private String searchValue;
private String regionMainCode;
}