Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

src/main/java/com/ssj/dao/weixin/library/dao/IBookManagerDao.java

@@ -372,4 +372,7 @@ public interface IBookManagerDao extends JpaRepository<TbLibManager, String> {
 
 	@Query(nativeQuery = true,value = "select * from tb_lib_manager where type=?1 and state=?2  and create_time  is not null order by create_time desc limit 1")
 	TbLibManager findExerciseByTypeAndState(int type,int state);
+
+	@Query(nativeQuery = true,value = "select * from tb_lib_manager where telephone=?1 and type=?2 and  state=1 order by create_time desc  limit 1")
+	TbLibManager findManagerByPhoneAndType(String mobile, int type);
 }

src/main/java/com/ssj/dao/weixin/library/dao/impl/LibJoinQueryDaoImpl.java

@@ -31,11 +31,13 @@ public class LibJoinQueryDaoImpl implements ILibJoinQueryDao{
 	        selSQL.append(" SELECT  t.* ,ifnull(t.name,u.wx_name) as wx_name,ifnull(t_photo,u.photo) as photo  from   tb_lib_manager   t LEFT JOIN  tb_user  u ");
 	        selSQL.append("  on t.user_id  = u.id  ");
 	        selSQL.append(" where  t.lib_id = ? and t.state = 1 ");
+
 	        if (searchParams.get("wx_name") != null && !searchParams.get("wx_name").equals("")) {
 	            selSQL.append(" and  u.wx_name LIKE  CONCAT(CONCAT('%',?,'%')) ");
 	            queryParams.add(searchParams.get("wx_name"));
 	        }
 	        queryParams.add(searchParams.get("libId"));
+			selSQL.append(" order by t.create_time desc ");
 	        return dao.findPage(selSQL.toString(), queryParams.toArray(), pageable);
 	}
 

src/main/java/com/ssj/service/weixin/library/service/IBookManagerService.java

@@ -1,5 +1,6 @@
 package com.ssj.service.weixin.library.service;
 
+import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
 import com.ssj.bean.weixin.user.domain.User;
 import com.ssj.framework.core.common.service.BaseService;
@@ -521,4 +522,12 @@ public interface IBookManagerService extends BaseService<TbLibManager, String> {
 	 */
 	TbLibManager findOneManagerBySubject (String subject);
 
+	/**
+	 * 添加校长
+	 * @param libId
+	 * @param name
+	 * @param mobile
+	 * @return
+	 */
+    Response managerAddSave(String libId, String name, String mobile);
 }

src/main/java/com/ssj/service/weixin/library/service/impl/BookManagerServiceImpl.java

@@ -1,8 +1,11 @@
 package com.ssj.service.weixin.library.service.impl;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.google.common.primitives.Ints;
+import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
+import com.ssj.bean.weixin.libmy.domain.TbLibManagerAudit;
 import com.ssj.bean.weixin.push.domain.SendTemplateShort;
 import com.ssj.bean.weixin.user.domain.User;
 import com.ssj.dao.kmt.kmt.dao.KmtQueryDao;
@@ -13,6 +16,7 @@ import com.ssj.dao.weixin.library.dao.IOneBookQueryDao;
 import com.ssj.framework.basic.utils.DateHelper;
 import com.ssj.framework.core.common.service.BaseServiceImpl;
 import com.ssj.framework.core.util.*;
+import com.ssj.framework.idworker.IdWorker;
 import com.ssj.service.conch.curator.request.CreateTeacherRequest;
 import com.ssj.service.conch.teacher.app.request.VcodeSubmitReq;
 import com.ssj.service.mapper.LibManagerMapper;
@@ -22,6 +26,7 @@ import com.ssj.service.sys.teacher.dto.CorrectionCountDTO;
 import com.ssj.service.sys.teacher.dto.OnlineCorrectTeacherDTO;
 import com.ssj.service.weixin.library.dto.*;
 import com.ssj.service.weixin.library.service.IBookManagerService;
+import com.ssj.service.weixin.library.service.LibManagerAuditService;
 import com.ssj.service.weixin.push.service.PushTemplateService;
 import com.ssj.service.weixin.user.service.UserService;
 import org.apache.commons.collections.CollectionUtils;
@@ -71,6 +76,9 @@ public class BookManagerServiceImpl extends BaseServiceImpl<TbLibManager, String
     @Autowired
     private LibVipMapper libVipMapper;
 
+    @Autowired
+    private LibManagerAuditService auditService;
+
     @Override
 	public PagingAndSortingRepository<TbLibManager, String> getDao() {
 		
@@ -969,6 +977,47 @@ public class BookManagerServiceImpl extends BaseServiceImpl<TbLibManager, String
     public TbLibManager findOneManagerBySubject (String subject){
         return libManagerMapper.findRandManagerByTypeAndSubject(subject);
     }
+
+    @Override
+    public Response managerAddSave(String libId, String name, String mobile) {
+        Response response = new  Response();
+        Date now = new Date();
+        TbLibManager tb = dao.findManagerByPhoneAndType(mobile,4);
+        if(Objects.nonNull(tb)){
+            response.failure("此电话号码已拥有校长身份！");
+            return  response;
+        }
+        User user = userService.findByMobile(mobile);
+        if(user==null){
+            user = new User();
+            user.setId(IdWorker.generateId());
+            user.setMobile(mobile);
+            user.setUserName(name);
+            user = userService.save(user);
+        }
+        tb = new TbLibManager();
+        tb.setUserId(user.getId());
+        tb.setName(name);
+        tb.setTelephone(mobile);
+        tb.setType(4);
+        tb.setState(1);
+        tb.setLibId(libId);
+        tb.setCreateTime(now);
+        tb = this.save(tb);
+
+        TbLibManagerAudit audit = new  TbLibManagerAudit();
+        audit.setStatus(1);
+        audit.setTelephone(tb.getTelephone());
+        audit.setLibManagerId(tb.getId());
+        audit.setLibId(tb.getLibId());
+        audit.setType(tb.getType());
+        audit.setCreateTime(now);
+        audit.setLastUpdateTime(now);
+        audit.setUserId(tb.getUserId());
+        audit.setName(tb.getName());
+        auditService.save(audit);
+        return response.success();
+    }
 }
 
 

src/main/java/com/ssj/sys/controller/SysLibController.java

@@ -1133,6 +1133,12 @@ public class SysLibController extends BaseController {
 		model.addAttribute("ws", lib);
 		return "sys/lib/libManagerEdit";
 	}
+	@RequestMapping("/libManagerAdd4")
+	public String libManagerAdd4(Model model, @RequestParam(defaultValue = "0") String libId) throws Exception {
+
+		model.addAttribute("libId", libId);
+		return "sys/lib/libManagerAdd4";
+	}
 	
 	@RequestMapping(value = "/managerSave", method = RequestMethod.POST)
 	@ResponseBody
@@ -1149,6 +1155,20 @@ public class SysLibController extends BaseController {
 		response.success();
     	return response;
 	}
+
+	@RequestMapping(value = "/managerAddSave", method = RequestMethod.POST)
+	@ResponseBody
+	public Response managerAddSave(String libId,String name,String mobile){
+		Response response = new  Response();
+		//查找
+		try{
+			response = managerService.managerAddSave(libId,name,mobile);
+		}catch (Exception e){
+			response.failure("保存出现异常，请联系管理员");
+			logger.error("添加校长异常",e);
+		}
+    	return response;
+	}
 	
 	/**
 	 * 心愿书单达成列表

src/main/java/com/ssj/sys/interceptor/LoginInterceptor.java

@@ -184,8 +184,8 @@ public class LoginInterceptor extends HandlerInterceptorAdapter{
 
     public static void initModelAndView(HttpServletRequest request, ModelAndView modelAndView) throws Exception {
         //modelAndView.addObject("sysUrl", "https://sys.sharingschool.com");
-        modelAndView.addObject("sysUrl", PropertiesUtil.getValue("sys_url")+"/ssj");
-        modelAndView.addObject("sysUrl", "http://127.0.0.1:8080");
+        modelAndView.addObject("sysUrl", PropertiesUtil.getValue("sys_url"));
+       // modelAndView.addObject("sysUrl", "http://127.0.0.1:8080");
         modelAndView.addObject("imgUrl", PropertiesUtil.getValue("STATIC_FILE_URL"));
 
     }

src/main/resources/templates/sys/lib/libManagerAdd4.html

@@ -0,0 +1,132 @@
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+	<title>私塾家</title>
+	<script th:include="sys/common/metaCSS" th:remove="tag"></script>
+	<script th:include="sys/common/metaJS" th:remove="tag"></script>
+	<script src="sys/js/jquery.validate.min.js" th:src="@{/static/sys/js/jquery.validate.min.js}"></script>
+	<script src="sys/js/jquery-validation/messages_zh.js" th:src="@{/static/sys/js/jquery-validation/messages_zh.js}"></script>
+
+
+	<style>
+		body {
+			min-width: 180px;
+		}
+
+		.select1 {
+			width: 100%;
+			height: 32px;
+			line-height: 32px;
+			border-top: solid 1px #a7b5bc;
+			border-left: solid 1px #a7b5bc;
+			border-right: solid 1px #ced9df;
+			border-bottom: solid 1px #ced9df;
+			opacity: 1;
+			margin-bottom: 10px;
+		}
+		.selectg {
+			width: 100%;
+			height: 32px;
+			line-height: 32px;
+			border-top: solid 1px #a7b5bc;
+			border-left: solid 1px #a7b5bc;
+			border-right: solid 1px #ced9df;
+			border-bottom: solid 1px #ced9df;
+			opacity: 1;
+			margin-bottom: 10px;
+		}
+
+		.btn {
+			width: 100px;
+		}
+
+		label.control-label-error {
+			color: Red;
+		}
+
+		.forminfo li label {
+			width: 85px;
+			line-height: 34px;
+			display: block;
+			float: left;
+		}
+	</style>
+</head>
+
+<body>
+<div class="formbody">
+	<form id="submitFrom"   method="post" class="form-horizontal form-validate">
+		<ul class="forminfo">
+			<input type="hidden" name="libId" th:value="${libId}">
+			<li class="clearfix">
+				<label>人员姓名:<b>*</b></label>
+				<input type="text" id="name" class="dfinput fl" name="name" />
+			</li>
+			<li class="clearfix">
+				<label>手机号码:<b>*</b></label>
+				<input type="text" id="mobile" class="dfinput fl" name="mobile" />
+			</li>
+			<li>
+				<label>&nbsp;</label>
+				<button type="submit" class="btn">保存</button>
+				<button type="button" class="btn" onclick="closeWin();">取消</button>
+			</li>
+		</ul>
+	</form>
+</div>
+</body>
+<script type="text/javascript">
+
+	$(function(){
+
+		$("#submitFrom").validate({
+			rules : {
+
+				name : {
+					required : true
+				},
+				mobile : {
+					required : true
+				}
+			},
+			messages: {
+				name : {
+					required : "名字不能为空"
+				},
+				mobile : {
+					required : "电话号码不能为空"
+				}
+
+			},
+			errorPlacement : function(error, element) {
+				error.appendTo(element.parent());
+			},
+			submitHandler : function(form) {
+				roleFrom();
+			}
+		});
+
+	});
+	function roleFrom(){
+		var url="[[${sysUrl}]]/sys/lib/managerAddSave";
+		var params = $("#submitFrom").serialize();
+		$.post(url,params,function(data){
+			if(data != null){
+				if(data.meta.success){
+					parent.layer.msg("操作成功",{icon:1});
+					closeWin();
+				}else{
+					parent.layer.msg(data.meta.message,{icon:11});
+				}
+			}
+
+		});
+	}
+	function closeWin(){
+		parent.location.reload();
+		parent.layer.close(parent.layer.getFrameIndex(window.name));
+	}
+
+
+
+</script>
+</html>

src/main/resources/templates/sys/lib/libManagerList.html

@@ -180,11 +180,17 @@ function addAdmin(id,type){
 	}else if(type == 3){
 		title = '添加学霸老师';
 	}else if(type==4){
-		title="添加馆长";
+		title="添加校长";
 	}else if(type==5){
 		title="添加合伙人";
-	}else if(type==6){
-		title="添加校长";
+	}else if(type==0){
+		title="添加馆长";
+	}
+	var content;
+	if(type==4){
+		content = '[[${sysUrl}]]/sys/lib/libManagerAdd4.html?libId='+id;
+	}else{
+		content= '[[${sysUrl}]]/sys/lib/selectUserList.html?libId='+id+'&type='+type;
 	}
 	layer.open({
 	    type: 2,
@@ -193,7 +199,7 @@ function addAdmin(id,type){
 	    shift: 0.8,
 	    //offset: '100px',
 	    area: ['80%', '80%'],
-	    content: '[[${sysUrl}]]/sys/lib/selectUserList.html?libId='+id+'&type='+type
+	    content:content
 	});
 }
 </script>