diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java deleted file mode 100644 index 47f547a..0000000 --- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.accessControl.cnt; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import java.util.HashSet; - -/** - * Created by test203 on 2015/10/22. - */ -public class MySessionListener implements HttpSessionListener { - public void sessionCreated(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext application = session.getServletContext(); - HashSet sessions = (HashSet)application.getAttribute("sessions"); - if(sessions == null){ - sessions = new HashSet(); - application.setAttribute("sessions",sessions); - } - sessions.add(session); - } - - public void sessionDestroyed(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext applications = session.getServletContext(); - HashSet sessions = (HashSet)applications.getAttribute("sessions"); - sessions.remove(session); - } -} diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java deleted file mode 100644 index 47f547a..0000000 --- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.accessControl.cnt; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import java.util.HashSet; - -/** - * Created by test203 on 2015/10/22. - */ -public class MySessionListener implements HttpSessionListener { - public void sessionCreated(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext application = session.getServletContext(); - HashSet sessions = (HashSet)application.getAttribute("sessions"); - if(sessions == null){ - sessions = new HashSet(); - application.setAttribute("sessions",sessions); - } - sessions.add(session); - } - - public void sessionDestroyed(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext applications = session.getServletContext(); - HashSet sessions = (HashSet)applications.getAttribute("sessions"); - sessions.remove(session); - } -} diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 1fee6ef..f50471e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.ws.rs.POST; import java.io.File; import java.io.IOException; import java.util.*; @@ -235,6 +236,7 @@ @RequestMapping("getMarkerListByCondition") @ResponseBody + @POST public Map getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) { Map map = new HashMap(); User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java deleted file mode 100644 index 47f547a..0000000 --- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.accessControl.cnt; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import java.util.HashSet; - -/** - * Created by test203 on 2015/10/22. - */ -public class MySessionListener implements HttpSessionListener { - public void sessionCreated(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext application = session.getServletContext(); - HashSet sessions = (HashSet)application.getAttribute("sessions"); - if(sessions == null){ - sessions = new HashSet(); - application.setAttribute("sessions",sessions); - } - sessions.add(session); - } - - public void sessionDestroyed(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext applications = session.getServletContext(); - HashSet sessions = (HashSet)applications.getAttribute("sessions"); - sessions.remove(session); - } -} diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 1fee6ef..f50471e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.ws.rs.POST; import java.io.File; import java.io.IOException; import java.util.*; @@ -235,6 +236,7 @@ @RequestMapping("getMarkerListByCondition") @ResponseBody + @POST public Map getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) { Map map = new HashMap(); User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a5b882..b659f37 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,7 +20,7 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 db.default.username=emsuser db.default.password=emsuser diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java deleted file mode 100644 index 47f547a..0000000 --- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.accessControl.cnt; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import java.util.HashSet; - -/** - * Created by test203 on 2015/10/22. - */ -public class MySessionListener implements HttpSessionListener { - public void sessionCreated(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext application = session.getServletContext(); - HashSet sessions = (HashSet)application.getAttribute("sessions"); - if(sessions == null){ - sessions = new HashSet(); - application.setAttribute("sessions",sessions); - } - sessions.add(session); - } - - public void sessionDestroyed(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext applications = session.getServletContext(); - HashSet sessions = (HashSet)applications.getAttribute("sessions"); - sessions.remove(session); - } -} diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 1fee6ef..f50471e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.ws.rs.POST; import java.io.File; import java.io.IOException; import java.util.*; @@ -235,6 +236,7 @@ @RequestMapping("getMarkerListByCondition") @ResponseBody + @POST public Map getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) { Map map = new HashMap(); User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a5b882..b659f37 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,7 +20,7 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 db.default.username=emsuser db.default.password=emsuser diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d81d650..5af92e8 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -31,10 +31,10 @@ org.springframework.web.context.ContextLoaderListener - + 30 diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java deleted file mode 100644 index 47f547a..0000000 --- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.accessControl.cnt; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import java.util.HashSet; - -/** - * Created by test203 on 2015/10/22. - */ -public class MySessionListener implements HttpSessionListener { - public void sessionCreated(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext application = session.getServletContext(); - HashSet sessions = (HashSet)application.getAttribute("sessions"); - if(sessions == null){ - sessions = new HashSet(); - application.setAttribute("sessions",sessions); - } - sessions.add(session); - } - - public void sessionDestroyed(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext applications = session.getServletContext(); - HashSet sessions = (HashSet)applications.getAttribute("sessions"); - sessions.remove(session); - } -} diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 1fee6ef..f50471e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.ws.rs.POST; import java.io.File; import java.io.IOException; import java.util.*; @@ -235,6 +236,7 @@ @RequestMapping("getMarkerListByCondition") @ResponseBody + @POST public Map getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) { Map map = new HashMap(); User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a5b882..b659f37 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,7 +20,7 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 db.default.username=emsuser db.default.password=emsuser diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d81d650..5af92e8 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -31,10 +31,10 @@ org.springframework.web.context.ContextLoaderListener - + 30 diff --git a/src/main/webapp/common/layout/header.jsp b/src/main/webapp/common/layout/header.jsp index f6fd3a1..99bcfb0 100644 --- a/src/main/webapp/common/layout/header.jsp +++ b/src/main/webapp/common/layout/header.jsp @@ -3,15 +3,7 @@ <%@ page import="com.casic.accessControl.util.StringUtils" %> <%@ page language="java" pageEncoding="UTF-8" %>
@@ -46,150 +38,6 @@
- - - - \ No newline at end of file diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java deleted file mode 100644 index 47f547a..0000000 --- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.accessControl.cnt; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import java.util.HashSet; - -/** - * Created by test203 on 2015/10/22. - */ -public class MySessionListener implements HttpSessionListener { - public void sessionCreated(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext application = session.getServletContext(); - HashSet sessions = (HashSet)application.getAttribute("sessions"); - if(sessions == null){ - sessions = new HashSet(); - application.setAttribute("sessions",sessions); - } - sessions.add(session); - } - - public void sessionDestroyed(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext applications = session.getServletContext(); - HashSet sessions = (HashSet)applications.getAttribute("sessions"); - sessions.remove(session); - } -} diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 1fee6ef..f50471e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.ws.rs.POST; import java.io.File; import java.io.IOException; import java.util.*; @@ -235,6 +236,7 @@ @RequestMapping("getMarkerListByCondition") @ResponseBody + @POST public Map getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) { Map map = new HashMap(); User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a5b882..b659f37 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,7 +20,7 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 db.default.username=emsuser db.default.password=emsuser diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d81d650..5af92e8 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -31,10 +31,10 @@ org.springframework.web.context.ContextLoaderListener - + 30 diff --git a/src/main/webapp/common/layout/header.jsp b/src/main/webapp/common/layout/header.jsp index f6fd3a1..99bcfb0 100644 --- a/src/main/webapp/common/layout/header.jsp +++ b/src/main/webapp/common/layout/header.jsp @@ -3,15 +3,7 @@ <%@ page import="com.casic.accessControl.util.StringUtils" %> <%@ page language="java" pageEncoding="UTF-8" %>
@@ -46,150 +38,6 @@
- - - - \ No newline at end of file diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp index ca1c791..3cf4b4e 100644 --- a/src/main/webapp/common/layout/menu_new.jsp +++ b/src/main/webapp/common/layout/menu_new.jsp @@ -32,22 +32,6 @@ - <%----%> - <%--<%––%>--%> - <%--
  • --%> - <%----%> - - <%----%> - - <%--层次结构管理--%> - - <%----%> - - <%----%> - <%--
    • --%> - <%----%> - <%--    --%> -
  • @@ -99,21 +83,6 @@
    • - <%----%> - <%----%> - <%--
  • --%> - - <%----%> - - <%----%> - - <%--任务图表--%> - - <%----%> - - <%----%> - <%--
    • --%> - <%--    --%> diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java deleted file mode 100644 index 47f547a..0000000 --- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.accessControl.cnt; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import java.util.HashSet; - -/** - * Created by test203 on 2015/10/22. - */ -public class MySessionListener implements HttpSessionListener { - public void sessionCreated(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext application = session.getServletContext(); - HashSet sessions = (HashSet)application.getAttribute("sessions"); - if(sessions == null){ - sessions = new HashSet(); - application.setAttribute("sessions",sessions); - } - sessions.add(session); - } - - public void sessionDestroyed(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext applications = session.getServletContext(); - HashSet sessions = (HashSet)applications.getAttribute("sessions"); - sessions.remove(session); - } -} diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 1fee6ef..f50471e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.ws.rs.POST; import java.io.File; import java.io.IOException; import java.util.*; @@ -235,6 +236,7 @@ @RequestMapping("getMarkerListByCondition") @ResponseBody + @POST public Map getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) { Map map = new HashMap(); User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a5b882..b659f37 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,7 +20,7 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 db.default.username=emsuser db.default.password=emsuser diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d81d650..5af92e8 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -31,10 +31,10 @@ org.springframework.web.context.ContextLoaderListener - + 30 diff --git a/src/main/webapp/common/layout/header.jsp b/src/main/webapp/common/layout/header.jsp index f6fd3a1..99bcfb0 100644 --- a/src/main/webapp/common/layout/header.jsp +++ b/src/main/webapp/common/layout/header.jsp @@ -3,15 +3,7 @@ <%@ page import="com.casic.accessControl.util.StringUtils" %> <%@ page language="java" pageEncoding="UTF-8" %>
    @@ -46,150 +38,6 @@
    - - - - \ No newline at end of file diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp index ca1c791..3cf4b4e 100644 --- a/src/main/webapp/common/layout/menu_new.jsp +++ b/src/main/webapp/common/layout/menu_new.jsp @@ -32,22 +32,6 @@ - <%----%> - <%--<%––%>--%> - <%--
  • --%> - <%----%> - - <%----%> - - <%--层次结构管理--%> - - <%----%> - - <%----%> - <%--
    • --%> - <%----%> - <%--    --%> -
  • @@ -99,21 +83,6 @@
    • - <%----%> - <%----%> - <%--
  • --%> - - <%----%> - - <%----%> - - <%--任务图表--%> - - <%----%> - - <%----%> - <%--
    • --%> - <%--    --%> diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp index d88bfe0..dd0e96a 100644 --- a/src/main/webapp/content/ems/ems.jsp +++ b/src/main/webapp/content/ems/ems.jsp @@ -33,7 +33,9 @@ +<%-- +--%> @@ -41,7 +43,6 @@ - +<%-- + +--%> + @@ -517,16 +522,17 @@ +<%-- +--%> +<%-- +--%> - + -<%----%> - @@ -551,7 +557,6 @@ Ems.initForm(); Ems.initSelect(); EmsMarkerOpt.init(); - }) diff --git a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java b/src/main/java/com/casic/accessControl/cnt/MySessionListener.java deleted file mode 100644 index 47f547a..0000000 --- a/src/main/java/com/casic/accessControl/cnt/MySessionListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.casic.accessControl.cnt; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; -import java.util.HashSet; - -/** - * Created by test203 on 2015/10/22. - */ -public class MySessionListener implements HttpSessionListener { - public void sessionCreated(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext application = session.getServletContext(); - HashSet sessions = (HashSet)application.getAttribute("sessions"); - if(sessions == null){ - sessions = new HashSet(); - application.setAttribute("sessions",sessions); - } - sessions.add(session); - } - - public void sessionDestroyed(HttpSessionEvent se) { - HttpSession session = se.getSession(); - ServletContext applications = session.getServletContext(); - HashSet sessions = (HashSet)applications.getAttribute("sessions"); - sessions.remove(session); - } -} diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 1fee6ef..f50471e 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.ws.rs.POST; import java.io.File; import java.io.IOException; import java.util.*; @@ -235,6 +236,7 @@ @RequestMapping("getMarkerListByCondition") @ResponseBody + @POST public Map getIdList(@RequestParam(required = true) String strMarkerDto, HttpSession session) { Map map = new HashMap(); User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1a5b882..b659f37 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,7 +20,7 @@ #db.default.username=scott #db.default.password=SZHTDB2 db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://127.0.0.1:3306/ems?useUnicode=true&characterEncoding=UTF-8 +db.default.url=jdbc:mysql://192.168.0.225:3306/ems?useUnicode=true&characterEncoding=UTF-8 db.default.username=emsuser db.default.password=emsuser diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d81d650..5af92e8 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -31,10 +31,10 @@ org.springframework.web.context.ContextLoaderListener - + 30 diff --git a/src/main/webapp/common/layout/header.jsp b/src/main/webapp/common/layout/header.jsp index f6fd3a1..99bcfb0 100644 --- a/src/main/webapp/common/layout/header.jsp +++ b/src/main/webapp/common/layout/header.jsp @@ -3,15 +3,7 @@ <%@ page import="com.casic.accessControl.util.StringUtils" %> <%@ page language="java" pageEncoding="UTF-8" %>
    @@ -46,150 +38,6 @@
    - - - - \ No newline at end of file diff --git a/src/main/webapp/common/layout/menu_new.jsp b/src/main/webapp/common/layout/menu_new.jsp index ca1c791..3cf4b4e 100644 --- a/src/main/webapp/common/layout/menu_new.jsp +++ b/src/main/webapp/common/layout/menu_new.jsp @@ -32,22 +32,6 @@ - <%----%> - <%--<%––%>--%> - <%--
  • --%> - <%----%> - - <%----%> - - <%--层次结构管理--%> - - <%----%> - - <%----%> - <%--
    • --%> - <%----%> - <%--    --%> -
  • @@ -99,21 +83,6 @@
    • - <%----%> - <%----%> - <%--
  • --%> - - <%----%> - - <%----%> - - <%--任务图表--%> - - <%----%> - - <%----%> - <%--
    • --%> - <%--    --%> diff --git a/src/main/webapp/content/ems/ems.jsp b/src/main/webapp/content/ems/ems.jsp index d88bfe0..dd0e96a 100644 --- a/src/main/webapp/content/ems/ems.jsp +++ b/src/main/webapp/content/ems/ems.jsp @@ -33,7 +33,9 @@ +<%-- +--%> @@ -41,7 +43,6 @@ - +<%-- + +--%> + @@ -517,16 +522,17 @@ +<%-- +--%> +<%-- +--%> - + -<%----%> - @@ -551,7 +557,6 @@ Ems.initForm(); Ems.initSelect(); EmsMarkerOpt.init(); - }) diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js index 0efb9a9..c024a9f 100644 --- a/src/main/webapp/s/app/ems/ems.js +++ b/src/main/webapp/s/app/ems/ems.js @@ -333,7 +333,6 @@ initForm: function () { handleDatePickers(); $("#selectObjectType").chosen(); - $("#resetEms").live("click", function (e) { $("#markerObjectType").val(""); $("#pipeDiameter").val(""); @@ -357,7 +356,6 @@ $("#memo").val(""); }); - $('#localize').click(function (e) { $('#addModal').modal('hide'); //注册地图点击事件 @@ -459,8 +457,7 @@ map.addEventListener("click", showInfo); }); - - $("#searchMarker").die().live("click", function (e) { + $("#searchMarker").live("click", function (e) { var Marker = {}; if (vectorMarkers.length != 0) { for (var i = 0; i < vectorMarkers.length; i++) @@ -477,7 +474,7 @@ Marker.eDate = $("#txt_end_day").val(); //请求后台的id列表，然后遍历marker列表，修改marker的颜色 $.ajax({ - type: "POST", + type: "GET", url: $('#context').val() + "/marker/getMarkerListByCondition.do", data: {"strMarkerDto": JSON.stringify(Marker)}, dataType: "json", @@ -489,7 +486,7 @@ } else { if (r.data.length == 0) { alert("没有搜到符合条件的标识器"); - return; + // return; } for (var a in r.data) {//遍历列表，添加marker var bdpoint = gpsBdUtils.gcj2bd(r.data[a].latitude, r.data[a].longitude); @@ -506,7 +503,7 @@ map.addOverlay(vectorMarker); pointArray.push(point); } - map.setViewport(pointArray); + map.setViewport(pointArray); } }