[FO] 일계부 등록 wip, FrontAuditCommand 커밋 누락

This commit is contained in:
김현주
2025-06-10 11:06:07 +09:00
parent b6aeb92597
commit d352b27c3e
17 changed files with 368 additions and 78 deletions

View File

@@ -0,0 +1,63 @@
package app.module.front.config.adapters.persistence.component;
import app.module.core.config.application.util.CommonUtil;
import app.module.front.config.application.security.FrontHouseholdUser;
import lombok.Getter;
import lombok.Setter;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import java.time.LocalDateTime;
@Getter
@Setter
public class FrontAuditCommand {
private Long householdSeq;
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
public void create() {
this.householdSeq = getCurrentUserSeq();
this.createdAt = LocalDateTime.now();
this.createdBy = getCurrentUsername();
this.updatedAt = LocalDateTime.now();
this.updatedBy = getCurrentUsername();
}
public void update() {
this.householdSeq = getCurrentUserSeq();
this.updatedAt = LocalDateTime.now();
this.updatedBy = getCurrentUsername();
}
public void delete() {
this.householdSeq = getCurrentUserSeq();
this.deletedAt = LocalDateTime.now();
this.deletedBy = getCurrentUsername();
}
private Long getCurrentUserSeq() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
Object principal = authentication.getPrincipal();
Long userseq = null;
if (principal instanceof UserDetails) {
userseq = ((FrontHouseholdUser) principal).getHouseholdSeq();
}
return userseq;
}
private String getCurrentUsername() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
return authentication != null && authentication.isAuthenticated()
? CommonUtil.getLoginUsername() : "INIT_DATA";
}
}

View File

@@ -0,0 +1,24 @@
package app.module.front.usecase.daily.income.application.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class DailyIncomeCmd {
private Long id;
private Long householdSeq;
private Boolean isCredit;
private String cropCode;
// TODO : 수입종류의 코드맵핑 여부 판단
private String categoryCode;
private String categoryName;
private String sourcePurpose;
// TODO : 타입
private String quantity;
private String unitCode;
private Integer price;
private Integer estimatedValue;
// TODO : 무슨 데이터 넣을 것인가?
private String createdBy;
}

View File

@@ -0,0 +1,58 @@
package app.module.front.usecase.daily.income.persistence;
import app.module.front.usecase.daily.income.application.model.DailyIncomeCmd;
import app.module.front.usecase.daily.income.persistence.model.DailyIncomeDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface DailyIncomeMapper {
/**
* 수입내역 데이터 존재 여부
* @param householdSeq
* @param recordMonth
* @param dayGroupNo
* @return
*/
Long getDailyIncomeExistCount(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo);
/**
* 수입내역 목록 조회
* @param householdSeq
* @param recordMonth
* @param dayGroupNo
* @return
*/
List<DailyIncomeDto> getDailyIncomeList(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo);
/**
* 수입내역 단건 조회
* @param householdSeq
* @param recordMonth
* @param dayGroupNo
* @return
*/
DailyIncomeDto getDailyIncome(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo);
/**
* 수입내역 등록
* @param command
* @return
*/
Long createDailyIncome(DailyIncomeCmd command);
/**
* 수입내역 수정
* @param command
* @return
*/
int updateDailyIncome(DailyIncomeCmd command);
/**
* 수입내역 삭제
* @return
*/
int removeDailyIncome();
}

View File

@@ -0,0 +1,21 @@
package app.module.front.usecase.daily.income.persistence.model;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
public class DailyIncomeDto {
private Long id;
private Long householdSeq;
private Boolean isCredit;
// TODO
private String createdBy;
private LocalDateTime createdAt;
private Integer price;
private Integer estimatedValue;
private String updatedBy;
private LocalDateTime updatedAt;
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.income.web;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.daily.income.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
@@ -18,14 +19,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
public class DailyIncomeController {
@GetMapping(path = "/{searchMonth}/{groupNo}")
public String index(Model model
, @PathVariable(required = true) String searchMonth
, @PathVariable(required = true) String groupNo) {
public String index(Model model,
@PathVariable(required = true) String searchMonth,
@PathVariable(required = true) String groupNo) {
DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO();
reqVO.setSearchMonth(searchMonth);
reqVO.setGroupNo(Integer.parseInt(groupNo));
reqVO.setHouseholdSeq(getAccessId());
reqVO.setHouseholdSeq(AuthUtil.getUserSeq());
log.debug("reqVO: {}", reqVO);
model.addAttribute("reqVO", reqVO);
@@ -33,9 +34,4 @@ public class DailyIncomeController {
return "record/income/index";
}
// TODO : 로그인 SEQ
private Long getAccessId() {
return 2L;
}
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.record.service;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.usecase.daily.record.persistence.DailyRecordMapper;
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
@@ -67,6 +68,6 @@ public class DailyRecordServiceImpl implements DailyRecordService {
}
}
dailyRecordMapper.createDailyRecord(command);
dailyRecordMapper.createDailyRecord(AuditUtil.create(command));
}
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.record.web;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.daily.calendar.service.RecordCalendarService;
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.service.DailyRecordService;
@@ -33,7 +34,7 @@ public class DailyRecordController {
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO();
reqVO.setSearchMonth(searchMonth);
reqVO.setGroupNo(Integer.parseInt(groupNo));
reqVO.setHouseholdSeq(getAccessId());
reqVO.setHouseholdSeq(AuthUtil.getUserSeq());
log.debug("reqVO: {}", reqVO);
//uiCodeListPortIn.connect("code.pageable.rows");
@@ -60,7 +61,7 @@ public class DailyRecordController {
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO();
reqVO.setSearchMonth(searchMonth);
reqVO.setGroupNo(Integer.parseInt(groupNo));
reqVO.setHouseholdSeq(getAccessId());
// reqVO.setHouseholdSeq(AuthUtil.getUserSeq());
log.debug("reqVO: {}", reqVO);
//uiCodeListPortIn.connect("code.pageable.rows");
@@ -79,9 +80,4 @@ public class DailyRecordController {
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
}
// TODO : 로그인 SEQ
private Long getAccessId() {
return 2L;
}
}

View File

@@ -1,16 +1,14 @@
package app.module.front.usecase.daily.record.web.model;
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
import java.util.Date;
@Data
public class CreateDailyRecordReqVO {
public class CreateDailyRecordReqVO extends FrontAuditCommand {
private Long id;
private Long householdSeq;
// private Long householdSeq;
private String recordMonth;
private int dayGroupNo;
private LocalDate startDate;
@@ -25,5 +23,5 @@ public class CreateDailyRecordReqVO {
private DailyTargetStatus powerStatus;
private DailyTargetStatus forestryStatus;
// TODO : 무슨 데이터 넣을 것인가?
private String createdBy;
// private String createdBy;
}