diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp
new file mode 100644
index 0000000..ae73386
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit2.jsp
@@ -0,0 +1,192 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%
+ String path = request.getContextPath();
+ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+
+
+
+
+
+
+
+ <%@ include file="../../system/index/top.jsp"%>
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="../../system/index/foot.jsp"%>
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
index 86ade58..88efaea 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -83,7 +83,7 @@
| ${myelfun:findClassTypeName(var.CLASS_TYPE)} |
${var.CLASS_CODE} |
${myelfun:findBasestationName(var.BASESTATION_ID)} |
-   |
+ |
diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties
index 0a550a0..3b85b61 100644
--- a/resources/dbconfig.properties
+++ b/resources/dbconfig.properties
@@ -1,11 +1,13 @@
#数据源 1
-url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
#url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
#url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
driverClassName:com.mysql.jdbc.Driver
username:root
-#password:elvis
-password:admin
+password:ZrZxKeYp
+#username:root
+#password:admin
filters:stat
maxActive:20
initialSize:1
diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
index c7c3873..57aeee1 100644
--- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
+++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
@@ -21,17 +21,16 @@ import org.springframework.web.servlet.ModelAndView;
import com.fh.controller.base.BaseController;
import com.fh.entity.Page;
-import com.fh.util.AppUtil;
-import com.fh.util.ObjectExcelView;
-import com.fh.util.PageData;
-import com.fh.util.Jurisdiction;
-import com.fh.util.Tools;
import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
import com.fh.service.sunvote.grade.GradeManager;
import com.fh.service.sunvote.sclass.SClassManager;
import com.fh.service.sunvote.subject.SubjectManager;
import com.fh.service.sunvote.teacher.TeacherManager;
import com.fh.service.sunvote.term.TermManager;
+import com.fh.util.AppUtil;
+import com.fh.util.Jurisdiction;
+import com.fh.util.ObjectExcelView;
+import com.fh.util.PageData;
/**
* 说明：任课管理
@@ -114,6 +113,24 @@ public class CourseManagementController extends BaseController {
return mv;
}
+ /**修改
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/edit2")
+ public ModelAndView edit2() throws Exception{
+ logBefore(logger, Jurisdiction.getUsername()+"修改CourseManagement");
+ if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
+ ModelAndView mv = this.getModelAndView();
+ PageData pd = new PageData();
+ pd = this.getPageData();
+
+ coursemanagementService.edit(pd);
+ mv.addObject("msg","success");
+ mv.setViewName("save_result2");
+ return mv;
+ }
+
/**列表
* @param page
* @throws Exception
@@ -186,6 +203,32 @@ public class CourseManagementController extends BaseController {
mv.addObject("pd", pd);
return mv;
}
+ /**去新增页面
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/goAdd2")
+ public ModelAndView goAdd2()throws Exception{
+ ModelAndView mv = this.getModelAndView();
+ PageData pd = new PageData();
+ pd = this.getPageData();
+ mv.setViewName("sunvote/coursemanagement/coursemanagement_edit2");
+
+ List teachers = teacherService.listAll(pd);
+ mv.addObject("teachers",teachers);
+ List classs = sclassService.listAll(pd);
+ mv.addObject("classs",classs);
+ List subjects = subjectService.listAll(pd);
+ mv.addObject("subjects", subjects);
+
+ List terms = termService.listAll(pd);
+ mv.addObject("terms", terms);
+ List grades = gradeService.listAll(pd);
+ mv.addObject("grades", grades);
+ mv.addObject("msg", "save");
+ mv.addObject("pd", pd);
+ return mv;
+ }
/**去修改页面
* @param
diff --git a/src/com/fh/controller/sunvote/sclass/SClassController.java b/src/com/fh/controller/sunvote/sclass/SClassController.java
index 7b9e906..299820a 100644
--- a/src/com/fh/controller/sunvote/sclass/SClassController.java
+++ b/src/com/fh/controller/sunvote/sclass/SClassController.java
@@ -109,6 +109,22 @@ public class SClassController extends BaseController {
mv.setViewName("save_result");
return mv;
}
+ /**修改
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/edit2")
+ public ModelAndView edit2() throws Exception{
+ logBefore(logger, Jurisdiction.getUsername()+"修改SClass");
+ if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
+ ModelAndView mv = this.getModelAndView();
+ PageData pd = new PageData();
+ pd = this.getPageData();
+ sclassService.edit(pd);
+ mv.addObject("msg","success");
+ mv.setViewName("save_result2");
+ return mv;
+ }
/**列表
* @param page
@@ -252,7 +268,7 @@ public class SClassController extends BaseController {
mv.addObject("grades", grades);
List classTypes = classtypeService.listAll(pd);
mv.addObject("classTypes", classTypes);
- mv.addObject("msg", "edit");
+ mv.addObject("msg", "edit2");
mv.addObject("pd", pd);
return mv;
}
diff --git a/src/com/fh/controller/sunvote/subject/SubjectController.java b/src/com/fh/controller/sunvote/subject/SubjectController.java
index 1af48cd..bd09042 100644
--- a/src/com/fh/controller/sunvote/subject/SubjectController.java
+++ b/src/com/fh/controller/sunvote/subject/SubjectController.java
@@ -203,6 +203,22 @@ public class SubjectController extends BaseController {
return mv;
}
+ /**去修改页面
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value="/goEdit2")
+ public ModelAndView goEdit2()throws Exception{
+ ModelAndView mv = this.getModelAndView();
+ PageData pd = new PageData();
+ pd = this.getPageData();
+ pd = subjectService.findById(pd); //根据ID读取
+ mv.setViewName("sunvote/subject/subject_edit2");
+ mv.addObject("msg", "edit");
+ mv.addObject("pd", pd);
+ return mv;
+ }
+
/**批量删除
* @param
* @throws Exception
diff --git a/src/com/fh/util/Jurisdiction.java b/src/com/fh/util/Jurisdiction.java
index 75a59ea..3127239 100644
--- a/src/com/fh/util/Jurisdiction.java
+++ b/src/com/fh/util/Jurisdiction.java
@@ -22,10 +22,11 @@ public class Jurisdiction {
* 根据点击的菜单的xxx.do去菜单中的URL去匹配，当匹配到了此菜单，判断是否有此菜单的权限，没有的话跳转到404页面
* 根据按钮权限，授权按钮(当前点的菜单和角色中各按钮的权限匹对)
*/
- String USERNAME = getUsername(); //获取当前登录者loginname
- Session session = getSession();
- List