平台管理员接口

src/main/java/com/ssj/api/domain/vo/teacher/teacherAddReq.java

@@ -8,10 +8,11 @@ import com.ssj.bean.common.framework.core.domain.BaseRequest;
  * @description req
  * @date 2021/2/18
  */
-public class teacherAddReq extends BaseRequest {
+public class TeacherAddReq extends BaseRequest {
     private  String name;
     private String mobile;
     private String courseName;
+    private String teacherId;
 
     public String getName() {
         return name;
@@ -36,4 +37,12 @@ public class teacherAddReq extends BaseRequest {
     public void setCourseName(String courseName) {
         this.courseName = courseName;
     }
+
+    public String getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(String teacherId) {
+        this.teacherId = teacherId;
+    }
 }

src/main/java/com/ssj/api/domain/vo/teacher/TeacherAllotReq.java

@@ -0,0 +1,57 @@
+package com.ssj.api.domain.vo.teacher;
+
+import com.ssj.bean.common.framework.core.domain.BaseRequest;
+
+/**
+ * @author sh
+ * @className teacherReq
+ * @description req
+ * @date 2021/2/18
+ */
+public class TeacherAllotReq extends BaseRequest {
+    private  Integer pageSize;
+    private  Integer pageNo;
+    private String subject;
+    private String teacherId;
+    private String teacherName;
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(String teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+}

src/main/java/com/ssj/api/domain/vo/teacher/TeacherChangeReq.java

@@ -0,0 +1,30 @@
+package com.ssj.api.domain.vo.teacher;
+
+import com.ssj.bean.common.framework.core.domain.BaseRequest;
+
+/**
+ * @author sh
+ * @className teacherReq
+ * @description 更改所属质检员req
+ * @date 2021/2/18
+ */
+public class TeacherChangeReq extends BaseRequest {
+    private  String id;
+    private  String teacherId;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(String teacherId) {
+        this.teacherId = teacherId;
+    }
+}

src/main/java/com/ssj/api/domain/vo/teacher/teacherDelReq.java

@@ -8,7 +8,7 @@ import com.ssj.bean.common.framework.core.domain.BaseRequest;
  * @description req
  * @date 2021/2/18
  */
-public class teacherDelReq extends BaseRequest {
+public class TeacherDelReq extends BaseRequest {
     private  String id;
 
     public String getId() {

src/main/java/com/ssj/api/domain/vo/teacher/teacherReq.java

@@ -8,7 +8,7 @@ import com.ssj.bean.common.framework.core.domain.BaseRequest;
  * @description req
  * @date 2021/2/18
  */
-public class teacherReq extends BaseRequest {
+public class TeacherReq extends BaseRequest {
     private  Integer pageSize;
     private  Integer pageNo;
     private String name;

src/main/java/com/ssj/bean/sys/imlibuser/TbClassTeacherTemp.java

@@ -42,6 +42,8 @@ public class TbClassTeacherTemp  extends BaseEntity {
     
     private Date createTime;
 
+    private String inspectorId;
+
 	public String getLibId() {
 		return libId;
 	}
@@ -154,6 +156,11 @@ public class TbClassTeacherTemp  extends BaseEntity {
 		this.className = className;
 	}
 
+	public String getInspectorId() {
+		return inspectorId;
+	}
 
-
+	public void setInspectorId(String inspectorId) {
+		this.inspectorId = inspectorId;
+	}
 }

src/main/java/com/ssj/bean/weixin/libmy/domain/TbLibReadManager.java

@@ -0,0 +1,110 @@
+package com.ssj.bean.weixin.libmy.domain;
+
+import com.ssj.bean.common.framework.core.domain.BaseEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Entity
+@Table(name = "tb_lib_read_manager")
+public class TbLibReadManager extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String libId;
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 0:馆长，1：图书馆管理员，
+     */
+    private Integer type;
+    /**
+     * 真实姓名
+     */
+    private String name;
+    /**
+     * 电话号码
+     */
+    private String telephone;
+    /**
+     * 性别
+     */
+    private Integer sex;
+
+    /**
+     * 头像
+     */
+    private String tPhoto;
+    /**
+     * 1有效-2无效
+     */
+    private Integer state;
+
+    public String getLibId() {
+        return libId;
+    }
+
+    public void setLibId(String libId) {
+        this.libId = libId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String gettPhoto() {
+        return tPhoto;
+    }
+
+    public void settPhoto(String tPhoto) {
+        this.tPhoto = tPhoto;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}

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

@@ -102,4 +102,20 @@ public interface ILibJoinQueryDao {
 	Long countByLikeNameAndCity(String name, String province, String city, String area);
 
 	Page<Map<String, Object>> findTeacherManagerList(Map<String, Object> params, Pageable initPage);
+
+    Page<Map<String, Object>> findReadForPage(Map<String, Object> params, Pageable initPage);
+
+	/**
+	 * 查询批注管理员
+	 * @return
+	 */
+	Map<String, Object> findHeadInfo();
+
+	/**
+	 * 批改老师作业批改情况
+	 * @param params
+	 * @param initPage
+	 * @return
+	 */
+	Page<Map<String, Object>> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage);
 }

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

@@ -1241,22 +1241,77 @@ public class LibJoinQueryDaoImpl implements ILibJoinQueryDao{
 	public Page<Map<String, Object>> findTeacherManagerList(Map<String, Object> params, Pageable initPage) {
 		StringBuilder selSQL = new StringBuilder();
 		List<Object> queryParams = new ArrayList<Object>();
-		selSQL.append("select id,name,telephone,course_name as courseName from tb_lib_manager where state = 1 ");
+		selSQL.append("select a.id,a.name,a.telephone,a.course_name as courseName,ifnull(b.name,'') as inspectorName  ");
+		selSQL.append(" from tb_lib_manager a ");
+		selSQL.append(" left join tb_lib_manager b  on a.inspector_id = b.user_id and b.type = 50 ");
+		selSQL.append("  where a.state = 1 ");
 		if(Objects.nonNull(params.get("type")) && StringUtils.isNotEmpty(MapUtils.getString(params,"type"))){
-			selSQL.append(" and type = ?");
+			selSQL.append(" and a.type = ?");
 			queryParams.add(params.get("type"));
 		}
 		if(Objects.nonNull(params.get("name")) && StringUtils.isNotEmpty(MapUtils.getString(params,"name"))){
-			selSQL.append(" and name like concat('%',?,'%') ");
+			selSQL.append(" and a.name like concat('%',?,'%') ");
 			queryParams.add(params.get("name"));
 		}
 		if(Objects.nonNull(params.get("mobile")) && StringUtils.isNotEmpty(MapUtils.getString(params,"mobile"))){
-			selSQL.append(" and telephone like concat('%',?,'%') ");
+			selSQL.append(" and a.telephone like concat('%',?,'%') ");
 			queryParams.add(params.get("mobile"));
 		}
-		selSQL.append(" order by create_time desc ");
+		selSQL.append(" order by a.create_time desc ");
 		return  dao.findPage(selSQL.toString(),queryParams.toArray(),initPage);
 	}
 
+	@Override
+	public Page<Map<String, Object>> findReadForPage(Map<String, Object> searchParams, Pageable initPage) {
+		StringBuilder selSQL = new StringBuilder();
+		List<Object> queryParams = new ArrayList<Object>();
+		selSQL.append(" SELECT  t.* ,ifnull(t.name,u.wx_name) as wx_name,ifnull(t_photo,u.photo) as photo   ");
+		selSQL.append("  from   tb_lib_read_manager   t  ");
+		selSQL.append("  LEFT JOIN  tb_user  u  on t.user_id  = u.id  ");
+		selSQL.append(" where   t.state = 1 ");
+
+		if(Objects.nonNull(searchParams.get("libId")) && StringUtils.isNotBlank(MapUtils.getString(searchParams,"libId"))){
+			selSQL.append(" and  t.lib_id = ?  ");
+			queryParams.add(searchParams.get("libId"));
+		}
+		if(Objects.nonNull(searchParams.get("type")) && StringUtils.isNotBlank(MapUtils.getString(searchParams,"type"))){
+			selSQL.append(" and  t.type = ?  ");
+			queryParams.add(searchParams.get("type"));
+		}
+
+		if (searchParams.get("wx_name") != null && !searchParams.get("wx_name").equals("")) {
+			selSQL.append(" and  (u.wx_name LIKE  CONCAT('%',?,'%') or  t.name like CONCAT('%',?,'%') )");
+			queryParams.add(searchParams.get("wx_name"));
+			queryParams.add(searchParams.get("wx_name"));
+		}
+
+		selSQL.append(" order by t.create_time desc ");
+		return dao.findPage(selSQL.toString(), queryParams.toArray(), initPage);
+	}
+
+	@Override
+	public Map<String, Object> findHeadInfo() {
+		StringBuilder selSQL = new StringBuilder();
+		List<Object> queryParams = new ArrayList<Object>();
+		Map<String, Object> map = new HashMap<String, Object>();
+		selSQL.append("select count(if(is_online=1,true,null)) AS onlineNums,count(if(is_online=0,true,null)) AS offlineNums from tb_lib_manager where type=30 and state= 1 ");
+		List<Map<String, Object>> mapList= dao.findMap(selSQL.toString(), queryParams.toArray());
+		if(mapList != null && mapList.size()>0){
+			map = mapList.get(0);
+		}
+		return map;
+	}
+
+	@Override
+	public Page<Map<String, Object>> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage) {
+		StringBuilder selSQL = new StringBuilder();
+		List<Object> queryParams = new ArrayList<Object>();
+		selSQL.append("select * from tb_lib_manager where type=30 and state= 1 ");
+		selSQL.append(" ");
+		selSQL.append(" ");
+		selSQL.append(" ");
+		return  dao.findPage(selSQL.toString(), queryParams.toArray(),initPage);
+	}
+
 
 }

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassTeacherTempServiceImpl.java

@@ -383,6 +383,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					tbLibManager.setLibId(tbLibImTeacherTemp.getLibId());
 					tbLibManager.setIsCorrect(1);
 					tbLibManager.setState(1);
+					tbLibManager.setInspectorId(tbLibImTeacherTemp.getInspectorId());
 					managerService.save(tbLibManager);
 				}else {
 					if(tbLibManager.getType()==Constant.ALL_TEACHER_TYPE){

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

@@ -538,4 +538,18 @@ public interface IBookManagerService extends BaseService<TbLibManager, String> {
 	 * @return
 	 */
     Page<Map<String, Object>> findTeacherManagerList(Map<String, Object> params, Pageable initPage);
+
+	/**
+	 * 查询批注老师在线和离线数量
+	 * @return
+	 */
+	Map<String, Object> findHeadInfo();
+
+	/**
+	 * 查询老师批改情况
+	 * @param params
+	 * @param initPage
+	 * @return
+	 */
+	Page<Map<String, Object>> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage);
 }

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

@@ -108,4 +108,12 @@ public interface ILibJoinService extends BaseService<TbLibJoin, String> {
 	public Long countByLikeNameAndCity(String name, String province, String city, String area);
 
     void libJoinSave(TbLibJoin lib) throws Exception;
+
+	/**
+	 * 图书馆管理员列表
+	 * @param params
+	 * @param initPage
+	 * @return
+	 */
+    Page<Map<String, Object>> findReadForPage(Map<String, Object> params, Pageable initPage);
 }