重构查询员增删改查功能

stmms-web/src/main/java/cn/com/qmth/stmms/admin/school/SchoolController.java

@@ -163,62 +163,6 @@ public class SchoolController extends BaseController {
         return adminInit(request, user.getSchoolId(), message);
     }
 
-    @RequestMapping(value = "/viewer", method = RequestMethod.GET)
-    public ModelAndView viewerInit(HttpServletRequest request, @RequestParam Integer id,
-            @RequestParam(required = false) String message) {
-        School school = schoolService.findById(id);
-        if (school != null) {
-            User user = userService.findSchoolViewer(id);
-            if (user == null) {
-                user = new User();
-                user.setSchoolId(id);
-            }
-            ModelAndView view = new ModelAndView("modules/sys/schoolViewerEdit");
-            view.addObject("school", school);
-            view.addObject("user", user);
-            view.addObject("message", message);
-            return view;
-        } else {
-            return new ModelAndView("redirect:/admin/sys/school");
-        }
-    }
-
-    @Logging(menu = "编辑学校查询员", type = LogType.UPDATE)
-    @RequestMapping(value = "/viewer/save", method = RequestMethod.POST)
-    public ModelAndView viewerSave(HttpServletRequest request, User user) {
-        School school = schoolService.findById(user.getSchoolId());
-        if (school == null) {
-            return new ModelAndView("redirect:/admin/sys/school");
-        }
-        User previous = userService.findSchoolViewer(user.getSchoolId());
-        String message = "";
-        if (previous != null) {
-            previous.setLoginName(user.getLoginName());
-            previous.setName(user.getName());
-            if (StringUtils.isNotBlank(user.getPassword())) {
-                previous.setPassword(EncryptUtils.md5(user.getPassword()));
-            }
-            if (checkLoginName(previous)) {
-                userService.save(previous);
-                return new ModelAndView("redirect:/admin/sys/school");
-            } else {
-                message = "登录名重复";
-            }
-        } else if (StringUtils.isBlank(user.getPassword())) {
-            message = "密码不能为空";
-        } else if (checkLoginName(user)) {
-            user.setEnable(true);
-            user.setRole(Role.SCHOOL_VIEWER);
-            user.setPassword(EncryptUtils.md5(user.getPassword()));
-            user.setSource(UserSource.INTERNAL);
-            userService.save(user);
-            return new ModelAndView("redirect:/admin/sys/school");
-        } else {
-            message = "登录名重复";
-        }
-        return viewerInit(request, user.getSchoolId(), message);
-    }
-
     @RequestMapping(value = "/restAccess", method = RequestMethod.GET)
     public ModelAndView restAccess(HttpServletRequest request, @RequestParam Integer id) {
         School school = schoolService.findById(id);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -35,7 +35,8 @@ public class UserController extends BaseController {
 
     public static final String SUBJECT_CODE_SPLIT = ",";
 
-    public static Role[] ROLE_LIST = { Role.SCANNER, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.MARKER };
+    public static Role[] ROLE_LIST = { Role.SCANNER, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.MARKER,
+            Role.SCHOOL_VIEWER };
 
     @Autowired
     private UserService userService;

stmms-web/src/main/webapp/WEB-INF/application.properties

@@ -38,3 +38,8 @@ qmth.examcloud.subject.uri=/api/exchange/outer/question/getSubjectivePaperStruct
 qmth.examcloud.subject.paper.uri=/api/exchange/outer/question/getSubjectivePaper
 qmth.examcloud.student.uri=/api/exchange/outer/question/getSubjectiveQuestion
 
+school.updateMinute=0 0 0 * * ?
+qmth.solar.accessKey=
+qmth.solar.accessSecret=
+qmth.solar.host=https://solar.qmth.com.cn
+qmth.solar.uri=/api/open/org/query

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/schoolList.jsp

@@ -51,7 +51,6 @@
 					<a href="${ctx}/admin/sys/school/edit?id=${school.id}">修改</a>
 					&nbsp;
 					<a href="${ctx}/admin/sys/school/admin?id=${school.id}">编辑管理员</a>
-					<a href="${ctx}/admin/sys/school/viewer?id=${school.id}">编辑查询员</a>
 				</td>
 			</tr>
 		</c:forEach>

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/schoolViewerEdit.jsp

@@ -1,80 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
-<html>
-<head>
-	<title>学校查询员</title>
-	<meta name="decorator" content="default"/>
-	<%@include file="/WEB-INF/views/include/head.jsp" %>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$("#loginName").focus();
-			$("#inputForm").validate({
-				submitHandler: function(form){
-					loading('正在提交，请稍等...');
-					form.submit();
-				},
-				errorContainer: "#messageBox",
-				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
-					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-						error.appendTo(element.parent().parent());
-					} else {
-						error.insertAfter(element);
-					}
-				}
-			});
-			$('#btnSubmit').click(function(){
-				var p1 = $('#password-input').val();
-				var p2 = $('#password2-input').val();
-				if((p1!='' || p2!='') && p2!=p1){
-					alert('两次密码输入不一致');
-					return false;
-				}else{
-					return true;
-				}
-			});
-		});
-	</script>
-</head>
-<body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/admin/sys/school">学校管理</a></li>
-		<li class="active"><a href="#">编辑查询员</a></li>
-	</ul><br/>
-	<form:form id="inputForm" modelAttribute="user" action="${ctx}/admin/sys/school/viewer/save" method="post" class="form-horizontal">
-		<form:hidden path="id"/>
-		<form:hidden path="schoolId"/>
-		<tags:message content="${message}"/>
-		<div class="control-group">
-			<label class="control-label">帐号</label>
-			<div class="controls">
-				<form:input path="loginName" htmlEscape="false" maxlength="200" class="required"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">名称</label>
-			<div class="controls">
-				<form:input path="name" htmlEscape="false" maxlength="200" class="required"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">密码</label>
-			<div class="controls">
-				<input type="password" name="password" id="password-input"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">重复输入</label>
-			<div class="controls">
-				<input type="password" id="password2-input"/>
-			</div>
-		</div>
-		<div class="form-actions">
-			<%-- <shiro:hasPermission name="exam:course:edit"> --%>
-			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-			<%-- </shiro:hasPermission> --%>
-			<!-- <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/> -->
-		</div>
-	</form:form>
-</body>
-</html>