From ccc1aa283e43be4f2528e0ccf5b2993f9e983123 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 27 Mar 2025 12:28:21 +0900 Subject: [PATCH] =?UTF-8?q?agent=20=EA=B4=80=EB=A0=A8=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmm/service/AbstractAgentService.java | 85 -- .../client/cmm/service/AgentService.java | 11 - .../client/one/mapper/AgentCOneMapper.java | 50 - .../client/one/mapper/domain/AgentCOneVO.java | 48 - .../client/one/service/AgentCOneService.java | 24 - .../service/impl/AgentCOneServiceImpl.java | 126 --- .../client/one/web/AgentCOneController.java | 32 - .../one/web/AgentCOneRestController.java | 168 ---- .../client/two/mapper/AgentCTwoMapper.java | 50 - .../client/two/mapper/domain/AgentCTwoVO.java | 46 - .../client/two/service/AgentCTwoService.java | 22 - .../service/impl/AgentCTwoServiceImpl.java | 120 --- .../client/two/web/AgentCTwoController.java | 48 - .../two/web/AgentCTwoRestController.java | 156 ---- .../agent/server/mapper/AgentSMapper.java | 50 - .../agent/server/mapper/domain/AgentSVO.java | 101 --- .../agent/server/service/AgentSService.java | 17 - .../service/impl/AgentSServiceImpl.java | 59 -- .../agent/server/web/AgentSController.java | 18 - .../server/web/AgentSRestController.java | 61 -- .../config/MjonAgentCFiveDatabaseConfig.java | 47 - .../config/MjonAgentCFourDatabaseConfig.java | 48 - .../config/MjonAgentCOneDatabaseConfig.java | 48 - .../config/MjonAgentCThreeDatabaseConfig.java | 48 - .../config/MjonAgentCTwoDatabaseConfig.java | 48 - .../cmn/config/MjonAgentSDatabaseConfig.java | 48 - src/main/resources/mybatis-config.xml | 3 - .../resources/templates/agent/result.html | 344 ------- src/main/resources/templates/agent/view.html | 852 ------------------ .../templates/fragments/mainsidebar.html | 29 +- 30 files changed, 2 insertions(+), 2805 deletions(-) delete mode 100644 src/main/java/com/itn/admin/agent/client/cmm/service/AbstractAgentService.java delete mode 100644 src/main/java/com/itn/admin/agent/client/cmm/service/AgentService.java delete mode 100644 src/main/java/com/itn/admin/agent/client/one/mapper/AgentCOneMapper.java delete mode 100644 src/main/java/com/itn/admin/agent/client/one/mapper/domain/AgentCOneVO.java delete mode 100644 src/main/java/com/itn/admin/agent/client/one/service/AgentCOneService.java delete mode 100644 src/main/java/com/itn/admin/agent/client/one/service/impl/AgentCOneServiceImpl.java delete mode 100644 src/main/java/com/itn/admin/agent/client/one/web/AgentCOneController.java delete mode 100644 src/main/java/com/itn/admin/agent/client/one/web/AgentCOneRestController.java delete mode 100644 src/main/java/com/itn/admin/agent/client/two/mapper/AgentCTwoMapper.java delete mode 100644 src/main/java/com/itn/admin/agent/client/two/mapper/domain/AgentCTwoVO.java delete mode 100644 src/main/java/com/itn/admin/agent/client/two/service/AgentCTwoService.java delete mode 100644 src/main/java/com/itn/admin/agent/client/two/service/impl/AgentCTwoServiceImpl.java delete mode 100644 src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoController.java delete mode 100644 src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoRestController.java delete mode 100644 src/main/java/com/itn/admin/agent/server/mapper/AgentSMapper.java delete mode 100644 src/main/java/com/itn/admin/agent/server/mapper/domain/AgentSVO.java delete mode 100644 src/main/java/com/itn/admin/agent/server/service/AgentSService.java delete mode 100644 src/main/java/com/itn/admin/agent/server/service/impl/AgentSServiceImpl.java delete mode 100644 src/main/java/com/itn/admin/agent/server/web/AgentSController.java delete mode 100644 src/main/java/com/itn/admin/agent/server/web/AgentSRestController.java delete mode 100644 src/main/java/com/itn/admin/cmn/config/MjonAgentCFiveDatabaseConfig.java delete mode 100644 src/main/java/com/itn/admin/cmn/config/MjonAgentCFourDatabaseConfig.java delete mode 100644 src/main/java/com/itn/admin/cmn/config/MjonAgentCOneDatabaseConfig.java delete mode 100644 src/main/java/com/itn/admin/cmn/config/MjonAgentCThreeDatabaseConfig.java delete mode 100644 src/main/java/com/itn/admin/cmn/config/MjonAgentCTwoDatabaseConfig.java delete mode 100644 src/main/java/com/itn/admin/cmn/config/MjonAgentSDatabaseConfig.java delete mode 100644 src/main/resources/templates/agent/result.html delete mode 100644 src/main/resources/templates/agent/view.html diff --git a/src/main/java/com/itn/admin/agent/client/cmm/service/AbstractAgentService.java b/src/main/java/com/itn/admin/agent/client/cmm/service/AbstractAgentService.java deleted file mode 100644 index 542f42c..0000000 --- a/src/main/java/com/itn/admin/agent/client/cmm/service/AbstractAgentService.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.itn.admin.agent.client.cmm.service; - -import com.itn.admin.cmn.msg.RestResponse; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public abstract class AbstractAgentService implements AgentService { - - @Autowired - protected M mapper; // 매퍼를 protected로 선언하여 서브 클래스에서 접근 가능 - - private static final int BATCH_SIZE = 100000; - - @Override - public RestResponse send(T agentVO) { - List agentVOL = new ArrayList<>(); - int sendCnt = parseSendCount(agentVO); - - - for (int i = 0; i < sendCnt; i++) { - T paramVO = createCopy(agentVO, i, sendCnt); - agentVOL.add(paramVO); - } - - int totalSize = agentVOL.size(); - long startTime = System.currentTimeMillis() / 1000; - int totalBatches = (int) Math.ceil((double) totalSize / BATCH_SIZE); - for (int i = 0; i < totalSize; i += BATCH_SIZE) { - int end = Math.min(totalSize, i + BATCH_SIZE); - List batchList = agentVOL.subList(i, end); - insertBatch(batchList); - logBatchProgress(i, totalBatches); - } - long endTime = System.currentTimeMillis() / 1000; - long totalTime = endTime - startTime; - log.info("insert 시간 : [{}]", totalTime); - return new RestResponse(HttpStatus.OK, "데이터를 정상적으로 입력했습니다.", totalTime + "초"); - } - - public RestResponse findByInsertCnt(T agentVO) { - int count = countByCondition(agentVO); - return new RestResponse(HttpStatus.OK, "", count); - } - - @Override - public RestResponse findByLogMoveCntWhereMessage(T agentVO) { - int count = countByLogMoveCntWhereMsgTypeAndMessage(agentVO); - return new RestResponse(HttpStatus.OK, "", count); - } - public RestResponse findAllLogMoveCnt(T agentVO) { - int count = this.countAllLogMoveCnt(agentVO); - return new RestResponse(HttpStatus.OK, "", count); - } - public RestResponse findByRequestDateWhereMessageFromLog(T agentVO) { - String count = this.findByRequestDateWhereMessageFromLogFn(agentVO); - return new RestResponse(HttpStatus.OK, "", count); - } - public RestResponse findByReportLog(T agentVO) { - return new RestResponse(HttpStatus.OK, "", this.findByReportLogFn(agentVO)); - } - - protected abstract T findByReportLogFn(T agentVO); - - protected abstract int countAllLogMoveCnt(T agentVO); - protected abstract String findByRequestDateWhereMessageFromLogFn(T agentVO); - - protected abstract int countByLogMoveCntWhereMsgTypeAndMessage(T agentVO); - - protected abstract int countByCondition(T agentVO); - protected abstract int parseSendCount(T agentVO); - protected abstract T createCopy(T originalVO, int index, int sendCnt); - protected abstract void insertBatch(List batchList); - - private void logBatchProgress(int i, int totalBatches) { - int currentBatch = (i / BATCH_SIZE) + 1; - log.info("현재 처리 중인 배치: [{}]", currentBatch + "/" + totalBatches); - log.info("남은 배치 수: [{}]", (totalBatches - currentBatch)); - } - -} diff --git a/src/main/java/com/itn/admin/agent/client/cmm/service/AgentService.java b/src/main/java/com/itn/admin/agent/client/cmm/service/AgentService.java deleted file mode 100644 index 146a796..0000000 --- a/src/main/java/com/itn/admin/agent/client/cmm/service/AgentService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.itn.admin.agent.client.cmm.service; - -import com.itn.admin.cmn.msg.RestResponse; - -public interface AgentService { - RestResponse send(T agentVO); - - RestResponse findByLogMoveCntWhereMessage(T agentVO); - - RestResponse findAllLogMoveCnt(T agentVO); -} diff --git a/src/main/java/com/itn/admin/agent/client/one/mapper/AgentCOneMapper.java b/src/main/java/com/itn/admin/agent/client/one/mapper/AgentCOneMapper.java deleted file mode 100644 index 29d2ff9..0000000 --- a/src/main/java/com/itn/admin/agent/client/one/mapper/AgentCOneMapper.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.itn.admin.agent.client.one.mapper; - -import com.itn.admin.agent.client.one.mapper.domain.AgentCOneVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * packageName : com.itn.admin.agent.mapper - * fileName : AgentMapper - * author : hylee - * date : 2024-07-31 - * description : - * =========================================================== - * DATE AUTHOR NOTE - * ----------------------------------------------------------- - * 2024-07-31 hylee 최초 생성 - */ -@Mapper -public interface AgentCOneMapper { - - List findAll(AgentCOneVO agentCTwoVO); - - void insertAgents(List agentCTwoVO); - - int countBySendStatusNotAndMsgType(AgentCOneVO agentCTwoVO); - - int countByLogMoveCntWhereMsgTypeAndMessage(AgentCOneVO agentVO); - - int findAllLogMoveCnt(AgentCOneVO agentVO); - - @Select("SELECT min(REQUEST_DATE) as requestDate " + - "FROM MUNJAON_MSG_LOG " + - "WHERE MESSAGE LIKE CONCAT(#{message}, '%')") - String findByRequestDateWhereMessageFromLogFn(AgentCOneVO agentVO); - - @Select(""" - - SELECT - COUNT(*) AS reportCnt, -- '총 카운트', - MIN(REPORT_DATE) AS minReportDate, -- '가장 빠른 REPORT_DATE', - MAX(REPORT_DATE) AS maxReportDate -- '가장 늦은 REPORT_DATE' - FROM - MUNJAON_MSG_LOG - WHERE - MESSAGE LIKE CONCAT(#{message}, '%') - """) - AgentCOneVO findByReportLogFn(AgentCOneVO agentVO); -} diff --git a/src/main/java/com/itn/admin/agent/client/one/mapper/domain/AgentCOneVO.java b/src/main/java/com/itn/admin/agent/client/one/mapper/domain/AgentCOneVO.java deleted file mode 100644 index 661e044..0000000 --- a/src/main/java/com/itn/admin/agent/client/one/mapper/domain/AgentCOneVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.itn.admin.agent.client.one.mapper.domain; - -import lombok.*; - -import java.io.Serializable; - -/** - * packageName : com.itn.admin.agent.mapper.domain - * fileName : AgentVO - * author : hylee - * date : 2024-07-31 - * description : 에이젼트 테스트발송 - * =========================================================== - * DATE AUTHOR NOTE - * ----------------------------------------------------------- - * 2023-05-09 hylee 최초 생성 - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Getter -@Setter -@ToString -public class AgentCOneVO implements Serializable { - - private static final long serialVersionUID = 1L; - private String msgType; - private String sendStatus; - private String requestSate; - private String recvPhone; - private String sendPhone; - private String subject; - private String message; - private String sendCnt; - private String fileName01; - private String fileName02; - private String fileName03; - private String requestDate; - - private String reportCnt; - private String minReportDate; - private String maxReportDate; - - - private String cnt; - - -} diff --git a/src/main/java/com/itn/admin/agent/client/one/service/AgentCOneService.java b/src/main/java/com/itn/admin/agent/client/one/service/AgentCOneService.java deleted file mode 100644 index aa3d07b..0000000 --- a/src/main/java/com/itn/admin/agent/client/one/service/AgentCOneService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.itn.admin.agent.client.one.service; - -import com.itn.admin.agent.client.one.mapper.domain.AgentCOneVO; -import com.itn.admin.cmn.msg.RestResponse; - - -public interface AgentCOneService { - - - - RestResponse send(AgentCOneVO agentCOneVO); - - RestResponse findByInsertCnt(AgentCOneVO agentCOneVO); - - RestResponse findByLogMoveCntWhereMessage(AgentCOneVO agentCOneVO); - - RestResponse findAllLogMoveCnt(AgentCOneVO agentCOneVO); - - RestResponse findByRequestDateWhereMessageFromLog(AgentCOneVO agentCOneVO); - - RestResponse findByReportLog(AgentCOneVO agentCOneVO); - -// RestResponse findByReportCnt(AgentCTwoVO agentCTwoVO); -} diff --git a/src/main/java/com/itn/admin/agent/client/one/service/impl/AgentCOneServiceImpl.java b/src/main/java/com/itn/admin/agent/client/one/service/impl/AgentCOneServiceImpl.java deleted file mode 100644 index e29fb7f..0000000 --- a/src/main/java/com/itn/admin/agent/client/one/service/impl/AgentCOneServiceImpl.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.itn.admin.agent.client.one.service.impl; - -import com.itn.admin.agent.client.cmm.service.AbstractAgentService; -import com.itn.admin.agent.client.one.mapper.AgentCOneMapper; -import com.itn.admin.agent.client.one.mapper.domain.AgentCOneVO; -import com.itn.admin.agent.client.one.service.AgentCOneService; -import com.itn.admin.cmn.msg.RestResponse; -import jakarta.annotation.PostConstruct; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - - -@Slf4j -@Service -public class AgentCOneServiceImpl extends AbstractAgentService implements AgentCOneService { - - @Autowired - private AgentCOneMapper agentCOneMapper; - - @PostConstruct - private void init() { - this.mapper = agentCOneMapper; - } - - @Override - protected AgentCOneVO findByReportLogFn(AgentCOneVO agentVO) { - return mapper.findByReportLogFn(agentVO); - } - - @Override - protected int countAllLogMoveCnt(AgentCOneVO agentVO) { - return mapper.findAllLogMoveCnt(agentVO); - } - - protected String findByRequestDateWhereMessageFromLogFn(AgentCOneVO agentVO) { - return mapper.findByRequestDateWhereMessageFromLogFn(agentVO); - } - - @Override - protected int countByLogMoveCntWhereMsgTypeAndMessage(AgentCOneVO agentVO) { - return mapper.countByLogMoveCntWhereMsgTypeAndMessage(agentVO); - } - - @Override - protected int countByCondition(AgentCOneVO agentVO) { - return mapper.countBySendStatusNotAndMsgType(agentVO); - } - - @Override - protected int parseSendCount(AgentCOneVO agentVO) { - try { - return StringUtils.isNotEmpty(agentVO.getSendCnt()) ? Integer.parseInt(agentVO.getSendCnt()) : 0; - } catch (NumberFormatException e) { - return 0; - } - } - - @Override - protected AgentCOneVO createCopy(AgentCOneVO originalVO, int index, int sendCnt) { - -// if (!originalVO.getMessage().startsWith("ITN")) { -// return originalVO; -// } - - AgentCOneVO paramVO = new AgentCOneVO(); - String msgType = originalVO.getMsgType(); - - paramVO.setMsgType(msgType); - paramVO.setSendStatus(originalVO.getSendStatus()); - if(sendCnt < 2){ - paramVO.setRecvPhone(originalVO.getRecvPhone()); - }else{ - paramVO.setRecvPhone(modifyPhoneNumber(originalVO.getRecvPhone(), index)); - } - paramVO.setSendPhone(originalVO.getSendPhone()); - - paramVO.setFileName01(originalVO.getFileName01()); - paramVO.setFileName02(originalVO.getFileName02()); - paramVO.setFileName03(originalVO.getFileName03()); - - paramVO.setMessage(originalVO.getMessage() + " " + (index + 1)); - if (!"S".equals(msgType)) { - paramVO.setSubject(originalVO.getSubject() + " " + (index + 1)); - } - return paramVO; - } - - @Override - protected void insertBatch(List batchList) { - mapper.insertAgents(batchList); - } - - - - private String modifyPhoneNumber(String phone, int index) { - // 휴대폰 번호는 010-XXXX-YYYY 형식으로 가정 -// String prefix = phone.substring(0, 4); // "010-" 부분 -// String middle = phone.substring(4, 8); // "XXXX" 부분 -// String suffix = phone.substring(8); // "YYYY" 부분 -// -// // 중간 부분 숫자 수정 -// int middleNumber = Integer.parseInt(middle); -// middleNumber = (middleNumber + index) % 10000; // 0000~9999 사이의 값으로 제한 -// middle = String.format("%04d", middleNumber); // 네 자리 숫자로 포맷 -// -// return prefix + middle + suffix; - // 인덱스를 번호 리스트 길이에 맞게 순환시키기 위해 모듈러 연산 사용 - int adjustedIndex = index % PHONE_NUMBER_LIST.size(); - return PHONE_NUMBER_LIST.get(adjustedIndex); - } - - // 번호 목록을 리스트로 저장 - private static final List PHONE_NUMBER_LIST = Arrays.asList( - "01057559725", "01093414986", "01041101024", - "01057058729", "01030266269", "01063170383", - "01066137278", "01023221941", "01087872615", - "01083584250", "01071101861", "01073859908", - "01034910882", "01051842895", "01094597958" - ); - -} diff --git a/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneController.java b/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneController.java deleted file mode 100644 index dece3c5..0000000 --- a/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.itn.admin.agent.client.one.web; - -import com.itn.admin.agent.client.one.mapper.domain.AgentCOneVO; -import com.itn.admin.agent.client.one.service.AgentCOneService; -import com.itn.admin.agent.client.two.mapper.domain.AgentCTwoVO; -import com.itn.admin.agent.client.two.service.AgentCTwoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; - -@Controller -public class AgentCOneController { - - private AgentCOneService agentCOneService; - - @Value("${spring.mjagent.client.one.userid}") - private String ONE_USER_ID; - - @Value("${spring.mjagent.client.two.userid}") - private String TOW_USER_ID; - - - @Autowired - public void setAgentCOneService(AgentCOneService agentCOneService) { - this.agentCOneService = agentCOneService; - } - - -} diff --git a/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneRestController.java b/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneRestController.java deleted file mode 100644 index 36fcfec..0000000 --- a/src/main/java/com/itn/admin/agent/client/one/web/AgentCOneRestController.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.itn.admin.agent.client.one.web; - -import com.itn.admin.agent.client.one.mapper.domain.AgentCOneVO; -import com.itn.admin.agent.client.one.service.AgentCOneService; -import com.itn.admin.cmn.msg.RestResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -@RestController -public class AgentCOneRestController { - - private AgentCOneService agentCOneService; - - private final String UPLOAD_DIR = "/home/mjon_client_agent_1/mmsfile"; - - @Value("${agent.file.dir.path}") - private String AGENT_FILE_PATH; - - @Autowired - public void setAgentService(AgentCOneService agentCOneService) { - this.agentCOneService = agentCOneService; - } - - /* - * client db에 insert - * */ - @PostMapping("/agent/one/send") - public ResponseEntity send(@RequestBody AgentCOneVO agentCOneVO) throws Exception { - return ResponseEntity.ok().body(agentCOneService.send(agentCOneVO)); - } - - /* - * client db에 insert 됐는지 확인 count - * */ - @PostMapping("/agent/one/findByInsertCnt") - public ResponseEntity findByInsertCnt(@RequestBody AgentCOneVO agentCOneVO) throws Exception { - return ResponseEntity.ok().body(agentCOneService.findByInsertCnt(agentCOneVO)); - } - - @GetMapping("/agent/one/findByInsertCnt") - public ResponseEntity findByInsertCntGet(@RequestParam String message) throws Exception { - AgentCOneVO agentCOneVO = new AgentCOneVO(); - agentCOneVO.setMessage(message); - return ResponseEntity.ok().body(agentCOneService.findByInsertCnt(agentCOneVO)); - } - - /* - * client LOG TB에 insert 됐는지 확인 count - * 리포트할때 ''현재'' 데이터가 LOG 테이블에 이동됐는지 확인 - * select cnt MESSAGE LIKE CONCAT(#{message}, '%') - * */ - @PostMapping("/agent/one/findByLogMoveCntWhereMessage") - public ResponseEntity findByLogMoveCntWhereMessage(@RequestBody AgentCOneVO agentCOneVO) throws Exception { - return ResponseEntity.ok().body(agentCOneService.findByLogMoveCntWhereMessage(agentCOneVO)); - } - - /* - * client LOG TB에 insert 됐는지 확인 count - * 리포트할때 동일 타입 데이터가 LOG 테이블에 이동됐는지 확인 - * select cnt WHERE msgType = #{msgType} - * */ - @PostMapping("/agent/one/findByLogMoveCnt") - public ResponseEntity findByLogMoveCnt(@RequestBody AgentCOneVO agentCOneVO) throws Exception { - return ResponseEntity.ok().body(agentCOneService.findAllLogMoveCnt(agentCOneVO)); - } - - @PostMapping("/agent/one/uploadFiles") - public ResponseEntity uploadFiles(@RequestParam("fileName01") MultipartFile file1, - @RequestParam("fileName02") MultipartFile file2, - @RequestParam("fileName03") MultipartFile file3) { - try { - Map fileNames = new HashMap<>(); - - // 각 파일을 업로드하고 파일명을 수집 - String fileName = ""; - if (!file1.isEmpty()) { - fileName = uploadSingleFile(file1); - fileNames.put("fileName01", fileName); - } - - if (!file2.isEmpty()) { - fileName = uploadSingleFile(file2); - fileNames.put("fileName02", fileName); - } - - if (!file3.isEmpty()) { - fileName = uploadSingleFile(file3); - fileNames.put("fileName03", fileName); - } - // 경로와 파일명 반환 - Map response = new HashMap<>(); - response.put("fileNames", fileNames); - response.put("status", "OK"); - - return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "",response) ); - - } catch (IOException ex) { - return ResponseEntity.ok(new RestResponse(HttpStatus.INTERNAL_SERVER_ERROR, "저장실패","") ); - } - } - - /* - * client db에 최초 insert된 시간 - * */ - @GetMapping("/agent/one/findByRequestDateWhereMessageFromLog") - public ResponseEntity findByRequestDateWhereMessageFromLog(@RequestParam String message) throws Exception { - AgentCOneVO agentCOneVO = new AgentCOneVO(); - agentCOneVO.setMessage(message); - return ResponseEntity.ok().body(agentCOneService.findByRequestDateWhereMessageFromLog(agentCOneVO)); - } - - /* - * client db에 report한 시간 - * */ - @GetMapping("/agent/one/findByReportLog") - public ResponseEntity findByReportLog(@RequestParam String message) throws Exception { - AgentCOneVO agentCOneVO = new AgentCOneVO(); - agentCOneVO.setMessage(message); - return ResponseEntity.ok().body(agentCOneService.findByReportLog(agentCOneVO)); - } - - - private String uploadSingleFile(MultipartFile file) throws IOException { - // 업로드된 파일의 이름을 가져옵니다. - String originalFileName = StringUtils.cleanPath(file.getOriginalFilename()); - - // 파일의 확장자를 추출합니다. 파일 이름에서 마지막 "." 이후 부분을 확장자로 간주합니다. - String fileExtension = ""; - int dotIndex = originalFileName.lastIndexOf("."); - if (dotIndex > 0) { - fileExtension = originalFileName.substring(dotIndex); - } - - // 고유한 파일명을 생성합니다. - String uniqueFileName = UUID.randomUUID().toString() + fileExtension; - - // 파일이 업로드될 경로를 설정합니다. - Path uploadPath = Paths.get(AGENT_FILE_PATH); - - // 해당 경로가 존재하지 않으면 디렉터리를 생성합니다. - if (!Files.exists(uploadPath)) { - Files.createDirectories(uploadPath); - } - - // 파일을 저장할 최종 경로를 생성합니다. - Path filePath = uploadPath.resolve(uniqueFileName); - - // 파일을 업로드 경로에 복사합니다. 이미 파일이 존재하면 대체합니다. - Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING); - - // 업로드된 고유한 파일명을 반환합니다. - return uniqueFileName; - } -} diff --git a/src/main/java/com/itn/admin/agent/client/two/mapper/AgentCTwoMapper.java b/src/main/java/com/itn/admin/agent/client/two/mapper/AgentCTwoMapper.java deleted file mode 100644 index b2c6e4a..0000000 --- a/src/main/java/com/itn/admin/agent/client/two/mapper/AgentCTwoMapper.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.itn.admin.agent.client.two.mapper; - -import com.itn.admin.agent.client.two.mapper.domain.AgentCTwoVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * packageName : com.itn.admin.agent.mapper - * fileName : AgentMapper - * author : hylee - * date : 2024-07-31 - * description : - * =========================================================== - * DATE AUTHOR NOTE - * ----------------------------------------------------------- - * 2024-07-31 hylee 최초 생성 - */ -@Mapper -public interface AgentCTwoMapper { - - List findAll(AgentCTwoVO agentCTwoVO); - - void insertAgents(List agentCTwoVO); - - int countBySendStatusNotAndMsgType(AgentCTwoVO agentCTwoVO); - - int countByLogMoveCntWhereMsgTypeAndMessage(AgentCTwoVO agentVO); - - int findAllLogMoveCnt(AgentCTwoVO agentVO); - - @Select("SELECT min(REQUEST_DATE) as requestDate " + - "FROM MUNJAON_MSG_LOG " + - "WHERE MESSAGE LIKE CONCAT(#{message}, '%')") - String findByRequestDateWhereMessageFromLogFn(AgentCTwoVO agentVO); - - @Select(""" - - SELECT - COUNT(*) AS reportCnt, -- '총 카운트', - MIN(REPORT_DATE) AS minReportDate, -- '가장 빠른 REPORT_DATE', - MAX(REPORT_DATE) AS maxReportDate -- '가장 늦은 REPORT_DATE' - FROM - MUNJAON_MSG_LOG - WHERE - MESSAGE LIKE CONCAT(#{message}, '%') - """) - AgentCTwoVO findByReportLogFn(AgentCTwoVO agentVO); -} diff --git a/src/main/java/com/itn/admin/agent/client/two/mapper/domain/AgentCTwoVO.java b/src/main/java/com/itn/admin/agent/client/two/mapper/domain/AgentCTwoVO.java deleted file mode 100644 index d018737..0000000 --- a/src/main/java/com/itn/admin/agent/client/two/mapper/domain/AgentCTwoVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.itn.admin.agent.client.two.mapper.domain; - -import lombok.*; - -import java.io.Serializable; - -/** - * packageName : com.itn.admin.agent.mapper.domain - * fileName : AgentVO - * author : hylee - * date : 2024-07-31 - * description : 에이젼트 테스트발송 - * =========================================================== - * DATE AUTHOR NOTE - * ----------------------------------------------------------- - * 2023-05-09 hylee 최초 생성 - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Getter -@Setter -@ToString -public class AgentCTwoVO implements Serializable { - - private static final long serialVersionUID = 1L; - private String msgType; - private String sendStatus; - private String requestSate; - private String recvPhone; - private String sendPhone; - private String subject; - private String message; - private String sendCnt; - private String fileName01; - private String fileName02; - private String fileName03; - private String requestDate; - - private String cnt; - - private String reportCnt; - private String minReportDate; - private String maxReportDate; - -} diff --git a/src/main/java/com/itn/admin/agent/client/two/service/AgentCTwoService.java b/src/main/java/com/itn/admin/agent/client/two/service/AgentCTwoService.java deleted file mode 100644 index 69b5711..0000000 --- a/src/main/java/com/itn/admin/agent/client/two/service/AgentCTwoService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.itn.admin.agent.client.two.service; - -import com.itn.admin.agent.client.two.mapper.domain.AgentCTwoVO; -import com.itn.admin.cmn.msg.RestResponse; - - -public interface AgentCTwoService { - - - - RestResponse send(AgentCTwoVO agentCTwoVO); - - RestResponse findByInsertCnt(AgentCTwoVO agentCTwoVO); - - RestResponse findByLogMoveCntWhereMessage(AgentCTwoVO agentCTwoVO); - - RestResponse findAllLogMoveCnt(AgentCTwoVO agentCTwoVO); - - RestResponse findByRequestDateWhereMessageFromLog(AgentCTwoVO agentCTwoVO); - - RestResponse findByReportLog(AgentCTwoVO agentCtwoVO); -} diff --git a/src/main/java/com/itn/admin/agent/client/two/service/impl/AgentCTwoServiceImpl.java b/src/main/java/com/itn/admin/agent/client/two/service/impl/AgentCTwoServiceImpl.java deleted file mode 100644 index 57a69c6..0000000 --- a/src/main/java/com/itn/admin/agent/client/two/service/impl/AgentCTwoServiceImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.itn.admin.agent.client.two.service.impl; - -import com.itn.admin.agent.client.cmm.service.AbstractAgentService; -import com.itn.admin.agent.client.one.mapper.domain.AgentCOneVO; -import com.itn.admin.agent.client.two.mapper.domain.AgentCTwoVO; -import com.itn.admin.agent.client.two.mapper.AgentCTwoMapper; -import com.itn.admin.agent.client.two.service.AgentCTwoService; -import jakarta.annotation.PostConstruct; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - - -@Slf4j -@Service -public class AgentCTwoServiceImpl extends AbstractAgentService implements AgentCTwoService { - - - @Autowired - private AgentCTwoMapper agentCTwoMapper; - - @PostConstruct - private void init() { - this.mapper = agentCTwoMapper; - } - - - @Override - protected int countByLogMoveCntWhereMsgTypeAndMessage(AgentCTwoVO agentVO) { - return mapper.countByLogMoveCntWhereMsgTypeAndMessage(agentVO); -// return mapper.countByLogMoveCntWhereMsgTypeAndMessage(agentVO); - } - - @Override - protected AgentCTwoVO findByReportLogFn(AgentCTwoVO agentVO) { - return mapper.findByReportLogFn(agentVO); - } - - @Override - protected int countAllLogMoveCnt(AgentCTwoVO agentVO) { - return mapper.findAllLogMoveCnt(agentVO); - } - - @Override - protected String findByRequestDateWhereMessageFromLogFn(AgentCTwoVO agentVO) { - return mapper.findByRequestDateWhereMessageFromLogFn(agentVO); - } - - @Override - protected int countByCondition(AgentCTwoVO agentVO) { - return mapper.countBySendStatusNotAndMsgType(agentVO); - } - - - @Override - protected int parseSendCount(AgentCTwoVO agentVO) { - try { - return StringUtils.isNotEmpty(agentVO.getSendCnt()) ? Integer.parseInt(agentVO.getSendCnt()) : 0; - } catch (NumberFormatException e) { - return 0; - } - } - - @Override - protected AgentCTwoVO createCopy(AgentCTwoVO originalVO, int index, int sendCnt) { - -// if (!originalVO.getMessage().startsWith("ITN")) { -// return originalVO; -// } - - AgentCTwoVO paramVO = new AgentCTwoVO(); - String msgType = originalVO.getMsgType(); - - paramVO.setMsgType(msgType); - paramVO.setSendStatus(originalVO.getSendStatus()); - if(sendCnt < 2){ - paramVO.setRecvPhone(originalVO.getRecvPhone()); - }else{ - paramVO.setRecvPhone(modifyPhoneNumber(originalVO.getRecvPhone(), index)); - } -// paramVO.setSendPhone(modifyPhoneNumber(originalVO.getSendPhone(), index)); - paramVO.setSendPhone(originalVO.getSendPhone()); - - paramVO.setFileName01(originalVO.getFileName01()); - paramVO.setFileName02(originalVO.getFileName02()); - paramVO.setFileName03(originalVO.getFileName03()); - - paramVO.setMessage(originalVO.getMessage() + " " + (index + 1)); - if (!"S".equals(msgType)) { - paramVO.setSubject(originalVO.getSubject() + " " + (index + 1)); - } - return paramVO; - } - - @Override - protected void insertBatch(List batchList) { - mapper.insertAgents(batchList); - } - - - private String modifyPhoneNumber(String phone, int index) { - // 인덱스를 번호 리스트 길이에 맞게 순환시키기 위해 모듈러 연산 사용 - int adjustedIndex = index % PHONE_NUMBER_LIST.size(); - return PHONE_NUMBER_LIST.get(adjustedIndex); - } - - // 번호 목록을 리스트로 저장 - private static final List PHONE_NUMBER_LIST = Arrays.asList( - "01057559725", "01093414986", "01041101024", - "01057058729", "01030266269", "01063170383", - "01066137278", "01023221941", "01087872615", - "01083584250", "01071101861", "01073859908", - "01034910882", "01051842895", "01094597958" - ); - -} diff --git a/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoController.java b/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoController.java deleted file mode 100644 index e3988b4..0000000 --- a/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.itn.admin.agent.client.two.web; - -import com.itn.admin.agent.client.two.service.AgentCTwoService; -import com.itn.admin.agent.client.two.mapper.domain.AgentCTwoVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; - -@Controller -public class AgentCTwoController { - - private AgentCTwoService agentCTwoService; - - @Value("${spring.mjagent.client.one.userid}") - private String ONE_USER_ID; - - @Value("${spring.mjagent.client.two.userid}") - private String TOW_USER_ID; - - - @Autowired - public void setAgentCTwoService(AgentCTwoService agentCTwoService) { - this.agentCTwoService = agentCTwoService; - } - - @GetMapping(value = "/agent/view") - public String list(@ModelAttribute("agentVO") AgentCTwoVO agentCTwoVO, Model model) { - - - model.addAttribute("oneUserId", ONE_USER_ID); - model.addAttribute("twoUserId", TOW_USER_ID); - - return "agent/view"; - } - @GetMapping(value = "/agent/result") - public String result(@ModelAttribute("agentVO") AgentCTwoVO agentCTwoVO, Model model) { - - - model.addAttribute("oneUserId", ONE_USER_ID); - model.addAttribute("twoUserId", TOW_USER_ID); - - return "agent/result"; - } - -} diff --git a/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoRestController.java b/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoRestController.java deleted file mode 100644 index a369394..0000000 --- a/src/main/java/com/itn/admin/agent/client/two/web/AgentCTwoRestController.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.itn.admin.agent.client.two.web; - -import com.itn.admin.agent.client.two.mapper.domain.AgentCTwoVO; -import com.itn.admin.agent.client.two.service.AgentCTwoService; -import com.itn.admin.cmn.msg.RestResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.util.*; - -@RestController -public class AgentCTwoRestController { - - private AgentCTwoService agentCTwoService; - - private final String UPLOAD_DIR = "/home/mjon_client_agent_2/mmsfile"; - - @Value("${agent.file.dir.path}") - private String AGENT_FILE_PATH; - - @Autowired - public void setAgentService(AgentCTwoService agentCTwoService) { - this.agentCTwoService = agentCTwoService; - } - - /* - * client db에 insert - * */ - @PostMapping("/agent/two/send") - public ResponseEntity send(@RequestBody AgentCTwoVO agentCTwoVO) throws Exception { - return ResponseEntity.ok().body(agentCTwoService.send(agentCTwoVO)); - } - - /* - * client db에 insert 됐는지 확인 count - * */ - @PostMapping("/agent/two/findByInsertCnt") - public ResponseEntity findByInsertCnt(@RequestBody AgentCTwoVO agentCTwoVO) throws Exception { - System.out.println("message : "+ agentCTwoVO.getMessage()); - return ResponseEntity.ok().body(agentCTwoService.findByInsertCnt(agentCTwoVO)); - } - - /* - * client db에 최초 insert된 시간 - * */ - @GetMapping("/agent/two/findByRequestDateWhereMessageFromLog") - public ResponseEntity findByRequestDateWhereMessageFromLog(@RequestParam String message) throws Exception { - AgentCTwoVO agentCTwoVO = new AgentCTwoVO(); - agentCTwoVO.setMessage(message); - return ResponseEntity.ok().body(agentCTwoService.findByRequestDateWhereMessageFromLog(agentCTwoVO)); - } - /* - * client LOG TB에 insert 됐는지 확인 count - * 리포트할때 ''현재'' 데이터가 LOG 테이블에 이동됐는지 확인 - * select cnt WHERE MESSAGE LIKE CONCAT(#{message}, '%') - * */ - @PostMapping("/agent/two/findByLogMoveCntWhereMessage") - public ResponseEntity findByLogMoveCntWhereMessage(@RequestBody AgentCTwoVO agentCTwoVO) throws Exception { - return ResponseEntity.ok().body(agentCTwoService.findByLogMoveCntWhereMessage(agentCTwoVO)); - } - - /* - * client LOG TB에 insert 됐는지 확인 count - * 리포트 update한 모든 데이터가 LOG 테이블에 이동됐는지 확인 - * */ - @PostMapping("/agent/two/findByLogMoveCnt") - public ResponseEntity findByLogMoveCnt(@RequestBody AgentCTwoVO agentCTwoVO) throws Exception { - return ResponseEntity.ok().body(agentCTwoService.findAllLogMoveCnt(agentCTwoVO)); - } - - @PostMapping("/agent/two/uploadFiles") - public ResponseEntity uploadFiles(@RequestParam("fileName01") MultipartFile file1, - @RequestParam("fileName02") MultipartFile file2, - @RequestParam("fileName03") MultipartFile file3) { - try { - Map fileNames = new HashMap<>(); - - // 각 파일을 업로드하고 파일명을 수집 - String fileName = ""; - if (!file1.isEmpty()) { - fileName = uploadSingleFile(file1); - fileNames.put("fileName01", fileName); - } - - if (!file2.isEmpty()) { - fileName = uploadSingleFile(file2); - fileNames.put("fileName02", fileName); - } - - if (!file3.isEmpty()) { - fileName = uploadSingleFile(file3); - fileNames.put("fileName03", fileName); - } - - return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "",fileNames) ); - - } catch (IOException ex) { - return ResponseEntity.ok(new RestResponse(HttpStatus.INTERNAL_SERVER_ERROR, "저장실패","") ); - } - } - - private String uploadSingleFile(MultipartFile file) throws IOException { - // 업로드된 파일의 이름을 가져옵니다. - String originalFileName = StringUtils.cleanPath(file.getOriginalFilename()); - - // 파일의 확장자를 추출합니다. 파일 이름에서 마지막 "." 이후 부분을 확장자로 간주합니다. - String fileExtension = ""; - int dotIndex = originalFileName.lastIndexOf("."); - if (dotIndex > 0) { - fileExtension = originalFileName.substring(dotIndex); - } - - // 고유한 파일명을 생성합니다. - String uniqueFileName = UUID.randomUUID().toString() + fileExtension; - - // 파일이 업로드될 경로를 설정합니다. - Path uploadPath = Paths.get(AGENT_FILE_PATH); - - // 해당 경로가 존재하지 않으면 디렉터리를 생성합니다. - if (!Files.exists(uploadPath)) { - Files.createDirectories(uploadPath); - } - - // 파일을 저장할 최종 경로를 생성합니다. - Path filePath = uploadPath.resolve(uniqueFileName); - - // 파일을 업로드 경로에 복사합니다. 이미 파일이 존재하면 대체합니다. - Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING); - - // 업로드된 고유한 파일명을 반환합니다. - return uniqueFileName; - } - - - - /* - * client db에 report한 시간 - * */ - @GetMapping("/agent/two/findByReportLog") - public ResponseEntity findByReportLog(@RequestParam String message) throws Exception { - AgentCTwoVO agentCtwoVO = new AgentCTwoVO(); - agentCtwoVO.setMessage(message); - return ResponseEntity.ok().body(agentCTwoService.findByReportLog(agentCtwoVO)); - } - -} diff --git a/src/main/java/com/itn/admin/agent/server/mapper/AgentSMapper.java b/src/main/java/com/itn/admin/agent/server/mapper/AgentSMapper.java deleted file mode 100644 index 10716dc..0000000 --- a/src/main/java/com/itn/admin/agent/server/mapper/AgentSMapper.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.itn.admin.agent.server.mapper; - -import com.itn.admin.agent.server.mapper.domain.AgentSVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * packageName : com.itn.admin.agent.mapper - * fileName : AgentMapper - * author : hylee - * date : 2024-07-31 - * description : - * =========================================================== - * DATE AUTHOR NOTE - * -----------------------------$------------------------------ - * 2024-07-31 hylee 최초 생성 - */ -@Mapper -public interface AgentSMapper { - int countByCurStateAndUserId(AgentSVO agentSVO); - - int updateReportWhereUserId(AgentSVO agentSVO); - - String findByCurStateAndUserIdAndSmsTxt(AgentSVO agentSVO); - - int updateReportWhereUserIdAndMassage(AgentSVO agentSVO); - - @Select(""" - SELECT - USER_ID, - MIN(REQ_DATE) AS minReqDate, -- 이관시작시간 - MAX(REQ_DATE) AS maxReqDate, -- 이관종료시간 - MIN(RESULT_LOG_UPDT_PNTTM) AS minResultLogUpdtPnttm, -- 전송사시작시간 - MAX(RESULT_LOG_UPDT_PNTTM) AS maxResultLogUpdtPnttm, -- 전송사종료시간 - COUNT(REQ_DATE) AS cnt, -- 갯수 - COUNT(CASE WHEN RESULT_LOG_UPDT_PNTTM IS NULL THEN 1 END) AS resultNull -- 전송사_report_안된_갯수 - FROM - mj_msg_data - WHERE - USER_ID IN ('006star', 'daltex', 'hylee250', 'dlwnsgh', 'dlwldn') - AND SMS_TXT LIKE CONCAT(#{message}, '%') - GROUP BY - USER_ID - ORDER BY - FIELD(USER_ID, 'daltex', '006star', 'hylee250', 'dlwnsgh', 'dlwldn') - """) - List findByCompanyLogAndSTransfer(AgentSVO agentSVO); -} diff --git a/src/main/java/com/itn/admin/agent/server/mapper/domain/AgentSVO.java b/src/main/java/com/itn/admin/agent/server/mapper/domain/AgentSVO.java deleted file mode 100644 index d4f70fb..0000000 --- a/src/main/java/com/itn/admin/agent/server/mapper/domain/AgentSVO.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.itn.admin.agent.server.mapper.domain; - -import lombok.*; - -import java.io.Serializable; -import java.util.Date; - -/** - * packageName : com.itn.admin.agent.server.mapper.domain - * fileName : AgentSVO - * author : hylee - * date : 2024-07-31 - * description : 에이젼트 테스트발송 - * =========================================================== - * DATE AUTHOR NOTE - * ----------------------------------------------------------- - * 2023-05-09 hylee 최초 생성 - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Getter -@Setter -@ToString -public class AgentSVO implements Serializable { - - private static final long serialVersionUID = 1L; - - - private String msgId; // 문자ID - private String userId; // 문자온 일반회원ID - private Integer userdata; // 사용자 정의 코드 - private Long msgSeq; // 메시지의 고유번호 - private String agentMsgId; // 고객전송 문자ID - private Integer curState; // 상태 값 - private Date sentDate; // 메시지를 전송한 시각 - private Date rsltDate; // 핸드폰에 전달된 시간 - private Date reportDate; // 레포트 처리한 시간 - private Date reqDate; // 예약일시 - private Integer rsltCode; // 결과처리코드 - private String rsltCode2; // 결과처리 상세코드 - private String rsltNet; // 결과처리 통신사 - private String callTo; // 수신번호 - private String callFrom; // 발신번호 - private String subject; // MMS경우 제목 - private String smsTxt; // SMS용 메시지본문 - private String msgType; // 메시지의 종류 - private String msgPayCode; // 최종전송콘텐트 종류 저장 - private Integer contSeq; // MMS의 콘텐츠 Key - private Integer msgTypeResend; // 재전송할 문자 타입 - private Integer centerSeqResend; // 재전송할 센터 - private String msgNoticetalkSenderKey; // 카카오 알림톡에 등록된 사용자 고유키 - private String msgNoticetalkTmpKey; // 카카오 알림톡에 등록된 문자 템플릿 고유키 - private Integer msgResendCount; // 재전송한 카운트 - private Date msgResendDate; // 재전송된 시간 - private Date sentDatePre; // 이전 메시지를 전송한 시각 - private Date rsltDatePre; // 이전 핸드폰에 전달된 시간 - private Date reportDatePre; // 이전 레포트 처리한 시간 - private Integer rsltCodePre; // 이전 결과처리코드 - private String rsltCode2Pre; // 이전 결과처리 상세코드 - private String rsltNetPre; // 이전 결과처리 통신사 - private String conectMthd; // 접속한 기기 - private String agentCode; // 전송사 - private String delFlag; // 사용자 삭제여부 - private Integer fileCnt; // 첨부파일 갯수 - private String filePath1; // 첨부파일 1 경로 - private String filePath2; // 첨부파일 2 경로 - private String filePath3; // 첨부파일 3 경로 - private String msgGroupId; // 문자그룹ID - private String neoType; // NEO MMS메세지 타입 - private String reserveCYn; // 예약 취소 유무 - private String refundYn; // 문자발송 실패의 환불처리 유무 - private Date resultLogUpdtPnttm; // LOG 테이블의 결과를 업데이트한 시간 - private String resellerCode; // 발송사업자 식별코드 정의 - private String bizKakaoResendType; // 카카오 재전송 type - private String bizKakaoResendData; // 카카오 재전송 내용 - private String bizKakaoJsonFile; // 카카오 json 첨부파일 - private String bizKakaoResendYn; // 카카오 재전송 여부 - private String bizKakaoTitle; // 카카오 강조유형 타이틀 - private String bizUmid; // 비즈뿌리오 서버에서 정의한 ID - private String message; // - - // client 컬럼 - private String sendStatus; - private String requestSate; - private String recvPhone; - private String sendPhone; - private String sendCnt; - - private String minReqDate; // 이관시작시간 - private String maxReqDate; // 이관종료시간 - private String minResultLogUpdtPnttm; // 전송사시작시간 - private String maxResultLogUpdtPnttm; // 전송사종료시간 - private String cnt; // 갯수 - private String resultNull; // 전송사_report_안된_갯수 - - - - - -} diff --git a/src/main/java/com/itn/admin/agent/server/service/AgentSService.java b/src/main/java/com/itn/admin/agent/server/service/AgentSService.java deleted file mode 100644 index fe7eae6..0000000 --- a/src/main/java/com/itn/admin/agent/server/service/AgentSService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.itn.admin.agent.server.service; - -import com.itn.admin.agent.server.mapper.domain.AgentSVO; -import com.itn.admin.cmn.msg.RestResponse; - - -public interface AgentSService { - - - RestResponse findByTransferCnt(AgentSVO agentSVO); - - RestResponse serverReport(AgentSVO agentSVO); - - RestResponse nowDataReport(AgentSVO agentSVO); - - RestResponse findByCompanyLogAndSTransfer(AgentSVO agentSVO); -} diff --git a/src/main/java/com/itn/admin/agent/server/service/impl/AgentSServiceImpl.java b/src/main/java/com/itn/admin/agent/server/service/impl/AgentSServiceImpl.java deleted file mode 100644 index 23d274b..0000000 --- a/src/main/java/com/itn/admin/agent/server/service/impl/AgentSServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.itn.admin.agent.server.service.impl; - -import com.itn.admin.agent.server.mapper.AgentSMapper; -import com.itn.admin.agent.server.mapper.domain.AgentSVO; -import com.itn.admin.agent.server.service.AgentSService; -import com.itn.admin.cmn.msg.RestResponse; -import io.micrometer.common.util.StringUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; - -import java.util.List; - - -@Slf4j -@Service -public class AgentSServiceImpl implements AgentSService { - - - @Autowired - AgentSMapper agentSMapper; - - @Override - public RestResponse findByTransferCnt(AgentSVO agentSVO) { - -// int cnt = agentSMapper.countByCurStateAndUserId(agentSVO); - String cntTxt = agentSMapper.findByCurStateAndUserIdAndSmsTxt(agentSVO); - - if(StringUtils.isNotEmpty(cntTxt) ){ - cntTxt = cntTxt.replace(agentSVO.getMessage(),"").trim(); - } - return new RestResponse(HttpStatus.OK,"", cntTxt); - } - - @Override - public RestResponse serverReport(AgentSVO agentSVO) { - int cnt = agentSMapper.updateReportWhereUserId(agentSVO); - String msg = agentSVO.getUserId()+ "관련 모든 데이터 report 시작합니다."; - return new RestResponse(HttpStatus.OK,msg, cnt); - } - - @Override - public RestResponse nowDataReport(AgentSVO agentSVO) { - - int cnt = agentSMapper.updateReportWhereUserIdAndMassage(agentSVO); - - log.info(" + nowDataReport cnt : [{}]", cnt); - String msg = agentSVO.getMessage() + "관련 데이터 report 시작합니다."; - - return new RestResponse(HttpStatus.OK,msg, cnt); - } - - @Override - public RestResponse findByCompanyLogAndSTransfer(AgentSVO agentSVO) { - List resultVo = agentSMapper.findByCompanyLogAndSTransfer(agentSVO); - return new RestResponse(HttpStatus.OK, "", resultVo); - } -} diff --git a/src/main/java/com/itn/admin/agent/server/web/AgentSController.java b/src/main/java/com/itn/admin/agent/server/web/AgentSController.java deleted file mode 100644 index 4189246..0000000 --- a/src/main/java/com/itn/admin/agent/server/web/AgentSController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.itn.admin.agent.server.web; - -import com.itn.admin.agent.client.two.service.AgentCTwoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; - -@Controller -public class AgentSController { - - private AgentCTwoService agentCTwoService; - - @Autowired - public void setCommuteService(AgentCTwoService agentCTwoService) { - this.agentCTwoService = agentCTwoService; - } - - -} diff --git a/src/main/java/com/itn/admin/agent/server/web/AgentSRestController.java b/src/main/java/com/itn/admin/agent/server/web/AgentSRestController.java deleted file mode 100644 index 6555d1c..0000000 --- a/src/main/java/com/itn/admin/agent/server/web/AgentSRestController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.itn.admin.agent.server.web; - -import com.itn.admin.agent.server.mapper.domain.AgentSVO; -import com.itn.admin.agent.server.service.AgentSService; -import com.itn.admin.cmn.msg.RestResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -@RestController -public class AgentSRestController { - - private AgentSService agentSService; - - @Autowired - public void setAgentService(AgentSService agentSService) { - this.agentSService = agentSService; - } - - /* - * - * */ - @PostMapping("/agent/server/findByTransferCnt") - public ResponseEntity findByTransferCnt(@RequestBody AgentSVO agentSVO) throws Exception { - return ResponseEntity.ok().body(agentSService.findByTransferCnt(agentSVO)); - } - - /* - * 전송사가 리턴해준것처럼 - * server DB에 update 함 - * @@ 모든 데이터 대량 없뎃 - * */ - @PostMapping("/agent/server/allReport") - public ResponseEntity serverReport(@RequestBody AgentSVO agentSVO) throws Exception { - return ResponseEntity.ok().body(agentSService.serverReport(agentSVO)); - } - - /* - * 전송사가 리턴해준것처럼 - * server DB에 update 함 - * @@ 현재 화면 기준 data만 없뎃 - * */ - @PostMapping("/agent/server/nowDataReport") - public ResponseEntity serverNowDataReport(@RequestBody AgentSVO agentSVO) throws Exception { - return ResponseEntity.ok().body(agentSService.nowDataReport(agentSVO)); - } - - - /* - * 전송사가 리턴해준것처럼 - * server DB에 update 함 - * @@ 현재 화면 기준 data만 없뎃 - * */ - @GetMapping("/agent/server/findByCompanyLogAndSTransfer") - public ResponseEntity findByCompanyLogAndSTransfer(@RequestParam String message) throws Exception { - AgentSVO agentSVO = new AgentSVO(); - agentSVO.setMessage(message); - return ResponseEntity.ok().body(agentSService.findByCompanyLogAndSTransfer(agentSVO)); - } - -} diff --git a/src/main/java/com/itn/admin/cmn/config/MjonAgentCFiveDatabaseConfig.java b/src/main/java/com/itn/admin/cmn/config/MjonAgentCFiveDatabaseConfig.java deleted file mode 100644 index 52f35d3..0000000 --- a/src/main/java/com/itn/admin/cmn/config/MjonAgentCFiveDatabaseConfig.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.itn.admin.cmn.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.sql.DataSource; - - -@Configuration -@MapperScan(value = "com.itn.admin.agent.client.five.mapper", sqlSessionFactoryRef = "factory8") -class MjonAgentCFiveDatabaseConfig { - - private final String COMMUTE_DATA_SOURCE = "MjagentClienFiveDatabase"; - - // A database DataSource - @Bean(COMMUTE_DATA_SOURCE) - @ConfigurationProperties(prefix = "spring.mjagent.client.five.datasource") - public DataSource CommuteDataSource() { - return DataSourceBuilder.create() -// .type(HikariDataSource.class) - .build(); - } - - // SqlSessionTemplate 에서 사용할 SqlSession 을 생성하는 Factory - @Bean(name = "factory8") - public SqlSessionFactory MjonAgentCTwoSqlSessionFactory(@Qualifier(COMMUTE_DATA_SOURCE) DataSource dataSource) throws Exception { - SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); - sqlSessionFactory.setDataSource(dataSource); - sqlSessionFactory.setTypeAliasesPackage("com.itn.admin.agent.client.five.*"); - //sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/agent/client/five/*Mapper.xml")); - //sqlSessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver().getResource("classpath:mybatis-config.xml")); - return sqlSessionFactory.getObject(); - } - - // DataSource 에서 Transaction 관리를 위한 Manager 클래스 등록 - @Bean(name = "sqlSession9") - public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) { - return new SqlSessionTemplate(sqlSessionFactory); - } -} \ No newline at end of file diff --git a/src/main/java/com/itn/admin/cmn/config/MjonAgentCFourDatabaseConfig.java b/src/main/java/com/itn/admin/cmn/config/MjonAgentCFourDatabaseConfig.java deleted file mode 100644 index b2f08c8..0000000 --- a/src/main/java/com/itn/admin/cmn/config/MjonAgentCFourDatabaseConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.itn.admin.cmn.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; - -import javax.sql.DataSource; - - -@Configuration -@MapperScan(value = "com.itn.admin.agent.client.four.mapper", sqlSessionFactoryRef = "factory7") -class MjonAgentCFourDatabaseConfig { - - private final String COMMUTE_DATA_SOURCE = "MjagentClienFourDatabase"; - - // A database DataSource - @Bean(COMMUTE_DATA_SOURCE) - @ConfigurationProperties(prefix = "spring.mjagent.client.four.datasource") - public DataSource CommuteDataSource() { - return DataSourceBuilder.create() -// .type(HikariDataSource.class) - .build(); - } - - // SqlSessionTemplate 에서 사용할 SqlSession 을 생성하는 Factory - @Bean(name = "factory7") - public SqlSessionFactory MjonAgentCTwoSqlSessionFactory(@Qualifier(COMMUTE_DATA_SOURCE) DataSource dataSource) throws Exception { - SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); - sqlSessionFactory.setDataSource(dataSource); - sqlSessionFactory.setTypeAliasesPackage("com.itn.admin.agent.client.four.*"); - //sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/agent/client/four/*Mapper.xml")); - //sqlSessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver().getResource("classpath:mybatis-config.xml")); - return sqlSessionFactory.getObject(); - } - - // DataSource 에서 Transaction 관리를 위한 Manager 클래스 등록 - @Bean(name = "sqlSession8") - public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) { - return new SqlSessionTemplate(sqlSessionFactory); - } -} \ No newline at end of file diff --git a/src/main/java/com/itn/admin/cmn/config/MjonAgentCOneDatabaseConfig.java b/src/main/java/com/itn/admin/cmn/config/MjonAgentCOneDatabaseConfig.java deleted file mode 100644 index a3f3c1b..0000000 --- a/src/main/java/com/itn/admin/cmn/config/MjonAgentCOneDatabaseConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.itn.admin.cmn.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; - -import javax.sql.DataSource; - - -@Configuration -@MapperScan(value = "com.itn.admin.agent.client.one.mapper", sqlSessionFactoryRef = "factory5") -class MjonAgentCOneDatabaseConfig { - - private final String COMMUTE_DATA_SOURCE = "MjagentClienOneDatabase"; - - // A database DataSource - @Bean(COMMUTE_DATA_SOURCE) - @ConfigurationProperties(prefix = "spring.mjagent.client.one.datasource") - public DataSource CommuteDataSource() { - return DataSourceBuilder.create() -// .type(HikariDataSource.class) - .build(); - } - - // SqlSessionTemplate 에서 사용할 SqlSession 을 생성하는 Factory - @Bean(name = "factory5") - public SqlSessionFactory MjonAgentCOneSqlSessionFactory(@Qualifier(COMMUTE_DATA_SOURCE) DataSource dataSource) throws Exception { - SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); - sqlSessionFactory.setDataSource(dataSource); - sqlSessionFactory.setTypeAliasesPackage("com.itn.admin.agent.client.one.*"); - sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/agent/client/one/*Mapper.xml")); - sqlSessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver().getResource("classpath:mybatis-config.xml")); - return sqlSessionFactory.getObject(); - } - - // DataSource 에서 Transaction 관리를 위한 Manager 클래스 등록 - @Bean(name = "sqlSession5") - public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) { - return new SqlSessionTemplate(sqlSessionFactory); - } -} \ No newline at end of file diff --git a/src/main/java/com/itn/admin/cmn/config/MjonAgentCThreeDatabaseConfig.java b/src/main/java/com/itn/admin/cmn/config/MjonAgentCThreeDatabaseConfig.java deleted file mode 100644 index 100588f..0000000 --- a/src/main/java/com/itn/admin/cmn/config/MjonAgentCThreeDatabaseConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.itn.admin.cmn.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; - -import javax.sql.DataSource; - - -@Configuration -@MapperScan(value = "com.itn.admin.agent.client.three.mapper", sqlSessionFactoryRef = "factory6") -class MjonAgentCThreeDatabaseConfig { - - private final String COMMUTE_DATA_SOURCE = "MjagentClienThreeDatabase"; - - // A database DataSource - @Bean(COMMUTE_DATA_SOURCE) - @ConfigurationProperties(prefix = "spring.mjagent.client.three.datasource") - public DataSource CommuteDataSource() { - return DataSourceBuilder.create() -// .type(HikariDataSource.class) - .build(); - } - - // SqlSessionTemplate 에서 사용할 SqlSession 을 생성하는 Factory - @Bean(name = "factory6") - public SqlSessionFactory MjonAgentCTwoSqlSessionFactory(@Qualifier(COMMUTE_DATA_SOURCE) DataSource dataSource) throws Exception { - SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); - sqlSessionFactory.setDataSource(dataSource); - sqlSessionFactory.setTypeAliasesPackage("com.itn.admin.agent.client.three.*"); - //sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/agent/client/three/*Mapper.xml")); - //sqlSessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver().getResource("classpath:mybatis-config.xml")); - return sqlSessionFactory.getObject(); - } - - // DataSource 에서 Transaction 관리를 위한 Manager 클래스 등록 - @Bean(name = "sqlSession7") - public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) { - return new SqlSessionTemplate(sqlSessionFactory); - } -} \ No newline at end of file diff --git a/src/main/java/com/itn/admin/cmn/config/MjonAgentCTwoDatabaseConfig.java b/src/main/java/com/itn/admin/cmn/config/MjonAgentCTwoDatabaseConfig.java deleted file mode 100644 index f822ef7..0000000 --- a/src/main/java/com/itn/admin/cmn/config/MjonAgentCTwoDatabaseConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.itn.admin.cmn.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; - -import javax.sql.DataSource; - - -@Configuration -@MapperScan(value = "com.itn.admin.agent.client.two.mapper", sqlSessionFactoryRef = "factory3") -class MjonAgentCTwoDatabaseConfig { - - private final String COMMUTE_DATA_SOURCE = "MjagentClienTwoDatabase"; - - // A database DataSource - @Bean(COMMUTE_DATA_SOURCE) - @ConfigurationProperties(prefix = "spring.mjagent.client.two.datasource") - public DataSource CommuteDataSource() { - return DataSourceBuilder.create() -// .type(HikariDataSource.class) - .build(); - } - - // SqlSessionTemplate 에서 사용할 SqlSession 을 생성하는 Factory - @Bean(name = "factory3") - public SqlSessionFactory MjonAgentCTwoSqlSessionFactory(@Qualifier(COMMUTE_DATA_SOURCE) DataSource dataSource) throws Exception { - SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); - sqlSessionFactory.setDataSource(dataSource); - sqlSessionFactory.setTypeAliasesPackage("com.itn.admin.agent.client.two.*"); - sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/agent/client/two/*Mapper.xml")); - sqlSessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver().getResource("classpath:mybatis-config.xml")); - return sqlSessionFactory.getObject(); - } - - // DataSource 에서 Transaction 관리를 위한 Manager 클래스 등록 - @Bean(name = "sqlSession6") - public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) { - return new SqlSessionTemplate(sqlSessionFactory); - } -} \ No newline at end of file diff --git a/src/main/java/com/itn/admin/cmn/config/MjonAgentSDatabaseConfig.java b/src/main/java/com/itn/admin/cmn/config/MjonAgentSDatabaseConfig.java deleted file mode 100644 index f6014f6..0000000 --- a/src/main/java/com/itn/admin/cmn/config/MjonAgentSDatabaseConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.itn.admin.cmn.config; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; - -import javax.sql.DataSource; - - -@Configuration -@MapperScan(value = "com.itn.admin.agent.server.mapper", sqlSessionFactoryRef = "factory4") -class MjonAgentSDatabaseConfig { - - private final String AGENT_S_DATA_SOURCE = "MjagentServerDatabase"; - - // A database DataSource - @Bean(AGENT_S_DATA_SOURCE) - @ConfigurationProperties(prefix = "spring.mjagent.server.datasource") - public DataSource MjagentServerSource() { - return DataSourceBuilder.create() - .type(com.zaxxer.hikari.HikariDataSource.class) // HikariDataSource를 명시적으로 사용 - .build(); - } - - // SqlSessionTemplate 에서 사용할 SqlSession 을 생성하는 Factory - @Bean(name = "factory4") - public SqlSessionFactory MjonAgentSSqlSessionFactory(@Qualifier(AGENT_S_DATA_SOURCE) DataSource dataSource) throws Exception { - SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); - sqlSessionFactory.setDataSource(dataSource); - sqlSessionFactory.setTypeAliasesPackage("com.itn.admin.agent.server.*"); - sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/agent/server/*Mapper.xml")); - sqlSessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver().getResource("classpath:mybatis-config.xml")); - return sqlSessionFactory.getObject(); - } - - // DataSource 에서 Transaction 관리를 위한 Manager 클래스 등록 - @Bean(name = "sqlSession4") - public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) { - return new SqlSessionTemplate(sqlSessionFactory); - } -} \ No newline at end of file diff --git a/src/main/resources/mybatis-config.xml b/src/main/resources/mybatis-config.xml index 057b5d2..97660f7 100644 --- a/src/main/resources/mybatis-config.xml +++ b/src/main/resources/mybatis-config.xml @@ -19,9 +19,6 @@ - - - diff --git a/src/main/resources/templates/agent/result.html b/src/main/resources/templates/agent/result.html deleted file mode 100644 index a0bbe3c..0000000 --- a/src/main/resources/templates/agent/result.html +++ /dev/null @@ -1,344 +0,0 @@ - - - - - - agent 발송 테스트 - - - - - - - - - - -
-
- - - - - -
- -
-
-
-
-

AGENT 결과

-
-
-
    -
  1. Home
    2. -
  2. AGENT 결과
    3. -
-
-
-
-
- - -
-
-
-
-
-
-

-
- -
-
-
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
C 번호사용자명[C]DB 등록시간이관 시작시간이관 완료시간이관 갯수[C]리포트 시작시간[C]리포트 완료시간[C]리포트 갯수전송사 에이전트 리포트 시작시간전송사 에이전트 리포트 종료시간전송사 에이전트 리포트 남은 갯수
1daltex
2006star
3hylee250
4dlwnsgh
5dlwldn
-
- -
- -
- -
- -
- -
- - -
- - -
-
- - - - -
- - - - - - - \ No newline at end of file diff --git a/src/main/resources/templates/agent/view.html b/src/main/resources/templates/agent/view.html deleted file mode 100644 index 0258a59..0000000 --- a/src/main/resources/templates/agent/view.html +++ /dev/null @@ -1,852 +0,0 @@ - - - - - - agent 발송 테스트 - - - - - - - - - - - - - -
-
- - - - - -
- -
-
-
-
-

AGENT 발송 테스트

-
-
-
    -
  1. Home
    2. -
  2. AGENT 발송 테스트
    3. -
-
-
-
-
- - -
-
-
- - - - - -
-
-
-

-
- - -
-

- -
-
- - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - -
- -
- -
-
0 bytes
-
-
- -
- -
-
-
- - - - -
-
-
-
-
-
-
- -

-
- - -
-

- - - -
-
- - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - -
- -
- -
-
0 bytes
-
-
- -
- -
-
-
- - - - - -
- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-

클라이언트1 현황확인

- - -
-
-
-
-
-
- -
- 클라이언트 insert -
- 0 - 건수 -
-
-
-
- - 0초 - -
-
-
- -
-
- -
- 데이터 이관 시간 (C -> S) -
- 0 - 건수 -
-
-
-
- - 0초 - -
-
-
- -
-
- -
- 클라이언트 report (S -> C) -
- 0 - - - 건수 -
-
-
-
- - 0초 - -
-
-
- - -
- - - - - - - - - - - - - -
-
-
- -
-
-
-
-

클라이언트2 현황확인

- - -
-
-
-
-
-
- -
- 클라이언트 insert -
- 0 - 건수 -
-
-
-
- - 0초 - -
-
-
- -
-
- -
- 데이터 이관 시간 (C -> S) -
- 0 - 건수 -
-
-
-
- - 0초 - -
-
-
- -
-
- -
- 클라이언트 report (S -> C) -
- 0 - - - 건수 -
-
-
-
- - 0초 - -
-
-
- - -
- - - - - - - - - - - - - -
-
-
- -
- -
- -
- - -
- - - - -
-
- - - - -
- - - - - - - - - - - diff --git a/src/main/resources/templates/fragments/mainsidebar.html b/src/main/resources/templates/fragments/mainsidebar.html index 2eff239..c463d1c 100644 --- a/src/main/resources/templates/fragments/mainsidebar.html +++ b/src/main/resources/templates/fragments/mainsidebar.html @@ -89,32 +89,7 @@

단어사전

-
  • - - -

    - 테스트 - -

    -     - - -
    • -
  • +