diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs index a6350f0..b9c9f42 100644 --- a/.settings/org.eclipse.buildship.core.prefs +++ b/.settings/org.eclipse.buildship.core.prefs @@ -1,4 +1,4 @@ -arguments=--init-script C\:\\Users\\bd091\\AppData\\Roaming\\Antigravity\\User\\globalStorage\\redhat.java\\1.50.0\\config_win\\org.eclipse.osgi\\58\\0\\.cp\\gradle\\init\\init.gradle --init-script C\:\\Users\\bd091\\AppData\\Roaming\\Antigravity\\User\\globalStorage\\redhat.java\\1.50.0\\config_win\\org.eclipse.osgi\\58\\0\\.cp\\gradle\\protobuf\\init.gradle +arguments=--init-script C\:\\Users\\bd091\\AppData\\Roaming\\Antigravity\\User\\globalStorage\\redhat.java\\1.52.0\\config_win\\org.eclipse.osgi\\58\\0\\.cp\\gradle\\init\\init.gradle --init-script C\:\\Users\\bd091\\AppData\\Roaming\\Antigravity\\User\\globalStorage\\redhat.java\\1.52.0\\config_win\\org.eclipse.osgi\\58\\0\\.cp\\gradle\\protobuf\\init.gradle auto.sync=false build.scans.enabled=false connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) diff --git a/DbCheck.java b/DbCheck.java new file mode 100644 index 0000000..f080d58 --- /dev/null +++ b/DbCheck.java @@ -0,0 +1,30 @@ +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.Statement; + +public class DbCheck { + public static void main(String[] args) { + String url = "jdbc:mariadb://183.98.184.84:3306/madeu"; + String user = "madeu"; + String password = "apdlemdb12#$"; + + try { + Class.forName("org.mariadb.jdbc.Driver"); + try (Connection conn = DriverManager.getConnection(url, user, password); + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT * FROM medical_divi_list LIMIT 1")) { + + ResultSetMetaData rsmd = rs.getMetaData(); + int columnCount = rsmd.getColumnCount(); + System.out.println("--- COLUMNS IN medical_divi_list ---"); + for (int i = 1; i <= columnCount; i++) { + System.out.println(rsmd.getColumnName(i) + " (" + rsmd.getColumnTypeName(i) + ")"); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/boot_error.txt b/boot_error.txt new file mode 100644 index 0000000..e69de29 diff --git a/boot_log.txt b/boot_log.txt new file mode 100644 index 0000000..0f7fb1b --- /dev/null +++ b/boot_log.txt @@ -0,0 +1 @@ +> Task :compileJava UP-TO-DATE diff --git a/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java b/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java new file mode 100644 index 0000000..2f3166b --- /dev/null +++ b/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java @@ -0,0 +1,343 @@ +/* + * Decompiled with CFR 0.152. + * + * Could not load the following classes: + * jakarta.servlet.http.HttpServletRequest + * jakarta.servlet.http.HttpSession + * org.slf4j.Logger + * org.slf4j.LoggerFactory + * org.springframework.beans.factory.annotation.Autowired + * org.springframework.beans.factory.annotation.Value + * org.springframework.stereotype.Service + * org.springframework.transaction.annotation.Transactional + * org.springframework.ui.Model + * org.springframework.web.multipart.MultipartFile + */ +package com.madeu.crm.procedureReview.svc; + +import com.madeu.crm.procedureReview.dto.ProcedureReviewDTO; +import com.madeu.crm.procedureReview.mapper.ProcedureReviewMapper; +import com.madeu.dao.web.webauthmenurelation.WebAuthMenuRelationSqlMapDAO; +import com.madeu.dao.web.webmember.WebMemberSqlMapDAO; +import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.util.RequestLogUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import java.io.File; +import java.lang.invoke.CallSite; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.ui.Model; +import org.springframework.web.multipart.MultipartFile; + +@Service +public class ProcedureReviewService { + private static final Logger log = LoggerFactory.getLogger(ProcedureReviewService.class); + @Autowired + private ProcedureReviewMapper procedureReviewMapper; + @Autowired + private WebMemberSqlMapDAO webMemberSqlMapDAO; + @Autowired + private WebAuthMenuRelationSqlMapDAO webAuthMenuRelationSqlMapDAO; + @Autowired + private WebLogHistoryService webLogHistoryService; + @Value(value="${file.upload.path.procedureReviewPath}") + private String procedureReviewPath; + @Value(value="${url.cdn}") + private String urlCdn; + + private void saveLogHistory(HttpServletRequest request, ProcedureReviewDTO dto, String funcName, String serviceName, Object responseValue, String errorMsg) { + try { + HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); + HashMap insertMap = new HashMap(); + insertMap.put("url", request.getRequestURI()); + insertMap.put("func", request.getRequestURI().substring(request.getRequestURI().lastIndexOf("/") + 1).replace(".do", "")); + insertMap.put("funcName", funcName); + insertMap.put("service", "procedureReviewService"); + insertMap.put("serviceName", serviceName); + insertMap.put("requestValue", String.valueOf(dto)); + insertMap.put("responseValue", String.valueOf(responseValue)); + insertMap.put("tId", dto.getTId()); + if (errorMsg == null || errorMsg.isEmpty()) { + insertMap.put("resultCode", "SUCCESS"); + } else { + insertMap.put("resultCode", "ERROR"); + } + insertMap.put("resultMsg", errorMsg != null ? errorMsg : ""); + insertMap.put("muMemberId", dto.getLoginMemberId()); + this.webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); + } + catch (Exception e) { + e.printStackTrace(); + } + } + + private boolean fillMenuAuth(ProcedureReviewDTO dto) { + try { + HashMap checkMap = new HashMap(); + checkMap.put("loginMemberId", dto.getLoginMemberId()); + List> userListMap = this.webMemberSqlMapDAO.checkMember(checkMap); + if (userListMap.size() == 1) { + dto.setMenuClassAuthId(String.valueOf(userListMap.get(0).get("muAuthId"))); + HashMap authCheckMap = new HashMap(); + authCheckMap.put("menuClass", dto.getMenuClass()); + authCheckMap.put("muAuthId", dto.getMenuClassAuthId()); + List> authList = this.webAuthMenuRelationSqlMapDAO.selectAuthMenuRelation(authCheckMap); + if (authList.size() == 1) { + dto.setSelectUseYn(String.valueOf(authList.get(0).get("selectUseYn"))); + dto.setInsertUseYn(String.valueOf(authList.get(0).get("insertUseYn"))); + dto.setUpdateUseYn(String.valueOf(authList.get(0).get("updateUseYn"))); + dto.setDeleteUseYn(String.valueOf(authList.get(0).get("deleteUseYn"))); + dto.setDownloadUseYn(String.valueOf(authList.get(0).get("downloadUseYn"))); + return true; + } + } + } + catch (Exception e) { + e.printStackTrace(); + } + return false; + } + + public void resolveMoveProcedureReviewList(HttpSession session, HttpServletRequest request, Model model, ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + if (this.fillMenuAuth(dto)) { + model.addAttribute("selectUseYn", (Object)dto.getSelectUseYn()); + model.addAttribute("insertUseYn", (Object)dto.getInsertUseYn()); + model.addAttribute("updateUseYn", (Object)dto.getUpdateUseYn()); + model.addAttribute("deleteUseYn", (Object)dto.getDeleteUseYn()); + model.addAttribute("downloadUseYn", (Object)dto.getDownloadUseYn()); + } + } + + public ProcedureReviewDTO getProcedureReviewList(HttpSession session, HttpServletRequest request, ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + try { + if (this.fillMenuAuth(dto) && "Y".equals(dto.getSelectUseYn())) { + if (dto.getDir() != null && "B".equals(dto.getDir())) { + dto.setDir("ASC"); + } else { + dto.setDir("DESC"); + } + dto.setUseYn("Y"); + List> countList = this.procedureReviewMapper.selectTotalProcedureReviewCount(dto); + int total = Integer.parseInt(String.valueOf(countList.get(0).get("totalCount"))); + dto.setTotalCount(total); + if (total > 0) { + dto.setRows(this.procedureReviewMapper.selectListProcedureReview(dto)); + } else { + dto.setRows(new ArrayList()); + } + dto.setMsgCode("0"); + dto.setSuccess("true"); + } else { + dto.setMsgCode("-1"); + dto.setMsgDesc("\uc870\ud68c \uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + } + catch (Exception e) { + e.printStackTrace(); + dto.setMsgCode("-1"); + dto.setMsgDesc("\uc5d0\ub7ec \ubc1c\uc0dd: " + e.getMessage()); + } + return dto; + } + + public ProcedureReviewDTO getProcedureReview(HttpSession session, HttpServletRequest request, ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + try { + if (dto.getMuProcedureReviewId() == null || dto.getMuProcedureReviewId().trim().isEmpty()) { + dto.setMsgCode("-1"); + dto.setMsgDesc("\uc2dc\uc220\ud6c4\uae30 \uc815\ubcf4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."); + return dto; + } + if (this.fillMenuAuth(dto) && "Y".equals(dto.getSelectUseYn())) { + List> res = this.procedureReviewMapper.selectProcedureReview(dto); + dto.setRows(res); + dto.setMsgCode("0"); + dto.setSuccess("true"); + } else { + dto.setMsgCode("-1"); + dto.setMsgDesc("\uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + } + catch (Exception e) { + e.printStackTrace(); + dto.setMsgCode("-1"); + dto.setMsgDesc("\uc870\ud68c \uc911 \uc5d0\ub7ec\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4."); + } + return dto; + } + + public ProcedureReviewDTO getCategoryList(HttpSession session, HttpServletRequest request, ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + try { + dto.setCategoryNo("07"); + List> cats = this.procedureReviewMapper.selectListPhotoCategory(dto); + dto.setRows(cats); + dto.setMsgCode("0"); + dto.setSuccess("true"); + } + catch (Exception e) { + e.printStackTrace(); + dto.setMsgCode("-1"); + dto.setMsgDesc("\uce74\ud14c\uace0\ub9ac \uc815\ubcf4 \uc870\ud68c \uc2e4\ud328"); + } + return dto; + } + + public void resolveMoveProcedureReviewInsert(HttpSession session, HttpServletRequest request, Model model, ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + if (this.fillMenuAuth(dto)) { + model.addAttribute("selectUseYn", (Object)dto.getSelectUseYn()); + model.addAttribute("insertUseYn", (Object)dto.getInsertUseYn()); + model.addAttribute("updateUseYn", (Object)dto.getUpdateUseYn()); + model.addAttribute("deleteUseYn", (Object)dto.getDeleteUseYn()); + model.addAttribute("downloadUseYn", (Object)dto.getDownloadUseYn()); + } + } + + public void resolveMoveProcedureReviewUpdate(HttpSession session, HttpServletRequest request, Model model, ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + if (this.fillMenuAuth(dto)) { + model.addAttribute("selectUseYn", (Object)dto.getSelectUseYn()); + model.addAttribute("insertUseYn", (Object)dto.getInsertUseYn()); + model.addAttribute("updateUseYn", (Object)dto.getUpdateUseYn()); + model.addAttribute("deleteUseYn", (Object)dto.getDeleteUseYn()); + model.addAttribute("downloadUseYn", (Object)dto.getDownloadUseYn()); + } + } + + @Transactional(rollbackFor={Exception.class}) + public ProcedureReviewDTO putProcedureReviewFile(HttpSession session, HttpServletRequest request, MultipartFile file, ProcedureReviewDTO dto) { + String errorMsg = ""; + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + dto.setRegId(dto.getLoginMemberId()); + dto.setModId(dto.getLoginMemberId()); + try { + if (this.fillMenuAuth(dto) && "Y".equals(dto.getInsertUseYn()) && file != null && !file.isEmpty()) { + String ext = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String savedName = UUID.randomUUID().toString() + ext; + String folder = "/procedureReview/" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + "/"; + File outDir = new File(this.procedureReviewPath + folder); + if (!outDir.exists()) { + outDir.mkdirs(); + } + file.transferTo(new File(outDir, savedName)); + HashMap resultRow = new HashMap(); + resultRow.put("filePath", (CallSite)((Object)(this.urlCdn + folder + savedName))); + dto.setRows(resultRow); + dto.setMsgCode("0"); + dto.setSuccess("true"); + dto.setMsgDesc("\uc815\uc0c1\uc801\uc73c\ub85c \ub4f1\ub85d\ub418\uc5c8\uc2b5\ub2c8\ub2e4."); + } else { + dto.setMsgCode("-1"); + dto.setMsgDesc("\uad8c\ud55c\uc774 \uc5c6\uac70\ub098 \ud30c\uc77c\uc774 \ube44\uc5b4\uc788\uc2b5\ub2c8\ub2e4."); + } + } + catch (Exception e) { + e.printStackTrace(); + errorMsg = e.toString(); + dto.setMsgCode("-1"); + dto.setMsgDesc("\ub4f1\ub85d \uc911 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4."); + } + this.saveLogHistory(request, dto, "\ud648\ud398\uc774\uc9c0 \uc2dc\uc220\ud6c4\uae30 \uc774\ubbf8\uc9c0\ud30c\uc77c \uc800\uc7a5", "\ud648\ud398\uc774\uc9c0 \uc2dc\uc220\ud6c4\uae30 \ub4f1\ub85d", dto, errorMsg); + return dto; + } + + @Transactional(rollbackFor={Exception.class}) + public ProcedureReviewDTO putProcedureReview(HttpSession session, HttpServletRequest request, ProcedureReviewDTO dto) { + String errorMsg = ""; + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + dto.setRegId(dto.getLoginMemberId()); + dto.setModId(dto.getLoginMemberId()); + try { + if (this.fillMenuAuth(dto) && "Y".equals(dto.getInsertUseYn())) { + this.procedureReviewMapper.insertProcedureReview(dto); + dto.setMsgCode("0"); + dto.setSuccess("true"); + dto.setMsgDesc("\uc815\uc0c1\uc801\uc73c\ub85c \ub4f1\ub85d\ub418\uc5c8\uc2b5\ub2c8\ub2e4."); + } else { + dto.setMsgCode("-1"); + dto.setMsgDesc("\uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + } + catch (Exception e) { + e.printStackTrace(); + errorMsg = e.toString(); + dto.setMsgCode("-1"); + dto.setMsgDesc("\ub4f1\ub85d \uc911 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4."); + } + this.saveLogHistory(request, dto, "\ud648\ud398\uc774\uc9c0 \uc2dc\uc220\ud6c4\uae30 \ub4f1\ub85d", "\ud648\ud398\uc774\uc9c0 \uc2dc\uc220\ud6c4\uae30 \ub4f1\ub85d", dto, errorMsg); + return dto; + } + + @Transactional(rollbackFor={Exception.class}) + public ProcedureReviewDTO modProcedureReview(HttpSession session, HttpServletRequest request, ProcedureReviewDTO dto) { + String errorMsg = ""; + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + dto.setRegId(dto.getLoginMemberId()); + dto.setModId(dto.getLoginMemberId()); + try { + if (this.fillMenuAuth(dto) && "Y".equals(dto.getUpdateUseYn())) { + this.procedureReviewMapper.updateProcedureReview(dto); + dto.setMsgCode("0"); + dto.setSuccess("true"); + dto.setMsgDesc("\uc815\uc0c1\uc801\uc73c\ub85c \uc218\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4."); + } else { + dto.setMsgCode("-1"); + dto.setMsgDesc("\uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + } + catch (Exception e) { + e.printStackTrace(); + errorMsg = e.toString(); + dto.setMsgCode("-1"); + dto.setMsgDesc("\uc218\uc815 \uc911 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4."); + } + this.saveLogHistory(request, dto, "\ud648\ud398\uc774\uc9c0 \uc2dc\uc220\ud6c4\uae30 \uc218\uc815", "\ud648\ud398\uc774\uc9c0 \uc2dc\uc220\ud6c4\uae30 \uc218\uc815", dto, errorMsg); + return dto; + } + + @Transactional(rollbackFor={Exception.class}) + public ProcedureReviewDTO delProcedureReview(HttpSession session, HttpServletRequest request, ProcedureReviewDTO dto) { + String errorMsg = ""; + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + dto.setRegId(dto.getLoginMemberId()); + dto.setModId(dto.getLoginMemberId()); + try { + if (this.fillMenuAuth(dto) && "Y".equals(dto.getDeleteUseYn())) { + String[] ids; + for (String id : ids = dto.getMuProcedureReviewId().split(",")) { + dto.setMuProcedureReviewId(id); + this.procedureReviewMapper.deleteProcedureReview(dto); + } + dto.setMsgCode("0"); + dto.setSuccess("true"); + dto.setMsgDesc("\uc815\uc0c1\uc801\uc73c\ub85c \uc0ad\uc81c\ub418\uc5c8\uc2b5\ub2c8\ub2e4."); + } else { + dto.setMsgCode("-1"); + dto.setMsgDesc("\uc0ad\uc81c \uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + } + catch (Exception e) { + e.printStackTrace(); + errorMsg = e.toString(); + dto.setMsgCode("-1"); + dto.setMsgDesc("\uc0ad\uc81c \uc911 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4."); + } + this.saveLogHistory(request, dto, "\ud648\ud398\uc774\uc9c0 \uc2dc\uc220\ud6c4\uae30 \uc0ad\uc81c", "\ud648\ud398\uc774\uc9c0 \uc2dc\uc220\ud6c4\uae30 \uc0ad\uc81c", dto, errorMsg); + return dto; + } +} diff --git a/ctrl.txt b/ctrl.txt new file mode 100644 index 0000000..4f713bf Binary files /dev/null and b/ctrl.txt differ diff --git a/db.gradle b/db.gradle new file mode 100644 index 0000000..21acd52 --- /dev/null +++ b/db.gradle @@ -0,0 +1,35 @@ +repositories { + mavenCentral() +} +configurations { + db +} +dependencies { + db 'org.mariadb.jdbc:mariadb-java-client:3.3.2' +} +task getColumns { + doLast { + def cl = new URLClassLoader(configurations.db.collect { it.toURI().toURL() } as URL[], this.class.classLoader) + def driver = cl.loadClass('org.mariadb.jdbc.Driver').newInstance() + def props = new Properties() + props.put("user", "madeu") + props.put("password", "apdlemdb12#$") + def conn = driver.connect("jdbc:mariadb://183.98.184.84:3306/madeu", props) + + println "--- medical_divi_list ---" + def rs = conn.createStatement().executeQuery("SHOW COLUMNS FROM medical_divi_list") + while (rs.next()) { + println rs.getString(1) + " : " + rs.getString(2) + } + rs.close() + + println "--- crm_cust_list ---" + rs = conn.createStatement().executeQuery("SHOW COLUMNS FROM crm_cust_list") + while (rs.next()) { + println rs.getString(1) + " : " + rs.getString(2) + } + rs.close() + + conn.close() + } +} diff --git a/recovered/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java b/recovered/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java new file mode 100644 index 0000000..5f49af0 --- /dev/null +++ b/recovered/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java @@ -0,0 +1,206 @@ +/* + * Decompiled with CFR 0.152. + * + * Could not load the following classes: + * lombok.Generated + * org.slf4j.Logger + * org.slf4j.LoggerFactory + * org.springframework.beans.factory.annotation.Autowired + * org.springframework.beans.factory.annotation.Value + * org.springframework.stereotype.Service + * org.springframework.transaction.annotation.Propagation + * org.springframework.transaction.annotation.Transactional + * org.springframework.web.multipart.MultipartFile + */ +package com.madeu.crm.procedureReview.svc; + +import com.madeu.common.service.AttachFileService; +import com.madeu.crm.procedureReview.mapper.ProcedureReviewMapper; +import com.madeu.dao.web.webauthmenurelation.WebAuthMenuRelationSqlMapDAO; +import com.madeu.dao.web.webmember.WebMemberSqlMapDAO; +import com.madeu.util.ValidationCheckUtil; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import lombok.Generated; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +@Service(value="ProcedureReviewService") +public class ProcedureReviewService { + @Generated + private static final Logger log = LoggerFactory.getLogger(ProcedureReviewService.class); + @Autowired + private ProcedureReviewMapper procedureReviewMapper; + @Autowired + private WebMemberSqlMapDAO webMemberSqlMapDAO; + @Autowired + private WebAuthMenuRelationSqlMapDAO webAuthMenuRelationSqlMapDAO; + @Autowired + private AttachFileService afs; + @Value(value="${url.cdn}") + String CDN_URL; + + public HashMap selectProcedureReviewListIntro(HashMap paramMap) throws Exception { + log.debug("ProcedureReviewService selectProcedureReviewListIntro START"); + HashMap map = new HashMap(); + try { + boolean check = true; + String menuClass = String.valueOf(paramMap.get("menuClass")); + if (!ValidationCheckUtil.emptyCheck(menuClass).booleanValue()) { + check = false; + map.put("msgCode", "-1"); + map.put("msgDesc", "\uba54\ub274 \uc815\ubcf4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + if (check) { + List> userListMap = this.webMemberSqlMapDAO.checkMember(paramMap); + int userListMapSize = userListMap.size(); + if (1 == userListMapSize) { + paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); + } else { + check = false; + map.put("msgCode", "-1"); + map.put("msgDesc", "\uc0ac\uc6a9\uc790 \uc815\ubcf4\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4."); + } + } + if (check) { + HashMap authCheckParamMap = new HashMap(); + authCheckParamMap.put("menuClass", paramMap.get("menuClass")); + authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); + List> authMenuRelationlistMap = this.webAuthMenuRelationSqlMapDAO.selectAuthMenuRelation(authCheckParamMap); + int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); + if (1 == authMenuRelationlistMapSize) { + map.put("msgCode", "0"); + map.put("success", "true"); + map.put("selectUseYn", authMenuRelationlistMap.get(0).get("selectUseYn")); + map.put("insertUseYn", authMenuRelationlistMap.get(0).get("insertUseYn")); + map.put("updateUseYn", authMenuRelationlistMap.get(0).get("updateUseYn")); + map.put("deleteUseYn", authMenuRelationlistMap.get(0).get("deleteUseYn")); + map.put("downloadUseYn", authMenuRelationlistMap.get(0).get("downloadUseYn")); + } else { + map.put("msgCode", "-1"); + map.put("msgDesc", "\uad8c\ud55c \uc815\ubcf4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + } + } + catch (Exception e) { + e.printStackTrace(); + throw e; + } + log.debug("ProcedureReviewService selectProcedureReviewListIntro END"); + return map; + } + + public HashMap selectListProcedureReview(HashMap hashMap) throws Exception { + throw new Error("Unresolved compilation problems: \n\tThe method selectTotalProcedureReviewCount(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n\tThe method selectListProcedureReview(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n"); + } + + public HashMap selectProcedureReview(HashMap hashMap) throws Exception { + throw new Error("Unresolved compilation problem: \n\tThe method selectProcedureReview(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n"); + } + + @Transactional(rollbackFor={Exception.class}, propagation=Propagation.REQUIRES_NEW) + public HashMap insertProcedureReviewFile(HashMap paramMap, MultipartFile file) throws Exception { + log.debug("ProcedureReviewService insertProcedureReviewFile START"); + HashMap map = new HashMap(); + try { + boolean check = true; + String tId = String.valueOf(System.currentTimeMillis()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar c1 = Calendar.getInstance(); + String tDate = sdf.format(c1.getTime()); + if (file == null || file.isEmpty()) { + check = false; + map.put("msgCode", "-1"); + map.put("msgDesc", "\uc774\ubbf8\uc9c0 \uc815\ubcf4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + if (check) { + List> userListMap = this.webMemberSqlMapDAO.checkMember(paramMap); + int userListMapSize = userListMap.size(); + if (1 == userListMapSize) { + paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); + } else { + check = false; + map.put("msgCode", "-1"); + map.put("msgDesc", "\uc0ac\uc6a9\uc790 \uc815\ubcf4\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4."); + } + } + if (check) { + HashMap authCheckParamMap = new HashMap(); + authCheckParamMap.put("menuClass", paramMap.get("menuClass")); + authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); + List> authMenuRelationlistMap = this.webAuthMenuRelationSqlMapDAO.selectAuthMenuRelation(authCheckParamMap); + int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); + if (1 == authMenuRelationlistMapSize) { + if (!"Y".equals(authMenuRelationlistMap.get(0).get("insertUseYn"))) { + check = false; + map.put("msgCode", "-1"); + map.put("msgDesc", "\ub4f1\ub85d \uad8c\ud55c \uc815\ubcf4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + } else { + check = false; + map.put("msgCode", "-1"); + map.put("msgDesc", "\uad8c\ud55c \uc815\ubcf4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."); + } + } + if (check) { + if (file != null && !file.isEmpty()) { + Map fileMap = this.afs.saveAttachFile("img", file); + String filePath = String.valueOf(fileMap.get("filePath")); + String fileName = String.valueOf(fileMap.get("attachfileNm")); + String chgFileName = String.valueOf(fileMap.get("orgAttachfileNm")); + Object formattedCdnUrl = this.CDN_URL.endsWith("/") ? this.CDN_URL : this.CDN_URL + "/"; + paramMap.put("filePath", (String)formattedCdnUrl + filePath); + paramMap.put("fileName", fileName); + paramMap.put("originalFileName", chgFileName); + paramMap.put("attachfileId", fileMap.get("attachfileId")); + } + paramMap.put("tDate", tDate); + paramMap.put("tId", tId); + map.put("rows", paramMap); + map.put("msgCode", "0"); + map.put("msgDesc", "\ub4f1\ub85d\ub418\uc5c8\uc2b5\ub2c8\ub2e4."); + } + } + catch (Exception e) { + e.printStackTrace(); + throw e; + } + log.debug("ProcedureReviewService insertProcedureReviewFile END"); + return map; + } + + public HashMap selectListCategory(HashMap hashMap) throws Exception { + throw new Error("Unresolved compilation problem: \n\tThe method selectListPhotoCategory(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n"); + } + + public HashMap selectProcedureReviewInsertIntro(HashMap hashMap) throws Exception { + throw new Error("Unresolved compilation problem: \n\tThe method selectListPhotoCategory(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n"); + } + + @Transactional(rollbackFor={Exception.class}, propagation=Propagation.REQUIRES_NEW) + public HashMap insertProcedureReview(HashMap hashMap) throws Exception { + throw new Error("Unresolved compilation problem: \n\tThe method insertProcedureReview(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n"); + } + + public HashMap selectProcedureReviewUpdateIntro(HashMap hashMap) throws Exception { + throw new Error("Unresolved compilation problem: \n\tThe method selectListPhotoCategory(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n"); + } + + @Transactional(rollbackFor={Exception.class}, propagation=Propagation.REQUIRES_NEW) + public HashMap updateProcedureReview(HashMap hashMap) throws Exception { + throw new Error("Unresolved compilation problem: \n\tThe method updateProcedureReview(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n"); + } + + public HashMap deleteProcedureReview(HashMap hashMap) throws Exception { + throw new Error("Unresolved compilation problem: \n\tThe method deleteProcedureReview(ProcedureReviewDTO) in the type ProcedureReviewMapper is not applicable for the arguments (HashMap)\n"); + } +} diff --git a/rewrite.py b/rewrite.py new file mode 100644 index 0000000..e69de29 diff --git a/rules.md b/rules.md index f9b3f97..95faa5c 100644 --- a/rules.md +++ b/rules.md @@ -10,12 +10,14 @@ AI 에디터(Agent)는 다음 규칙을 항상 준수하여 코드를 작성하 - **서비스 (Service)**: `svc` - **DTO (Data Transfer Object)**: `dto` - **매퍼 (Mapper)**: `mapper` +- **공통 서비스**: `com.madeu.common.service` (LogHistoryService 등 시스템 공통 모듈) ## 2. 파일 명명 규칙 및 구성 (File Naming Conventions) - **컨트롤러 (Controller)**: `[도메인명]Controller.java` (예: `ABCDController.java`) - **서비스 (Service)**: `[도메인명]Service.java` (인터페이스와 구현체(impl)를 분리하지 않고 Service 클래스 파일 하나로만 구현, 예: `ABCDService.java`) - **DTO**: `[도메인명]DTO.java` (예: `ABCDDTO.java`) - **매퍼 (Mapper)**: `[도메인명]Mapper.java` (예: `ABCDMapper.java`) +- **XML Mapper**: `[도메인명]SqlMap.xml` (namespace는 Mapper 인터페이스의 **FQCN**과 반드시 일치) ## 3. URL 및 메소드 명명 규칙 (RequestMapping & Method Naming) @@ -29,8 +31,115 @@ AI 에디터(Agent)는 다음 규칙을 항상 준수하여 코드를 작성하 - **단, 컨트롤러 메소드명은 위 url에서 `.do`를 제외한 이름과 동일하게 명명합니다.** ### 2) 서비스 메소드명 +- 서비스 메소드명은 **컨트롤러 메소드명과 동일**하게 명명합니다. + - 조회: `getXXXX` / 목록 조회: `getXXXXList` + - 저장: `putXXXX` + - 수정: `modXXXX` + - 삭제: `delXXXX` + +### 3) Mapper 인터페이스 메소드명 - 단일조회 : `selectXXXX` - 리스트조회 : `selectListXXXX` - insert : `insertXXXX` - update : `updateXXXX` - delete : `deleteXXXX` + +## 4. 데이터베이스 연동 정보 (DB Connection) +- `application-local.yml`의 설정을 기반으로 한 공통 접속 정보입니다. +- **Host**: 183.98.184.84 +- **Port**: 3306 +- **Database**: madeu +- **User**: madeu +- **Password**: apdlemdb12#$ + +## 5. 아키텍처 및 코딩 원칙 (Architecture & Coding Principles) + +### 5-1. 컨트롤러 원칙 (Skinny Controller) +- 컨트롤러에는 비즈니스 로직이나 예외처리 로직을 넣지 않고, **서비스 메서드를 호출하는 1줄로만 작성**합니다. +- 컨트롤러 클래스는 `@Controller` 대신 **`@RestController`**를 사용하며, `@ResponseBody`는 생략합니다. +- 데이터 입출력 메소드의 파라미터는 **단일 DTO 하나만 `@RequestBody`**로 받습니다. +- 파일 업로드가 포함된 경우에만 `@ModelAttribute` + `@RequestParam MultipartFile`을 허용합니다. +- 화면 이동(`move~`) 메소드는 **`ModelAndView`를 리턴**합니다. (`@RestController`에서 String 리턴 시 뷰 이름이 아닌 응답 바디로 해석되므로) +- 화면 이동 메소드의 뷰 경로는 **컨트롤러에서 직접 명시**합니다. (서비스에 위임 금지) + +### 5-2. 서비스 원칙 (Service Layer) +- 에러 처리(try-catch), 응답 메시지(msgCode, msgDesc) 설정은 **서비스 계층에서 전담**합니다. +- `HttpServletRequest`, `HttpSession`은 `@Autowired`로 직접 주입받아 사용합니다. (Spring이 Request-scope 프록시로 제공) +- `session.getAttribute("loginMemberId")`를 통해 로그인 ID를 가져오고, DTO에 설정합니다. +- 권한 체크는 `request.getAttribute("selectUseYn")` 등 인터셉터가 설정한 값을 참조합니다. + +### 5-3. DTO 원칙 (DTO Communication) +- **HashMap 사용 금지**. 컨트롤러 ↔ 서비스 ↔ 매퍼 간 모든 데이터는 **DTO 객체만 사용**합니다. +- DTO에는 `@Data` (Lombok)을 사용합니다. +- DTO 필드 구성: + - **DB 컬럼 매핑 필드**: `muProcedureReviewId`, `title`, `content` 등 + - **조회 결과 전용 필드**: `rowNum`, `writeDate`, `writeName` 등 + - **검색/UI 변수**: `startDate`, `endDate`, `start`, `limit`, `sort`, `dir` 등 + - **접근/로직 변수**: `loginMemberId` + - **응답 매핑 변수**: `msgCode`, `msgDesc`, `success`, `totalCount`, `rows`(Object 타입), `tId` + +### 5-4. Mapper 원칙 (MyBatis Mapper) +- Mapper는 **`@Mapper` 어노테이션을 사용한 인터페이스**로 작성합니다. (`SqlSessionDaoSupport` 상속 금지) +- XML Mapper의 `namespace`는 Mapper 인터페이스의 **FQCN(Fully Qualified Class Name)**과 일치시킵니다. +- XML의 `resultType`은 `hashmap` 대신 **DTO FQCN**을 사용합니다. + - 예외: 도메인 외부 테이블 조회(카테고리 등)는 `hashmap` 허용 +- XML alias는 **DTO 필드명(camelCase)**과 정확히 일치시킵니다. +- 단건 조회는 `List` 대신 **DTO 단일 객체를 리턴**합니다. + +## 6. 공통 모듈 사용 규칙 (Common Modules) + +### 6-1. 로그 히스토리 (LogHistoryService) +- 위치: `com.madeu.common.service.LogHistoryService` +- CUD 작업 후 반드시 호출합니다: + ```java + logHistoryService.save("기능명", "서비스명", requestObj, responseObj, errorMsg); + ``` +- `request`, `session`은 LogHistoryService 내부에서 자동 주입되므로 호출 시 전달할 필요 없습니다. + +### 6-2. 메시지 서비스 (MessageSource) +- 위치: `src/main/resources/messages.properties` +- 서비스에서 하드코딩 메시지 대신 **메시지 코드**를 사용합니다: + ```java + @Autowired + private MessageSource messageSource; + + private String msg(String code) { + return messageSource.getMessage(code, null, Locale.getDefault()); + } + + // 사용 예 + dto.setMsgDesc(msg("auth.error.select")); + dto.setMsgDesc(msg("success.insert")); + ``` +- 공통 메시지 코드 규칙: + - 권한 오류: `auth.error.{select|insert|update|delete|noAuth}` + - CRUD 성공: `success.{insert|update|delete}` + - CRUD 실패: `error.{select|insert|update|delete}` + - 모듈별 메시지: `{모듈명}.{카테고리}.{설명}` (예: `procedureReview.error.noData`) + +## 7. 인터셉터 및 필터 규칙 (Interceptor & Filter) + +### 7-1. WebLoginInterceptor +- 인터셉터 `postHandle`에서 권한 속성(`selectUseYn`, `insertUseYn`, `updateUseYn`, `deleteUseYn`)을 ModelAndView에 주입합니다. +- 서비스에서 `request.getAttribute("xxxUseYn")`으로 권한을 체크합니다. + +### 7-2. RequestCachingFilter (CachedBodyRequestWrapper) +- `application/json` 요청만 `CachedBodyRequestWrapper`로 래핑합니다. +- Multipart, GET 등 다른 요청은 래핑하지 않습니다. + +## 8. 파일 업로드 규칙 (File Upload) +- `MultipartFile.transferTo()` 사용 시 반드시 **절대경로를 명시**합니다: + ```java + File dest = new File(outDir, savedName); + file.transferTo(dest.toPath().toAbsolutePath()); + ``` +- 상대경로 사용 시 Tomcat 임시 디렉토리 기준으로 해석되어 오류가 발생합니다. + +## 9. 참조 구현체 (Reference Implementation) +- **`ProcedureReview`** 모듈이 위 규칙의 기준 구현체입니다. +- 새로운 모듈 개발 시 `com.madeu.crm.procedureReview` 패키지 구조를 참고합니다: + - `ctrl/ProcedureReviewController.java` - Skinny Controller 패턴 + - `svc/ProcedureReviewService.java` - MessageSource + LogHistoryService + DTO 기반 + - `dto/ProcedureReviewDTO.java` - 응답/검색/DB 매핑 필드 분류 + - `mapper/ProcedureReviewMapper.java` - @Mapper 인터페이스 + - `mappers/ProcedureReviewSqlMap.xml` - DTO resultType + FQCN namespace diff --git a/src/main/java/com/madeu/common/service/LogHistoryService.java b/src/main/java/com/madeu/common/service/LogHistoryService.java new file mode 100644 index 0000000..4b22076 --- /dev/null +++ b/src/main/java/com/madeu/common/service/LogHistoryService.java @@ -0,0 +1,67 @@ +package com.madeu.common.service; + +import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.util.RequestLogUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Slf4j +@Service +public class LogHistoryService { + + @Autowired + private HttpServletRequest request; + + @Autowired + private HttpSession session; + + @Autowired + private WebLogHistoryService webLogHistoryService; + + /** + * 로그 히스토리 저장 (공통) + * + * @param funcName 기능명 (예: "권한그룹 수정") + * @param serviceName 서비스명 (예: "권한그룹 수정") + * @param requestObj 요청 파라미터 (DTO 또는 HashMap) + * @param responseObj 응답 데이터 (DTO 또는 HashMap) + * @param errorMsg 에러 메시지 (없으면 null 또는 빈 문자열) + */ + public void save(String funcName, String serviceName, + Object requestObj, Object responseObj, String errorMsg) { + try { + String uri = request.getRequestURI(); + String func = uri.substring(uri.lastIndexOf("/") + 1).replace(".do", ""); + String[] paths = uri.split("/"); + String servicePath = paths.length > 1 ? paths[1] + "Service" : ""; + String loginMemberId = (String) session.getAttribute("loginMemberId"); + + HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); + HashMap insertMap = new HashMap<>(); + insertMap.put("url", uri); + insertMap.put("func", func); + insertMap.put("funcName", funcName); + insertMap.put("service", servicePath); + insertMap.put("serviceName", serviceName); + insertMap.put("requestValue", String.valueOf(requestObj)); + insertMap.put("responseValue", String.valueOf(responseObj)); + insertMap.put("resultCode", (errorMsg == null || errorMsg.isEmpty()) ? "SUCCESS" : "ERROR"); + insertMap.put("resultMsg", errorMsg != null ? errorMsg : ""); + insertMap.put("muMemberId", loginMemberId); + + if (responseObj instanceof Map) { + insertMap.put("tId", ((Map) responseObj).get("tId")); + } + + webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); + } catch (Exception e) { + log.error("로그 히스토리 저장 실패", e); + } + } +} diff --git a/src/main/java/com/madeu/config/WebConfig.java b/src/main/java/com/madeu/config/WebConfig.java index 3d63e51..742c90e 100644 --- a/src/main/java/com/madeu/config/WebConfig.java +++ b/src/main/java/com/madeu/config/WebConfig.java @@ -1,20 +1,34 @@ package com.madeu.config; import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.resource.PathResourceResolver; +import com.madeu.interceptor.WebLoginInterceptor; + import java.io.IOException; @Configuration public class WebConfig implements WebMvcConfigurer { - + + @Autowired + private WebLoginInterceptor webLoginInterceptor; + + @Override + public void addInterceptors(InterceptorRegistry registry) { + // ProcedureReview 전체 통제 + registry.addInterceptor(webLoginInterceptor) + .addPathPatterns("/procedureReview/**"); + } + @Value("${file.upload-path}") private String uploadPath; - + @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/cdn/**") @@ -25,26 +39,26 @@ public class WebConfig implements WebMvcConfigurer { @Override protected Resource getResource(String resourcePath, Resource location) throws IOException { Resource requestedResource = location.createRelative(resourcePath); - + // 보안 검증: 허용된 파일 타입만 - if (requestedResource.exists() && requestedResource.isReadable() - && isAllowedResource(requestedResource)) { + if (requestedResource.exists() && requestedResource.isReadable() + && isAllowedResource(requestedResource)) { return requestedResource; } return null; } - + private boolean isAllowedResource(Resource resource) { try { String filename = resource.getFilename(); - return filename != null && - (filename.toLowerCase().endsWith(".jpg") || - filename.toLowerCase().endsWith(".jpeg") || - filename.toLowerCase().endsWith(".png") || - filename.toLowerCase().endsWith(".gif") || - filename.toLowerCase().endsWith(".webp") || - filename.toLowerCase().endsWith(".bmp") || - filename.toLowerCase().endsWith(".svg")); + return filename != null && + (filename.toLowerCase().endsWith(".jpg") || + filename.toLowerCase().endsWith(".jpeg") || + filename.toLowerCase().endsWith(".png") || + filename.toLowerCase().endsWith(".gif") || + filename.toLowerCase().endsWith(".webp") || + filename.toLowerCase().endsWith(".bmp") || + filename.toLowerCase().endsWith(".svg")); } catch (Exception e) { return false; } diff --git a/src/main/java/com/madeu/controller/api/doctalk/DocTalkController.java b/src/main/java/com/madeu/controller/api/doctalk/DocTalkController.java index 8d43c0c..796c7fa 100644 --- a/src/main/java/com/madeu/controller/api/doctalk/DocTalkController.java +++ b/src/main/java/com/madeu/controller/api/doctalk/DocTalkController.java @@ -2,7 +2,7 @@ package com.madeu.controller.api.doctalk; import com.madeu.init.ManagerDraftAction; import com.madeu.service.api.doctalk.DocTalkService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; @@ -27,7 +27,7 @@ public class DocTalkController extends ManagerDraftAction{ private DocTalkService docTalkService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 예약 생성 @@ -61,29 +61,7 @@ public class DocTalkController extends ManagerDraftAction{ errorMsg.append(e); }finally { - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/add-booking"); - insertMap.put("func", "insertReserveNaver"); - insertMap.put("funcName", "예약 생성"); - insertMap.put("service", "docTalkService"); - insertMap.put("serviceName", "DocTalk"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - }else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("예약 생성", "DocTalk", paramMap, map, String.valueOf(errorMsg)); } log.debug("DocTalkController insertReserveNaver END"); diff --git a/src/main/java/com/madeu/controller/mobile/mobiledevice/MobileDeviceController.java b/src/main/java/com/madeu/controller/mobile/mobiledevice/MobileDeviceController.java index 821d178..b62064f 100644 --- a/src/main/java/com/madeu/controller/mobile/mobiledevice/MobileDeviceController.java +++ b/src/main/java/com/madeu/controller/mobile/mobiledevice/MobileDeviceController.java @@ -4,7 +4,6 @@ import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.mobile.mobiledevice.MobileDeviceService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -16,13 +15,17 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import java.util.HashMap; +import com.madeu.common.service.LogHistoryService; @Slf4j @Controller -public class MobileDeviceController extends ManagerDraftAction{ +public class MobileDeviceController extends ManagerDraftAction { @Autowired private MobileDeviceService mobileDeviceService; + @Autowired + private LogHistoryService logHistoryService; + /** * 디바이스 푸시 알림 여부 조회 * @@ -31,35 +34,32 @@ public class MobileDeviceController extends ManagerDraftAction{ * @return */ @RequestMapping(value = "/mobiledevice/selectDevicePushYn.do") - public ModelAndView selectDevicePushYn(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + public ModelAndView selectDevicePushYn(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { log.debug("MobileDeviceController selectDevicePushYn START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - try{ - if(!mobileCheckLogin(session)){ + try { + if (!mobileCheckLogin(session)) { return null; - } - else{ + } else { paramMap.put("muUserId", String.valueOf(session.getAttribute("loginUserId"))); paramMap.put("deviceUuid", String.valueOf(session.getAttribute("mobileDeviceUuid"))); map = mobileDeviceService.selectDevicePushYn(paramMap); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } @@ -75,7 +75,8 @@ public class MobileDeviceController extends ManagerDraftAction{ * @return */ @RequestMapping(value = "/mobiledevice/updateDevicePushYn.do") - public ModelAndView updateDevicePushYn(HttpSession session,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { + public ModelAndView updateDevicePushYn(HttpSession session, HttpServletRequest request, + HttpServletResponse response, MultipartHttpServletRequest file) { log.debug("MobileDeviceController updateDevicePushYn START"); HashMap paramMap = HttpUtil.getParameterMap(request); @@ -83,11 +84,10 @@ public class MobileDeviceController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); - try{ - if(!mobileCheckLogin(session)){ + try { + if (!mobileCheckLogin(session)) { return null; - } - else{ + } else { paramMap.put("membershipAccount", String.valueOf(session.getAttribute("mobileLoginId"))); paramMap.put("muUserId", String.valueOf(session.getAttribute("loginUserId"))); paramMap.put("regId", String.valueOf(session.getAttribute("loginUserId"))); @@ -95,49 +95,21 @@ public class MobileDeviceController extends ManagerDraftAction{ paramMap.put("deviceUuid", String.valueOf(session.getAttribute("mobileDeviceUuid"))); map = mobileDeviceService.updateDevicePushYn(paramMap); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/mobiledevice/updateDevicePushYn.do"); - insertMap.put("func", "updateDevicePushYn"); - insertMap.put("funcName", "디바이스 푸시 알림 여부 수정"); - insertMap.put("service", "mobileDeviceService"); - insertMap.put("serviceName", "디바이스"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - -// webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("디바이스 푸시 알림 여부 수정", "디바이스", paramMap, map, String.valueOf(errorMsg)); } log.debug("MobileDeviceController updateDevicePushYn END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/mobile/mobileinquiry/MobileInquiryController.java b/src/main/java/com/madeu/controller/mobile/mobileinquiry/MobileInquiryController.java index 8119a0a..ae1e066 100644 --- a/src/main/java/com/madeu/controller/mobile/mobileinquiry/MobileInquiryController.java +++ b/src/main/java/com/madeu/controller/mobile/mobileinquiry/MobileInquiryController.java @@ -4,7 +4,6 @@ import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.mobile.mobileuserinquiry.MobileUserInquiryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -16,14 +15,17 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import java.util.HashMap; +import com.madeu.common.service.LogHistoryService; @Slf4j @Controller -public class MobileInquiryController extends ManagerDraftAction{ +public class MobileInquiryController extends ManagerDraftAction { @Autowired private MobileUserInquiryService mobileUserInquiryService; -// @Autowired -// private WebLogHistoryService webLogHistoryService; + + @Autowired + private LogHistoryService logHistoryService; + /** * 1:1 문의 리스트 조회 * @@ -32,34 +34,31 @@ public class MobileInquiryController extends ManagerDraftAction{ * @return */ @RequestMapping(value = "/mobileuserinquiry/selectListUserInquiry.do") - public ModelAndView selectListUserInquiry(HttpSession session, HttpServletRequest request, HttpServletResponse response) { + public ModelAndView selectListUserInquiry(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { log.debug("MobileInquiryController selectListUserInquiry START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - try{ - if(!mobileCheckLogin(session)){ + try { + if (!mobileCheckLogin(session)) { return null; - } - else{ + } else { paramMap.put("muUserId", String.valueOf(session.getAttribute("loginUserId"))); map = mobileUserInquiryService.selectListUserInquiry(paramMap); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } @@ -75,34 +74,31 @@ public class MobileInquiryController extends ManagerDraftAction{ * @return */ @RequestMapping(value = "/mobileuserinquiry/selectUserInquiry.do") - public ModelAndView selectUserInquiry(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + public ModelAndView selectUserInquiry(HttpSession session, HttpServletRequest request, + HttpServletResponse response) { log.debug("MobileInquiryController selectUserInquiry START"); HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - try{ - if(!mobileCheckLogin(session)){ + try { + if (!mobileCheckLogin(session)) { return null; - } - else{ + } else { paramMap.put("muUserId", String.valueOf(session.getAttribute("loginUserId"))); map = mobileUserInquiryService.selectUserInquiry(paramMap); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } @@ -118,7 +114,8 @@ public class MobileInquiryController extends ManagerDraftAction{ * @return */ @RequestMapping(value = "/mobileuserinquiry/insertUserInquiry.do") - public ModelAndView insertUserInquiry(HttpSession session,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { + public ModelAndView insertUserInquiry(HttpSession session, HttpServletRequest request, HttpServletResponse response, + MultipartHttpServletRequest file) { log.debug("MobileInquiryController insertUserInquiry START"); HashMap paramMap = HttpUtil.getParameterMap(request); @@ -126,60 +123,31 @@ public class MobileInquiryController extends ManagerDraftAction{ StringBuffer errorMsg = new StringBuffer(); - try{ - if(!mobileCheckLogin(session)){ + try { + if (!mobileCheckLogin(session)) { return null; - } - else{ + } else { paramMap.put("membershipAccount", String.valueOf(session.getAttribute("mobileLoginId"))); paramMap.put("muUserId", String.valueOf(session.getAttribute("loginUserId"))); paramMap.put("regId", String.valueOf(session.getAttribute("loginUserId"))); paramMap.put("modId", String.valueOf(session.getAttribute("loginUserId"))); map = mobileUserInquiryService.insertUserInquiry(paramMap); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); errorMsg.append(e); - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/mobileuserinquiry/insertUserInquiry.do"); - insertMap.put("func", "insertUserInquiry"); - insertMap.put("funcName", "1:1 문의 등록"); - insertMap.put("service", "mobileUserInquiryService"); - insertMap.put("serviceName", "1:1 문의 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - -// webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("1:1 문의 등록", "1:1 문의 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("MobileInquiryController insertUserInquiry END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/mobile/mobilereservation/MobileReservationController.java b/src/main/java/com/madeu/controller/mobile/mobilereservation/MobileReservationController.java index a1b3667..64df3a1 100644 --- a/src/main/java/com/madeu/controller/mobile/mobilereservation/MobileReservationController.java +++ b/src/main/java/com/madeu/controller/mobile/mobilereservation/MobileReservationController.java @@ -5,7 +5,6 @@ import com.madeu.init.ManagerDraftAction; import com.madeu.service.mobile.mobilelogin.MobileLoginService; import com.madeu.service.mobile.mobilereservation.MobileReservationService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.util.ValidationCheckUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -19,6 +18,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import java.util.HashMap; +import com.madeu.common.service.LogHistoryService; @Slf4j @@ -28,6 +28,9 @@ public class MobileReservationController extends ManagerDraftAction{ @Autowired private MobileReservationService mobileReservationService; + @Autowired + private LogHistoryService logHistoryService; + /** * 예약등록 정보 확인 페이지 이동 * 페이지 처리 없음 @@ -267,32 +270,7 @@ public class MobileReservationController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/mobilereservation/insertReserve.do"); - insertMap.put("func", "insertReserve"); - insertMap.put("funcName", "예약현황 등록"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "예약현황 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - -// webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("예약현황 등록", "예약현황 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("MobileReservationController insertReserve END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -341,32 +319,7 @@ public class MobileReservationController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/mobilereservation/updateReserveStatus.do"); - insertMap.put("func", "updateReserve"); - insertMap.put("funcName", "예약현황 상태수정(진료상태)"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "예약현황 상태수정(진료상태"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - -// webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("예약현황 상태수정(진료상태)", "예약현황 상태수정(진료상태", paramMap, map, String.valueOf(errorMsg)); } log.debug("MobileReservationController updateReserveStatus END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/mobile/mobiletreatment/MobileTreatmentController.java b/src/main/java/com/madeu/controller/mobile/mobiletreatment/MobileTreatmentController.java index f35098d..9dd90e1 100644 --- a/src/main/java/com/madeu/controller/mobile/mobiletreatment/MobileTreatmentController.java +++ b/src/main/java/com/madeu/controller/mobile/mobiletreatment/MobileTreatmentController.java @@ -24,8 +24,6 @@ public class MobileTreatmentController extends ManagerDraftAction{ private MobileTreatmentService mobileTreatmentService; // @Autowired -// private WebLogHistoryService webLogHistoryService; - /** * 진료 정보 리스트 조회 (option) * diff --git a/src/main/java/com/madeu/controller/mobile/mobiletreatmentprocedure/MobileTreatmentProcedureController.java b/src/main/java/com/madeu/controller/mobile/mobiletreatmentprocedure/MobileTreatmentProcedureController.java index 90d69cb..0e54c19 100644 --- a/src/main/java/com/madeu/controller/mobile/mobiletreatmentprocedure/MobileTreatmentProcedureController.java +++ b/src/main/java/com/madeu/controller/mobile/mobiletreatmentprocedure/MobileTreatmentProcedureController.java @@ -3,7 +3,7 @@ package com.madeu.controller.mobile.mobiletreatmentprocedure; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.mobile.mobiletreatmentProcedure.MobileTreatmentProcedureService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webtreatmentprocedure.WebTreatmentProcedureService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -28,8 +28,6 @@ public class MobileTreatmentProcedureController extends ManagerDraftAction{ private MobileTreatmentProcedureService mobileTreatmentProcedureService; // @Autowired -// private WebLogHistoryService webLogHistoryService; - /** * 진료 시술 정보 리스트 조회 (option) * diff --git a/src/main/java/com/madeu/controller/mobile/mobileuserphysical/MobileUserPhysicalController.java b/src/main/java/com/madeu/controller/mobile/mobileuserphysical/MobileUserPhysicalController.java index a83da05..da82a21 100644 --- a/src/main/java/com/madeu/controller/mobile/mobileuserphysical/MobileUserPhysicalController.java +++ b/src/main/java/com/madeu/controller/mobile/mobileuserphysical/MobileUserPhysicalController.java @@ -3,7 +3,7 @@ package com.madeu.controller.mobile.mobileuserphysical; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.mobile.mobileuserphysical.MobileUserPhysicalService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuser.WebUserService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; diff --git a/src/main/java/com/madeu/controller/web/webappboard/WebAppBoardController.java b/src/main/java/com/madeu/controller/web/webappboard/WebAppBoardController.java index 62beb53..9c3c226 100644 --- a/src/main/java/com/madeu/controller/web/webappboard/WebAppBoardController.java +++ b/src/main/java/com/madeu/controller/web/webappboard/WebAppBoardController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webappboard; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappboard.WebAppBoardService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -28,7 +27,7 @@ public class WebAppBoardController extends ManagerDraftAction { private WebAppBoardService webAppBoardService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 보드관리 리스트 화면으로 이동. @@ -269,32 +268,7 @@ public class WebAppBoardController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappboard/insertAppBoard.do"); - insertMap.put("func", "insertAppBoard"); - insertMap.put("funcName", "앱 보드 등록"); - insertMap.put("service", "webAppBoardService"); - insertMap.put("serviceName", "앱 보드 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 보드 등록", "앱 보드 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppBoardController insertAppBoard END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -343,32 +317,7 @@ public class WebAppBoardController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappboard/updateAppBoard.do"); - insertMap.put("func", "updateAppBoard"); - insertMap.put("funcName", "앱 보드 수정"); - insertMap.put("service", "webAppBoardService"); - insertMap.put("serviceName", "앱 보드 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 보드 수정", "앱 보드 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppBoardController updateAppBoard END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -418,32 +367,7 @@ public class WebAppBoardController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappboard/deleteAppBoard.do"); - insertMap.put("func", "deleteAppBoard"); - insertMap.put("funcName", "앱 보드 삭제"); - insertMap.put("service", "webAppBoardService"); - insertMap.put("serviceName", "앱 보드 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 보드 삭제", "앱 보드 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppBoardController deleteAppBoard END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webappcontents/WebAppContentsController.java b/src/main/java/com/madeu/controller/web/webappcontents/WebAppContentsController.java index 35d8b07..3058409 100644 --- a/src/main/java/com/madeu/controller/web/webappcontents/WebAppContentsController.java +++ b/src/main/java/com/madeu/controller/web/webappcontents/WebAppContentsController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webappcontents; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappcontents.WebAppContentsService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -27,7 +26,7 @@ public class WebAppContentsController extends ManagerDraftAction { private WebAppContentsService webAppContentsService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 콘텐츠관리 리스트 화면으로 이동. @@ -269,32 +268,7 @@ public class WebAppContentsController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappcontents/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "앱 콘텐츠 상세 이미지파일 저장"); - insertMap.put("service", "webAppContentsService"); - insertMap.put("serviceName", "앱 콘텐츠 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 콘텐츠 상세 이미지파일 저장", "앱 콘텐츠 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppContentsController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -342,32 +316,7 @@ public class WebAppContentsController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappcontents/insertAppContents.do"); - insertMap.put("func", "insertAppContents"); - insertMap.put("funcName", "앱 콘텐츠 등록"); - insertMap.put("service", "webAppContentsService"); - insertMap.put("serviceName", "앱 콘텐츠 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 콘텐츠 등록", "앱 콘텐츠 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppContentsController insertAppContents END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -416,32 +365,7 @@ public class WebAppContentsController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappcontents/updateAppContents.do"); - insertMap.put("func", "updateAppContents"); - insertMap.put("funcName", "앱 콘텐츠 수정"); - insertMap.put("service", "webAppContentsService"); - insertMap.put("serviceName", "앱 콘텐츠 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 콘텐츠 수정", "앱 콘텐츠 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppContentsController updateAppContents END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -491,32 +415,7 @@ public class WebAppContentsController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappcontents/deleteAppContents.do"); - insertMap.put("func", "deleteAppContents"); - insertMap.put("funcName", "앱 콘텐츠 삭제"); - insertMap.put("service", "webAppContentsService"); - insertMap.put("serviceName", "앱 콘텐츠 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 콘텐츠 삭제", "앱 콘텐츠 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppContentsController deleteAppContents END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webappevent/WebAppEventController.java b/src/main/java/com/madeu/controller/web/webappevent/WebAppEventController.java index a055c96..80858dd 100644 --- a/src/main/java/com/madeu/controller/web/webappevent/WebAppEventController.java +++ b/src/main/java/com/madeu/controller/web/webappevent/WebAppEventController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webappevent; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappevent.WebAppEventService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -29,7 +28,7 @@ public class WebAppEventController extends ManagerDraftAction { private WebAppEventService webAppEventService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 앱 이벤트 정보 리스트 조회 (option) @@ -277,32 +276,7 @@ public class WebAppEventController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappevent/insertAppEvent.do"); - insertMap.put("func", "insertAppEvent"); - insertMap.put("funcName", "앱 이벤트 등록"); - insertMap.put("service", "webAppEventService"); - insertMap.put("serviceName", "앱 이벤트 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 이벤트 등록", "앱 이벤트 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppEventController insertAppEvent END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -388,32 +362,7 @@ public class WebAppEventController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappevent/updateAppEvent.do"); - insertMap.put("func", "updateAppEvent"); - insertMap.put("funcName", "앱 이벤트 수정"); - insertMap.put("service", "webAppEventService"); - insertMap.put("serviceName", "앱 이벤트 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 이벤트 수정", "앱 이벤트 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppEventController updateAppEvent END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -463,32 +412,7 @@ public class WebAppEventController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappevent/deleteAppEvent.do"); - insertMap.put("func", "deleteAppEvent"); - insertMap.put("funcName", "앱 이벤트 삭제"); - insertMap.put("service", "webAppEventService"); - insertMap.put("serviceName", "앱 이벤트 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 이벤트 삭제", "앱 이벤트 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppEventController deleteAppEvent END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webappnotice/WebAppNoticeController.java b/src/main/java/com/madeu/controller/web/webappnotice/WebAppNoticeController.java index 3bc2053..23cde1d 100644 --- a/src/main/java/com/madeu/controller/web/webappnotice/WebAppNoticeController.java +++ b/src/main/java/com/madeu/controller/web/webappnotice/WebAppNoticeController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webappnotice; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappnotice.WebAppNoticeService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -27,7 +26,7 @@ public class WebAppNoticeController extends ManagerDraftAction { private WebAppNoticeService webAppNoticeService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 앱 공지사항 리스트 화면으로 이동. @@ -195,32 +194,7 @@ public class WebAppNoticeController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappnotice/insertAppNotice.do"); - insertMap.put("func", "insertAppNotice"); - insertMap.put("funcName", "앱 공지사항 등록"); - insertMap.put("service", "webAppNoticeService"); - insertMap.put("serviceName", "앱 공지사항 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 공지사항 등록", "앱 공지사항 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppNoticeController insertAppNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -269,32 +243,7 @@ public class WebAppNoticeController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappnotice/updateAppNotice.do"); - insertMap.put("func", "updateAppNotice"); - insertMap.put("funcName", "앱 공지사항 수정"); - insertMap.put("service", "webAppNoticeService"); - insertMap.put("serviceName", "앱 공지사항 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 공지사항 수정", "앱 공지사항 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppNoticeController updateAppNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -344,32 +293,7 @@ public class WebAppNoticeController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webappnotice/deleteAppNotice.do"); - insertMap.put("func", "deleteAppNotice"); - insertMap.put("funcName", "앱 공지사항 삭제"); - insertMap.put("service", "webAppNoticeService"); - insertMap.put("serviceName", "앱 공지사항 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 공지사항 삭제", "앱 공지사항 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAppNoticeController deleteAppNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webappuser/WebAppUserController.java b/src/main/java/com/madeu/controller/web/webappuser/WebAppUserController.java index 35c9dda..4a687cd 100644 --- a/src/main/java/com/madeu/controller/web/webappuser/WebAppUserController.java +++ b/src/main/java/com/madeu/controller/web/webappuser/WebAppUserController.java @@ -3,7 +3,7 @@ package com.madeu.controller.web.webappuser; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webappuser.WebAppUserService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; import com.madeu.view.web.WebAppUserView; import com.madeu.view.web.WebHolidayManagementView; @@ -32,7 +32,7 @@ public class WebAppUserController extends ManagerDraftAction{ private WebAppUserService webAppUserService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 앱 회원 리스트 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webattendance/WebAttendanceController.java b/src/main/java/com/madeu/controller/web/webattendance/WebAttendanceController.java index 064abce..69109a4 100644 --- a/src/main/java/com/madeu/controller/web/webattendance/WebAttendanceController.java +++ b/src/main/java/com/madeu/controller/web/webattendance/WebAttendanceController.java @@ -15,9 +15,8 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webattendance.WebAttendanceService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebAttendanceView; import jakarta.servlet.http.HttpServletRequest; @@ -34,7 +33,7 @@ public class WebAttendanceController extends ManagerDraftAction{ private WebAttendanceService webAttendanceService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 근태/연차 정보 리스트 화면으로 이동. @@ -241,32 +240,7 @@ public class WebAttendanceController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webattendance/insertAttendance.do"); - insertMap.put("func", "insertAttendance"); - insertMap.put("funcName", "근태관리 등록"); - insertMap.put("service", "webAttendanceService"); - insertMap.put("serviceName", "근태관리 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("근태관리 등록", "근태관리 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAttendanceController insertAttendance END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -359,32 +333,7 @@ public class WebAttendanceController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webattendance/updateAttendanceCommute.do"); - insertMap.put("func", "updateAttendanceCommute"); - insertMap.put("funcName", "근태관리 수정 (출/퇴근)"); - insertMap.put("service", "webAttendanceService"); - insertMap.put("serviceName", "근태관리 수정 (출/퇴근)"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("근태관리 수정 (출/퇴근)", "근태관리 수정 (출/퇴근)", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAttendanceController updateAttendanceCommute END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -476,32 +425,7 @@ public class WebAttendanceController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webattendance/insertAttendanceVacation.do"); - insertMap.put("func", "insertAttendanceVacation"); - insertMap.put("funcName", "근태관리 등록 (연차)"); - insertMap.put("service", "webAttendanceService"); - insertMap.put("serviceName", "근태관리 등록 (연차)"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("근태관리 등록 (연차)", "근태관리 등록 (연차)", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAttendanceController insertAttendanceVacation END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -550,32 +474,7 @@ public class WebAttendanceController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webattendance/updateAttendanceVacation.do"); - insertMap.put("func", "updateAttendanceVacation"); - insertMap.put("funcName", "근태관리 수정 (연차)"); - insertMap.put("service", "webAttendanceService"); - insertMap.put("serviceName", "근태관리 수정 (연차)"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("근태관리 수정 (연차)", "근태관리 수정 (연차)", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAttendanceController updateAttendanceVacation END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -624,32 +523,7 @@ public class WebAttendanceController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webattendance/updateAttendanceVacationCancel.do"); - insertMap.put("func", "updateAttendanceVacationCancel"); - insertMap.put("funcName", "근태관리 취소 (연차)"); - insertMap.put("service", "webAttendanceService"); - insertMap.put("serviceName", "근태관리 취소 (연차)"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("근태관리 취소 (연차)", "근태관리 취소 (연차)", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAttendanceController updateAttendanceVacationCancel END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webauth/WebAuthController.java b/src/main/java/com/madeu/controller/web/webauth/WebAuthController.java index 2b53d02..ef5388b 100644 --- a/src/main/java/com/madeu/controller/web/webauth/WebAuthController.java +++ b/src/main/java/com/madeu/controller/web/webauth/WebAuthController.java @@ -12,9 +12,8 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webauth.WebAuthService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -30,7 +29,7 @@ public class WebAuthController extends ManagerDraftAction{ private WebAuthService webAuthService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 권한 정보 리스트 조회 (option) @@ -247,32 +246,7 @@ public class WebAuthController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webauth/updateAuth.do"); - insertMap.put("func", "updateAuth"); - insertMap.put("funcName", "권한그룹 수정"); - insertMap.put("service", "webAuthService"); - insertMap.put("serviceName", "권한그룹 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("권한그룹 수정", "권한그룹 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAuthController updateAuth END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -321,32 +295,7 @@ public class WebAuthController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webauth/insertAuth.do"); - insertMap.put("func", "insertAuth"); - insertMap.put("funcName", "권한 등록"); - insertMap.put("service", "webAuthService"); - insertMap.put("serviceName", "권한 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("권한 등록", "권한 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAuthController insertAuth END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -396,32 +345,7 @@ public class WebAuthController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webauth/deleteAuth.do"); - insertMap.put("func", "deleteAuth"); - insertMap.put("funcName", "권한 삭제"); - insertMap.put("service", "webAuthService"); - insertMap.put("serviceName", "권한 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("권한 삭제", "권한 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAuthController deleteAuth END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webauthmenurelation/WebAuthMenuRelationController.java b/src/main/java/com/madeu/controller/web/webauthmenurelation/WebAuthMenuRelationController.java index ed9087c..0282ea8 100644 --- a/src/main/java/com/madeu/controller/web/webauthmenurelation/WebAuthMenuRelationController.java +++ b/src/main/java/com/madeu/controller/web/webauthmenurelation/WebAuthMenuRelationController.java @@ -10,9 +10,8 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webauthmenurelation.WebAuthMenuRelationService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -28,7 +27,7 @@ public class WebAuthMenuRelationController extends ManagerDraftAction{ private WebAuthMenuRelationService webAuthMenuRelationService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** @@ -117,32 +116,7 @@ public class WebAuthMenuRelationController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webauthmenurelation/updateAuthMenuRelation.do"); - insertMap.put("func", "updateAuthMenuRelation"); - insertMap.put("funcName", "권한별 메뉴 저장"); - insertMap.put("service", "webAuthMenuRelationService"); - insertMap.put("serviceName", "권한별 메뉴 저장"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("권한별 메뉴 저장", "권한별 메뉴 저장", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebAuthMenuRelationController updateAuthMenuRelation END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webcategory/WebCategoryController.java b/src/main/java/com/madeu/controller/web/webcategory/WebCategoryController.java index d606959..9bd1619 100644 --- a/src/main/java/com/madeu/controller/web/webcategory/WebCategoryController.java +++ b/src/main/java/com/madeu/controller/web/webcategory/WebCategoryController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webcategory; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webcategory.WebCategoryService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -27,7 +26,7 @@ public class WebCategoryController extends ManagerDraftAction { private WebCategoryService webCategoryService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 병원 기타설정 화면으로 이동 @@ -242,32 +241,7 @@ public class WebCategoryController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webcategory/insertHospitalOther.do"); - insertMap.put("func", "insertHospitalOther"); - insertMap.put("funcName", "병원 기타정보 등록"); - insertMap.put("service", "insertHospitalOther"); - insertMap.put("serviceName", "병원 기타정보 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("병원 기타정보 등록", "병원 기타정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebCategoryController insertHospitalOther END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -316,32 +290,7 @@ public class WebCategoryController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webcategory/updateHospitalOther.do"); - insertMap.put("func", "updateHospitalOther"); - insertMap.put("funcName", "병원 기타정보 수정"); - insertMap.put("service", "webCategoryService"); - insertMap.put("serviceName", "병원 기타정보 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("병원 기타정보 수정", "병원 기타정보 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebCategoryController updateHospitalOther END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -389,32 +338,7 @@ public class WebCategoryController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webcategory/deleteHospitalOther.do"); - insertMap.put("func", "deleteHospitalOther"); - insertMap.put("funcName", "병원 기타정보 삭제"); - insertMap.put("service", "deleteHospitalOther"); - insertMap.put("serviceName", "병원 기타정보 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("병원 기타정보 삭제", "병원 기타정보 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebCategoryController deleteHospitalOther END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webcompany/WebCompanyController.java b/src/main/java/com/madeu/controller/web/webcompany/WebCompanyController.java index e66f1c0..665aede 100644 --- a/src/main/java/com/madeu/controller/web/webcompany/WebCompanyController.java +++ b/src/main/java/com/madeu/controller/web/webcompany/WebCompanyController.java @@ -11,10 +11,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webcompany.WebCompanyService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -30,7 +29,7 @@ public class WebCompanyController extends ManagerDraftAction{ private WebCompanyService webCompanyService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** @@ -245,32 +244,7 @@ public class WebCompanyController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webcompany/insertCompany.do"); - insertMap.put("func", "insertCompany"); - insertMap.put("funcName", "거래처 등록"); - insertMap.put("service", "webCompanyService"); - insertMap.put("serviceName", "거래처 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("거래처 등록", "거래처 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebCompanyController insertCompany END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -358,32 +332,7 @@ public class WebCompanyController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webcompany/updateCompany.do"); - insertMap.put("func", "updateCompany"); - insertMap.put("funcName", "거래처 수정"); - insertMap.put("service", "webCompanyService"); - insertMap.put("serviceName", "거래처 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("거래처 수정", "거래처 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebCompanyController updateCompany END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -434,32 +383,7 @@ public class WebCompanyController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webcompany/deleteCompany.do"); - insertMap.put("func", "deleteCompany"); - insertMap.put("funcName", "거래처 삭제"); - insertMap.put("service", "webCompanyService"); - insertMap.put("serviceName", "거래처 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("거래처 삭제", "거래처 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebCompanyController deleteCompany END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webcontentsboard/WebContentsBoardController.java b/src/main/java/com/madeu/controller/web/webcontentsboard/WebContentsBoardController.java index 054c3c5..24bf8fe 100644 --- a/src/main/java/com/madeu/controller/web/webcontentsboard/WebContentsBoardController.java +++ b/src/main/java/com/madeu/controller/web/webcontentsboard/WebContentsBoardController.java @@ -2,7 +2,7 @@ package com.madeu.controller.web.webcontentsboard; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webcontentsboard.WebContentsBoardService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -23,7 +23,7 @@ public class WebContentsBoardController extends ManagerDraftAction { private WebContentsBoardService webContentsBoardService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 1:1 문의 리스트 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webduty/WebDutyController.java b/src/main/java/com/madeu/controller/web/webduty/WebDutyController.java index 15ab0cf..b68b9b9 100644 --- a/src/main/java/com/madeu/controller/web/webduty/WebDutyController.java +++ b/src/main/java/com/madeu/controller/web/webduty/WebDutyController.java @@ -12,9 +12,8 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webduty.WebDutyService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -30,7 +29,7 @@ public class WebDutyController extends ManagerDraftAction{ private WebDutyService webDutyService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 직무 정보 리스트 조회 (option) @@ -207,32 +206,7 @@ public class WebDutyController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webduty/insertDuty.do"); - insertMap.put("func", "insertDuty"); - insertMap.put("funcName", "직무 등록"); - insertMap.put("service", "webDutyService"); - insertMap.put("serviceName", "직무 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("직무 등록", "직무 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebDutyController insertDuty END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -282,32 +256,7 @@ public class WebDutyController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webduty/updateDuty.do"); - insertMap.put("func", "updateDuty"); - insertMap.put("funcName", "직무 수정"); - insertMap.put("service", "webDutyService"); - insertMap.put("serviceName", "직무 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("직무 수정", "직무 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebDutyController updateDuty END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -358,32 +307,7 @@ public class WebDutyController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webduty/deleteDuty.do"); - insertMap.put("func", "deleteDuty"); - insertMap.put("funcName", "직무 삭제"); - insertMap.put("service", "webDutyService"); - insertMap.put("serviceName", "직무 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("직무 삭제", "직무 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebDutyController deleteDuty END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webevent/WebEventController.java b/src/main/java/com/madeu/controller/web/webevent/WebEventController.java index 45e30be..048d003 100644 --- a/src/main/java/com/madeu/controller/web/webevent/WebEventController.java +++ b/src/main/java/com/madeu/controller/web/webevent/WebEventController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webevent; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webevent.WebEventService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -28,7 +27,7 @@ public class WebEventController extends ManagerDraftAction { private WebEventService webEventService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 이벤트 리스트 화면으로 이동. @@ -196,32 +195,7 @@ public class WebEventController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webevent/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 이벤트 상세 이미지파일 저장"); - insertMap.put("service", "webEventService"); - insertMap.put("serviceName", "홈페이지 이벤트 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트 상세 이미지파일 저장", "홈페이지 이벤트 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -307,32 +281,7 @@ public class WebEventController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webevent/insertWebEvent.do"); - insertMap.put("func", "insertWebEvent"); - insertMap.put("funcName", "홈페이지 이벤트 등록"); - insertMap.put("service", "webEventService"); - insertMap.put("serviceName", "홈페이지 이벤트 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트 등록", "홈페이지 이벤트 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventController insertWebEvent END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -418,32 +367,7 @@ public class WebEventController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webevent/updateWebEvent.do"); - insertMap.put("func", "updateWebEvent"); - insertMap.put("funcName", "홈페이지 이벤트 수정"); - insertMap.put("service", "webEventService"); - insertMap.put("serviceName", "홈페이지 이벤트 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트 수정", "홈페이지 이벤트 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventController updateWebEvent END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -493,32 +417,7 @@ public class WebEventController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webevent/deleteWebEvent.do"); - insertMap.put("func", "deleteWebEvent"); - insertMap.put("funcName", "홈페이지 이벤트 삭제"); - insertMap.put("service", "webEventService"); - insertMap.put("serviceName", "홈페이지 이벤트 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트 삭제", "홈페이지 이벤트 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventController deleteWebEvent END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webeventdiet/WebEventDietController.java b/src/main/java/com/madeu/controller/web/webeventdiet/WebEventDietController.java index 9cf2cc3..a54b08b 100644 --- a/src/main/java/com/madeu/controller/web/webeventdiet/WebEventDietController.java +++ b/src/main/java/com/madeu/controller/web/webeventdiet/WebEventDietController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webeventdiet; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webeventdiet.WebEventDietService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -28,7 +27,7 @@ public class WebEventDietController extends ManagerDraftAction { private WebEventDietService webEventDietService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 이벤트(다이어트) 리스트 화면으로 이동. @@ -196,32 +195,7 @@ public class WebEventDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webeventdiet/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 이벤트(다이어트) 상세 이미지파일 저장"); - insertMap.put("service", "webEventDietService"); - insertMap.put("serviceName", "홈페이지 이벤트(다이어트) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트(다이어트) 상세 이미지파일 저장", "홈페이지 이벤트(다이어트) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventDietController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -308,32 +282,7 @@ public class WebEventDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webeventdiet/insertWebEventDiet.do"); - insertMap.put("func", "insertWebEventDiet"); - insertMap.put("funcName", "홈페이지 이벤트(다이어트) 등록"); - insertMap.put("service", "webEventDietService"); - insertMap.put("serviceName", "홈페이지 이벤트(다이어트) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트(다이어트) 등록", "홈페이지 이벤트(다이어트) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventDietController insertWebEventDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -420,32 +369,7 @@ public class WebEventDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webeventdiet/updateWebEventDiet.do"); - insertMap.put("func", "updateWebEventDiet"); - insertMap.put("funcName", "홈페이지 이벤트(다이어트) 수정"); - insertMap.put("service", "webEventDietService"); - insertMap.put("serviceName", "홈페이지 이벤트(다이어트) 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트(다이어트) 수정", "홈페이지 이벤트(다이어트) 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventDietController updateWebEventDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -495,32 +419,7 @@ public class WebEventDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webeventdiet/deleteWebEventDiet.do"); - insertMap.put("func", "deleteWebEventDiet"); - insertMap.put("funcName", "홈페이지 이벤트(다이어트) 삭제"); - insertMap.put("service", "webEventDietService"); - insertMap.put("serviceName", "홈페이지 이벤트(다이어트) 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트(다이어트) 삭제", "홈페이지 이벤트(다이어트) 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventDietController deleteWebEventDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webeventpetit/WebEventPetitController.java b/src/main/java/com/madeu/controller/web/webeventpetit/WebEventPetitController.java index 7224ca0..806908a 100644 --- a/src/main/java/com/madeu/controller/web/webeventpetit/WebEventPetitController.java +++ b/src/main/java/com/madeu/controller/web/webeventpetit/WebEventPetitController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webeventpetit; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webeventpetit.WebEventPetitService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -28,7 +27,7 @@ public class WebEventPetitController extends ManagerDraftAction { private WebEventPetitService webEventPetitService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 이벤트(쁘띠) 리스트 화면으로 이동. @@ -196,32 +195,7 @@ public class WebEventPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webeventpetit/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 이벤트(쁘띠) 상세 이미지파일 저장"); - insertMap.put("service", "webEventPetitService"); - insertMap.put("serviceName", "홈페이지 이벤트(쁘띠) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트(쁘띠) 상세 이미지파일 저장", "홈페이지 이벤트(쁘띠) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventPetitController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -308,32 +282,7 @@ public class WebEventPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webeventpetit/insertWebEventPetit.do"); - insertMap.put("func", "insertWebEventPetit"); - insertMap.put("funcName", "홈페이지 이벤트(쁘띠) 등록"); - insertMap.put("service", "webEventPetitService"); - insertMap.put("serviceName", "홈페이지 이벤트(쁘띠) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트(쁘띠) 등록", "홈페이지 이벤트(쁘띠) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventPetitController insertWebEventPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -420,32 +369,7 @@ public class WebEventPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webeventpetit/updateWebEventPetit.do"); - insertMap.put("func", "updateWebEventPetit"); - insertMap.put("funcName", "홈페이지 이벤트(쁘띠) 수정"); - insertMap.put("service", "webEventPetitService"); - insertMap.put("serviceName", "홈페이지 이벤트(쁘띠) 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트(쁘띠) 수정", "홈페이지 이벤트(쁘띠) 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventPetitController updateWebEventPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -495,32 +419,7 @@ public class WebEventPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webeventpetit/deleteWebEventPetit.do"); - insertMap.put("func", "deleteWebEventPetit"); - insertMap.put("funcName", "홈페이지 이벤트(쁘띠) 삭제"); - insertMap.put("service", "webEventPetitService"); - insertMap.put("serviceName", "홈페이지 이벤트(쁘띠) 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 이벤트(쁘띠) 삭제", "홈페이지 이벤트(쁘띠) 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebEventPetitController deleteWebEventPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webgroup/WebGroupController.java b/src/main/java/com/madeu/controller/web/webgroup/WebGroupController.java index cf6681f..9835c26 100644 --- a/src/main/java/com/madeu/controller/web/webgroup/WebGroupController.java +++ b/src/main/java/com/madeu/controller/web/webgroup/WebGroupController.java @@ -12,9 +12,8 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webgroup.WebGroupService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -30,7 +29,7 @@ public class WebGroupController extends ManagerDraftAction{ private WebGroupService webGroupService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 조직 정보 리스트 조회 (option) @@ -244,32 +243,7 @@ public class WebGroupController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webgroup/insertGroup.do"); - insertMap.put("func", "insertGroup"); - insertMap.put("funcName", "조직 등록"); - insertMap.put("service", "webGroupService"); - insertMap.put("serviceName", "조직 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("조직 등록", "조직 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebGroupController insertGroup END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -319,32 +293,7 @@ public class WebGroupController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webgroup/updateGroup.do"); - insertMap.put("func", "updateGroup"); - insertMap.put("funcName", "조직 수정"); - insertMap.put("service", "webGroupService"); - insertMap.put("serviceName", "조직 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("조직 수정", "조직 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebGroupController updateGroup END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -395,32 +344,7 @@ public class WebGroupController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webgroup/deleteGroup.do"); - insertMap.put("func", "deleteGroup"); - insertMap.put("funcName", "조직 삭제"); - insertMap.put("service", "webGroupService"); - insertMap.put("serviceName", "조직 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("조직 삭제", "조직 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebGroupController deleteGroup END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webholidaymanagement/WebHolidayManagementController.java b/src/main/java/com/madeu/controller/web/webholidaymanagement/WebHolidayManagementController.java index f2d85ae..066b54f 100644 --- a/src/main/java/com/madeu/controller/web/webholidaymanagement/WebHolidayManagementController.java +++ b/src/main/java/com/madeu/controller/web/webholidaymanagement/WebHolidayManagementController.java @@ -17,9 +17,8 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webholidaymanagement.WebHolidayManagementService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebHolidayManagementView; import jakarta.servlet.http.HttpServletRequest; @@ -36,7 +35,7 @@ public class WebHolidayManagementController extends ManagerDraftAction{ private WebHolidayManagementService webHolidayManagementService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 휴무관리 정보 리스트 조회 @@ -204,32 +203,7 @@ public class WebHolidayManagementController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webholidaymanagement/insertHolidayManagement.do"); - insertMap.put("func", "insertHolidayManagement"); - insertMap.put("funcName", "휴무관리 등록"); - insertMap.put("service", "webHolidayManagementService"); - insertMap.put("serviceName", "휴무관리 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("휴무관리 등록", "휴무관리 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebHolidayManagementController insertHolidayManagement END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -278,32 +252,7 @@ public class WebHolidayManagementController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webholidaymanagement/updateHolidayManagement.do"); - insertMap.put("func", "updateHolidayManagement"); - insertMap.put("funcName", "휴무관리 수정"); - insertMap.put("service", "webHolidayManagementService"); - insertMap.put("serviceName", "휴무관리 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("휴무관리 수정", "휴무관리 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebHolidayManagementController updateHolidayManagement END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -352,32 +301,7 @@ public class WebHolidayManagementController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webholidaymanagement/updateHolidayManagementCancel.do"); - insertMap.put("func", "updateHolidayManagementCancel"); - insertMap.put("funcName", "휴무관리 휴무취소"); - insertMap.put("service", "webHolidayManagementService"); - insertMap.put("serviceName", "휴무관리 휴무취소"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("휴무관리 휴무취소", "휴무관리 휴무취소", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebHolidayManagementController updateHolidayManagementCancel END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -427,32 +351,7 @@ public class WebHolidayManagementController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webholidaymanagement/deleteHolidayManagement.do"); - insertMap.put("func", "deleteHolidayManagement"); - insertMap.put("funcName", "휴무관리 삭제"); - insertMap.put("service", "webHolidayManagementService"); - insertMap.put("serviceName", "휴무관리 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("휴무관리 삭제", "휴무관리 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebHolidayManagementController deleteHolidayManagement END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webhospital/WebHospitalController.java b/src/main/java/com/madeu/controller/web/webhospital/WebHospitalController.java index ef8d0b7..d9283f7 100644 --- a/src/main/java/com/madeu/controller/web/webhospital/WebHospitalController.java +++ b/src/main/java/com/madeu/controller/web/webhospital/WebHospitalController.java @@ -12,7 +12,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webhospital.WebHospitalService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -29,7 +29,7 @@ public class WebHospitalController extends ManagerDraftAction { private WebHospitalService webHospitalService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 병원 정보 상세 화면으로 이동. @@ -229,31 +229,7 @@ public class WebHospitalController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webhospital/updateHospital.do"); - insertMap.put("func", "updateHospital"); - insertMap.put("funcName", "병원 수정"); - insertMap.put("service", "webHospitalService"); - insertMap.put("serviceName", "병원 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("병원 수정", "병원 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebHospitalController updateHospital END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webkakao/WebKakaoController.java b/src/main/java/com/madeu/controller/web/webkakao/WebKakaoController.java index 1c071fa..d8bbf81 100644 --- a/src/main/java/com/madeu/controller/web/webkakao/WebKakaoController.java +++ b/src/main/java/com/madeu/controller/web/webkakao/WebKakaoController.java @@ -2,10 +2,9 @@ package com.madeu.controller.web.webkakao; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webkakao.WebKakaoService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -27,7 +26,7 @@ public class WebKakaoController extends ManagerDraftAction{ private WebKakaoService webKakaoService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 알림톡 정보 리스트 조회 @@ -115,32 +114,7 @@ public class WebKakaoController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webkakao/insertKakao.do"); - insertMap.put("func", "insertKakao"); - insertMap.put("funcName", "알림톡 등록"); - insertMap.put("service", "webKakaoService"); - insertMap.put("serviceName", "알림톡 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("알림톡 등록", "알림톡 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebKakaoController insertKakao END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/weblogin/WebLoginController.java b/src/main/java/com/madeu/controller/web/weblogin/WebLoginController.java index bc48c6a..71e6b8b 100644 --- a/src/main/java/com/madeu/controller/web/weblogin/WebLoginController.java +++ b/src/main/java/com/madeu/controller/web/weblogin/WebLoginController.java @@ -19,159 +19,149 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; import lombok.extern.slf4j.Slf4j; - @Slf4j @Controller -public class WebLoginController extends ManagerDraftAction{ +public class WebLoginController extends ManagerDraftAction { - @Autowired + @Autowired private WebLoginService webLoginService; - + /** * 로그인 화면 이동 - * 페이지 처리 없음 - * request: + * 페이지 처리 없음 + * request: * response : msgCode, msgDesc * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/weblogin/loginIntro.do") - public String loginIntro(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = "/weblogin/loginIntro.do") + public String loginIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response) { log.debug("WebLoginController loginIntro START"); - - try{ - if(!webCheckLogin(session)){ - - } - else{ + + try { + if (!webCheckLogin(session)) { + + } else { return "/web/home/home"; } - } - catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); } log.debug("WebLoginController loginIntro END"); return "/web/login/login"; } - + /** * 로그인 - * 페이지 처리 없음 - * request: + * 페이지 처리 없음 + * request: * response : msgCode, msgDesc * * @param request - * @param response + * @param response * @return */ @SuppressWarnings("unchecked") - @RequestMapping(value="/weblogin/login.do") - public ModelAndView login(HttpSession session,HttpServletRequest request, HttpServletResponse response, Model model) throws Exception { + @RequestMapping(value = "/weblogin/login.do") + public ModelAndView login(HttpSession session, HttpServletRequest request, HttpServletResponse response, + Model model) throws Exception { log.debug("WebLoginController login START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - - try{ + try { HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap loginMap = webLoginService.memberLogin(paramMap,visitLogParamMap); + HashMap loginMap = webLoginService.memberLogin(paramMap, visitLogParamMap); - if((Constants.FAIL).equals(String.valueOf(loginMap.get("msgCode")))){ + if ((Constants.FAIL).equals(String.valueOf(loginMap.get("msgCode")))) { map.put("msgCode", loginMap.get("msgCode")); map.put("msgDesc", loginMap.get("msgDesc")); - } - else{ + } else { log.debug("======================== USER INFO START =========================="); - log.debug("muMemberId : "+loginMap.get("muMemberId")); - log.debug("loginId : "+loginMap.get("loginId")); - log.debug("memberName : "+loginMap.get("memberName")); - log.debug("memberType : "+loginMap.get("memberType")); + log.debug("muMemberId : " + loginMap.get("muMemberId")); + log.debug("loginId : " + loginMap.get("loginId")); + log.debug("memberName : " + loginMap.get("memberName")); + log.debug("memberType : " + loginMap.get("memberType")); log.debug("======================== USER INFO END ============================"); - - // 회원 - session.setAttribute("loginMemberId",loginMap.get("muMemberId")); - session.setAttribute("loginId",loginMap.get("loginId")); - session.setAttribute("loginName",loginMap.get("memberName")); - log.debug("session : "+session); - + // 회원 + session.setAttribute("loginMemberId", loginMap.get("muMemberId")); + session.setAttribute("loginId", loginMap.get("loginId")); + session.setAttribute("loginName", loginMap.get("memberName")); + + log.debug("session : " + session); + map.put("msgCode", loginMap.get("msgCode")); map.put("msgDesc", loginMap.get("msgDesc")); } - } - catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); - } - finally { - if(Constants.OK == map.get("msgCode")) { + } finally { + if (Constants.OK == map.get("msgCode")) { - } - else{ + } else { map.put("msgCode", Constants.FAIL); map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); + if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { + map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); } } } log.debug("WebLoginController login END"); return HttpUtil.makeHashToJsonModelAndView(map); } - + /** * 로그아웃 - * 페이지 처리 없음 - * request: + * 페이지 처리 없음 + * request: * response : msgCode, msgDesc * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/weblogin/logout.do") - public String logout(HttpSession session,HttpServletRequest request, HttpServletResponse response) { + @RequestMapping(value = { "/weblogin/logout.do", "/web/login/logout" }) + public String logout(HttpSession session, HttpServletRequest request, HttpServletResponse response) { log.debug("WebLoginController logout START"); - - try{ + + try { log.debug("Session Clear1"); session.invalidate(); log.debug("Session Clear2"); - } - catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); } log.debug("WebLoginController logout END"); return "/web/login/login"; } - + /** * 로그인 아이디 중복체크 (아이디 중복확인) * * @param request - * @param response + * @param response * @return */ - @RequestMapping(value="/weblogin/checkloginId.do") - public ModelAndView checkloginId(HttpSession session,HttpServletRequest request, HttpServletResponse response) { - + @RequestMapping(value = "/weblogin/checkloginId.do") + public ModelAndView checkloginId(HttpSession session, HttpServletRequest request, HttpServletResponse response) { + log.debug("WebLoginController checkloginId START"); - + HashMap paramMap = HttpUtil.getParameterMap(request); HashMap map = new HashMap(); - - try{ - if(!webCheckLogin(session)){ + + try { + if (!webCheckLogin(session)) { return null; - } - else{ + } else { map = webLoginService.checkloginId(paramMap); } - } - catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); return null; } diff --git a/src/main/java/com/madeu/controller/web/webmainbanner/WebMainBannerController.java b/src/main/java/com/madeu/controller/web/webmainbanner/WebMainBannerController.java index 1c22899..dca9a2f 100644 --- a/src/main/java/com/madeu/controller/web/webmainbanner/WebMainBannerController.java +++ b/src/main/java/com/madeu/controller/web/webmainbanner/WebMainBannerController.java @@ -2,10 +2,9 @@ package com.madeu.controller.web.webmainbanner; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmainbanner.WebMainBannerService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -28,7 +27,7 @@ public class WebMainBannerController extends ManagerDraftAction { private WebMainBannerService webMainBannerService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 메인 배너 리스트 화면으로 이동. @@ -196,32 +195,7 @@ public class WebMainBannerController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmainbanner/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 메인 배너 상세 이미지파일 저장"); - insertMap.put("service", "webMainBannerService"); - insertMap.put("serviceName", "홈페이지 메인 배너 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 메인 배너 상세 이미지파일 저장", "홈페이지 메인 배너 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMainBannerController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -307,32 +281,7 @@ public class WebMainBannerController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmainbanner/insertWebMainBanner.do"); - insertMap.put("func", "insertWebMainBanner"); - insertMap.put("funcName", "홈페이지 메인 배너 등록"); - insertMap.put("service", "webMainBannerService"); - insertMap.put("serviceName", "홈페이지 메인 배너 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 메인 배너 등록", "홈페이지 메인 배너 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMainBannerController insertWebMainBanner END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -418,32 +367,7 @@ public class WebMainBannerController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmainbanner/updateWebMainBanner.do"); - insertMap.put("func", "updateWebMainBanner"); - insertMap.put("funcName", "홈페이지 메인 배너 수정"); - insertMap.put("service", "webMainBannerService"); - insertMap.put("serviceName", "홈페이지 메인 배너 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 메인 배너 수정", "홈페이지 메인 배너 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMainBannerController updateWebMainBanner END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -493,32 +417,7 @@ public class WebMainBannerController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmainbanner/deleteWebMainBanner.do"); - insertMap.put("func", "deleteWebMainBanner"); - insertMap.put("funcName", "홈페이지 메인 배너 삭제"); - insertMap.put("service", "webMainBannerService"); - insertMap.put("serviceName", "홈페이지 메인 배너 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 메인 배너 삭제", "홈페이지 메인 배너 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMainBannerController deleteWebMainBanner END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webmarketing/WebMarketingController.java b/src/main/java/com/madeu/controller/web/webmarketing/WebMarketingController.java index 8331f74..7f99d8e 100644 --- a/src/main/java/com/madeu/controller/web/webmarketing/WebMarketingController.java +++ b/src/main/java/com/madeu/controller/web/webmarketing/WebMarketingController.java @@ -1,7 +1,7 @@ package com.madeu.controller.web.webmarketing; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmember.WebMemberService; import com.madeu.util.HttpUtil; import jakarta.servlet.http.HttpServletRequest; @@ -33,7 +33,7 @@ public class WebMarketingController extends ManagerDraftAction{ private WebMemberService webMemberService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 알림톡 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webmedicine/WebMedicineController.java b/src/main/java/com/madeu/controller/web/webmedicine/WebMedicineController.java index 5261a9b..31d50f6 100644 --- a/src/main/java/com/madeu/controller/web/webmedicine/WebMedicineController.java +++ b/src/main/java/com/madeu/controller/web/webmedicine/WebMedicineController.java @@ -9,7 +9,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmedicine.WebMedicineService; import com.madeu.util.HttpUtil; @@ -27,7 +27,7 @@ public class WebMedicineController extends ManagerDraftAction{ private WebMedicineService webMedicineService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 약품 정보 리스트 조회 (option) diff --git a/src/main/java/com/madeu/controller/web/webmember/WebMemberController.java b/src/main/java/com/madeu/controller/web/webmember/WebMemberController.java index 9310d73..95ca8c7 100644 --- a/src/main/java/com/madeu/controller/web/webmember/WebMemberController.java +++ b/src/main/java/com/madeu/controller/web/webmember/WebMemberController.java @@ -16,10 +16,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmember.WebMemberService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebMemberView; import jakarta.servlet.http.HttpServletRequest; @@ -36,7 +35,7 @@ public class WebMemberController extends ManagerDraftAction{ private WebMemberService webMemberService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** @@ -370,32 +369,7 @@ public class WebMemberController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmember/insertMember.do"); - insertMap.put("func", "insertMember"); - insertMap.put("funcName", "직원 등록"); - insertMap.put("service", "webMemberService"); - insertMap.put("serviceName", "직원 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("직원 등록", "직원 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController insertMember END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -481,32 +455,7 @@ public class WebMemberController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmember/updateMember.do"); - insertMap.put("func", "updateMember"); - insertMap.put("funcName", "직원 수정"); - insertMap.put("service", "webMemberService"); - insertMap.put("serviceName", "직원 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("직원 수정", "직원 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController updateMember END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -555,32 +504,7 @@ public class WebMemberController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmember/updateMemberStatus.do"); - insertMap.put("func", "updateMemberStatus"); - insertMap.put("funcName", "직원 계정 비활성화 수정"); - insertMap.put("service", "webMemberService"); - insertMap.put("serviceName", "직원 계정 비활성화 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("직원 계정 비활성화 수정", "직원 계정 비활성화 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController updateMemberStatus END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -629,32 +553,7 @@ public class WebMemberController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmember/updateMemberPassword.do"); - insertMap.put("func", "updateMemberPassword"); - insertMap.put("funcName", "직원 비밀번호 수정"); - insertMap.put("service", "webMemberService"); - insertMap.put("serviceName", "직원 비밀번호 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("직원 비밀번호 수정", "직원 비밀번호 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController updateMemberPassword END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -704,32 +603,7 @@ public class WebMemberController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmember/deleteMember.do"); - insertMap.put("func", "deleteMember"); - insertMap.put("funcName", "직원 삭제"); - insertMap.put("service", "webMemberService"); - insertMap.put("serviceName", "직원 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("직원 삭제", "직원 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController deleteMember END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webmembership/WebMembershipController.java b/src/main/java/com/madeu/controller/web/webmembership/WebMembershipController.java index ecb40f6..336647d 100644 --- a/src/main/java/com/madeu/controller/web/webmembership/WebMembershipController.java +++ b/src/main/java/com/madeu/controller/web/webmembership/WebMembershipController.java @@ -2,10 +2,9 @@ package com.madeu.controller.web.webmembership; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmembership.WebMembershipService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebAppUserView; import com.madeu.view.web.WebMembershipHistoryView; import com.madeu.view.web.WebMembershipView; @@ -35,7 +34,7 @@ public class WebMembershipController extends ManagerDraftAction { private WebMembershipService webMembershipService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 멤버십 사용자 리스트 화면으로 이동. @@ -497,32 +496,7 @@ public class WebMembershipController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmembership/updateTransferMembership.do"); - insertMap.put("func", "updateTransferMembership"); - insertMap.put("funcName", "멤버십 양도"); - insertMap.put("service", "webMembershipService"); - insertMap.put("serviceName", "멤버십 양도"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("멤버십 양도", "멤버십 양도", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMembershipController updateTransferMembership END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -572,32 +546,7 @@ public class WebMembershipController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmembership/insertMembership.do"); - insertMap.put("func", "insertMembership"); - insertMap.put("funcName", "멤버십 충전"); - insertMap.put("service", "webMembershipService"); - insertMap.put("serviceName", "멤버십 충전"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("멤버십 충전", "멤버십 충전", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMembershipController insertMembership END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -646,32 +595,7 @@ public class WebMembershipController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmembership/insertMembershipPoint.do"); - insertMap.put("func", "insertMembershipPoint"); - insertMap.put("funcName", "멤버십 포인트 충전"); - insertMap.put("service", "webMembershipService"); - insertMap.put("serviceName", "멤버십 포인트 충전"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("멤버십 포인트 충전", "멤버십 포인트 충전", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMembershipController insertMembershipPoint END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -720,32 +644,7 @@ public class WebMembershipController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmembership/insertMembershipProcedure.do"); - insertMap.put("func", "insertMembership"); - insertMap.put("funcName", "멤버십 상품등록"); - insertMap.put("service", "webMembershipService"); - insertMap.put("serviceName", "멤버십 상품등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("멤버십 상품등록", "멤버십 상품등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMembershipController insertMembershipProcedure END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -946,32 +845,7 @@ public class WebMembershipController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webmembership/deleteMembershipProcedure.do"); - insertMap.put("func", "deleteMembershipProcedure"); - insertMap.put("funcName", "멤버십 상품 삭제"); - insertMap.put("service", "webMembershipService"); - insertMap.put("serviceName", "멤버십 상품 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("멤버십 상품 삭제", "멤버십 상품 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController deleteMembershipProcedure END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webmenu/WebMenuController.java b/src/main/java/com/madeu/controller/web/webmenu/WebMenuController.java index 091b4a7..6bc163a 100644 --- a/src/main/java/com/madeu/controller/web/webmenu/WebMenuController.java +++ b/src/main/java/com/madeu/controller/web/webmenu/WebMenuController.java @@ -9,7 +9,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webmenu.WebMenuService; import com.madeu.util.HttpUtil; @@ -27,7 +27,7 @@ public class WebMenuController extends ManagerDraftAction{ private WebMenuService webMenuService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 메뉴 정보 리스트 조회 diff --git a/src/main/java/com/madeu/controller/web/webnotice/WebNoticeController.java b/src/main/java/com/madeu/controller/web/webnotice/WebNoticeController.java index ac7311a..11ae48f 100644 --- a/src/main/java/com/madeu/controller/web/webnotice/WebNoticeController.java +++ b/src/main/java/com/madeu/controller/web/webnotice/WebNoticeController.java @@ -11,10 +11,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webnotice.WebNoticeService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -30,7 +29,7 @@ public class WebNoticeController extends ManagerDraftAction{ private WebNoticeService webNoticeService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 공지사항 정보 리스트 화면으로 이동. @@ -265,32 +264,7 @@ public class WebNoticeController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webnotice/insertNotice.do"); - insertMap.put("func", "insertNotice"); - insertMap.put("funcName", "공지사항 등록"); - insertMap.put("service", "webNoticeService"); - insertMap.put("serviceName", "공지사항 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("공지사항 등록", "공지사항 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebNoticeController insertNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -368,32 +342,7 @@ public class WebNoticeController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webnotice/updateNotice.do"); - insertMap.put("func", "updateNotice"); - insertMap.put("funcName", "공지사항 수정"); - insertMap.put("service", "webNoticeService"); - insertMap.put("serviceName", "공지사항 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("공지사항 수정", "공지사항 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebNoticeController updateNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -443,32 +392,7 @@ public class WebNoticeController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webnotice/deleteNotice.do"); - insertMap.put("func", "deleteNotice"); - insertMap.put("funcName", "공지사항 삭제"); - insertMap.put("service", "webNoticeService"); - insertMap.put("serviceName", "공지사항 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("공지사항 삭제", "공지사항 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebNoticeController deleteNotice END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webpayment/WebPaymentController.java b/src/main/java/com/madeu/controller/web/webpayment/WebPaymentController.java index 38f0e48..a5d6346 100644 --- a/src/main/java/com/madeu/controller/web/webpayment/WebPaymentController.java +++ b/src/main/java/com/madeu/controller/web/webpayment/WebPaymentController.java @@ -9,7 +9,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.madeu.util.RequestLogUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.Resource; @@ -26,7 +25,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webpayment.WebPaymentService; import com.madeu.util.HttpUtil; import com.madeu.view.web.WebPaymentView; @@ -45,7 +44,7 @@ public class WebPaymentController extends ManagerDraftAction { private WebPaymentService webPaymentService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 수납내역 리스트 화면으로 이동. @@ -367,32 +366,7 @@ public class WebPaymentController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpayment/insertPayment.do"); - insertMap.put("func", "insertPayment"); - insertMap.put("funcName", "결제 정보 등록"); - insertMap.put("service", "webPaymentService"); - insertMap.put("serviceName", "결제 정보 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("결제 정보 등록", "결제 정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPaymentController insertPayment END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -441,32 +415,7 @@ public class WebPaymentController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpayment/insertPaymentRequestHistory.do"); - insertMap.put("func", "insertPaymentRequestHistory"); - insertMap.put("funcName", "단말기 결제요청 정보 등록"); - insertMap.put("service", "webPaymentService"); - insertMap.put("serviceName", "단말기 결제요청 정보 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("단말기 결제요청 정보 등록", "단말기 결제요청 정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPaymentController insertPaymentRequestHistory END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -515,32 +464,7 @@ public class WebPaymentController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpayment/insertPaymentResponseHistory.do"); - insertMap.put("func", "insertPaymentResponseHistory"); - insertMap.put("funcName", "단말기 결제응답 정보 등록"); - insertMap.put("service", "webPaymentService"); - insertMap.put("serviceName", "단말기 결제응답 정보 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("단말기 결제응답 정보 등록", "단말기 결제응답 정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPaymentController insertPaymentResponseHistory END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -589,32 +513,7 @@ public class WebPaymentController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpayment/paymentCancellation.do"); - insertMap.put("func", "insertPayment"); - insertMap.put("funcName", "결제 취소 정보 등록"); - insertMap.put("service", "webPaymentService"); - insertMap.put("serviceName", "결제 취소 정보 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("결제 취소 정보 등록", "결제 취소 정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPaymentController paymentCancellation END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -663,32 +562,7 @@ public class WebPaymentController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpayment/paymentCancellationPay.do"); - insertMap.put("func", "paymentCancellationPay"); - insertMap.put("funcName", "결제 취소 정보 등록"); - insertMap.put("service", "webPaymentService"); - insertMap.put("serviceName", "결제 취소 정보 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("결제 취소 정보 등록", "결제 취소 정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPaymentController paymentCancellationPay END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webphotodiet/WebPhotoDietController.java b/src/main/java/com/madeu/controller/web/webphotodiet/WebPhotoDietController.java index 0fdddbf..aa8cba7 100644 --- a/src/main/java/com/madeu/controller/web/webphotodiet/WebPhotoDietController.java +++ b/src/main/java/com/madeu/controller/web/webphotodiet/WebPhotoDietController.java @@ -3,7 +3,7 @@ package com.madeu.controller.web.webphotodiet; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webphotodiet.WebPhotoDietService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; @@ -30,7 +30,7 @@ public class WebPhotoDietController extends ManagerDraftAction { private WebPhotoDietService webPhotoDietService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 전후사진(다이어트) 리스트 화면으로 이동. @@ -226,31 +226,7 @@ public class WebPhotoDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webphotodiet/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 전후사진(다이어트) 상세 이미지파일 저장"); - insertMap.put("service", "webPhotoDietService"); - insertMap.put("serviceName", "홈페이지 전후사진(다이어트) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 전후사진(다이어트) 상세 이미지파일 저장", "홈페이지 전후사진(다이어트) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPhotoDietController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -338,31 +314,7 @@ public class WebPhotoDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webphotodiet/insertWebPhotoDiet.do"); - insertMap.put("func", "insertWebPhotoDiet"); - insertMap.put("funcName", "홈페이지 전후사진(다이어트) 등록"); - insertMap.put("service", "webPhotoDietService"); - insertMap.put("serviceName", "홈페이지 전후사진(다이어트) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 전후사진(다이어트) 등록", "홈페이지 전후사진(다이어트) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPhotoDietController insertWebPhotoDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -450,31 +402,7 @@ public class WebPhotoDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webphotodiet/updateWebPhotoDiet.do"); - insertMap.put("func", "updateWebPhotoDiet"); - insertMap.put("funcName", "홈페이지 전후사진(다이어트) 수정"); - insertMap.put("service", "webPhotoDietService"); - insertMap.put("serviceName", "홈페이지 전후사진(다이어트) 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 전후사진(다이어트) 수정", "홈페이지 전후사진(다이어트) 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPhotoDietController updateWebPhotoDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -520,31 +448,7 @@ public class WebPhotoDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webphotodiet/deleteWebPhotoDiet.do"); - insertMap.put("func", "deleteWebPhotoDiet"); - insertMap.put("funcName", "홈페이지 전후사진(다이어트) 삭제"); - insertMap.put("service", "webPhotoDietService"); - insertMap.put("serviceName", "홈페이지 전후사진(다이어트) 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 전후사진(다이어트) 삭제", "홈페이지 전후사진(다이어트) 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPhotoDietController deleteWebPhotoDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webphotopetit/WebPhotoPetitController.java b/src/main/java/com/madeu/controller/web/webphotopetit/WebPhotoPetitController.java index e58c069..e351184 100644 --- a/src/main/java/com/madeu/controller/web/webphotopetit/WebPhotoPetitController.java +++ b/src/main/java/com/madeu/controller/web/webphotopetit/WebPhotoPetitController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webphotopetit; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webphotopetit.WebPhotoPetitService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -30,7 +29,7 @@ public class WebPhotoPetitController extends ManagerDraftAction { private WebPhotoPetitService webPhotoPetitService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 전후사진(쁘띠) 리스트 화면으로 이동. @@ -198,32 +197,7 @@ public class WebPhotoPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webphotopetit/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 전후사진(쁘띠) 상세 이미지파일 저장"); - insertMap.put("service", "webPhotoPetitService"); - insertMap.put("serviceName", "홈페이지 전후사진(쁘띠) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 전후사진(쁘띠) 상세 이미지파일 저장", "홈페이지 전후사진(쁘띠) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPhotoPetitController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -315,32 +289,7 @@ public class WebPhotoPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webphotopetit/insertWebPhotoPetit.do"); - insertMap.put("func", "insertWebPhotoPetit"); - insertMap.put("funcName", "홈페이지 전후사진(쁘띠) 등록"); - insertMap.put("service", "webPhotoPetitService"); - insertMap.put("serviceName", "홈페이지 전후사진(쁘띠) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 전후사진(쁘띠) 등록", "홈페이지 전후사진(쁘띠) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPhotoPetitController insertWebPhotoPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -432,32 +381,7 @@ public class WebPhotoPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webphotopetit/updateWebPhotoPetit.do"); - insertMap.put("func", "updateWebPhotoPetit"); - insertMap.put("funcName", "홈페이지 전후사진(쁘띠) 수정"); - insertMap.put("service", "webPhotoPetitService"); - insertMap.put("serviceName", "홈페이지 전후사진(쁘띠) 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 전후사진(쁘띠) 수정", "홈페이지 전후사진(쁘띠) 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPhotoPetitController updateWebPhotoPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -507,32 +431,7 @@ public class WebPhotoPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webphotopetit/deleteWebPhotoPetit.do"); - insertMap.put("func", "deleteWebPhotoPetit"); - insertMap.put("funcName", "홈페이지 전후사진(쁘띠) 삭제"); - insertMap.put("service", "webPhotoPetitService"); - insertMap.put("serviceName", "홈페이지 전후사진(쁘띠) 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 전후사진(쁘띠) 삭제", "홈페이지 전후사진(쁘띠) 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPhotoPetitController deleteWebPhotoPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webpopbillpoint/WebPopbillPointController.java b/src/main/java/com/madeu/controller/web/webpopbillpoint/WebPopbillPointController.java index 35a5f38..228abae 100644 --- a/src/main/java/com/madeu/controller/web/webpopbillpoint/WebPopbillPointController.java +++ b/src/main/java/com/madeu/controller/web/webpopbillpoint/WebPopbillPointController.java @@ -2,10 +2,9 @@ package com.madeu.controller.web.webpopbillpoint; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webpopbillpoint.WebPopbillPointService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -25,7 +24,7 @@ public class WebPopbillPointController extends ManagerDraftAction{ private WebPopbillPointService webPopbillPointService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 잔여 포인트 조회 @@ -69,32 +68,7 @@ public class WebPopbillPointController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpopbillpoint/selectPopbillPoint.do"); - insertMap.put("func", "selectPopbillPoint"); - insertMap.put("funcName", "잔여 포인트 조회"); - insertMap.put("service", "webPopbillPointService"); - insertMap.put("serviceName", "잔여 포인트 조회"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("잔여 포인트 조회", "잔여 포인트 조회", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPopbillPointController selectPopbillPoint END"); @@ -144,32 +118,7 @@ public class WebPopbillPointController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpopbillpoint/chargePopbillPointIntro.do"); - insertMap.put("func", "chargePopbillPointIntro"); - insertMap.put("funcName", "포인트 충전 이동"); - insertMap.put("service", "webPopbillPointService"); - insertMap.put("serviceName", "포인트 충전 이동"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("포인트 충전 이동", "포인트 충전 이동", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPopbillPointController chargePopbillPointIntro END"); diff --git a/src/main/java/com/madeu/controller/web/webpopup/WebPopupController.java b/src/main/java/com/madeu/controller/web/webpopup/WebPopupController.java index 7391cbc..7678683 100644 --- a/src/main/java/com/madeu/controller/web/webpopup/WebPopupController.java +++ b/src/main/java/com/madeu/controller/web/webpopup/WebPopupController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webpopup; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webpopup.WebPopupService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -28,7 +27,7 @@ public class WebPopupController extends ManagerDraftAction { private WebPopupService webPopupService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 팝업 리스트 화면으로 이동. @@ -196,32 +195,7 @@ public class WebPopupController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpopup/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 팝업 상세 이미지파일 저장"); - insertMap.put("service", "webPopupService"); - insertMap.put("serviceName", "홈페이지 팝업 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 팝업 상세 이미지파일 저장", "홈페이지 팝업 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPopupController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -307,32 +281,7 @@ public class WebPopupController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpopup/insertWebPopup.do"); - insertMap.put("func", "insertWebPopup"); - insertMap.put("funcName", "홈페이지 팝업 등록"); - insertMap.put("service", "webPopupService"); - insertMap.put("serviceName", "홈페이지 팝업 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 팝업 등록", "홈페이지 팝업 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPopupController insertWebPopup END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -418,32 +367,7 @@ public class WebPopupController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpopup/updateWebPopup.do"); - insertMap.put("func", "updateWebPopup"); - insertMap.put("funcName", "홈페이지 팝업 수정"); - insertMap.put("service", "webPopupService"); - insertMap.put("serviceName", "홈페이지 팝업 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 팝업 수정", "홈페이지 팝업 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPopupController updateWebPopup END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -493,32 +417,7 @@ public class WebPopupController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpopup/deleteWebPopup.do"); - insertMap.put("func", "deleteWebPopup"); - insertMap.put("funcName", "홈페이지 팝업 삭제"); - insertMap.put("service", "webPopupService"); - insertMap.put("serviceName", "홈페이지 팝업 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 팝업 삭제", "홈페이지 팝업 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPopupController deleteWebPopup END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webproduct/WebProductController.java b/src/main/java/com/madeu/controller/web/webproduct/WebProductController.java index b1e167f..9314681 100644 --- a/src/main/java/com/madeu/controller/web/webproduct/WebProductController.java +++ b/src/main/java/com/madeu/controller/web/webproduct/WebProductController.java @@ -9,7 +9,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webproduct.WebProductService; import com.madeu.util.HttpUtil; @@ -27,7 +27,7 @@ public class WebProductController extends ManagerDraftAction{ private WebProductService webProductService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 제품 정보 리스트 조회 (option) diff --git a/src/main/java/com/madeu/controller/web/webpush/WebPushController.java b/src/main/java/com/madeu/controller/web/webpush/WebPushController.java index f777d0b..e1c47c9 100644 --- a/src/main/java/com/madeu/controller/web/webpush/WebPushController.java +++ b/src/main/java/com/madeu/controller/web/webpush/WebPushController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webpush; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webpush.WebPushService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -27,7 +26,7 @@ public class WebPushController extends ManagerDraftAction{ private WebPushService webPushService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 앱 푸시 정보 리스트 조회 @@ -115,32 +114,7 @@ public class WebPushController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webpush/insertPush.do"); - insertMap.put("func", "insertPush"); - insertMap.put("funcName", "앱 푸시 등록"); - insertMap.put("service", "webPushService"); - insertMap.put("serviceName", "앱 푸시 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("앱 푸시 등록", "앱 푸시 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebPushController insertPush END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webreserve/WebReserveController.java b/src/main/java/com/madeu/controller/web/webreserve/WebReserveController.java index f7c9368..6905862 100644 --- a/src/main/java/com/madeu/controller/web/webreserve/WebReserveController.java +++ b/src/main/java/com/madeu/controller/web/webreserve/WebReserveController.java @@ -21,10 +21,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webreserve.WebReserveService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebReserveColumnView; import com.madeu.view.web.WebReserveUserHistoryView; @@ -42,7 +41,7 @@ public class WebReserveController extends ManagerDraftAction{ private WebReserveService webReserveService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; @Autowired ResourceLoader resourceLoader; @@ -550,32 +549,7 @@ public class WebReserveController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webreserve/insertReserve.do"); - insertMap.put("func", "insertReserve"); - insertMap.put("funcName", "예약현황 등록"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "예약현황 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("예약현황 등록", "예약현황 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebReserveController insertReserve END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -624,32 +598,7 @@ public class WebReserveController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webreserve/insertReserveSimple.do"); - insertMap.put("func", "insertReserveSimple"); - insertMap.put("funcName", "간편예약 등록"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "간편예약 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("간편예약 등록", "간편예약 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebReserveController insertReserveSimple END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -698,32 +647,7 @@ public class WebReserveController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webreserve/insertReserveReady.do"); - insertMap.put("func", "insertReserveReady"); - insertMap.put("funcName", "바로접수 등록"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "바로접수 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("바로접수 등록", "바로접수 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebReserveController insertReserveReady END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -772,32 +696,7 @@ public class WebReserveController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webreserve/updateReserve.do"); - insertMap.put("func", "updateReserve"); - insertMap.put("funcName", "예약현황 수정"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "예약현황 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("예약현황 수정", "예약현황 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebReserveController updateReserve END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -846,32 +745,7 @@ public class WebReserveController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webreserve/updateReserveStatus.do"); - insertMap.put("func", "updateReserve"); - insertMap.put("funcName", "예약현황 상태수정(진료상태)"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "예약현황 상태수정(진료상태"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("예약현황 상태수정(진료상태)", "예약현황 상태수정(진료상태", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebReserveController updateReserveStatus END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -920,32 +794,7 @@ public class WebReserveController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webreserve/updateReserveStatus2.do"); - insertMap.put("func", "updateReserve"); - insertMap.put("funcName", "예약현황 상태수정(수납상태)"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "예약현황 상태수정(수납상태"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("예약현황 상태수정(수납상태)", "예약현황 상태수정(수납상태", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebReserveController updateReserveStatus2 END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -994,32 +843,7 @@ public class WebReserveController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webreserve/deleteReserve.do"); - insertMap.put("func", "deleteReserve"); - insertMap.put("funcName", "예약현황 삭제"); - insertMap.put("service", "webReserveService"); - insertMap.put("serviceName", "예약현황 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("예약현황 삭제", "예약현황 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebReserveController deleteReserve END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/websms/WebSmsController.java b/src/main/java/com/madeu/controller/web/websms/WebSmsController.java index 2b06d42..011b2fd 100644 --- a/src/main/java/com/madeu/controller/web/websms/WebSmsController.java +++ b/src/main/java/com/madeu/controller/web/websms/WebSmsController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.websms; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.websms.WebSmsService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -27,7 +26,7 @@ public class WebSmsController extends ManagerDraftAction{ private WebSmsService webSmsService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 문자 정보 리스트 조회 @@ -158,32 +157,7 @@ public class WebSmsController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/websms/insertSms.do"); - insertMap.put("func", "insertSms"); - insertMap.put("funcName", "문자 등록"); - insertMap.put("service", "webSmsService"); - insertMap.put("serviceName", "문자"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("문자 등록", "문자", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebSmsController insertSms END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -232,32 +206,7 @@ public class WebSmsController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/websms/insertSmsHome.do"); - insertMap.put("func", "insertSmsHome"); - insertMap.put("funcName", "문자 등록 - 홈"); - insertMap.put("service", "webSmsService"); - insertMap.put("serviceName", "문자"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("문자 등록 - 홈", "문자", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebSmsController insertSmsHome END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -306,32 +255,7 @@ public class WebSmsController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/websms/insertSmsConsultingChart.do"); - insertMap.put("func", "insertSmsConsultingChart"); - insertMap.put("funcName", "문자 등록 - 상담 차트"); - insertMap.put("service", "webSmsService"); - insertMap.put("serviceName", "문자"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("문자 등록 - 상담 차트", "문자", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebSmsController insertSmsConsultingChart END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webstatistics/WebStatisticsController.java b/src/main/java/com/madeu/controller/web/webstatistics/WebStatisticsController.java index 8f590d4..b089457 100644 --- a/src/main/java/com/madeu/controller/web/webstatistics/WebStatisticsController.java +++ b/src/main/java/com/madeu/controller/web/webstatistics/WebStatisticsController.java @@ -2,7 +2,7 @@ package com.madeu.controller.web.webstatistics; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstatistics.WebStatisticsService; import com.madeu.util.HttpUtil; import com.madeu.view.web.*; @@ -32,7 +32,7 @@ public class WebStatisticsController extends ManagerDraftAction { private WebStatisticsService webStatisticsService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; @Autowired ResourceLoader resourceLoader; diff --git a/src/main/java/com/madeu/controller/web/webstockclose/WebStockCloseController.java b/src/main/java/com/madeu/controller/web/webstockclose/WebStockCloseController.java index d59d12c..f0092ce 100644 --- a/src/main/java/com/madeu/controller/web/webstockclose/WebStockCloseController.java +++ b/src/main/java/com/madeu/controller/web/webstockclose/WebStockCloseController.java @@ -14,10 +14,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstockclose.WebStockCloseService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebStockCloseView; import jakarta.servlet.http.HttpServletRequest; @@ -34,7 +33,7 @@ public class WebStockCloseController extends ManagerDraftAction{ private WebStockCloseService webStockCloseService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 재고마감 리스트 조회 화면으로 이동. @@ -196,32 +195,7 @@ public class WebStockCloseController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webstockclose/insertStockClose.do"); - insertMap.put("func", "insertStockClose"); - insertMap.put("funcName", "재고마감생성 정보 등록"); - insertMap.put("service", "webStockCloseService"); - insertMap.put("serviceName", "재고마감생성 정보 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("재고마감생성 정보 등록", "재고마감생성 정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebStockCloseController insertStockClose END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webstockclosedetail/WebStockCloseDetailController.java b/src/main/java/com/madeu/controller/web/webstockclosedetail/WebStockCloseDetailController.java index db3aa2e..271278f 100644 --- a/src/main/java/com/madeu/controller/web/webstockclosedetail/WebStockCloseDetailController.java +++ b/src/main/java/com/madeu/controller/web/webstockclosedetail/WebStockCloseDetailController.java @@ -13,7 +13,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstockclosedetail.WebStockCloseDetailService; import com.madeu.util.HttpUtil; import com.madeu.view.web.WebStockCloseDetailView; @@ -32,7 +32,7 @@ public class WebStockCloseDetailController extends ManagerDraftAction{ private WebStockCloseDetailService webStockCloseDetailService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 재고마감 상세 리스트 조회 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webstockhistory/WebStockHistoryController.java b/src/main/java/com/madeu/controller/web/webstockhistory/WebStockHistoryController.java index efecda8..70270cd 100644 --- a/src/main/java/com/madeu/controller/web/webstockhistory/WebStockHistoryController.java +++ b/src/main/java/com/madeu/controller/web/webstockhistory/WebStockHistoryController.java @@ -20,10 +20,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstockhistory.WebStockHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebStockHistoryView; import jakarta.servlet.http.HttpServletRequest; @@ -40,7 +39,7 @@ public class WebStockHistoryController extends ManagerDraftAction{ private WebStockHistoryService webStockHistoryService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; @Autowired ResourceLoader resourceLoader; @Value("${file.upload-path}") @@ -296,32 +295,7 @@ public class WebStockHistoryController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webstockhistory/insertStockHistory.do"); - insertMap.put("func", "insertStockHistory"); - insertMap.put("funcName", "입출고 내역 등록"); - insertMap.put("service", "webStockHistoryService"); - insertMap.put("serviceName", "입출고 내역 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("입출고 내역 등록", "입출고 내역 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebStockHistoryController insertStockHistory END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webstockstatus/WebStockStatusController.java b/src/main/java/com/madeu/controller/web/webstockstatus/WebStockStatusController.java index 7fcf609..470ba01 100644 --- a/src/main/java/com/madeu/controller/web/webstockstatus/WebStockStatusController.java +++ b/src/main/java/com/madeu/controller/web/webstockstatus/WebStockStatusController.java @@ -13,7 +13,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstockstatus.WebStockStatusService; import com.madeu.util.HttpUtil; import com.madeu.view.web.WebStockStatusView; @@ -32,7 +32,7 @@ public class WebStockStatusController extends ManagerDraftAction{ private WebStockStatusService webStockStatusService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 입출고 현황 정보 리스트 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webstocksum/WebStockSumController.java b/src/main/java/com/madeu/controller/web/webstocksum/WebStockSumController.java index 9113eec..641f509 100644 --- a/src/main/java/com/madeu/controller/web/webstocksum/WebStockSumController.java +++ b/src/main/java/com/madeu/controller/web/webstocksum/WebStockSumController.java @@ -22,7 +22,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstocksum.WebStockSumService; import com.madeu.util.HttpUtil; import com.madeu.view.web.WebStockSumCompanyView; @@ -41,7 +41,7 @@ public class WebStockSumController extends ManagerDraftAction{ private WebStockSumService webStockSumService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 현재 재고 제품별 거래처 리스트 조회 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webstocksumadjustment/WebStockSumAdjustmentController.java b/src/main/java/com/madeu/controller/web/webstocksumadjustment/WebStockSumAdjustmentController.java index 8a12405..d1a4a20 100644 --- a/src/main/java/com/madeu/controller/web/webstocksumadjustment/WebStockSumAdjustmentController.java +++ b/src/main/java/com/madeu/controller/web/webstocksumadjustment/WebStockSumAdjustmentController.java @@ -22,7 +22,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstocksumadjustment.WebStockSumAdjustmentService; import com.madeu.util.HttpUtil; import com.madeu.view.web.WebStockSumAdjustmentView; diff --git a/src/main/java/com/madeu/controller/web/webstocksumadjustmentdetail/WebStockSumAdjustmentDetailController.java b/src/main/java/com/madeu/controller/web/webstocksumadjustmentdetail/WebStockSumAdjustmentDetailController.java index cd9b561..c07ad67 100644 --- a/src/main/java/com/madeu/controller/web/webstocksumadjustmentdetail/WebStockSumAdjustmentDetailController.java +++ b/src/main/java/com/madeu/controller/web/webstocksumadjustmentdetail/WebStockSumAdjustmentDetailController.java @@ -10,10 +10,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstocksumadjustmentdetail.WebStockSumAdjustmentDetailService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -29,7 +28,7 @@ public class WebStockSumAdjustmentDetailController extends ManagerDraftAction{ private WebStockSumAdjustmentDetailService webStockSumAdjustmentDetailService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** @@ -118,32 +117,7 @@ public class WebStockSumAdjustmentDetailController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webstocksumadjustmentdetail/insertStockAdjustmentDetail.do"); - insertMap.put("func", "insertStockAdjustmentDetail"); - insertMap.put("funcName", "제품별 실시간 재고 현황 (재고조정 팝업 화면) 저장"); - insertMap.put("service", "webStockSumAdjustmentDetailService"); - insertMap.put("serviceName", "제품별 실시간 재고 현황 (재고조정 팝업 화면) 저장"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("제품별 실시간 재고 현황 (재고조정 팝업 화면) 저장", "제품별 실시간 재고 현황 (재고조정 팝업 화면) 저장", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebStockSumAdjustmentDetailController insertStockAdjustmentDetail END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webstocksumhistory/WebStockSumHistoryController.java b/src/main/java/com/madeu/controller/web/webstocksumhistory/WebStockSumHistoryController.java index d5ee2ee..173e2da 100644 --- a/src/main/java/com/madeu/controller/web/webstocksumhistory/WebStockSumHistoryController.java +++ b/src/main/java/com/madeu/controller/web/webstocksumhistory/WebStockSumHistoryController.java @@ -10,7 +10,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webstocksumhistory.WebStockSumHistoryService; import com.madeu.util.HttpUtil; @@ -28,7 +28,7 @@ public class WebStockSumHistoryController extends ManagerDraftAction{ private WebStockSumHistoryService webStockSumHistoryService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 현재 재고 제품별 거래처 - 상세 리스트 조회 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webtreatment/WebTreatmentController.java b/src/main/java/com/madeu/controller/web/webtreatment/WebTreatmentController.java index 7cd34dd..b8866f6 100644 --- a/src/main/java/com/madeu/controller/web/webtreatment/WebTreatmentController.java +++ b/src/main/java/com/madeu/controller/web/webtreatment/WebTreatmentController.java @@ -11,10 +11,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webtreatment.WebTreatmentService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -30,7 +29,7 @@ public class WebTreatmentController extends ManagerDraftAction{ private WebTreatmentService webTreatmentService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 진료 정보 리스트 조회 (option) @@ -240,32 +239,7 @@ public class WebTreatmentController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatment/insertTreatment.do"); - insertMap.put("func", "insertTreatment"); - insertMap.put("funcName", "진료 등록"); - insertMap.put("service", "webTreatmentService"); - insertMap.put("serviceName", "진료 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("진료 등록", "진료 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentController insertTreatment END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -314,32 +288,7 @@ public class WebTreatmentController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatment/deleteTreatment.do"); - insertMap.put("func", "deleteTreatment"); - insertMap.put("funcName", "진료 삭제"); - insertMap.put("service", "webTreatmentService"); - insertMap.put("serviceName", "진료 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("진료 삭제", "진료 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentController deleteTreatment END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webtreatmentdiet/WebTreatmentDietController.java b/src/main/java/com/madeu/controller/web/webtreatmentdiet/WebTreatmentDietController.java index 5844b0e..8aa0e76 100644 --- a/src/main/java/com/madeu/controller/web/webtreatmentdiet/WebTreatmentDietController.java +++ b/src/main/java/com/madeu/controller/web/webtreatmentdiet/WebTreatmentDietController.java @@ -3,9 +3,8 @@ package com.madeu.controller.web.webtreatmentdiet; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; import com.madeu.service.web.webtreatmentdiet.WebTreatmentDietService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -28,7 +27,7 @@ public class WebTreatmentDietController extends ManagerDraftAction { private WebTreatmentDietService webTreatmentDietService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 시술예약(다이어트) 리스트 화면으로 이동. @@ -196,32 +195,7 @@ public class WebTreatmentDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentdiet/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 시술예약(다이어트) 상세 이미지파일 저장"); - insertMap.put("service", "webTreatmentDietService"); - insertMap.put("serviceName", "홈페이지 시술예약(다이어트) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 시술예약(다이어트) 상세 이미지파일 저장", "홈페이지 시술예약(다이어트) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentDietController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -308,32 +282,7 @@ public class WebTreatmentDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentdiet/insertWebTreatmentDiet.do"); - insertMap.put("func", "insertWebTreatmentDiet"); - insertMap.put("funcName", "홈페이지 시술예약(다이어트) 등록"); - insertMap.put("service", "webTreatmentDietService"); - insertMap.put("serviceName", "홈페이지 시술예약(다이어트) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 시술예약(다이어트) 등록", "홈페이지 시술예약(다이어트) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentDietController insertWebTreatmentDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -420,32 +369,7 @@ public class WebTreatmentDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentdiet/updateWebTreatmentDiet.do"); - insertMap.put("func", "updateWebTreatmentDiet"); - insertMap.put("funcName", "홈페이지 시술예약(다이어트) 수정"); - insertMap.put("service", "webTreatmentDietService"); - insertMap.put("serviceName", "홈페이지 시술예약(다이어트) 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 시술예약(다이어트) 수정", "홈페이지 시술예약(다이어트) 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentDietController updateWebTreatmentDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -495,32 +419,7 @@ public class WebTreatmentDietController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentdiet/deleteWebTreatmentDiet.do"); - insertMap.put("func", "deleteWebTreatmentDiet"); - insertMap.put("funcName", "홈페이지 시술예약(다이어트) 삭제"); - insertMap.put("service", "webTreatmentDietService"); - insertMap.put("serviceName", "홈페이지 시술예약(다이어트) 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 시술예약(다이어트) 삭제", "홈페이지 시술예약(다이어트) 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentDietController deleteWebTreatmentDiet END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webtreatmentpetit/WebTreatmentPetitController.java b/src/main/java/com/madeu/controller/web/webtreatmentpetit/WebTreatmentPetitController.java index a802b2f..33ef2c9 100644 --- a/src/main/java/com/madeu/controller/web/webtreatmentpetit/WebTreatmentPetitController.java +++ b/src/main/java/com/madeu/controller/web/webtreatmentpetit/WebTreatmentPetitController.java @@ -15,10 +15,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webtreatmentpetit.WebTreatmentPetitService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -33,7 +32,7 @@ public class WebTreatmentPetitController extends ManagerDraftAction { private WebTreatmentPetitService webTreatmentPetitService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 시술예약(쁘띠) 리스트 화면으로 이동. @@ -201,32 +200,7 @@ public class WebTreatmentPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentpetit/uploadFile.do"); - insertMap.put("func", "uploadFile"); - insertMap.put("funcName", "홈페이지 시술예약(쁘띠) 상세 이미지파일 저장"); - insertMap.put("service", "webTreatmentPetitService"); - insertMap.put("serviceName", "홈페이지 시술예약(쁘띠) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 시술예약(쁘띠) 상세 이미지파일 저장", "홈페이지 시술예약(쁘띠) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentPetitController uploadFile END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -313,32 +287,7 @@ public class WebTreatmentPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentpetit/insertWebTreatmentPetit.do"); - insertMap.put("func", "insertWebTreatmentPetit"); - insertMap.put("funcName", "홈페이지 시술예약(쁘띠) 등록"); - insertMap.put("service", "webTreatmentPetitService"); - insertMap.put("serviceName", "홈페이지 시술예약(쁘띠) 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 시술예약(쁘띠) 등록", "홈페이지 시술예약(쁘띠) 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentPetitController insertWebTreatmentPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -425,32 +374,7 @@ public class WebTreatmentPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentpetit/updateWebTreatmentPetit.do"); - insertMap.put("func", "updateWebTreatmentPetit"); - insertMap.put("funcName", "홈페이지 시술예약(쁘띠) 수정"); - insertMap.put("service", "webTreatmentPetitService"); - insertMap.put("serviceName", "홈페이지 시술예약(쁘띠) 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 시술예약(쁘띠) 수정", "홈페이지 시술예약(쁘띠) 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentPetitController updateWebTreatmentPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -502,32 +426,7 @@ public class WebTreatmentPetitController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentpetit/deleteWebTreatmentPetit.do"); - insertMap.put("func", "deleteWebTreatmentPetit"); - insertMap.put("funcName", "홈페이지 시술예약(쁘띠) 삭제"); - insertMap.put("service", "webTreatmentPetitService"); - insertMap.put("serviceName", "홈페이지 시술예약(쁘띠) 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 시술예약(쁘띠) 삭제", "홈페이지 시술예약(쁘띠) 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentPetitController deleteWebTreatmentPetit END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webtreatmentprocedure/WebTreatmentProcedureController.java b/src/main/java/com/madeu/controller/web/webtreatmentprocedure/WebTreatmentProcedureController.java index dad0d1e..b327514 100644 --- a/src/main/java/com/madeu/controller/web/webtreatmentprocedure/WebTreatmentProcedureController.java +++ b/src/main/java/com/madeu/controller/web/webtreatmentprocedure/WebTreatmentProcedureController.java @@ -10,10 +10,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webtreatmentprocedure.WebTreatmentProcedureService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -29,7 +28,7 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ private WebTreatmentProcedureService webTreatmentProcedureService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 진료 시술 정보 리스트 조회 (option) @@ -246,32 +245,7 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentprocedure/insertTreatmentProcedure.do"); - insertMap.put("func", "insertTreatmentProcedure"); - insertMap.put("funcName", "진료 시술 등록"); - insertMap.put("service", "webTreatmentProcedureService"); - insertMap.put("serviceName", "진료 시술 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("진료 시술 등록", "진료 시술 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentProcedureController insertTreatmentProcedure END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -320,32 +294,7 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentprocedure/updateTreatmentProcedure.do"); - insertMap.put("func", "updateTreatmentProcedure"); - insertMap.put("funcName", "진료 시술 수정"); - insertMap.put("service", "webTreatmentProcedureService"); - insertMap.put("serviceName", "진료 시술 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("진료 시술 수정", "진료 시술 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentProcedureController updateTreatmentProcedure END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -395,32 +344,7 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentprocedure/updateTreatmentProcedureEnableYn.do"); - insertMap.put("func", "updateTreatmentProcedureEnableYn"); - insertMap.put("funcName", "진료 시술 활성화/비활성화"); - insertMap.put("service", "webTreatmentProcedureService"); - insertMap.put("serviceName", "진료 시술 활성화/비활성화"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("진료 시술 활성화/비활성화", "진료 시술 활성화/비활성화", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentProcedureController updateTreatmentProcedureEnableYn END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -470,32 +394,7 @@ public class WebTreatmentProcedureController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webtreatmentprocedure/updateTreatmentProcedureTreatmentId.do"); - insertMap.put("func", "updateTreatmentProcedureTreatmentId"); - insertMap.put("funcName", "진료 시술 진료이동"); - insertMap.put("service", "webTreatmentProcedureService"); - insertMap.put("serviceName", "진료 시술 진료이동"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("진료 시술 진료이동", "진료 시술 진료이동", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebTreatmentProcedureController updateTreatmentProcedureTreatmentId END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webuser/WebUserController.java b/src/main/java/com/madeu/controller/web/webuser/WebUserController.java index adb6f21..df68f15 100644 --- a/src/main/java/com/madeu/controller/web/webuser/WebUserController.java +++ b/src/main/java/com/madeu/controller/web/webuser/WebUserController.java @@ -17,7 +17,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuser.WebUserService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -38,7 +38,7 @@ public class WebUserController extends ManagerDraftAction { private WebUserService webUserService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 고객 정보 리스트 화면으로 이동. @@ -116,416 +116,7 @@ public class WebUserController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuser/insertUser.do"); - insertMap.put("func", "insertUser"); - insertMap.put("funcName", "고객 등록"); - insertMap.put("service", "webUserService"); - insertMap.put("serviceName", "고객 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if (("").equals(String.valueOf(errorMsg)) || null == (String.valueOf(errorMsg)) || 0 == String.valueOf(errorMsg).length()) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } - } - log.debug("WebUserController insertUser END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - - /** - * 고객 검색 조회 (상단 검색) - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/selectUserSearch.do") - public ModelAndView selectUserSearch(HttpSession session, HttpServletRequest request, HttpServletResponse response) { - log.debug("WebUserController selectUserSearch START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectUserSearch(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("WebUserController selectUserSearch END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - - /** - * 고객 정보 리스트 조회 (option) - * 예약등록 팝업 - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/selectListUserOption.do") - public ModelAndView selectListUserOption(HttpSession session, HttpServletRequest request, HttpServletResponse response) { - log.debug("WebCustomerController selectListUser START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectListUserOption(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("WebUserController selectListUserOption END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - /** - * 고객 정보 리스트 조회 (List) - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/selectListUser.do") - public ModelAndView selectListUser(HttpSession session, HttpServletRequest request, HttpServletResponse response) { - log.debug("WebCustomerController selectListUser START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectListUser(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("WebUserController selectListUser END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - - /** - * 마케팅 - 고객 정보 리스트 조회 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/selectListUserMarketing.do") - public ModelAndView selectListUserMarketing(HttpSession session, HttpServletRequest request, HttpServletResponse response) { - log.debug("WebCustomerController selectListUserMarketing START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectListUserMarketing(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("WebUserController selectListUserMarketing END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - - /** - * 마케팅 - 고객 정보 리스트 조회 (푸시) - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/selectListUserMarketingPush.do") - public ModelAndView selectListUserMarketingPush(HttpSession session, HttpServletRequest request, HttpServletResponse response) { - log.debug("WebCustomerController selectListUserMarketingPush START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectListUserMarketingPush(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("WebUserController selectListUserMarketingPush END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - - /** - * 고객 정보 엑셀 다운로드 - * 페이지 처리 없음 - * request: - * response : msgCode, msgDesc - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/downloadUserExcel.do") - public ModelAndView downloadUserExcel(HttpSession session, HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "file", required = false) MultipartFile file, Model model) { - log.debug("WebUserController downloadUserExcel START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - List> selectListReport = new ArrayList>(); - Map map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webUserService.selectListUserExcel(paramMap); - map.put("selectListUser", selectListReport); - map.put("name", "user"); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } - log.debug("WebMemberController downloadUserExcel END"); - return new ModelAndView(new WebUserView(), "map", map); - } - - /** - * 고객 정보 수정 화면으로 이동. - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/updateUserIntro.do") - public String updateUserIntro(HttpSession session, HttpServletRequest request, HttpServletResponse response, Model model) { - - log.debug("WebUserController updateUserIntro START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.updateUserIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("muUserId", map.get("muUserId")); - model.addAttribute("muMemberId", map.get("loginMemberId")); - } - } - catch (Exception e) { - e.printStackTrace(); - return "/web/login/logout"; - } - log.debug("WebMemberController updateMemberIntro END"); - return "/web/user/userUpdate"; - } - /** - * 고객 정보 상세 조회 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/selectUser.do") - public ModelAndView selectUser(HttpSession session, HttpServletRequest request, HttpServletResponse response) { - - log.debug("WebUserController selectUser START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectUser(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("WebMemberController selectMember END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - - /** - * 고객 정보 수정 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/updateUser.do") - public ModelAndView updateUser(HttpSession session, HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { - - log.debug("WebMemberController updateMember START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - StringBuffer errorMsg = new StringBuffer(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.updateUser(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - errorMsg.append(e); - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuser/updateUser.do"); - insertMap.put("func", "updateUser"); - insertMap.put("funcName", "고객 수정"); - insertMap.put("service", "webUserService"); - insertMap.put("serviceName", "고객 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if (("").equals(String.valueOf(errorMsg)) || null == (String.valueOf(errorMsg)) || 0 == String.valueOf(errorMsg).length()) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("고객 등록", "고객 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController updateUser END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -573,30 +164,7 @@ public class WebUserController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuser/updateUser2.do"); - insertMap.put("func", "updateUser2"); - insertMap.put("funcName", "고객 정보 수정2 (간편예약고객 -> 신환등록)"); - insertMap.put("service", "webUserService"); - insertMap.put("serviceName", "고객 정보 수정2 (간편예약고객 -> 신환등록)"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if (("").equals(String.valueOf(errorMsg)) || null == (String.valueOf(errorMsg)) || 0 == String.valueOf(errorMsg).length()) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("고객 정보 수정2 (간편예약고객 -> 신환등록)", "고객 정보 수정2 (간편예약고객 -> 신환등록)", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebUserController updateUser2 END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -681,221 +249,7 @@ public class WebUserController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuser/insertPhysical.do"); - insertMap.put("func", "insertPhysical"); - insertMap.put("funcName", "고객 신체정보 등록"); - insertMap.put("service", "webUserService"); - insertMap.put("serviceName", "고객 신체정보 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if (("").equals(String.valueOf(errorMsg)) || null == (String.valueOf(errorMsg)) || 0 == String.valueOf(errorMsg).length()) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - }catch (Exception e) { - e.printStackTrace(); - } - } - log.debug("WebUserController insertPhysical END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - /** - * 고객 신체정보 리스트 조회 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/selectUserPhysicalList.do") - public ModelAndView selectUserPhysicalList(HttpSession session, HttpServletRequest request, HttpServletResponse response) { - log.debug("WebCustomerController selectUserPhysicalList START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectUserPhysicalList(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("WebUserController selectUserPhysicalList END"); - return HttpUtil.makeHashToJsonModelAndView(map); -// return map; - } - - /** - * 고객 신체정보 엑셀 다운로드 - * 페이지 처리 없음 - * request: - * response : msgCode, msgDesc - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/downloadPhysicalExcel.do") - public ModelAndView downloadPhysicalExcel(HttpSession session, HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "file", required = false) MultipartFile file, Model model) { - log.debug("WebUserController downloadPhysicalExcel START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - List> selectListReport = new ArrayList>(); - Map map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("muMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - selectListReport = webUserService.selectUserPhysicalListExcel(paramMap); - map.put("selectListUserPhysical", selectListReport); - map.put("name", "userPhysical"); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } - log.debug("WebMemberController downloadPhysicalExcel END"); - return new ModelAndView(new WebUserPhysicalView(), "map", map); - } - - /** - * 고객 신체정보 상세 조회 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value="/webuser/selectUserPhysical.do") - public ModelAndView selectUserPhysical(HttpSession session,HttpServletRequest request, HttpServletResponse response) { - log.debug("WebUserController selectUserPhysical START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try{ - if(!webCheckLogin(session)){ - return null; - } - else{ - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.selectUserPhysical(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - return null; - } - finally { - if(Constants.OK == map.get("msgCode")) { - - } - else{ - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if(null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc","정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("WebUserController selectUserPhysical END"); - return HttpUtil.makeHashToJsonModelAndView(map); - } - - /** - * 고객 신체정보 수정 (담당자) - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/webuser/updateUserPhysical.do") - public ModelAndView updateUserPhysical(HttpSession session, HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest file) { - - log.debug("WebMemberController updateUserPhysical START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - StringBuffer errorMsg = new StringBuffer(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = webUserService.updateUserPhysical(paramMap); - } - } - catch (Exception e) { - e.printStackTrace(); - errorMsg.append(e); - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuser/updateUserPhysical.do"); - insertMap.put("func", "updateUser"); - insertMap.put("funcName", "고객 신체정보 수정"); - insertMap.put("service", "webUserService"); - insertMap.put("serviceName", "고객 신체정보 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if (("").equals(String.valueOf(errorMsg)) || null == (String.valueOf(errorMsg)) || 0 == String.valueOf(errorMsg).length()) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("고객 신체정보 등록", "고객 신체정보 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebMemberController updateUserPhysical END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -943,30 +297,7 @@ public class WebUserController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuser/insertUserPhysicalInbodyApi.do"); - insertMap.put("func", "insertUserPhysicalInbodyApi"); - insertMap.put("funcName", "고객 신체정보 불러오기"); - insertMap.put("service", "webUserService"); - insertMap.put("serviceName", "고객 신체정보 불러오기"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if (("").equals(String.valueOf(errorMsg)) || null == (String.valueOf(errorMsg)) || 0 == String.valueOf(errorMsg).length()) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - }catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("고객 신체정보 불러오기", "고객 신체정보 불러오기", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebUserController insertUserPhysicalInbodyApi END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -1049,30 +380,7 @@ public class WebUserController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuser/insertUserAgreement.do"); - insertMap.put("func", "insertUserAgreement"); - insertMap.put("funcName", "고객 동의서 등록"); - insertMap.put("service", "webUserService"); - insertMap.put("serviceName", "고객 동의서 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if (("").equals(String.valueOf(errorMsg)) || null == (String.valueOf(errorMsg)) || 0 == String.valueOf(errorMsg).length()) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - }catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("고객 동의서 등록", "고객 동의서 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebUserController insertUserAgreement END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webuserconsultingchart/WebUserConsultingChartController.java b/src/main/java/com/madeu/controller/web/webuserconsultingchart/WebUserConsultingChartController.java index 27c77b7..845c443 100644 --- a/src/main/java/com/madeu/controller/web/webuserconsultingchart/WebUserConsultingChartController.java +++ b/src/main/java/com/madeu/controller/web/webuserconsultingchart/WebUserConsultingChartController.java @@ -16,10 +16,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuserconsultingchart.WebUserConsultingChartService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebUserConsultingChartView; import jakarta.servlet.http.HttpServletRequest; @@ -36,7 +35,7 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ private WebUserConsultingChartService webUserConsultingChartService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 고객 상담차트 정보 리스트 화면으로 이동. @@ -321,32 +320,7 @@ public class WebUserConsultingChartController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuserconsultingchart/updateUserConsultingChart.do"); - insertMap.put("func", "updateUserConsultingChart"); - insertMap.put("funcName", "고객 상담차트 수정"); - insertMap.put("service", "webUserConsultingChartService"); - insertMap.put("serviceName", "고객 상담차트 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("고객 상담차트 수정", "고객 상담차트 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebUserConsultingChartController updateUserConsultingChart END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webuserinquiry/WebUserInquiryController.java b/src/main/java/com/madeu/controller/web/webuserinquiry/WebUserInquiryController.java index 8113646..da928db 100644 --- a/src/main/java/com/madeu/controller/web/webuserinquiry/WebUserInquiryController.java +++ b/src/main/java/com/madeu/controller/web/webuserinquiry/WebUserInquiryController.java @@ -2,10 +2,9 @@ package com.madeu.controller.web.webuserinquiry; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuserinquiry.WebUserInquiryService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -27,7 +26,7 @@ public class WebUserInquiryController extends ManagerDraftAction { private WebUserInquiryService webUserInquiryService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 1:1 문의 리스트 화면으로 이동. @@ -201,32 +200,7 @@ public class WebUserInquiryController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuserinquiry/insertAppUserInquiry.do"); - insertMap.put("func", "insertAppUserInquiry"); - insertMap.put("funcName", "1:1 문의 등록"); - insertMap.put("service", "webUserInquiryService"); - insertMap.put("serviceName", "1:1 문의 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("1:1 문의 등록", "1:1 문의 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebUserInquiryController insertAppUserInquiry END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -276,32 +250,7 @@ public class WebUserInquiryController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webuserinquiry/updateAppUserInquiry.do"); - insertMap.put("func", "updateAppUserInquiry"); - insertMap.put("funcName", "1:1 문의 수정"); - insertMap.put("service", "webUserInquiryService"); - insertMap.put("serviceName", "1:1 문의 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("1:1 문의 수정", "1:1 문의 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebUserInquiryController updateAppUserInquiry END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webusermedicalchart/WebUserMedicalChartController.java b/src/main/java/com/madeu/controller/web/webusermedicalchart/WebUserMedicalChartController.java index 3bd6e93..174eeec 100644 --- a/src/main/java/com/madeu/controller/web/webusermedicalchart/WebUserMedicalChartController.java +++ b/src/main/java/com/madeu/controller/web/webusermedicalchart/WebUserMedicalChartController.java @@ -16,10 +16,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webusermedicalchart.WebUserMedicalChartService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebUserMedicalChartView; import jakarta.servlet.http.HttpServletRequest; @@ -36,7 +35,7 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ private WebUserMedicalChartService webUserMedicalChartService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 고객 시술차트 정보 리스트 화면으로 이동. @@ -320,32 +319,7 @@ public class WebUserMedicalChartController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webusermedicalchart/updateUserMedicalChart.do"); - insertMap.put("func", "updateUserMedicalChart"); - insertMap.put("funcName", "고객 시술차트 수정"); - insertMap.put("service", "webUserMedicalChartService"); - insertMap.put("serviceName", "고객 시술차트 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("고객 시술차트 수정", "고객 시술차트 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebUserMedicalChartController updateUserMedicalChart END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webuseroriginalchart/WebUserOriginalChartController.java b/src/main/java/com/madeu/controller/web/webuseroriginalchart/WebUserOriginalChartController.java index 5e3ecea..ff2cd66 100644 --- a/src/main/java/com/madeu/controller/web/webuseroriginalchart/WebUserOriginalChartController.java +++ b/src/main/java/com/madeu/controller/web/webuseroriginalchart/WebUserOriginalChartController.java @@ -2,7 +2,7 @@ package com.madeu.controller.web.webuseroriginalchart; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuseroriginalchart.WebUserOriginalChartService; import com.madeu.util.HttpUtil; import com.madeu.util.RequestLogUtil; @@ -33,7 +33,7 @@ public class WebUserOriginalChartController extends ManagerDraftAction{ private WebUserOriginalChartService webUserOriginalChartService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 고객 상담차트 정보 리스트 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webuserpushhistory/WebUserPushHistoryController.java b/src/main/java/com/madeu/controller/web/webuserpushhistory/WebUserPushHistoryController.java index cf31531..0b95978 100644 --- a/src/main/java/com/madeu/controller/web/webuserpushhistory/WebUserPushHistoryController.java +++ b/src/main/java/com/madeu/controller/web/webuserpushhistory/WebUserPushHistoryController.java @@ -15,7 +15,7 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webuserpushhistory.WebUserPushHistoryService; import com.madeu.util.HttpUtil; import com.madeu.view.web.WebUserPushHistoryView; @@ -34,7 +34,7 @@ public class WebUserPushHistoryController extends ManagerDraftAction{ private WebUserPushHistoryService webUserPushHistoryService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 고객 - 알림 리스트 조회 화면으로 이동. diff --git a/src/main/java/com/madeu/controller/web/webvacation/WebVacationController.java b/src/main/java/com/madeu/controller/web/webvacation/WebVacationController.java index d4fc99a..0778982 100644 --- a/src/main/java/com/madeu/controller/web/webvacation/WebVacationController.java +++ b/src/main/java/com/madeu/controller/web/webvacation/WebVacationController.java @@ -11,10 +11,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webvacation.WebVacationService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -30,7 +29,7 @@ public class WebVacationController extends ManagerDraftAction{ private WebVacationService webVacationService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 연차설정 정보 리스트 조회 (option) @@ -204,32 +203,7 @@ public class WebVacationController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webvacation/insertVacation.do"); - insertMap.put("func", "insertVacation"); - insertMap.put("funcName", "연차설정 등록"); - insertMap.put("service", "webVacationService"); - insertMap.put("serviceName", "연차설정 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("연차설정 등록", "연차설정 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebVacationController insertVacation END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -278,32 +252,7 @@ public class WebVacationController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webvacation/updateVacation.do"); - insertMap.put("func", "updateVacation"); - insertMap.put("funcName", "연차설정 수정"); - insertMap.put("service", "webVacationService"); - insertMap.put("serviceName", "연차설정 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("연차설정 수정", "연차설정 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebVacationController updateVacation END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -353,32 +302,7 @@ public class WebVacationController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webvacation/deleteVacation.do"); - insertMap.put("func", "deleteVacation"); - insertMap.put("funcName", "연차설정 삭제"); - insertMap.put("service", "webVacationService"); - insertMap.put("serviceName", "연차설정 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("연차설정 삭제", "연차설정 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebVacationController deleteVacation END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webvacationmanagement/WebVacationManagementController.java b/src/main/java/com/madeu/controller/web/webvacationmanagement/WebVacationManagementController.java index 92c4e98..aea6181 100644 --- a/src/main/java/com/madeu/controller/web/webvacationmanagement/WebVacationManagementController.java +++ b/src/main/java/com/madeu/controller/web/webvacationmanagement/WebVacationManagementController.java @@ -23,10 +23,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webvacationmanagement.WebVacationManagementService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import com.madeu.view.web.WebVacationManagementView; import jakarta.servlet.http.HttpServletRequest; @@ -46,7 +45,7 @@ public class WebVacationManagementController extends ManagerDraftAction{ private WebVacationManagementService webVacationManagementService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 연차관리 정보 리스트 조회 @@ -378,32 +377,7 @@ public class WebVacationManagementController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webvacationmanagement/insertVacationManagement.do"); - insertMap.put("func", "insertVacationManagement"); - insertMap.put("funcName", "연차관리 등록"); - insertMap.put("service", "webVacationManagementService"); - insertMap.put("serviceName", "연차관리 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("연차관리 등록", "연차관리 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebVacationManagementController insertVacationManagement END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -452,32 +426,7 @@ public class WebVacationManagementController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webvacationmanagement/insertVacationManagement.do"); - insertMap.put("func", "insertVacationManagement"); - insertMap.put("funcName", "연차관리 일괄등록"); - insertMap.put("service", "webVacationManagementService"); - insertMap.put("serviceName", "연차관리 일괄등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("연차관리 일괄등록", "연차관리 일괄등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebVacationManagementController insertVacationManagementExcel END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -526,32 +475,7 @@ public class WebVacationManagementController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webvacationmanagement/updateVacationManagement.do"); - insertMap.put("func", "updateVacationManagement"); - insertMap.put("funcName", "연차관리 수정"); - insertMap.put("service", "webVacationManagementService"); - insertMap.put("serviceName", "연차관리 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("연차관리 수정", "연차관리 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebVacationManagementController updateVacationManagement END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -599,32 +523,7 @@ public class WebVacationManagementController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webvacationmanagement/deleteVacationManagement.do"); - insertMap.put("func", "deleteVacationManagement"); - insertMap.put("funcName", "연차관리 삭제"); - insertMap.put("service", "webVacationManagementService"); - insertMap.put("serviceName", "연차관리 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("연차관리 삭제", "연차관리 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebVacationManagementController deleteVacationManagement END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webwork/WebWorkController.java b/src/main/java/com/madeu/controller/web/webwork/WebWorkController.java index d13f51c..426ed84 100644 --- a/src/main/java/com/madeu/controller/web/webwork/WebWorkController.java +++ b/src/main/java/com/madeu/controller/web/webwork/WebWorkController.java @@ -11,10 +11,9 @@ import org.springframework.web.servlet.ModelAndView; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webwork.WebWorkService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -30,7 +29,7 @@ public class WebWorkController extends ManagerDraftAction{ private WebWorkService webWorkService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 근무/연차 설정 정보 리스트 화면으로 이동. @@ -198,32 +197,7 @@ public class WebWorkController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webwork/insertWork.do"); - insertMap.put("func", "insertWork"); - insertMap.put("funcName", "근무설정 등록"); - insertMap.put("service", "webWorkService"); - insertMap.put("serviceName", "근무설정 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("근무설정 등록", "근무설정 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebWorkController insertWork END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -272,32 +246,7 @@ public class WebWorkController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webwork/updateWork.do"); - insertMap.put("func", "updateWork"); - insertMap.put("funcName", "근무설정 수정"); - insertMap.put("service", "webWorkService"); - insertMap.put("serviceName", "근무설정 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("근무설정 수정", "근무설정 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebWorkController updateWork END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -347,32 +296,7 @@ public class WebWorkController extends ManagerDraftAction{ } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webwork/deleteWork.do"); - insertMap.put("func", "deleteWork"); - insertMap.put("funcName", "근무설정 삭제"); - insertMap.put("service", "webWorkService"); - insertMap.put("serviceName", "근무설정 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("근무설정 삭제", "근무설정 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebWorkController deleteWork END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/controller/web/webyoutube/WebYouTubeController.java b/src/main/java/com/madeu/controller/web/webyoutube/WebYouTubeController.java index 34fb92b..0c8a76a 100644 --- a/src/main/java/com/madeu/controller/web/webyoutube/WebYouTubeController.java +++ b/src/main/java/com/madeu/controller/web/webyoutube/WebYouTubeController.java @@ -2,10 +2,9 @@ package com.madeu.controller.web.webyoutube; import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; -import com.madeu.service.web.webloghistory.WebLogHistoryService; +import com.madeu.common.service.LogHistoryService; import com.madeu.service.web.webyoutube.WebYouTubeService; import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -28,7 +27,7 @@ public class WebYouTubeController extends ManagerDraftAction { private WebYouTubeService webYouTubeService; @Autowired - private WebLogHistoryService webLogHistoryService; + private LogHistoryService logHistoryService; /** * 홈페이지 유튜브 리스트 화면으로 이동. @@ -233,32 +232,7 @@ public class WebYouTubeController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webyoutube/insertWebYouTube.do"); - insertMap.put("func", "insertWebYouTube"); - insertMap.put("funcName", "홈페이지 유튜브 등록"); - insertMap.put("service", "webYouTubeService"); - insertMap.put("serviceName", "홈페이지 유튜브 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 유튜브 등록", "홈페이지 유튜브 등록", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebYouTubeController insertWebYouTube END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -344,32 +318,7 @@ public class WebYouTubeController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webyoutube/updateWebYouTube.do"); - insertMap.put("func", "updateWebYouTube"); - insertMap.put("funcName", "홈페이지 유튜브 수정"); - insertMap.put("service", "webYouTubeService"); - insertMap.put("serviceName", "홈페이지 유튜브 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 유튜브 수정", "홈페이지 유튜브 수정", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebYouTubeController updateWebYouTube END"); return HttpUtil.makeHashToJsonModelAndView(map); @@ -419,32 +368,7 @@ public class WebYouTubeController extends ManagerDraftAction { } } - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/webyoutube/deleteWebYouTube.do"); - insertMap.put("func", "deleteWebYouTube"); - insertMap.put("funcName", "홈페이지 유튜브 삭제"); - insertMap.put("service", "webYouTubeService"); - insertMap.put("serviceName", "홈페이지 유튜브 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) || String.valueOf(errorMsg).length() == 0){ - insertMap.put("resultCode", "SUCCESS"); - } - else{ - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } - catch (Exception e) { - e.printStackTrace(); - } + logHistoryService.save("홈페이지 유튜브 삭제", "홈페이지 유튜브 삭제", paramMap, map, String.valueOf(errorMsg)); } log.debug("WebYouTubeController deleteWebYouTube END"); return HttpUtil.makeHashToJsonModelAndView(map); diff --git a/src/main/java/com/madeu/crm/procedureReview/ctrl/ProcedureReviewController.java b/src/main/java/com/madeu/crm/procedureReview/ctrl/ProcedureReviewController.java index c44ed90..e78c2c7 100644 --- a/src/main/java/com/madeu/crm/procedureReview/ctrl/ProcedureReviewController.java +++ b/src/main/java/com/madeu/crm/procedureReview/ctrl/ProcedureReviewController.java @@ -1,473 +1,73 @@ package com.madeu.crm.procedureReview.ctrl; -import com.madeu.constants.Constants; import com.madeu.init.ManagerDraftAction; +import com.madeu.crm.procedureReview.dto.ProcedureReviewDTO; import com.madeu.crm.procedureReview.svc.ProcedureReviewService; -import com.madeu.service.web.webloghistory.WebLogHistoryService; -import com.madeu.util.HttpUtil; -import com.madeu.util.RequestLogUtil; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; - -import java.util.HashMap; +import org.springframework.web.multipart.MultipartFile; @Slf4j -@Controller +@RestController public class ProcedureReviewController extends ManagerDraftAction { @Autowired private ProcedureReviewService procedureReviewService; - @Autowired - private WebLogHistoryService webLogHistoryService; - @RequestMapping(value = "/procedureReview/moveProcedureReviewList.do") - public String moveProcedureReviewList(HttpSession session, HttpServletRequest request, - HttpServletResponse response, Model model) { - log.debug("ProcedureReviewController moveProcedureReviewList START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.selectProcedureReviewListIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - } - } catch (Exception e) { - e.printStackTrace(); - return "/web/login/logout"; - } - log.debug("ProcedureReviewController moveProcedureReviewList END"); - return "/crm/procedureReview/procedureReviewSelectList"; + public ModelAndView moveProcedureReviewList() throws Exception { + return new ModelAndView("/crm/procedureReview/procedureReviewSelectList"); } @RequestMapping(value = "/procedureReview/getProcedureReviewList.do") - public ModelAndView getProcedureReviewList(HttpSession session, HttpServletRequest request, - HttpServletResponse response) { - log.debug("ProcedureReviewController getProcedureReviewList START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.selectListProcedureReview(paramMap); - } - } catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("ProcedureReviewController getProcedureReviewList END"); - return HttpUtil.makeHashToJsonModelAndView(map); + public ProcedureReviewDTO getProcedureReviewList(@RequestBody ProcedureReviewDTO paramDTO) throws Exception { + return procedureReviewService.getProcedureReviewList(paramDTO); } @RequestMapping(value = "/procedureReview/getProcedureReview.do") - public ModelAndView getProcedureReview(HttpSession session, HttpServletRequest request, - HttpServletResponse response) { - log.debug("ProcedureReviewController getProcedureReview START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.selectProcedureReview(paramMap); - } - } catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("ProcedureReviewController getProcedureReview END"); - return HttpUtil.makeHashToJsonModelAndView(map); + public ProcedureReviewDTO getProcedureReview(@RequestBody ProcedureReviewDTO paramDTO) throws Exception { + return procedureReviewService.getProcedureReview(paramDTO); } @RequestMapping(value = "/procedureReview/getCategoryList.do") - public ModelAndView getCategoryList(HttpSession session, HttpServletRequest request, - HttpServletResponse response) { - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - map = procedureReviewService.selectListCategory(paramMap); - } - } catch (Exception e) { - e.printStackTrace(); - return null; - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - } - log.debug("ProcedureReviewController getCategoryList END"); - return HttpUtil.makeHashToJsonModelAndView(map); + public ProcedureReviewDTO getCategoryList(@RequestBody ProcedureReviewDTO paramDTO) throws Exception { + return procedureReviewService.getCategoryList(paramDTO); } @RequestMapping(value = "/procedureReview/putProcedureReviewFile.do") - public ModelAndView putProcedureReviewFile(HttpSession session, HttpServletRequest request, - HttpServletResponse response, - @RequestParam(value = "file", required = false) MultipartFile file) { - log.debug("ProcedureReviewController putProcedureReviewFile START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - StringBuffer errorMsg = new StringBuffer(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.insertProcedureReviewFile(paramMap, file); - } - } catch (Exception e) { - e.printStackTrace(); - errorMsg.append(e); - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/procedureReview/putProcedureReviewFile.do"); - insertMap.put("func", "putProcedureReviewFile"); - insertMap.put("funcName", "홈페이지 시술후기 상세 이미지파일 저장"); - insertMap.put("service", "procedureReviewService"); - insertMap.put("serviceName", "홈페이지 시술후기 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } - } - log.debug("ProcedureReviewController putProcedureReviewFile END"); - return HttpUtil.makeHashToJsonModelAndView(map); + public ProcedureReviewDTO putProcedureReviewFile(@RequestParam(value = "file", required = false) MultipartFile file, + @ModelAttribute ProcedureReviewDTO paramDTO) throws Exception { + return procedureReviewService.putProcedureReviewFile(file, paramDTO); } @RequestMapping(value = "/procedureReview/moveProcedureReviewInsert.do") - public String moveProcedureReviewInsert(HttpSession session, HttpServletRequest request, - HttpServletResponse response, - Model model) { - log.debug("ProcedureReviewController moveProcedureReviewInsert START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.selectProcedureReviewInsertIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } - } catch (Exception e) { - e.printStackTrace(); - return "/web/login/logout"; - } - log.debug("ProcedureReviewController moveProcedureReviewInsert END"); - return "/crm/procedureReview/procedureReviewInsert"; + public ModelAndView moveProcedureReviewInsert() throws Exception { + return new ModelAndView("/crm/procedureReview/procedureReviewInsert"); } @RequestMapping(value = "/procedureReview/putProcedureReview.do") - public ModelAndView putProcedureReview(HttpSession session, HttpServletRequest request, - HttpServletResponse response) { - log.debug("ProcedureReviewController putProcedureReview START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - StringBuffer errorMsg = new StringBuffer(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.insertProcedureReview(paramMap); - } - } catch (Exception e) { - e.printStackTrace(); - errorMsg.append(e); - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/procedureReview/putProcedureReview.do"); - insertMap.put("func", "putProcedureReview"); - insertMap.put("funcName", "홈페이지 시술후기 등록"); - insertMap.put("service", "procedureReviewService"); - insertMap.put("serviceName", "홈페이지 시술후기 등록"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } - } - log.debug("ProcedureReviewController putProcedureReview END"); - return HttpUtil.makeHashToJsonModelAndView(map); + public ProcedureReviewDTO putProcedureReview(@RequestBody ProcedureReviewDTO paramDTO) throws Exception { + return procedureReviewService.putProcedureReview(paramDTO); } @RequestMapping(value = "/procedureReview/moveProcedureReviewUpdate.do") - public String moveProcedureReviewUpdate(HttpSession session, HttpServletRequest request, - HttpServletResponse response, - Model model) { - log.debug("ProcedureReviewController moveProcedureReviewUpdate START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - try { - if (!webCheckLogin(session)) { - return "/web/login/logout"; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.selectProcedureReviewUpdateIntro(paramMap); - - model.addAttribute("selectUseYn", map.get("selectUseYn")); - model.addAttribute("insertUseYn", map.get("insertUseYn")); - model.addAttribute("updateUseYn", map.get("updateUseYn")); - model.addAttribute("deleteUseYn", map.get("deleteUseYn")); - model.addAttribute("downloadUseYn", map.get("downloadUseYn")); - model.addAttribute("categorylist", map.get("categorylist")); - } - } catch (Exception e) { - e.printStackTrace(); - return "/web/login/logout"; - } - log.debug("ProcedureReviewController moveProcedureReviewUpdate END"); - return "/crm/procedureReview/procedureReviewUpdate"; + public ModelAndView moveProcedureReviewUpdate() throws Exception { + return new ModelAndView("/crm/procedureReview/procedureReviewUpdate"); } @RequestMapping(value = "/procedureReview/modProcedureReview.do") - public ModelAndView modProcedureReview(HttpSession session, HttpServletRequest request, - HttpServletResponse response) { - log.debug("ProcedureReviewController modProcedureReview START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - StringBuffer errorMsg = new StringBuffer(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.updateProcedureReview(paramMap); - } - } catch (Exception e) { - e.printStackTrace(); - errorMsg.append(e); - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/procedureReview/modProcedureReview.do"); - insertMap.put("func", "modProcedureReview"); - insertMap.put("funcName", "홈페이지 시술후기 수정"); - insertMap.put("service", "procedureReviewService"); - insertMap.put("serviceName", "홈페이지 시술후기 수정"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } - } - log.debug("ProcedureReviewController modProcedureReview END"); - return HttpUtil.makeHashToJsonModelAndView(map); + public ProcedureReviewDTO modProcedureReview(@RequestBody ProcedureReviewDTO paramDTO) throws Exception { + return procedureReviewService.modProcedureReview(paramDTO); } @RequestMapping(value = "/procedureReview/delProcedureReview.do") - public ModelAndView delProcedureReview(HttpSession session, HttpServletRequest request, - HttpServletResponse response) { - log.debug("ProcedureReviewController delProcedureReview START"); - - HashMap paramMap = HttpUtil.getParameterMap(request); - HashMap map = new HashMap(); - - StringBuffer errorMsg = new StringBuffer(); - - try { - if (!webCheckLogin(session)) { - return null; - } else { - paramMap.put("loginMemberId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("regId", String.valueOf(session.getAttribute("loginMemberId"))); - paramMap.put("modId", String.valueOf(session.getAttribute("loginMemberId"))); - map = procedureReviewService.deleteProcedureReview(paramMap); - } - } catch (Exception e) { - e.printStackTrace(); - errorMsg.append(e); - } finally { - if (Constants.OK == map.get("msgCode")) { - - } else { - map.put("msgCode", Constants.FAIL); - map.put("success", false); - if (null == map.get("msgDesc") || ("").equals(map.get("msgDesc"))) { - map.put("msgDesc", "정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다."); - } - } - - try { - HashMap visitLogParamMap = RequestLogUtil.getVisitLogParameterMap(request); - HashMap insertMap = new HashMap(); - - insertMap.put("url", "/procedureReview/delProcedureReview.do"); - insertMap.put("func", "delProcedureReview"); - insertMap.put("funcName", "홈페이지 시술후기 삭제"); - insertMap.put("service", "procedureReviewService"); - insertMap.put("serviceName", "홈페이지 시술후기 삭제"); - insertMap.put("requestValue", String.valueOf(paramMap)); - insertMap.put("responseValue", String.valueOf(map)); - insertMap.put("tId", map.get("tId")); - if ((String.valueOf(errorMsg)).equals("") || (String.valueOf(errorMsg) == null) - || String.valueOf(errorMsg).length() == 0) { - insertMap.put("resultCode", "SUCCESS"); - } else { - insertMap.put("resultCode", "ERROR"); - } - insertMap.put("resultMsg", String.valueOf(errorMsg)); - insertMap.put("muMemberId", paramMap.get("loginMemberId")); - - webLogHistoryService.insertLogHistory(insertMap, visitLogParamMap); - } catch (Exception e) { - e.printStackTrace(); - } - } - log.debug("ProcedureReviewController delProcedureReview END"); - return HttpUtil.makeHashToJsonModelAndView(map); + public ProcedureReviewDTO delProcedureReview(@RequestBody ProcedureReviewDTO paramDTO) throws Exception { + return procedureReviewService.delProcedureReview(paramDTO); } } diff --git a/src/main/java/com/madeu/crm/procedureReview/dto/ProcedureReviewDTO.java b/src/main/java/com/madeu/crm/procedureReview/dto/ProcedureReviewDTO.java index 5a23e4b..102e157 100644 --- a/src/main/java/com/madeu/crm/procedureReview/dto/ProcedureReviewDTO.java +++ b/src/main/java/com/madeu/crm/procedureReview/dto/ProcedureReviewDTO.java @@ -4,6 +4,42 @@ import lombok.Data; @Data public class ProcedureReviewDTO { - // WebPhotoDiet uses HashMap for data transfer, creating this DTO as placeholder - // to follow project conventions. + // DB Column mapping + private String id; // selectKey 자동생성 ID + private String categoryDivCd; + private String muProcedureReviewId; + private String muMemberId; + private String categoryNo; + private String title; + private String content; + private String hashtag; + private Integer viewCount; + private String useYn; + private String regId; + private String regDate; + private String modId; + private String modDate; + + // Search & UI Variables + private String rowNum; // 조회 결과 행번호 + private String writeDate; // 조회 결과 등록일 + private String writeName; + private String startDate; + private String endDate; + private String dateType; + private Integer start; + private Integer limit; + private String sort; + private String dir; + + // Access & Logic variables + private String loginMemberId; + + // Response Mapping Variables + private String msgCode; + private String msgDesc; + private String success; + private int totalCount; + private Object rows; + private String tId; } diff --git a/src/main/java/com/madeu/crm/procedureReview/mapper/ProcedureReviewMapper.java b/src/main/java/com/madeu/crm/procedureReview/mapper/ProcedureReviewMapper.java index 5be132c..8f06a65 100644 --- a/src/main/java/com/madeu/crm/procedureReview/mapper/ProcedureReviewMapper.java +++ b/src/main/java/com/madeu/crm/procedureReview/mapper/ProcedureReviewMapper.java @@ -1,97 +1,27 @@ package com.madeu.crm.procedureReview.mapper; -import jakarta.annotation.PostConstruct; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.support.SqlSessionDaoSupport; -import org.springframework.beans.factory.annotation.Autowired; +import org.apache.ibatis.annotations.Mapper; import org.springframework.dao.DataAccessException; -import org.springframework.stereotype.Repository; -import java.util.HashMap; +import com.madeu.crm.procedureReview.dto.ProcedureReviewDTO; import java.util.List; import java.util.Map; -@Repository -public class ProcedureReviewMapper extends SqlSessionDaoSupport { +@Mapper +public interface ProcedureReviewMapper { - @Autowired - private SqlSessionTemplate sqlSessionTemplate; + List selectTotalProcedureReviewCount(ProcedureReviewDTO paramDTO) throws DataAccessException; - @PostConstruct - void init() { - setSqlSessionTemplate(sqlSessionTemplate); - } + List selectListProcedureReview(ProcedureReviewDTO paramDTO) throws DataAccessException; - public List> selectTotalProcedureReviewCount(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper selectTotalProcedureReviewCount START"); - String sqlId = "ProcedureReview.selectTotalProcedureReviewCount"; - logger.debug("ProcedureReviewMapper selectTotalProcedureReviewCount END"); - return getSqlSession().selectList(sqlId, paramMap); - } + ProcedureReviewDTO selectProcedureReview(ProcedureReviewDTO paramDTO) throws DataAccessException; - public List> selectListProcedureReview(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper selectListProcedureReview START"); - String sqlId = "ProcedureReview.selectListProcedureReview"; - logger.debug("ProcedureReviewMapper selectListProcedureReview END"); - return getSqlSession().selectList(sqlId, paramMap); - } + int insertProcedureReview(ProcedureReviewDTO paramDTO) throws DataAccessException; - public List> selectProcedureReview(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper selectProcedureReview START"); - String sqlId = "ProcedureReview.selectProcedureReview"; - logger.debug("ProcedureReviewMapper selectProcedureReview END"); - return getSqlSession().selectList(sqlId, paramMap); - } + int updateProcedureReview(ProcedureReviewDTO paramDTO) throws DataAccessException; - public int insertProcedureReview(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper insertProcedureReview START"); - String sqlId = "ProcedureReview.insertProcedureReview"; - logger.debug("ProcedureReviewMapper insertProcedureReview END"); - return getSqlSession().insert(sqlId, paramMap); - } + int deleteProcedureReview(ProcedureReviewDTO paramDTO) throws DataAccessException; - public int updateProcedureReview(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper updateProcedureReview START"); - String sqlId = "ProcedureReview.updateProcedureReview"; - logger.debug("ProcedureReviewMapper updateProcedureReview END"); - return getSqlSession().update(sqlId, paramMap); - } - - public int deleteProcedureReview(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper deleteProcedureReview START"); - String sqlId = "ProcedureReview.deleteProcedureReview"; - logger.debug("ProcedureReviewMapper deleteProcedureReview END"); - return getSqlSession().update(sqlId, paramMap); - } - - public List> selectListPhotoCategory(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper selectListPhotoCategory START"); - String sqlId = "ProcedureReview.selectListPhotoCategory"; - logger.debug("ProcedureReviewMapper selectListPhotoCategory END"); - return getSqlSession().selectList(sqlId, paramMap); - } - - public int insertProcedureReviewBeforeFile(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper insertProcedureReviewBeforeFile START"); - String sqlId = "ProcedureReview.insertProcedureReviewBeforeFile"; - logger.debug("ProcedureReviewMapper insertProcedureReviewBeforeFile END"); - return getSqlSession().insert(sqlId, paramMap); - } - - public int insertProcedureReviewAfterFile(HashMap paramMap) - throws DataAccessException { - logger.debug("ProcedureReviewMapper insertProcedureReviewAfterFile START"); - String sqlId = "ProcedureReview.insertProcedureReviewAfterFile"; - logger.debug("ProcedureReviewMapper insertProcedureReviewAfterFile END"); - return getSqlSession().insert(sqlId, paramMap); - } + List> selectListPhotoCategory(ProcedureReviewDTO paramDTO) throws DataAccessException; } diff --git a/src/main/java/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java b/src/main/java/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java index ae60ecf..6e7a168 100644 --- a/src/main/java/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java +++ b/src/main/java/com/madeu/crm/procedureReview/svc/ProcedureReviewService.java @@ -1,728 +1,263 @@ package com.madeu.crm.procedureReview.svc; import com.madeu.constants.Constants; +import com.madeu.crm.procedureReview.dto.ProcedureReviewDTO; import com.madeu.crm.procedureReview.mapper.ProcedureReviewMapper; -import com.madeu.dao.web.webauthmenurelation.WebAuthMenuRelationSqlMapDAO; -import com.madeu.dao.web.webmember.WebMemberSqlMapDAO; -import com.madeu.common.service.AttachFileService; -import com.madeu.util.ValidationCheckUtil; +import com.madeu.common.service.LogHistoryService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.MessageSource; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + import org.springframework.web.multipart.MultipartFile; -import java.text.SimpleDateFormat; +import java.io.File; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; @Slf4j @Service("ProcedureReviewService") public class ProcedureReviewService { + @Autowired + private HttpServletRequest request; + + @Autowired + private HttpSession session; + @Autowired private ProcedureReviewMapper procedureReviewMapper; @Autowired - private WebMemberSqlMapDAO webMemberSqlMapDAO; + private LogHistoryService logHistoryService; @Autowired - private WebAuthMenuRelationSqlMapDAO webAuthMenuRelationSqlMapDAO; + private MessageSource messageSource; - @Autowired - private AttachFileService afs; + @Value("${file.upload-path}") + private String procedureReviewPath; @Value("${url.cdn}") String CDN_URL; - public HashMap selectProcedureReviewListIntro( - HashMap paramMap) throws Exception { - log.debug("ProcedureReviewService selectProcedureReviewListIntro START"); - - HashMap map = new HashMap(); + /** 메시지 코드 → 문자열 변환 헬퍼 */ + private String msg(String code) { + return messageSource.getMessage(code, null, Locale.getDefault()); + } + public ProcedureReviewDTO getProcedureReviewList(ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); try { - boolean check = true; - - String menuClass = String.valueOf(paramMap.get("menuClass")); - - if (true != ValidationCheckUtil.emptyCheck(menuClass)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "메뉴 정보가 없습니다."); - } - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); + String selectUseYn = (String) request.getAttribute("selectUseYn"); + if ("Y".equals(selectUseYn)) { + if (dto.getDir() != null && "B".equals(dto.getDir())) { + dto.setDir("ASC"); } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); + dto.setDir("DESC"); } - } + dto.setUseYn("Y"); - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); - int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); + List countList = procedureReviewMapper.selectTotalProcedureReviewCount(dto); + int total = countList.get(0).getTotalCount(); - if (1 == authMenuRelationlistMapSize) { - map.put("msgCode", Constants.OK); - map.put("success", "true"); - - map.put("selectUseYn", authMenuRelationlistMap.get(0).get("selectUseYn")); - map.put("insertUseYn", authMenuRelationlistMap.get(0).get("insertUseYn")); - map.put("updateUseYn", authMenuRelationlistMap.get(0).get("updateUseYn")); - map.put("deleteUseYn", authMenuRelationlistMap.get(0).get("deleteUseYn")); - map.put("downloadUseYn", authMenuRelationlistMap.get(0).get("downloadUseYn")); + dto.setTotalCount(total); + if (total > 0) { + dto.setRows(procedureReviewMapper.selectListProcedureReview(dto)); } else { - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); + dto.setRows(new ArrayList<>()); } + dto.setMsgCode(Constants.OK); + dto.setSuccess("true"); + } else { + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("auth.error.select")); } } catch (Exception e) { - e.printStackTrace(); - throw e; + log.error("Error in getProcedureReviewList", e); + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("error.select")); } - log.debug("ProcedureReviewService selectProcedureReviewListIntro END"); - return map; + return dto; } - public HashMap selectListProcedureReview( - HashMap paramMap) throws Exception { - log.debug("ProcedureReviewService selectListProcedureReview START"); - - HashMap map = new HashMap(); - - List> listMap = new ArrayList>(); - + public ProcedureReviewDTO getProcedureReview(ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); try { - boolean check = true; - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); - } + if (dto.getMuProcedureReviewId() == null || dto.getMuProcedureReviewId().trim().isEmpty()) { + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("procedureReview.error.noData")); + return dto; } - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); - - if (1 == authMenuRelationlistMap.size()) { - - if (("Y").equals(authMenuRelationlistMap.get(0).get("selectUseYn"))) { - - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "조회 권한 정보가 없습니다."); - } - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); - } - } - - paramMap.put("categoryDivCd", "07"); - - if (true == check) { - if (null == paramMap.get("procedureReviewDir") || ("").equals(paramMap.get("procedureReviewDir"))) { - - } else { - String dir = String.valueOf(paramMap.get("procedureReviewDir")); - if (("A").equals(dir)) { - paramMap.put("procedureReviewDir", "DESC"); - } else if (("B").equals(dir)) { - paramMap.put("procedureReviewDir", "ASC"); - } else { - paramMap.put("procedureReviewDir", "DESC"); - } - } - - paramMap.put("useYn", "Y"); - - List> totalCountListMap = procedureReviewMapper - .selectTotalProcedureReviewCount(paramMap); - int totalCount = Integer.parseInt(String.valueOf(totalCountListMap.get(0).get("totalCount"))); - - if (0 < totalCount) { - listMap = procedureReviewMapper.selectListProcedureReview(paramMap); - } - - map.put("msgCode", Constants.OK); - map.put("success", "true"); - map.put("totalCount", totalCount); - map.put("rows", listMap); + String selectUseYn = (String) request.getAttribute("selectUseYn"); + if ("Y".equals(selectUseYn)) { + ProcedureReviewDTO res = procedureReviewMapper.selectProcedureReview(dto); + dto.setRows(res); + dto.setMsgCode(Constants.OK); + dto.setSuccess("true"); + } else { + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("auth.error.select")); } } catch (Exception e) { - e.printStackTrace(); - throw e; + log.error("Error in getProcedureReview", e); + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("error.select")); } - log.debug("ProcedureReviewService selectListProcedureReview END"); - return map; + return dto; } - public HashMap selectProcedureReview( - HashMap paramMap) throws Exception { - log.debug("ProcedureReviewService selectProcedureReview START"); + public ProcedureReviewDTO getCategoryList(ProcedureReviewDTO dto) { + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + try { + dto.setCategoryDivCd("07"); + List> cats = procedureReviewMapper.selectListPhotoCategory(dto); + dto.setRows(cats); + dto.setMsgCode(Constants.OK); + dto.setSuccess("true"); + } catch (Exception e) { + log.error("Error in getCategoryList", e); + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("procedureReview.category.error")); + } + return dto; + } - HashMap map = new HashMap(); + @Transactional(rollbackFor = { Exception.class }) + public ProcedureReviewDTO putProcedureReviewFile(MultipartFile file, ProcedureReviewDTO dto) { + String errorMsg = ""; + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + dto.setRegId(dto.getLoginMemberId()); + dto.setModId(dto.getLoginMemberId()); try { - boolean check = true; - String muProcedureReviewId = String.valueOf(paramMap.get("muProcedureReviewId")); + String insertUseYn = (String) request.getAttribute("insertUseYn"); + if ("Y".equals(insertUseYn) && file != null && !file.isEmpty()) { + String ext = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String savedName = UUID.randomUUID().toString() + ext; + String folder = "/procedureReview/" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + + "/"; - if (true != ValidationCheckUtil.emptyCheck(muProcedureReviewId)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "시술후기 정보가 없습니다."); - } - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); + File outDir = new File(procedureReviewPath + folder); + if (!outDir.exists()) { + outDir.mkdirs(); } - } - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); + File dest = new File(outDir, savedName); + file.transferTo(dest.toPath().toAbsolutePath()); - if (1 == authMenuRelationlistMap.size()) { + HashMap resultRow = new HashMap<>(); + resultRow.put("filePath", CDN_URL + folder + savedName); - if (("Y").equals(authMenuRelationlistMap.get(0).get("selectUseYn"))) { - - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "조회 권한 정보가 없습니다."); - } - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); - } - } - - if (true == check) { - List> listMap = procedureReviewMapper.selectProcedureReview(paramMap); - - map.put("msgCode", Constants.OK); - map.put("success", "true"); - map.put("rows", listMap); + dto.setRows(resultRow); + dto.setMsgCode(Constants.OK); + dto.setSuccess("true"); + dto.setMsgDesc(msg("success.insert")); + } else { + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("auth.error.noAuthOrEmpty")); } } catch (Exception e) { - e.printStackTrace(); - throw e; + log.error("Error in putProcedureReviewFile", e); + errorMsg = e.toString(); + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("error.insert")); } - log.debug("ProcedureReviewService selectProcedureReview END"); - return map; + logHistoryService.save("홈페이지 시술후기 이미지파일 저장", "홈페이지 시술후기 등록", dto, dto, errorMsg); + return dto; } - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRES_NEW) - public HashMap insertProcedureReviewFile( - HashMap paramMap, MultipartFile file) throws Exception { - log.debug("ProcedureReviewService insertProcedureReviewFile START"); - - HashMap map = new HashMap(); + @Transactional(rollbackFor = { Exception.class }) + public ProcedureReviewDTO putProcedureReview(ProcedureReviewDTO dto) { + String errorMsg = ""; + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + dto.setMuMemberId(dto.getLoginMemberId()); + dto.setRegId(dto.getLoginMemberId()); + dto.setModId(dto.getLoginMemberId()); try { - boolean check = true; - String tId = String.valueOf(System.currentTimeMillis()); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Calendar c1 = Calendar.getInstance(); - String tDate = sdf.format(c1.getTime()); - - if (null == file || file.isEmpty()) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "이미지 정보가 없습니다."); - } - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); - } - } - - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); - int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); - - if (1 == authMenuRelationlistMapSize) { - - if (("Y").equals(authMenuRelationlistMap.get(0).get("insertUseYn"))) { - - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "등록 권한 정보가 없습니다."); - } - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); - } - } - - if (true == check) { - if (null != file && !file.isEmpty()) { - Map fileMap = afs.saveAttachFile("img", file); - String filePath = String.valueOf(fileMap.get("filePath")); - String fileName = String.valueOf(fileMap.get("attachfileNm")); - String chgFileName = String.valueOf(fileMap.get("orgAttachfileNm")); - - String formattedCdnUrl = CDN_URL.endsWith("/") ? CDN_URL : CDN_URL + "/"; - paramMap.put("filePath", formattedCdnUrl + filePath); - paramMap.put("fileName", fileName); - paramMap.put("originalFileName", chgFileName); - paramMap.put("attachfileId", fileMap.get("attachfileId")); - } - paramMap.put("tDate", tDate); - paramMap.put("tId", tId); - - map.put("rows", paramMap); - map.put("msgCode", Constants.OK); - map.put("msgDesc", "등록되었습니다."); + String insertUseYn = (String) request.getAttribute("insertUseYn"); + if ("Y".equals(insertUseYn)) { + procedureReviewMapper.insertProcedureReview(dto); + dto.setMsgCode(Constants.OK); + dto.setSuccess("true"); + dto.setMsgDesc(msg("success.insert")); + } else { + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("auth.error.noAuth")); } } catch (Exception e) { - e.printStackTrace(); - throw e; + log.error("Error in putProcedureReview", e); + errorMsg = e.toString(); + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("error.insert")); } - log.debug("ProcedureReviewService insertProcedureReviewFile END"); - return map; + logHistoryService.save("홈페이지 시술후기 등록", "홈페이지 시술후기 등록", dto, dto, errorMsg); + return dto; } - public HashMap selectListCategory(HashMap paramMap) throws Exception { - HashMap map = new HashMap(); - paramMap.put("categoryDivCd", "07"); - List> listMap = procedureReviewMapper.selectListPhotoCategory(paramMap); - map.put("msgCode", Constants.OK); - map.put("rows", listMap); - return map; - } - - public HashMap selectProcedureReviewInsertIntro( - HashMap paramMap) throws Exception { - log.debug("ProcedureReviewService selectProcedureReviewInsertIntro START"); - - HashMap map = new HashMap(); + @Transactional(rollbackFor = { Exception.class }) + public ProcedureReviewDTO modProcedureReview(ProcedureReviewDTO dto) { + String errorMsg = ""; + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + dto.setRegId(dto.getLoginMemberId()); + dto.setModId(dto.getLoginMemberId()); try { - boolean check = true; - - String menuClass = String.valueOf(paramMap.get("menuClass")); - - if (true != ValidationCheckUtil.emptyCheck(menuClass)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "메뉴 정보가 없습니다."); + String updateUseYn = (String) request.getAttribute("updateUseYn"); + if ("Y".equals(updateUseYn)) { + procedureReviewMapper.updateProcedureReview(dto); + dto.setMsgCode(Constants.OK); + dto.setSuccess("true"); + dto.setMsgDesc(msg("success.update")); + } else { + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("auth.error.noAuth")); } - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); - } - } - - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); - int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); - - if (1 == authMenuRelationlistMapSize) { - map.put("msgCode", Constants.OK); - map.put("success", "true"); - - map.put("selectUseYn", authMenuRelationlistMap.get(0).get("selectUseYn")); - map.put("insertUseYn", authMenuRelationlistMap.get(0).get("insertUseYn")); - map.put("updateUseYn", authMenuRelationlistMap.get(0).get("updateUseYn")); - map.put("deleteUseYn", authMenuRelationlistMap.get(0).get("deleteUseYn")); - map.put("downloadUseYn", authMenuRelationlistMap.get(0).get("downloadUseYn")); - } else { - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); - } - } - paramMap.put("categoryDivCd", "07"); - List> listMap = procedureReviewMapper.selectListPhotoCategory(paramMap); - map.put("categorylist", listMap); } catch (Exception e) { - e.printStackTrace(); - throw e; + log.error("Error in modProcedureReview", e); + errorMsg = e.toString(); + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("error.update")); } - log.debug("ProcedureReviewService selectProcedureReviewInsertIntro END"); - return map; + logHistoryService.save("홈페이지 시술후기 수정", "홈페이지 시술후기 수정", dto, dto, errorMsg); + return dto; } - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRES_NEW) - public HashMap insertProcedureReview( - HashMap paramMap) throws Exception { - log.debug("ProcedureReviewService insertProcedureReview START"); - - HashMap map = new HashMap(); + @Transactional(rollbackFor = { Exception.class }) + public ProcedureReviewDTO delProcedureReview(ProcedureReviewDTO dto) { + String errorMsg = ""; + dto.setLoginMemberId(String.valueOf(session.getAttribute("loginMemberId"))); + dto.setRegId(dto.getLoginMemberId()); + dto.setModId(dto.getLoginMemberId()); try { - boolean check = true; - String tId = String.valueOf(System.currentTimeMillis()); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Calendar c1 = Calendar.getInstance(); - String tDate = sdf.format(c1.getTime()); - - String title = String.valueOf(paramMap.get("title")); - String content = String.valueOf(paramMap.get("content")); - String isEncoded = String.valueOf(paramMap.get("isEncoded")); - if ("Y".equals(isEncoded) && content != null) { - try { - byte[] decodedBytes = java.util.Base64.getDecoder().decode(content); - content = java.net.URLDecoder.decode(new String(decodedBytes, "UTF-8"), "UTF-8"); - paramMap.put("content", content); - } catch (Exception e) { - e.printStackTrace(); + String deleteUseYn = (String) request.getAttribute("deleteUseYn"); + if ("Y".equals(deleteUseYn)) { + String[] ids = dto.getMuProcedureReviewId().split(","); + for (String id : ids) { + dto.setMuProcedureReviewId(id.trim()); + procedureReviewMapper.deleteProcedureReview(dto); } - } - - if (true != ValidationCheckUtil.emptyCheck(title)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "제목 정보가 없습니다."); - } - - if (true != ValidationCheckUtil.emptyCheck(content)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "시술후기 상세 정보가 없습니다."); - } - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); - } - } - - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); - int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); - - if (1 == authMenuRelationlistMapSize) { - if (("Y").equals(authMenuRelationlistMap.get(0).get("insertUseYn"))) { - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "등록 권한 정보가 없습니다."); - } - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); - } - } - - if (true == check) { - paramMap.put("tDate", tDate); - paramMap.put("tId", tId); - paramMap.put("muMemberId", paramMap.get("loginMemberId")); - procedureReviewMapper.insertProcedureReview(paramMap); - paramMap.put("muProcedureReviewId", paramMap.get("id")); - map.put("muProcedureReviewId", paramMap.get("muProcedureReviewId")); - map.put("msgCode", Constants.OK); - map.put("msgDesc", "등록되었습니다."); + dto.setMsgCode(Constants.OK); + dto.setSuccess("true"); + dto.setMsgDesc(msg("success.delete")); + } else { + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("auth.error.delete")); } } catch (Exception e) { - e.printStackTrace(); - throw e; + log.error("Error in delProcedureReview", e); + errorMsg = e.toString(); + dto.setMsgCode(Constants.FAIL); + dto.setMsgDesc(msg("error.delete")); } - log.debug("ProcedureReviewService insertProcedureReview END"); - return map; + logHistoryService.save("홈페이지 시술후기 삭제", "홈페이지 시술후기 삭제", dto, dto, errorMsg); + return dto; } - - public HashMap selectProcedureReviewUpdateIntro( - HashMap paramMap) throws Exception { - log.debug("ProcedureReviewService selectProcedureReviewUpdateIntro START"); - - HashMap map = new HashMap(); - - try { - boolean check = true; - - String menuClass = String.valueOf(paramMap.get("menuClass")); - - if (true != ValidationCheckUtil.emptyCheck(menuClass)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "메뉴 정보가 없습니다."); - } - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); - } - } - - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); - int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); - - if (1 == authMenuRelationlistMapSize) { - map.put("msgCode", Constants.OK); - map.put("success", "true"); - - map.put("selectUseYn", authMenuRelationlistMap.get(0).get("selectUseYn")); - map.put("insertUseYn", authMenuRelationlistMap.get(0).get("insertUseYn")); - map.put("updateUseYn", authMenuRelationlistMap.get(0).get("updateUseYn")); - map.put("deleteUseYn", authMenuRelationlistMap.get(0).get("deleteUseYn")); - map.put("downloadUseYn", authMenuRelationlistMap.get(0).get("downloadUseYn")); - } else { - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); - } - } - paramMap.put("categoryDivCd", "07"); - List> listMap = procedureReviewMapper.selectListPhotoCategory(paramMap); - map.put("categorylist", listMap); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - log.debug("ProcedureReviewService selectProcedureReviewUpdateIntro END"); - return map; - } - - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRES_NEW) - public HashMap updateProcedureReview( - HashMap paramMap) throws Exception { - log.debug("ProcedureReviewService updateProcedureReview START"); - - HashMap map = new HashMap(); - - try { - boolean check = true; - - String muProcedureReviewId = String.valueOf(paramMap.get("muProcedureReviewId")); - String title = String.valueOf(paramMap.get("title")); - String content = String.valueOf(paramMap.get("content")); - String isEncoded = String.valueOf(paramMap.get("isEncoded")); - if ("Y".equals(isEncoded) && content != null) { - try { - byte[] decodedBytes = java.util.Base64.getDecoder().decode(content); - content = java.net.URLDecoder.decode(new String(decodedBytes, "UTF-8"), "UTF-8"); - paramMap.put("content", content); - } catch (Exception e) { - e.printStackTrace(); - } - } - - if (true != ValidationCheckUtil.emptyCheck(muProcedureReviewId)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "시술후기 식별자 정보가 없습니다."); - } - - if (true != ValidationCheckUtil.emptyCheck(title)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "제목 정보가 없습니다."); - } - - if (true != ValidationCheckUtil.emptyCheck(content)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "시술후기 상세 정보가 없습니다."); - } - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); - } - } - - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); - int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); - - if (1 == authMenuRelationlistMapSize) { - - if (("Y").equals(authMenuRelationlistMap.get(0).get("updateUseYn"))) { - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "수정 권한 정보가 없습니다."); - } - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); - } - } - - if (true == check) { - procedureReviewMapper.updateProcedureReview(paramMap); - map.put("msgCode", Constants.OK); - map.put("msgDesc", "수정되었습니다."); - } - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - log.debug("ProcedureReviewService updateProcedureReview END"); - return map; - } - - public HashMap deleteProcedureReview( - HashMap paramMap) throws Exception { - log.debug("ProcedureReviewService deleteProcedureReview START"); - - HashMap map = new HashMap(); - - try { - boolean check = true; - - String muProcedureReviewId = String.valueOf(paramMap.get("muProcedureReviewId")); - - if (true != ValidationCheckUtil.emptyCheck(muProcedureReviewId)) { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "시술후기 식별자 정보가 없습니다."); - } - - if (true == check) { - List> userListMap = webMemberSqlMapDAO.checkMember(paramMap); - int userListMapSize = userListMap.size(); - - if (1 == userListMapSize) { - paramMap.put("menuClassAuthId", userListMap.get(0).get("muAuthId")); - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "사용자 정보가 올바르지 않습니다."); - } - } - - if (true == check) { - HashMap authCheckParamMap = new HashMap(); - authCheckParamMap.put("menuClass", paramMap.get("menuClass")); - authCheckParamMap.put("muAuthId", paramMap.get("menuClassAuthId")); - List> authMenuRelationlistMap = webAuthMenuRelationSqlMapDAO - .selectAuthMenuRelation(authCheckParamMap); - int authMenuRelationlistMapSize = authMenuRelationlistMap.size(); - - if (1 == authMenuRelationlistMapSize) { - - if (("Y").equals(authMenuRelationlistMap.get(0).get("deleteUseYn"))) { - - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "삭제 권한 정보가 없습니다."); - } - } else { - check = false; - map.put("msgCode", Constants.FAIL); - map.put("msgDesc", "권한 정보가 없습니다."); - } - } - - String muProcedureReviewIdStr = String.valueOf(paramMap.get("muProcedureReviewId")); - if (true == check) { - String[] idArray = muProcedureReviewIdStr.split(","); - for (String id : idArray) { - paramMap.put("muProcedureReviewId", id.trim()); - procedureReviewMapper.deleteProcedureReview(paramMap); - } - - map.put("msgCode", Constants.OK); - map.put("msgDesc", "삭제되었습니다."); - } - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - log.debug("ProcedureReviewService deleteProcedureReview END"); - return map; - } - } diff --git a/src/main/java/com/madeu/filter/CachedBodyRequestWrapper.java b/src/main/java/com/madeu/filter/CachedBodyRequestWrapper.java new file mode 100644 index 0000000..745ccf1 --- /dev/null +++ b/src/main/java/com/madeu/filter/CachedBodyRequestWrapper.java @@ -0,0 +1,62 @@ +package com.madeu.filter; + +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; + +import java.io.*; + +public class CachedBodyRequestWrapper extends HttpServletRequestWrapper { + + private final byte[] cachedBody; + + public CachedBodyRequestWrapper(HttpServletRequest request) throws IOException { + super(request); + InputStream requestInputStream = request.getInputStream(); + this.cachedBody = requestInputStream.readAllBytes(); + } + + @Override + public ServletInputStream getInputStream() { + return new CachedBodyServletInputStream(this.cachedBody); + } + + @Override + public BufferedReader getReader() { + ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(this.cachedBody); + return new BufferedReader(new InputStreamReader(byteArrayInputStream)); + } + + public byte[] getCachedBody() { + return cachedBody; + } + + private static class CachedBodyServletInputStream extends ServletInputStream { + private final ByteArrayInputStream inputStream; + + public CachedBodyServletInputStream(byte[] cachedBody) { + this.inputStream = new ByteArrayInputStream(cachedBody); + } + + @Override + public boolean isFinished() { + return inputStream.available() == 0; + } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setReadListener(ReadListener listener) { + throw new UnsupportedOperationException(); + } + + @Override + public int read() { + return inputStream.read(); + } + } +} diff --git a/src/main/java/com/madeu/filter/RequestCachingFilter.java b/src/main/java/com/madeu/filter/RequestCachingFilter.java new file mode 100644 index 0000000..2ed00eb --- /dev/null +++ b/src/main/java/com/madeu/filter/RequestCachingFilter.java @@ -0,0 +1,29 @@ +package com.madeu.filter; + +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +public class RequestCachingFilter implements Filter { + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + if (request instanceof HttpServletRequest) { + String contentType = request.getContentType(); + // JSON 요청만 래핑 (body에서 menuClass 파싱 필요) + if (contentType != null && contentType.toLowerCase().contains("application/json")) { + CachedBodyRequestWrapper wrappingRequest = new CachedBodyRequestWrapper( + (HttpServletRequest) request); + chain.doFilter(wrappingRequest, response); + } else { + chain.doFilter(request, response); + } + } else { + chain.doFilter(request, response); + } + } +} diff --git a/src/main/java/com/madeu/interceptor/WebLoginInterceptor.java b/src/main/java/com/madeu/interceptor/WebLoginInterceptor.java new file mode 100644 index 0000000..eb4302f --- /dev/null +++ b/src/main/java/com/madeu/interceptor/WebLoginInterceptor.java @@ -0,0 +1,125 @@ +package com.madeu.interceptor; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.beans.factory.annotation.Autowired; +import com.madeu.dao.web.webauthmenurelation.WebAuthMenuRelationSqlMapDAO; +import com.madeu.dao.web.webmember.WebMemberSqlMapDAO; +import com.madeu.filter.CachedBodyRequestWrapper; +import org.springframework.web.servlet.ModelAndView; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Slf4j +@Component +public class WebLoginInterceptor implements HandlerInterceptor { + + @Autowired + private WebMemberSqlMapDAO webMemberSqlMapDAO; + + @Autowired + private WebAuthMenuRelationSqlMapDAO webAuthMenuRelationSqlMapDAO; + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) + throws Exception { + HttpSession session = request.getSession(false); + + if (session == null) { + response.sendRedirect("/web/login/logout"); + return false; + } + + String loginMemberId = (String) session.getAttribute("loginMemberId"); + String loginId = (String) session.getAttribute("loginId"); + String loginName = (String) session.getAttribute("loginName"); + + log.debug("======================== USER CHECKLOGIN START ========================="); + log.debug(" loginMemberId : " + loginMemberId); + log.debug(" loginId : " + loginId); + log.debug(" loginName : " + loginName); + log.debug("======================== USER CHECKLOGIN END ==========================="); + + if (loginMemberId == null || loginMemberId.isEmpty()) { + response.sendRedirect("/web/login/logout"); + return false; + } + + // 권한 체크 시작 + String menuClass = request.getParameter("menuClass"); + + // Body (JSON) 에서 menuClass 파싱 시도 + if (menuClass == null || menuClass.isEmpty()) { + if (request instanceof CachedBodyRequestWrapper) { + CachedBodyRequestWrapper wrapper = (CachedBodyRequestWrapper) request; + String body = new String(wrapper.getCachedBody(), + request.getCharacterEncoding() != null ? request.getCharacterEncoding() : "UTF-8"); + if (!body.isEmpty()) { + try { + ObjectMapper mapper = new ObjectMapper(); + JsonNode root = mapper.readTree(body); + if (root.has("menuClass")) { + menuClass = root.get("menuClass").asText(); + } + } catch (Exception e) { + log.error("Fail to parse JSON body for menuClass", e); + } + } + } + } + + if (menuClass != null && !menuClass.isEmpty()) { + try { + HashMap checkMap = new HashMap<>(); + checkMap.put("loginMemberId", loginMemberId); + List> userListMap = webMemberSqlMapDAO.checkMember(checkMap); + if (userListMap.size() == 1) { + String muAuthId = String.valueOf(userListMap.get(0).get("muAuthId")); + + HashMap authCheckMap = new HashMap<>(); + authCheckMap.put("menuClass", menuClass); + authCheckMap.put("muAuthId", muAuthId); + List> authList = webAuthMenuRelationSqlMapDAO + .selectAuthMenuRelation(authCheckMap); + + if (authList.size() == 1) { + request.setAttribute("selectUseYn", String.valueOf(authList.get(0).get("selectUseYn"))); + request.setAttribute("insertUseYn", String.valueOf(authList.get(0).get("insertUseYn"))); + request.setAttribute("updateUseYn", String.valueOf(authList.get(0).get("updateUseYn"))); + request.setAttribute("deleteUseYn", String.valueOf(authList.get(0).get("deleteUseYn"))); + request.setAttribute("downloadUseYn", String.valueOf(authList.get(0).get("downloadUseYn"))); + log.debug("Menu Auth Set for menuClass: " + menuClass); + } else { + log.warn("No auth found for menuClass: " + menuClass + ", muAuthId: " + muAuthId); + } + } + } catch (Exception e) { + log.error("Menu Auth Check Error", e); + } + } + + return true; + } + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, + ModelAndView modelAndView) throws Exception { + if (modelAndView != null) { + String selectUseYn = (String) request.getAttribute("selectUseYn"); + if (selectUseYn != null) { + modelAndView.addObject("selectUseYn", selectUseYn); + modelAndView.addObject("insertUseYn", request.getAttribute("insertUseYn")); + modelAndView.addObject("updateUseYn", request.getAttribute("updateUseYn")); + modelAndView.addObject("deleteUseYn", request.getAttribute("deleteUseYn")); + modelAndView.addObject("downloadUseYn", request.getAttribute("downloadUseYn")); + } + } + } +} diff --git a/src/main/resources/mappers/ProcedureReviewSqlMap.xml b/src/main/resources/mappers/ProcedureReviewSqlMap.xml index 0f7d717..bac3f7a 100644 --- a/src/main/resources/mappers/ProcedureReviewSqlMap.xml +++ b/src/main/resources/mappers/ProcedureReviewSqlMap.xml @@ -1,30 +1,34 @@ - + - SELECT COUNT(*) AS "totalCount" FROM MU_PROCEDURE_REVIEW MPR WHERE MPR.USE_YN = 'Y' - - AND MPR.TITLE LIKE CONCAT('%', TRIM(#{procedureReviewSearchKeywordParam1}), '%') + + AND MPR.CATEGORY_DIV_CD = #{categoryDivCd} + + + AND MPR.TITLE LIKE CONCAT('%', TRIM(#{title}), '%') - + AND IFNULL((SELECT MM.NAME FROM MU_MEMBER AS MM WHERE MM.USE_YN = 'Y' AND MM.MU_MEMBER_ID = MPR.REG_ID LIMIT 0, 1 - ),'') LIKE CONCAT('%', TRIM(#{procedureReviewSearchKeywordParam2}), '%') + ),'') LIKE CONCAT('%', TRIM(#{writeName}), '%') - SELECT MPR.* FROM ( SELECT MPR.* ,CAST(@RNUM:=@RNUM + 1 AS CHAR) AS "rowNum" FROM ( SELECT MPR.MU_PROCEDURE_REVIEW_ID AS "muProcedureReviewId" + ,MPR.CATEGORY_DIV_CD AS "categoryDivCd" ,MPR.TITLE AS "title" ,MPR.CONTENT AS "content" ,MPR.HASHTAG AS "hashtag" @@ -38,19 +42,22 @@ ),'') AS "writeName" FROM MU_PROCEDURE_REVIEW MPR WHERE MPR.USE_YN = 'Y' - - AND MPR.TITLE LIKE CONCAT('%', TRIM(#{procedureReviewSearchKeywordParam1}), '%') + + AND MPR.CATEGORY_DIV_CD = #{categoryDivCd} - + + AND MPR.TITLE LIKE CONCAT('%', TRIM(#{title}), '%') + + AND IFNULL((SELECT MM.NAME FROM MU_MEMBER AS MM WHERE MM.USE_YN = 'Y' AND MM.MU_MEMBER_ID = MPR.REG_ID LIMIT 0, 1 - ),'') LIKE CONCAT('%', TRIM(#{procedureReviewSearchKeywordParam2}), '%') + ),'') LIKE CONCAT('%', TRIM(#{writeName}), '%') - - ORDER BY ${procedureReviewSort} + + ORDER BY ${sort} ORDER BY MPR.REG_DATE DESC @@ -61,38 +68,34 @@ WHERE 1 = 1 ) MPR WHERE 1 = 1 - LIMIT ${procedureReviewStart}, ${procedureReviewLimit} + LIMIT ${start}, ${limit} - SELECT MPR.MU_PROCEDURE_REVIEW_ID AS "muProcedureReviewId" - ,MPR.CATEGORY_NO AS "categoryno" + ,MPR.CATEGORY_DIV_CD AS "categoryDivCd" + ,MPR.CATEGORY_NO AS "categoryNo" ,MPR.TITLE AS "title" ,MPR.CONTENT AS "content" ,MPR.HASHTAG AS "hashtag" - ,HAF.FILE_PATH AS "beforefile" - ,HAF2.FILE_PATH AS "afterfile" FROM MU_PROCEDURE_REVIEW MPR - LEFT OUTER JOIN HP_ATTACH_FILE HAF ON HAF.ATTACHFILE_ID = MPR.BEFORE_PHOTO_ATTACHFILE_ID - LEFT OUTER JOIN HP_ATTACH_FILE HAF2 ON HAF2.ATTACHFILE_ID = MPR.AFTER_PHOTO_ATTACHFILE_ID WHERE MPR.USE_YN = 'Y' AND MPR.MU_PROCEDURE_REVIEW_ID = #{muProcedureReviewId} LIMIT 0, 1 - + SELECT CONCAT('PR-', LPAD(NEXTVAL(MU_PROCEDURE_REVIEW_SEQ), 21, '0')) INSERT INTO MU_PROCEDURE_REVIEW ( - MU_PROCEDURE_REVIEW_ID + CATEGORY_DIV_CD + ,MU_PROCEDURE_REVIEW_ID ,MU_MEMBER_ID ,CATEGORY_NO ,TITLE ,CONTENT ,HASHTAG - ,BEFORE_PHOTO_ATTACHFILE_ID - ,AFTER_PHOTO_ATTACHFILE_ID ,VIEW_COUNT ,USE_YN ,REG_ID @@ -100,14 +103,13 @@ ,MOD_ID ,MOD_DATE ) VALUES ( - #{id} + #{categoryDivCd, jdbcType=VARCHAR} + ,#{id} ,#{muMemberId} - ,#{categoryno, jdbcType=VARCHAR} + ,#{categoryNo, jdbcType=VARCHAR} ,#{title} ,#{content} ,#{hashtag} - ,#{beforeId, jdbcType=VARCHAR} - ,#{afterId, jdbcType=VARCHAR} ,0 ,'Y' ,#{regId} @@ -117,78 +119,22 @@ ) - - - SELECT CONCAT('ATF-', LPAD(NEXTVAL(seq_attachfile_id), 21, '0')) - - INSERT INTO HP_ATTACH_FILE ( - ATTACHFILE_ID - ,ATTACHFILE_NM - ,FILE_PATH - ,FILE_SIZE - ,FILE_TYPE - ,REG_ID - ,REG_DATE - ,MOD_ID - ,MOD_DATE - ) VALUES ( - #{beforeId} - ,#{beforeFileName} - ,#{beforeFilePath} - ,'0' - ,'img' - ,#{regId} - ,NOW() - ,#{modId} - ,NOW() - ) - - - - SELECT CONCAT('ATF-', LPAD(NEXTVAL(seq_attachfile_id), 21, '0')) - - INSERT INTO HP_ATTACH_FILE ( - ATTACHFILE_ID - ,ATTACHFILE_NM - ,FILE_PATH - ,FILE_SIZE - ,FILE_TYPE - ,REG_ID - ,REG_DATE - ,MOD_ID - ,MOD_DATE - ) VALUES ( - #{afterId} - ,#{afterFileName} - ,#{afterFilePath} - ,'0' - ,'img' - ,#{regId} - ,NOW() - ,#{modId} - ,NOW() - ) - - - + UPDATE MU_PROCEDURE_REVIEW SET TITLE = #{title} + + ,CATEGORY_DIV_CD = #{categoryDivCd} + ,CONTENT = #{content} ,HASHTAG = #{hashtag} - - ,BEFORE_PHOTO_ATTACHFILE_ID = #{beforeId} - - - ,AFTER_PHOTO_ATTACHFILE_ID = #{afterId} - ,MOD_ID = #{modId} ,MOD_DATE = NOW() WHERE USE_YN = 'Y' AND MU_PROCEDURE_REVIEW_ID = #{muProcedureReviewId} - + UPDATE MU_PROCEDURE_REVIEW SET MOD_ID = #{modId} ,MOD_DATE = NOW() @@ -197,7 +143,7 @@ AND MU_PROCEDURE_REVIEW_ID = #{muProcedureReviewId} - SELECT ROW_NUMBER() OVER (ORDER BY HC.REG_DATE DESC) AS "rowNum" ,HC.CATEGORY_NO AS "categoryNo" ,HC.CATEGORY_NM AS "categoryNm" diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 7b5f2f9..f801a2c 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -1,9 +1,39 @@ +# ============================================================================= +# 공통 메시지 +# ============================================================================= + # 공통 오류 common.error.server=서버 오류가 발생했습니다. +common.error.general=정상적으로 수행되지 않았습니다. 관리자에게 문의하시기 바랍니다. + +# 권한 관련 +auth.error.select=조회 권한이 없습니다. +auth.error.insert=등록 권한이 없습니다. +auth.error.update=수정 권한이 없습니다. +auth.error.delete=삭제 권한이 없습니다. +auth.error.noAuth=권한이 없습니다. +auth.error.noAuthOrEmpty=권한이 없거나 파일이 비어있습니다. + +# CRUD 성공 +success.insert=정상적으로 등록되었습니다. +success.update=정상적으로 수정되었습니다. +success.delete=정상적으로 삭제되었습니다. + +# CRUD 실패 +error.select=조회 중 에러가 발생했습니다. +error.insert=등록 중 오류가 발생했습니다. +error.update=수정 중 오류가 발생했습니다. +error.delete=삭제 중 오류가 발생했습니다. + +# ============================================================================= +# 모듈별 메시지 +# ============================================================================= + +# 시술후기 +procedureReview.error.noData=시술후기 정보가 없습니다. +procedureReview.category.error=카테고리 정보 조회 실패 # 예약/접수 관련 (Reservation) reserve.checkin.success=접수되었습니다! 안내데스크에서 확인 후 바로 안내해 드릴게요. 잠시만 기다려 주세요. reserve.checkin.time-mismatch=오늘 예약은 확인되었습니다만, 방문하신 시간이 예약 시간과 차이가 있어 데스크 확인이 필요합니다. 안내데스크로 문의해 주세요. - -# 만약 파라미터를 쓴다면 (나중을 위해) reserve.checkin.welcome={0}님, 접수가 완료되었습니다. 잠시만 기다려 주세요. \ No newline at end of file diff --git a/src/main/resources/static/js/crm/procedureReview/procedureReviewInsert.js b/src/main/resources/static/js/crm/procedureReview/procedureReviewInsert.js index 3f4908f..0b5ffc7 100644 --- a/src/main/resources/static/js/crm/procedureReview/procedureReviewInsert.js +++ b/src/main/resources/static/js/crm/procedureReview/procedureReviewInsert.js @@ -228,6 +228,7 @@ function fn_insertProcedureReview() { } let title = $("#title").val(); + let categoryDivCd = $("#categoryDivCd").val(); let content = fn_getQuillContentForSave(); let hashtag = $("#hashtag").val(); @@ -248,21 +249,21 @@ function fn_insertProcedureReview() { } modalEvent.info("등록", "시술후기 정보를 등록하시겠습니까?", function () { - let formData = new FormData(); - formData.append("menuClass", menuClass); - formData.append("title", title); - let encodedContent = btoa(unescape(encodeURIComponent(content))); - formData.append("content", encodedContent); - formData.append("isEncoded", "Y"); // base64 인코딩 플래그 추가 - formData.append("hashtag", hashtag); + let paramData = { + "menuClass": menuClass, + "categoryDivCd": categoryDivCd, + "title": title, + "content": encodedContent, + "isEncoded": "Y", + "hashtag": hashtag + }; $.ajax({ url: encodeURI('/procedureReview/putProcedureReview.do'), - data: formData, + data: JSON.stringify(paramData), dataType: "json", - processData: false, - contentType: false, + contentType: "application/json", type: 'POST', async: true, success: function (data) { @@ -288,6 +289,8 @@ function fn_insertProcedureReview() { function fn_selectListProcedureReviewIntro() { if ("Y" == selectUseYn) { let pagingParam = "?menuClass=" + menuClass; + pagingParam += "&categoryDivCd=" + categoryDivCdQuery; + pagingParam += "&title=" + titleQuery; fn_leftFormAction("/procedureReview/moveProcedureReviewList.do" + pagingParam); } else { modalEvent.warning("", "조회 권한이 없습니다."); diff --git a/src/main/resources/static/js/crm/procedureReview/procedureReviewSelectList.js b/src/main/resources/static/js/crm/procedureReview/procedureReviewSelectList.js index 290c77e..5c0bf9a 100644 --- a/src/main/resources/static/js/crm/procedureReview/procedureReviewSelectList.js +++ b/src/main/resources/static/js/crm/procedureReview/procedureReviewSelectList.js @@ -12,26 +12,25 @@ let procedureReviewSelectCategoryNo = ""; * 시술후기 정보 리스트 조회 ****************************************************************************/ function fn_selectListProcedureReviewJson() { - let formData = new FormData(); - formData.append("menuClass", menuClass); - formData.append("procedureReviewSearchKeywordParam0", procedureReviewSearchKeywordParam0); - formData.append("procedureReviewSearchKeywordParam1", procedureReviewSearchKeywordParam1); - formData.append("procedureReviewSearchKeywordParam2", procedureReviewSearchKeywordParam2); - formData.append("procedureReviewSearchKeywordParam3", procedureReviewSearchKeywordParam3); - formData.append("procedureReviewSort", procedureReviewSort); - formData.append("procedureReviewDir", procedureReviewDir); - formData.append("procedureReviewStart", procedureReviewStart); - formData.append("procedureReviewLimit", procedureReviewLimit); - formData.append("procedureReviewSearchStartDate", procedureReviewSearchStartDate); - formData.append("procedureReviewSearchEndDate", procedureReviewSearchEndDate); - formData.append("procedureReviewSearchDateType", procedureReviewSearchDateType); + let paramData = { + "menuClass": menuClass, + "categoryDivCd": categoryDivCd, + "title": title, + "writeName": writeName, + "sort": sort, + "dir": dir, + "start": start, + "limit": limit, + "startDate": startDate, + "endDate": endDate, + "dateType": dateType + }; $.ajax({ url: encodeURI('/procedureReview/getProcedureReviewList.do'), - data: formData, + data: JSON.stringify(paramData), dataType: "json", - processData: false, - contentType: false, + contentType: "application/json", type: 'POST', async: true, success: function (data) { @@ -39,7 +38,7 @@ function fn_selectListProcedureReviewJson() { // 페이징 처리 procedureReviewTotalCount = data.totalCount; - procedureReviewTotalPages = Math.ceil(procedureReviewTotalCount / procedureReviewLimit); + procedureReviewTotalPages = Math.ceil(procedureReviewTotalCount / limit); // 리스트 조회 procedureReviewAgGridData = data.rows; @@ -48,7 +47,7 @@ function fn_selectListProcedureReviewJson() { if (0 < data.rows.length) { //페이징 처리 window.pagObj = $('#procedureReviewPagination').twbsPagination({ - startPage: ((procedureReviewStart / procedureReviewLimit) + 1), + startPage: ((start / limit) + 1), totalPages: (procedureReviewTotalPages == 0) ? 1 : procedureReviewTotalPages, visiblePages: 10, initiateStartPageClick: false, @@ -91,14 +90,13 @@ function fn_procedureReviewSearch(param) { fn_procedureReviewPaginReset(); - procedureReviewSearchKeywordParam0 = $("#procedureReviewSearchKeyword0").val(); - procedureReviewSearchKeywordParam1 = $("#procedureReviewSearchKeyword1").val(); - procedureReviewSearchKeywordParam2 = ""; // 작성자 검색 제거 - procedureReviewSearchKeywordParam3 = $("#procedureReviewSearchKeywordParam3").val(); + categoryDivCd = $("#procedureReviewSearchCategory").val(); + title = $("#titleSearch").val(); + writeName = ""; // 작성자 검색 제거 - procedureReviewSearchDateType = $("#procedureReviewSearchDateType").val(); - procedureReviewSearchStartDate = $("#procedureReviewSearchStartDate").val(); - procedureReviewSearchEndDate = $("#procedureReviewSearchEndDate").val(); + dateType = $("#dateType").val(); + startDate = $("#startDate").val(); + endDate = $("#endDate").val(); fn_selectListProcedureReviewJson(); } @@ -108,10 +106,8 @@ function fn_procedureReviewSearch(param) { * 초기화하기 ****************************************************************************/ function fn_procedureReviewReset() { - $("#procedureReviewSearchKeyword0").val(""); - $("#procedureReviewSearchKeyword1").val(""); - $("#procedureReviewSearchKeyword2").val(""); - $("#procedureReviewSearchKeyword3").val(""); + $("#procedureReviewSearchCategory").val(""); + $("#titleSearch").val(""); fn_procedureReviewSearch(); } @@ -120,7 +116,7 @@ function fn_procedureReviewReset() { * 페이징 처리 ****************************************************************************/ function fn_procedureReviewPagination(param) { - procedureReviewStart = (parseInt(param) - 1) * procedureReviewLimit; + start = (parseInt(param) - 1) * limit; fn_selectListProcedureReviewJson(); } @@ -129,13 +125,11 @@ function fn_procedureReviewPagination(param) { * 페이징 리셋 ****************************************************************************/ function fn_procedureReviewPaginReset() { - procedureReviewSearchKeywordParam0 = ''; - procedureReviewSearchKeywordParam1 = ''; - procedureReviewSearchKeywordParam2 = ''; - procedureReviewSearchKeywordParam3 = ''; + title = ''; + writeName = ''; - procedureReviewStart = 0; - procedureReviewLimit = 100; + start = 0; + limit = 100; procedureReviewTotalCount = 0; procedureReviewTotalPages = 0; @@ -160,16 +154,16 @@ function fn_deleteProcedureReview() { } modalEvent.info("삭제", "선택한 시술후기 정보를 삭제하시겠습니까?", function () { - let formData = new FormData(); - formData.append("menuClass", menuClass); - formData.append("muProcedureReviewId", procedureReviewSelectId); + let paramData = { + "menuClass": menuClass, + "muProcedureReviewId": procedureReviewSelectId + }; $.ajax({ url: encodeURI('/procedureReview/delProcedureReview.do'), - data: formData, + data: JSON.stringify(paramData), dataType: "json", - processData: false, - contentType: false, + contentType: "application/json", type: 'POST', async: true, success: function (data) { @@ -224,6 +218,8 @@ function fn_procedureReviewOk() { function fn_insertProcedureReviewIntro() { if ("Y" == insertUseYn) { let pagingParam = "?menuClass=" + menuClass; + pagingParam += "&categoryDivCd=" + categoryDivCd; + pagingParam += "&title=" + title; fn_leftFormAction("/procedureReview/moveProcedureReviewInsert.do" + pagingParam); } else { modalEvent.warning("", "등록 권한이 없습니다."); @@ -238,6 +234,8 @@ function fn_insertProcedureReviewIntro() { function fn_updateProcedureReviewIntro(muProcedureReviewId) { if ("Y" == updateUseYn) { let pagingParam = "?menuClass=" + menuClass; + pagingParam += "&categoryDivCd=" + categoryDivCd; + pagingParam += "&title=" + title; pagingParam += "&muProcedureReviewId=" + muProcedureReviewId; fn_leftFormAction("/procedureReview/moveProcedureReviewUpdate.do" + pagingParam); } else { @@ -250,6 +248,13 @@ function fn_updateProcedureReviewIntro(muProcedureReviewId) { let procedureReviewColumnDefs = [ { field: "checkbox", headerName: "", minWidth: 55, maxWidth: 55, headerCheckboxSelection: true, checkboxSelection: true }, { field: "rowNum", headerName: "번호", minWidth: 60, maxWidth: 60, sortable: false, cellStyle: { textAlign: 'center' } }, + { + field: "categoryDivCd", headerName: "구분", minWidth: 100, maxWidth: 120, cellStyle: { textAlign: 'center' }, valueFormatter: function (params) { + if (params.value == '07') return '다이어트 센터'; + if (params.value == '08') return '쁘띠 센터'; + return params.value; + } + }, { field: "title", headerName: "제목", minWidth: 150, cellStyle: { cursor: 'pointer', color: '#3985EA' } }, { field: "content", @@ -323,7 +328,7 @@ let procedureReviewGridOptions = { procedureReviewSelectId = procedureReviewSelectId.substring(0, procedureReviewSelectId.lastIndexOf(',')); }, onSortChanged: function (event) { - procedureReviewSort = ''; + sort = ''; let columnArr = event.columnApi.getColumnState(); if (0 < columnArr.length) { columnArr.sort(function (a, b) { @@ -336,20 +341,20 @@ let procedureReviewGridOptions = { let gridSort = columnArr[i].sort; if (gridSort != null) { - procedureReviewStart = 0; - procedureReviewSort += gridSortModel + ' ' + gridSort + ','; + start = 0; + sort += gridSortModel + ' ' + gridSort + ','; } else { nullCnt++; if (nullCnt == columnArr.length) { - procedureReviewSort = ''; - procedureReviewDir = ''; - procedureReviewStart = 0; + sort = ''; + dir = ''; + start = 0; } } } } - procedureReviewSort = procedureReviewSort.substring(0, procedureReviewSort.lastIndexOf(",")); + sort = sort.substring(0, sort.lastIndexOf(",")); fn_procedureReviewSearch(); } @@ -363,16 +368,14 @@ new agGrid.Grid(procedureReviewGridDiv, procedureReviewGridOptions); * 페이지 init ****************************************************************************/ function fn_pageInit() { - if (!procedureReviewSearchStartDate && !procedureReviewSearchEndDate) { + if (!startDate && !endDate) { } else { - $("#procedureReviewSearchStartDate").val(procedureReviewSearchStartDate).trigger("change"); - $("#procedureReviewSearchEndDate").val(procedureReviewSearchEndDate).trigger("change"); + $("#startDate").val(startDate).trigger("change"); + $("#endDate").val(endDate).trigger("change"); } - $("#procedureReviewSearchKeyword0").val(procedureReviewSearchKeywordParam0); - $("#procedureReviewSearchKeyword1").val(procedureReviewSearchKeywordParam1); - $("#procedureReviewSearchKeyword2").val(procedureReviewSearchKeywordParam2); - $("#procedureReviewSearchKeyword3").val(procedureReviewSearchKeywordParam3); + $("#procedureReviewSearchCategory").val(categoryDivCd); + $("#titleSearch").val(title); fn_procedureReviewSearch("A"); } @@ -384,7 +387,7 @@ function fn_pageInit() { ****************************************************************************/ function fn_pageProcedureReview() { - $(document).on('keypress', '#procedureReviewSearchKeyword1', function (e) { + $(document).on('keypress', '#titleSearch', function (e) { fn_procedureReviewEnter(e); }); diff --git a/src/main/resources/static/js/crm/procedureReview/procedureReviewUpdate.js b/src/main/resources/static/js/crm/procedureReview/procedureReviewUpdate.js index 2277d4d..1feaba3 100644 --- a/src/main/resources/static/js/crm/procedureReview/procedureReviewUpdate.js +++ b/src/main/resources/static/js/crm/procedureReview/procedureReviewUpdate.js @@ -226,22 +226,23 @@ function fn_selectProcedureReview() { modalEvent.warning("수정", "시술후기 정보가 없습니다."); return; } - let formData = new FormData(); - formData.append("menuClass", menuClass); - formData.append("muProcedureReviewId", muProcedureReviewId); + let paramData = { + "menuClass": menuClass, + "muProcedureReviewId": muProcedureReviewId + }; $.ajax({ url: encodeURI('/procedureReview/getProcedureReview.do'), - data: formData, + data: JSON.stringify(paramData), dataType: "json", - processData: false, - contentType: false, + contentType: "application/json", type: 'POST', async: true, success: function (data) { if ('0' == data.msgCode) { - if (data.rows && data.rows.length > 0) { - let photoData = data.rows[0]; + if (data.rows) { + let photoData = data.rows; + $("#categoryDivCd").val(photoData.categoryDivCd); $("#title").val(photoData.title); fn_loadQuillContent(photoData.content); $("#hashtag").val(photoData.hashtag); @@ -267,6 +268,7 @@ function fn_updateProcedureReview() { return false; } let title = $("#title").val(); + let categoryDivCd = $("#categoryDivCd").val(); let content = fn_getQuillContentForSave(); let hashtag = $("#hashtag").val(); @@ -287,22 +289,22 @@ function fn_updateProcedureReview() { } modalEvent.info("수정", "시술후기 정보를 수정하시겠습니까?", function () { - let formData = new FormData(); - formData.append("menuClass", menuClass); - formData.append("title", title); - let encodedContent = btoa(unescape(encodeURIComponent(content))); - formData.append("content", encodedContent); - formData.append("isEncoded", "Y"); // base64 인코딩 플래그 추가 - formData.append("hashtag", hashtag); - formData.append("muProcedureReviewId", muProcedureReviewId); + let paramData = { + "menuClass": menuClass, + "categoryDivCd": categoryDivCd, + "title": title, + "content": encodedContent, + "isEncoded": "Y", + "hashtag": hashtag, + "muProcedureReviewId": muProcedureReviewId + }; $.ajax({ url: encodeURI('/procedureReview/modProcedureReview.do'), - data: formData, + data: JSON.stringify(paramData), dataType: "json", - processData: false, - contentType: false, + contentType: "application/json", type: 'POST', async: true, success: function (data) { @@ -328,6 +330,8 @@ function fn_updateProcedureReview() { function fn_selectListProcedureReviewIntro() { if ("Y" == selectUseYn) { let pagingParam = "?menuClass=" + menuClass; + pagingParam += "&categoryDivCd=" + categoryDivCdQuery; + pagingParam += "&title=" + titleQuery; fn_leftFormAction("/procedureReview/moveProcedureReviewList.do" + pagingParam); } else { modalEvent.warning("", "조회 권한이 없습니다."); diff --git a/src/main/resources/templates/crm/procedureReview/procedureReviewInsert.html b/src/main/resources/templates/crm/procedureReview/procedureReviewInsert.html index d4b8ddd..5316a50 100644 --- a/src/main/resources/templates/crm/procedureReview/procedureReviewInsert.html +++ b/src/main/resources/templates/crm/procedureReview/procedureReviewInsert.html @@ -253,6 +253,8 @@ let menuClass = "[[${param.menuClass}]]" == "" ? "" : "[[${param.menuClass}]]"; let selectUseYn = "[[${selectUseYn}]]" == "" ? "N" : "[[${selectUseYn}]]"; let insertUseYn = "[[${insertUseYn}]]" == "" ? "N" : "[[${insertUseYn}]]"; + let titleQuery = "[[${param.title}]]" == "" ? "" : "[[${param.title}]]"; + let categoryDivCdQuery = "[[${param.categoryDivCd}]]" == "" ? "" : "[[${param.categoryDivCd}]]"; @@ -260,9 +262,17 @@

시술후기 등록

- +
-
+
+ + +
+
diff --git a/src/main/resources/templates/crm/procedureReview/procedureReviewSelectList.html b/src/main/resources/templates/crm/procedureReview/procedureReviewSelectList.html index 2b19b66..f2d30ee 100644 --- a/src/main/resources/templates/crm/procedureReview/procedureReviewSelectList.html +++ b/src/main/resources/templates/crm/procedureReview/procedureReviewSelectList.html @@ -9,7 +9,7 @@ @@ -41,11 +39,20 @@
+
+ +
+
search - +
diff --git a/src/main/resources/templates/crm/procedureReview/procedureReviewUpdate.html b/src/main/resources/templates/crm/procedureReview/procedureReviewUpdate.html index a004bbe..7ccefe0 100644 --- a/src/main/resources/templates/crm/procedureReview/procedureReviewUpdate.html +++ b/src/main/resources/templates/crm/procedureReview/procedureReviewUpdate.html @@ -255,6 +255,8 @@ let updateUseYn = "[[${updateUseYn}]]" == "" ? "N" : "[[${updateUseYn}]]"; let muProcedureReviewId = "[[${param.muProcedureReviewId}]]"; const CDN_URL = "[[${@environment.getProperty('url.cdn')}]]"; + let titleQuery = "[[${param.title}]]" == "" ? "" : "[[${param.title}]]"; + let categoryDivCdQuery = "[[${param.categoryDivCd}]]" == "" ? "" : "[[${param.categoryDivCd}]]"; @@ -262,9 +264,17 @@

시술후기 수정

- +
-
+
+ + +
+
diff --git a/wiki b/wiki new file mode 160000 index 0000000..56f4e92 --- /dev/null +++ b/wiki @@ -0,0 +1 @@ +Subproject commit 56f4e92b163f6a9305c2c0520b634727bd4ea8d6