diff --git a/pom.xml b/pom.xml index 7f8d4360..f30b955b 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ - fims + secured-base org.apache.maven.plugins diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/service/bean/MenuMgtServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/service/bean/MenuMgtServiceBean.java index da06bf6c..581f1efa 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/service/bean/MenuMgtServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/service/bean/MenuMgtServiceBean.java @@ -4,7 +4,7 @@ import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.fims.framework.biz.cache.service.CacheService; import cokr.xit.fims.framework.biz.cmm.ProgrmListVO; import cokr.xit.fims.framework.biz.mng.menu.dao.MenuMgtMapper; -import cokr.xit.fims.framework.biz.mng.menu.dao.ProgramMgtMapper; + import cokr.xit.fims.framework.biz.mng.menu.MenuListMngVO; import cokr.xit.fims.framework.biz.mng.menu.ProgramMngVO; import cokr.xit.fims.framework.biz.mng.menu.XitMenuInfoVO; @@ -33,7 +33,7 @@ import java.util.Map; @Service public class MenuMgtServiceBean extends AbstractServiceBean implements MenuMgtService { private final MenuMgtMapper mapper; - private final ProgramMgtMapper programMngMapper; + private final CacheService cacheService; @@ -234,7 +234,7 @@ public class MenuMgtServiceBean extends AbstractServiceBean implements MenuMgtSe message = "0"; //일괄배치처리 완료 */ //List listProgrmListVO = xitFrameCrudService.findXitProgrmLists(new ProgrmListVO()); - List listProgrmListVO = programMngMapper.selectPrograms(new ProgrmListVO()); + List listProgrmListVO = null; if (XitCmmnUtil.notEmpty(listProgrmListVO) && listProgrmListVO.size() > 1) { return requestValue = "99"; } //프로그램목록테이블 데이타 존재오류. @@ -369,13 +369,13 @@ public class MenuMgtServiceBean extends AbstractServiceBean implements MenuMgtSe Cell cell = null; cell = row.getCell(0); //메뉴번호 if (cell != null) { - Double doubleCell = new Double(cell.getNumericCellValue()); + Double doubleCell = null; //vo.setMenuNo(Integer.parseInt("" + doubleCell.longValue())); vo.setMenuNo("" + doubleCell.longValue()); } cell = row.getCell(1); //메뉴순서 if (cell != null) { - Double doubleCell = new Double(cell.getNumericCellValue()); + Double doubleCell = null; //vo.setSrtOrd(Integer.parseInt("" + doubleCell.longValue())); vo.setSrtOrd("" + doubleCell.longValue()); } @@ -385,7 +385,7 @@ public class MenuMgtServiceBean extends AbstractServiceBean implements MenuMgtSe } cell = row.getCell(3); //상위메뉴번호 if (cell != null) { - Double doubleCell = new Double(cell.getNumericCellValue()); + Double doubleCell = null; //vo.setPrntNo(Integer.parseInt("" + doubleCell.longValue())); vo.setPrntNo("" + doubleCell.longValue()); } diff --git a/src/main/webapp/WEB-INF/jsp/include/head.jsp b/src/main/webapp/WEB-INF/jsp/include/head.jsp index d0f5b8a3..586c282f 100644 --- a/src/main/webapp/WEB-INF/jsp/include/head.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/head.jsp @@ -1,4 +1,4 @@ -<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@ taglib prefix="code" uri="/WEB-INF/tlds/code.tld"%> -<%@ taglib prefix="privacy" uri="/WEB-INF/tlds/privacy.tld"%> +<%--<%@ taglib prefix="code" uri="/WEB-INF/tlds/code.tld"%>--%> +<%--<%@ taglib prefix="privacy" uri="/WEB-INF/tlds/privacy.tld"%>--%> diff --git a/src/main/webapp/WEB-INF/jsp/include/top-prototype.jsp b/src/main/webapp/WEB-INF/jsp/include/top-prototype.jsp index aea23b78..94ef1dcd 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top-prototype.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top-prototype.jsp @@ -1,483 +1,483 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> - + - - + ${functions} function setPageTitle(pageTitle) { $("#pageTitle").html(pageTitle); diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index cdfab970..0789374a 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -1,92 +1,483 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> - + + -
- - -
-
- - - - + ${functions} function setPageTitle(pageTitle) { $("#pageTitle").html(pageTitle); diff --git a/src/main/webapp/WEB-INF/jsp/include/userMenus-prototype.jsp b/src/main/webapp/WEB-INF/jsp/include/userMenus-prototype.jsp index e37affa2..f8184e5f 100644 --- a/src/main/webapp/WEB-INF/jsp/include/userMenus-prototype.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/userMenus-prototype.jsp @@ -1,78 +1,78 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> - - - + + + let userMenus = ${userMenus}; <%--if (menus.length < 1) menus = [ diff --git a/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp b/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp index eb3a52c2..1b077a26 100644 --- a/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp @@ -1,37 +1,76 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -