Merge branch 'bo_sms-auto-send' into 'dev'

Bo sms auto send

See merge request korea-research/korea-research!86
This commit is contained in:
이강선 매니저/ST
2025-07-08 07:10:00 +00:00
42 changed files with 1067 additions and 33 deletions

View File

@@ -1,10 +1,12 @@
package app.module.admin.config.application.util;
import app.module.admin.config.application.util.model.DayRange;
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 java.util.Optional;
import org.springframework.stereotype.Component;
@Component
@@ -30,4 +32,45 @@ public class DateUiUtil {
public static String getCurrentMonthValue() {
return LocalDate.now().format(VALUE_FORMAT);
}
public static String getMonthValue(LocalDate date) {
return date.format(VALUE_FORMAT);
}
/**
* 문자 자동 발송 대상 날짜 범위를 반환합니다.
*
* 발송일 기준으로 대상자 범위를 계산합니다.
* 발송일은 매월 8일, 15일, 22일, 다음 달 1일이며,
* 각 발송일마다 고정된 날짜 구간이 대상자 범위로 설정됩니다.
*
* 예시:
* - 8일인 경우 → 1일부터 7일 까지
* - 15일인 경우 → 8일부터 14일 까지
* - 22일인 경우 → 15일부터 21일 까지
* - 다음 달 1일인 경우 → 전달의 22일 부터 28,30,31일 까지
*
* 발송일이 아닌 경우에는 빈 Optional을 반환합니다.
*
* @param today 현재 날짜
* @return DayRange 객체 또는 발송일이 아니면 Optional.empty()
*/
public static Optional<DayRange> getDayRange(LocalDate today) {
int day = today.getDayOfMonth();
if (day == 8) {
return Optional.of(new DayRange(1, 7));
} else if (day == 15) {
return Optional.of(new DayRange(8, 14));
} else if (day == 22) {
return Optional.of(new DayRange(15, 21));
} else if (day == 1) {
// 다음 달 1일 → 전달 22~말일까지
LocalDate prevMonth = today.minusMonths(1);
int prevLastDay = prevMonth.lengthOfMonth();
return Optional.of(new DayRange(22, prevLastDay));
} else {
return Optional.empty();
}
}
}

View File

@@ -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 DayRange {
private int fromDay;
private int toDay;
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatusCmd;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut;
import java.util.Optional;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetSmsAutoStatusDao implements GetSmsAutoStatusPortOut {
private final GetSmsAutoStatusMapper mapper;
@Override
public Optional<GetSmsAutoStatus> operate() {
return mapper.operate();
}
}

View File

@@ -0,0 +1,10 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetSmsAutoStatusMapper {
Optional<GetSmsAutoStatus> operate();
}

View File

@@ -0,0 +1,8 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import java.util.Optional;
public interface GetSmsAutoStatusPortIn {
Optional<GetSmsAutoStatus> operate();
}

View File

@@ -0,0 +1,8 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import java.util.Optional;
public interface GetSmsAutoStatusPortOut {
Optional<GetSmsAutoStatus> operate();
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetSmsAutoStatusService implements GetSmsAutoStatusPortIn {
private final GetSmsAutoStatusPortOut portOut;
@Override
public Optional<GetSmsAutoStatus> operate() {
return portOut.operate();
}
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetSmsAutoStatus {
private Boolean active;
private String message;
private String sendPhone;
private LocalDateTime updatedAt;
private String updatedBy;
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetSmsAutoStatusCmd {
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.persistence;
import app.module.core.config.application.annotation.UpdateCommand;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class UpdateSmsAutoStatusDao implements UpdateSmsAutoStatusPortOut {
private final UpdateSmsAutoStatusMapper mapper;
@Override
@UpdateCommand
public void operate(UpdateSmsAutoStatusCmd cmd) {
mapper.operate(cmd);
}
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.persistence;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface UpdateSmsAutoStatusMapper {
void operate(UpdateSmsAutoStatusCmd cmd);
}

View File

@@ -0,0 +1,45 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import app.module.core.config.application.util.MessageUtil;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusReqVO;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusResVO;
@Slf4j
@RestController
@RequiredArgsConstructor
class UpdateSmsAutoStatusController {
private final UpdateSmsAutoStatusPortIn portIn;
private final MessageUtil messageUtil;
@PatchMapping(path = "/api/smsAutoStatus/update")
ResponseEntity<?> operate(@Valid @RequestBody UpdateSmsAutoStatusReqVO reqVO,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
try {
portIn.operate(new UpdateSmsAutoStatusCmd(reqVO.getActive()));
} catch (Exception e) {
// update 실패
log.info(e.getMessage());
throw new RuntimeException(e);
}
return ResponseEntity.status(HttpStatus.OK).body(new UpdateSmsAutoStatusResVO(
messageUtil.getMessage("operation.common.update.done")));
}
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
public class UpdateSmsAutoStatusReqVO {
private Boolean active;
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class UpdateSmsAutoStatusResVO {
private String message;
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
public interface UpdateSmsAutoStatusPortIn {
void operate(UpdateSmsAutoStatusCmd cmd);
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
public interface UpdateSmsAutoStatusPortOut {
void operate(UpdateSmsAutoStatusCmd cmd);
}

View File

@@ -0,0 +1,18 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class UpdateSmsAutoStatusService implements UpdateSmsAutoStatusPortIn {
private final UpdateSmsAutoStatusPortOut portOut;
@Override
public void operate(UpdateSmsAutoStatusCmd cmd) {
portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class UpdateSmsAutoStatusCmd extends AuditCommand {
private Boolean active;
}

View File

@@ -1,5 +1,7 @@
package app.module.admin.usecase.home.adapters.web;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import java.security.Principal;
import lombok.RequiredArgsConstructor;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
public class HomeController {
private final AdminViewPortIn adminViewPortIn;
private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn;
@GetMapping
public String home(Principal principal, Model model) {
@@ -25,6 +28,9 @@ public class HomeController {
model.addAttribute("loginUserRoles", loginUser.getRole());
});
model.addAttribute("smsActive",
getSmsAutoStatusPortIn.operate().orElse(null).getActive());
return "home";
}
}

View File

@@ -1,12 +1,15 @@
package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence;
import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut;
import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
@Slf4j
@Repository
@RequiredArgsConstructor
class AutoSchedulesDao implements AutoSchedulesPortOut {
@@ -26,4 +29,19 @@ class AutoSchedulesDao implements AutoSchedulesPortOut {
}
}
@Override
@Transactional
public Optional<Boolean> sendAutoSms(CreateSmsAutoSendCmd cmd) {
try {
mapper.createSmsAutoSend(cmd);
return Optional.of(true);
} catch (Exception e) {
log.info(e.getMessage());
// 예외 발생 시 false 반환
return Optional.of(false);
}
}
}

View File

@@ -1,9 +1,10 @@
package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence;
import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface AutoSchedulesMapper {
void createMonthlyInputStatus();
void createSmsAutoSend(CreateSmsAutoSendCmd cmd);
}

View File

@@ -1,6 +1,9 @@
package app.module.admin.usecase.schedule.autoSchedules.adapters.web;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.config.application.util.model.DayRange;
import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn;
import java.time.LocalDate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -20,6 +23,12 @@ public class AutoSchedulesController {
portIn.operate();
}
// 매일 오후 5시 마다 실행되는 스케줄러
@Scheduled(cron = "0 0 17 * * ?")
public void fetchSmsAutoSend() {
portIn.sendAutoSms();
}
/**
* TODO 스케쥴 있다면.. 추가.
*/

View File

@@ -5,4 +5,5 @@ import java.util.Optional;
public interface AutoSchedulesPortIn {
Optional<Boolean> operate();
Optional<Boolean> sendAutoSms();
}

View File

@@ -1,8 +1,10 @@
package app.module.admin.usecase.schedule.autoSchedules.ports;
import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd;
import java.util.Optional;
public interface AutoSchedulesPortOut {
Optional<Boolean> operate();
Optional<Boolean> sendAutoSms(CreateSmsAutoSendCmd cmd);
}

View File

@@ -1,20 +1,79 @@
package app.module.admin.usecase.schedule.autoSchedules.ports.application;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.config.application.util.model.DayRange;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn;
import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut;
import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortIn;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.UUID;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Optional;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@Service
@RequiredArgsConstructor
class AutoSchedulesService implements AutoSchedulesPortIn {
private final AutoSchedulesPortOut portOut;
private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn;
private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn;
@Override
public Optional<Boolean> operate() {
return portOut.operate();
}
@Override
@Transactional
public Optional<Boolean> sendAutoSms() {
GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null);
// 문자 자동 발송 활성화 상태 체크
if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) {
System.out.println("문자 발송 비활성화 상태");
return Optional.of(false);
}
LocalDate today = LocalDate.now();
int day = today.getDayOfMonth();
// 발송일 조건: 8일, 15일, 22일, 1일(다음 달 대상자)
if (day == 8 || day == 15 || day == 22 || day == 1) {
// 발송 대상 날짜 범위 구하기
DayRange dayRange = DateUiUtil.getDayRange(today).orElse(null);
if (dayRange == null) return Optional.of(false);
// 대상 월 계산 (1일 이면 이전 달 / 1일이 아니면 현재 달 yyyyMM 을 가져온다.)
LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today;
String targetMonth = DateUiUtil.getMonthValue(baseDate);
// dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회
List<GetIncompleteHouseholds> incompleteHouseholds = getIncompleteHouseholdsPortIn.operate(
new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay())
);
// 미등록 임가가 있을 경우에만 실행
if(!CollectionUtils.isEmpty(incompleteHouseholds)) {
portOut.sendAutoSms(new CreateSmsAutoSendCmd(
incompleteHouseholds,
getSmsAutoStatus.getSendPhone(),
getSmsAutoStatus.getMessage()
));
}
}
return Optional.of(true);
}
}

View File

@@ -0,0 +1,18 @@
package app.module.admin.usecase.schedule.autoSchedules.ports.application.domain;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateSmsAutoSendCmd {
private List<GetIncompleteHouseholds> sendHouseholds;
private String sendPhone;
private String message;
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.schedule.getIncompleteHouseholds.adapters.persistence;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortOut;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetIncompleteHouseholdsDao implements GetIncompleteHouseholdsPortOut {
private final GetIncompleteHouseholdsMapper mapper;
@Override
public List<GetIncompleteHouseholds> operate(GetIncompleteHouseholdsCmd cmd) {
return mapper.operate(cmd);
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.schedule.getIncompleteHouseholds.adapters.persistence;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetIncompleteHouseholdsMapper {
List<GetIncompleteHouseholds> operate(GetIncompleteHouseholdsCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd;
import java.util.List;
public interface GetIncompleteHouseholdsPortIn {
List<GetIncompleteHouseholds> operate(GetIncompleteHouseholdsCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd;
import java.util.List;
public interface GetIncompleteHouseholdsPortOut {
List<GetIncompleteHouseholds> operate(GetIncompleteHouseholdsCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortIn;
import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortOut;
import java.util.List;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetIncompleteHouseholdsService implements GetIncompleteHouseholdsPortIn {
private final GetIncompleteHouseholdsPortOut portOut;
@Override
public List<GetIncompleteHouseholds> operate(GetIncompleteHouseholdsCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,17 @@
package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetIncompleteHouseholds {
private Long seq;
private String householdNum;
private String ownerName;
private String phone;
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetIncompleteHouseholdsCmd {
private String recordMonth;
private int fromDay;
private int toDay;
}

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence.GetSmsAutoStatusMapper">
<select id="operate"
resultType="app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus">
/* operate : 문자 자동발송 상태 조회 */
SELECT active,
message,
send_phone,
updated_at,
updated_by
FROM sms_auto_status
</select>
</mapper>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.persistence.UpdateSmsAutoStatusMapper" >
<update id="operate">
/* operate : 문자 자동 발송 활성화 상태 수정 */
UPDATE sms_auto_status
SET active = #{active},
<include refid="common.fields.UpdateBaseSet" />
</update>
</mapper>

View File

@@ -6,4 +6,30 @@
<select id="createMonthlyInputStatus">
select fn_monthly_input_status()
</select>
<insert id="createSmsAutoSend">
/* createSmsAutoSend : 문자 발송 insert */
INSERT INTO biz_msg
(
MSG_TYPE,
CMID,
REQUEST_TIME,
SEND_TIME,
DEST_PHONE,
SEND_PHONE,
MSG_BODY
)
VALUES
<foreach collection="sendHouseholds" item="item" separator=",">
(
5,
TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum},
NOW(),
NOW(),
#{item.phone},
#{sendPhone},
#{message}
)
</foreach>
</insert>
</mapper>

View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.schedule.getIncompleteHouseholds.adapters.persistence.GetIncompleteHouseholdsMapper">
<select id="operate"
resultType="app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds">
/* operate : 문자 발송 일계부 미완료된 대상자 조회 */
SELECT h.seq,
h.household_num,
h.owner_name,
h.phone
FROM household h
WHERE h.seq IN (
SELECT DISTINCT dr.household_seq
FROM daily_record dr
WHERE dr.record_month = #{recordMonth}
AND dr.day_group_no IN (
SELECT ddg.group_no
FROM daily_day_group ddg
WHERE ddg.is_deleted = false
AND ddg.start_day >= #{fromDay}
AND ddg.end_day &lt; #{toDay}
)
AND dr.all_status NOT IN ('DONE', 'TODAY_NONE')
)
</select>
</mapper>

View File

@@ -94,7 +94,7 @@
<a aria-current="page" th:href="${topNode.uri}" >
<img class="logo" th:src="@{/static/assets/images/common/ico_logo.svg}" alt="로고 이미지">
</a>
<p class="logo-tit">임가경제조사 일계부 관리자모드</p>
<p class="logo-tit"><a th:href="${topNode.uri}">임가경제조사 일계부 관리자모드</a></p>
</div>
<ul class="main-menu" th:if="${topNode != null}">
<li class="menu-item" th:each="menu : ${topNode.children}"

View File

@@ -1,35 +1,423 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-home}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html layout:decorate="~{layout/layout-home}"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:sec="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org">
<head>
<title>관리자 수정</title>
</head>
<body>
<section layout:fragment="content">
<hgroup class="page-tit-group">
<h2 class="page-tit">
2025년 6월 현황
</h2>
<div class="table-tit-group large">
<div class="component-select">
<select class="select-list" required>
<option value="" disabled hidden>선택해주세요.</option>
<option value="value1" selected>전체</option>
<option value="value2">Option 2</option>
</select>
</div>
</div>
</hgroup>
<div class="content-inner">
<section class="dounut-chart-area">
<div class="chart-group type-green">
<dl>
<dt>
<strong>일계부 진행률</strong>
<span>(전체 임가 기준)</span>
</dt>
<dd>
<strong class="percent">50</strong>
<span class="d-flex">
<span>1006</span>
/
<span>1476</span>
</span>
</dd>
</dl>
<div class="donut-chart" style="--percent: 50;">
</div>
</div>
<div class="p-5 mb-4 bg-light rounded-3">
<div class="container-fluid py-5">
<h1 class="display-5 fw-bold">안녕하세요, <span class="text-muted"
sec:authentication="name"></span> :-)</h1>
<p class="col-md-8 fs-4">
관리자 메인에 오신걸 환영합니다. <span class="text-muted" sec:authentication="name"></span> 님께 부여된 역할에 따라
메뉴이용이
제한되는 점에 유의해주세요.
</p>
<div class="chart-group type-blue">
<dl>
<dt>
<strong>일계부 진행률</strong>
<span>(전체 임가 기준)</span>
</dt>
<dd>
<strong class="percent">68</strong>
<span class="d-flex">
<span>1006</span>
/
<span>1476</span>
</span>
</dd>
</dl>
<div class="donut-chart" style="--percent: 68;">
</div>
</div>
<div class="chart-group type-orange">
<dl>
<dt>
<strong>일계부 진행률</strong>
<span>(전체 임가 기준)</span>
</dt>
<dd>
<strong class="percent">48</strong>
<span class="d-flex">
<span>1006</span>
/
<span>1476</span>
</span>
</dd>
</dl>
<div class="donut-chart" style="--percent: 48;">
</div>
</div>
</section>
<section>
<div class="table-group">
<div class="table-tit-group large">
<h3>
지방실사별 진행현황
</h3>
</div>
<table>
<thead>
<tr>
<th>
실사
</th>
<th>임계부 진행률</th>
<th>현장 방문률(1차)</th>
<th>답례품 전달률</th>
</tr>
</thead>
<tbody>
<tr>
<td>서울</td>
<td>
<div class="progress-group type-green">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
<td>
<div class="progress-group type-blue">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
<td>
<div class="progress-group type-orange">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
</tr>
<tr>
<td>강원</td>
<td>
<div class="progress-group type-green">
<progress class="progress" value="35" min="0" max="100"></progress>
<div class="detail">
<p class="percent">35</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
<td>
<div class="progress-group type-blue">
<progress class="progress" value="55" min="0" max="100"></progress>
<div class="detail">
<p class="percent">55</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
<td>
<div class="progress-group type-orange">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
</tr>
<tr class="total">
<td>전체</td>
<td>
<span>68</span>%
</td>
<td>
<span>68</span>%
</td>
<td>
<span>68</span>%
</td>
</tr>
</tbody>
</table>
</div>
<div class="table-group">
<div class="table-tit-group large">
<h3>
조사원별 진행 현황
</h3>
<div class="component-select">
<select class="select-list" required>
<option value="" disabled hidden>선택해주세요.</option>
<option value="value1" selected>전체</option>
<option value="value2">Option 2</option>
</select>
</div>
</div>
<table>
<colgroup>
<col width="8%"/>
<col width="8%"/>
<col width="8%"/>
<col width="25%"/>
<col width="25%"/>
<col width="25%"/>
</colgroup>
<thead>
<tr>
<th>조사원명</th>
<th>실사</th>
<th>할당 임가 수</th>
<th>임계부 진행률</th>
<th>현장 방문률(1차)</th>
<th>답례품 전달률</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<a href="">김조사</a>
</td>
<td>서울</td>
<td>24</td>
<td>
<div class="progress-group type-green">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
<td>
<div class="progress-group type-blue">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
<td>
<div class="progress-group type-orange">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
</tr>
<tr>
<td>
<a href="">김조사</a>
</td>
<td>서울</td>
<td>24</td>
<td>
<div class="progress-group type-green">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
<td>
<div class="progress-group type-blue">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
<td>
<div class="progress-group type-orange">
<progress class="progress" value="85" min="0" max="100"></progress>
<div class="detail">
<p class="percent">85</p>
<span class="d-flex">
(
<span>66</span>
/
<span>78</span>
)
</span>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</section>
<section th:if="${loginUserRoles.id == 'ROLE_ADMIN'}">
<div class="table-group">
<div class="table-tit-group large">
<h3>
문자 발송 체크
</h3>
</div>
<button type="button" class="btn small">
<span class="btn-txt">
<label class="radio-inner">
<input type="checkbox" id="smsAutoSend" th:checked="${smsActive}"
onclick="smsAutoSendConfirm(this);">
<span class="radio-item">
<span class="radio-txt">문자 자동 발송</span>
</span>
</label>
</span>
</button>
</div>
</section>
<p class="col-md-8 fs-5">
<span>역할</span>
<span class="text-muted"
th:each="role, status : ${loginUserRoles}"
th:text="${role.getId()} + ' (' + ${role.description} + ')' + ${!status.last ? ', ': ''}"></span>
</p>
</div>
</div>
</section>
</body>
<section layout:fragment="script">
<script>
/**
* 문자 발송 체크 스크립트
* */
// 문자 자동 발송 컨펌창
const smsAutoSendConfirm = (el) => {
let message = el.checked ? '문자 자동 발송 기능을 사용하시겠습니까?' : '문자 자동 발송 기능을 중지하시겠습니까?';
etUI.dialog.confirm({
title: '문자 자동 발송 안내',
message: message,
negativeCallback: function () {
$(el).prop('checked', !el.checked);
},
positiveCallback: function () {
updateSmsAutoStatusActive(el.checked);
},
});
}
// 문자 자동 발송 기능 활성화
const updateSmsAutoStatusActive = (active) => {
ajaxUtil._ajaxMethod(
'/api/smsAutoStatus/update',
JSON.stringify({
active: active,
}),
() => {
$('#smsAutoSend').prop('checked', active);
},
(code, rstData) => {
if(code == 422) alert(rstData.responseText);
$('#smsAutoSend').prop('checked', !active);
},
'patch',
'json',
{ handle422Type: 'alert' }
);
}
</script>
</section>
</html>

View File

@@ -4,23 +4,26 @@
<head th:replace="~{common/components :: head}"></head>
<body>
<header th:replace="~{common/components :: header}"></header>
<div id="wrap">
<header th:replace="~{common/components :: header}"></header>
<div id="container">
<div id="content" role="main">
<div class="inner">
<div class="content-inner">
<div th:replace="~{common/components :: operationMessage}"></div>
<div style="display: flex; justify-content: space-evenly;align-items: center; width:100%; background: #DEE2E6; height: 500px; font-size: 16px;">
<section class="container" layout:fragment="content">
<div th:replace="~{common/components :: operationMessage}"></div>
<div class="content-inner">
<section layout:fragment="content">
page content
</section>
</div>
</div>
</div>
</div>
</div>
<div th:replace="~{common/components :: footer}"></div>
<section layout:fragment="script"></section>
</div>
</body>
</html>

View File

@@ -16,3 +16,27 @@ INSERT INTO uri
VALUES('uri.front.guide', '이용안내', '/guide', 'FRONT', 2, true, 'uri.front', now(), 'INIT_DATA', now(), 'INIT_DATA', false);
-- 문자 자동 발송 초기 데이터 등록
insert into sms_auto_status (
active,
message,
send_phone,
updated_at,
updated_by
)
values (
false,
'[임가경제조사] 일계부 작성 부탁드립니다.
안녕하십니까? 임가경영주님.
임가경제조사를 담당하고 있는 코리아리서치입니다.
앱에서 지난 1주 동안 일계부 미작성 부분이 확인되어, 작성을 요청 드리고자 합니다.
여러분이 작성해 주시는 일계부는 임업정책 수립이나 임업문제 연구의 실증적 기초자료를 제공하는 아주 귀중한 자료입니다.
바쁘신 와중에도 본 조사를 위해 일계부를 작성하여 주신 것에 대하여 진심으로 감사드립니다.',
'02-3415-5187',
now(),
'INIT_DATA'
);

View File

@@ -1904,4 +1904,26 @@ COMMENT ON COLUMN address.updated_at IS '수정일';
COMMENT ON COLUMN address.updated_by IS '수정자';
COMMENT ON COLUMN address.deleted_at IS '삭제일';
COMMENT ON COLUMN address.deleted_by IS '삭제자';
COMMENT ON COLUMN address.is_deleted IS '삭제여부';
COMMENT ON COLUMN address.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : sms_auto_send
-- DESC : 문자 자동 발송 활성화 테이블
-- ============================================
CREATE TABLE sms_auto_status (
active boolean NOT null,
message text,
send_phone varchar(255),
updated_at timestamp(6),
updated_by varchar(255)
);
COMMENT ON TABLE sms_auto_status IS '문자 자동 발송 활성화 테이블';
COMMENT ON COLUMN sms_auto_status.active IS '자동 발송 기능 ON/OFF 여부';
COMMENT ON COLUMN sms_auto_status.message IS '메세지';
COMMENT ON COLUMN sms_auto_status.send_phone IS '발송번호';
COMMENT ON COLUMN sms_auto_status.updated_at IS '수정일';
COMMENT ON COLUMN sms_auto_status.updated_by IS '수정자';