Skip to content

D
dd_school
Commit f7bc0052 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents ab3bdd77 3b806784
Showing with 317 additions and 22 deletions
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
...@@ -113,6 +113,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter ...@@ -113,6 +113,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers( "/webSocket/**").anonymous() .antMatchers( "/webSocket/**").anonymous()
.antMatchers("/login", "/register", "/captchaImage").anonymous() .antMatchers("/login", "/register", "/captchaImage").anonymous()
.antMatchers("/wx/user/login","/wx/user/getRoleType/**").permitAll() .antMatchers("/wx/user/login","/wx/user/getRoleType/**").permitAll()
.antMatchers("/wx/teacherLeave/**").permitAll()
.antMatchers("/teacherFiles/notice/**").permitAll()
.antMatchers("/wx/level/expriment/**").permitAll()
.antMatchers("/dd/user/login").permitAll() .antMatchers("/dd/user/login").permitAll()
.antMatchers( "/common/**").permitAll() .antMatchers( "/common/**").permitAll()
.antMatchers( "/dd/school/**").permitAll() .antMatchers( "/dd/school/**").permitAll()
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
...@@ -107,6 +107,7 @@ public interface SysUserMapper { ...@@ -107,6 +107,7 @@ public interface SysUserMapper {
* @return 结果 * @return 结果
*/ */
public int deleteUserById(Long userId); public int deleteUserById(Long userId);
public SysUser selectUserByDdUserId(String ddUserId);
/** /**
* 批量删除用户信息 * 批量删除用户信息
......
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
...@@ -200,6 +200,13 @@ public interface ISysUserService { ...@@ -200,6 +200,13 @@ public interface ISysUserService {
public int deleteUserById(Long userId); public int deleteUserById(Long userId);
/** /**
* 根据dduserId查询用户表
* @param userId
* @return
*/
public SysUser selectUserByDdUserId(String ddUserId);
/**
* 批量删除用户信息 * 批量删除用户信息
* *
* @param userIds 需要删除的用户ID * @param userIds 需要删除的用户ID
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
...@@ -465,6 +465,17 @@ public class SysUserServiceImpl implements ISysUserService { ...@@ -465,6 +465,17 @@ public class SysUserServiceImpl implements ISysUserService {
return userMapper.deleteUserById(userId); return userMapper.deleteUserById(userId);
} }
/**
* 根据钉钉用户id 查询用户
* @param ddUserId
* @return
*/
@Override
public SysUser selectUserByDdUserId(String ddUserId) {
return userMapper.selectUserByDdUserId(ddUserId);
}
/** /**
* 批量删除用户信息 * 批量删除用户信息
* *
......
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
...@@ -322,6 +322,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -322,6 +322,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sys_user set del_flag = '2' where user_id = #{userId} update sys_user set del_flag = '2' where user_id = #{userId}
</delete> </delete>
<select id="selectUserByDdUserId" parameterType="String" resultMap="SysUserResult">
select * from sys_user where dd_user_id = #{ddUserId}
</select>
<delete id="deleteUserByIds" parameterType="Long"> <delete id="deleteUserByIds" parameterType="Long">
update sys_user set del_flag = '2' where user_id in update sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")"> <foreach collection="array" item="userId" open="(" separator="," close=")">
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java
...@@ -17,8 +17,10 @@ public class SchoolOrganizationSignin extends OurBaseEntity ...@@ -17,8 +17,10 @@ public class SchoolOrganizationSignin extends OurBaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id */ /** id */
@TableId(value = "id", type = IdType.AUTO)
@Excel(name = "id") @Excel(name = "id")
private Long id; private Long id;
/** 姓名 */ /** 姓名 */
@Excel(name = "姓名") @Excel(name = "姓名")
private String name; private String name;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolClass/SchoolClassMentorMapper.java
...@@ -9,6 +9,7 @@ import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassMentorVo; ...@@ -9,6 +9,7 @@ import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassMentorVo;
import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo; import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo;
import java.util.List; import java.util.List;
import java.util.Map;
@Mapper @Mapper
public interface SchoolClassMentorMapper extends BaseMapper<SchoolClassMentor> { public interface SchoolClassMentorMapper extends BaseMapper<SchoolClassMentor> {
...@@ -18,6 +19,7 @@ public interface SchoolClassMentorMapper extends BaseMapper<SchoolClassMentor> { ...@@ -18,6 +19,7 @@ public interface SchoolClassMentorMapper extends BaseMapper<SchoolClassMentor> {
String selectByTeacherName(@Param("id") Long teacherId); String selectByTeacherName(@Param("id") Long teacherId);
SchoolClassMentorVo selectSchoolClassById(@Param("id") Long id); SchoolClassMentorVo selectSchoolClassById(@Param("id") Long id);
Map<String,String> selectTeacherGroupMentot(Long userId);
List<SchoolClassMentorVo> exportByIds(@Param("id") List<Integer> ids,@Param("classId") Long classId); List<SchoolClassMentorVo> exportByIds(@Param("id") List<Integer> ids,@Param("classId") Long classId);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolClass/SchoolClassMentorImpl.java
...@@ -14,6 +14,7 @@ import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassMentorVo; ...@@ -14,6 +14,7 @@ import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassMentorVo;
import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo; import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo;
import java.util.List; import java.util.List;
import java.util.Map;
@Service @Service
public class SchoolClassMentorImpl extends ServiceImpl<SchoolClassMentorMapper, SchoolClassMentor> implements ISchoolClassMentorService { public class SchoolClassMentorImpl extends ServiceImpl<SchoolClassMentorMapper, SchoolClassMentor> implements ISchoolClassMentorService {
...@@ -32,6 +33,15 @@ public class SchoolClassMentorImpl extends ServiceImpl<SchoolClassMentorMapper, ...@@ -32,6 +33,15 @@ public class SchoolClassMentorImpl extends ServiceImpl<SchoolClassMentorMapper,
List<SchoolClassMentorVo> list = schoolClassMentorMapper.selectSchoolClass(schoolClassMentorVo); List<SchoolClassMentorVo> list = schoolClassMentorMapper.selectSchoolClass(schoolClassMentorVo);
return list; return list;
} }
/**
* 查询老师所教的课程
* @param userId
* @return
*/
@Override
public Map<String,String> selectTeacherGroupMentot(Long userId) {
return schoolClassMentorMapper.selectTeacherGroupMentot(userId);
}
@Override @Override
public SchoolClassMentorVo selectSchoolClassMentorById(Long id) { public SchoolClassMentorVo selectSchoolClassMentorById(Long id) {
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolExperimentPlanServiceImpl.java
package yangtz.cs.liu.campus.service.impl.schoolLab; package yangtz.cs.liu.campus.service.impl.schoolLab;
import com.ruoyi.framework.util.UserInfoUtil;
import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.SysUserMapper;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
...@@ -21,12 +22,14 @@ import java.util.Map; ...@@ -21,12 +22,14 @@ import java.util.Map;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolExperimentPlanClass; import yangtz.cs.liu.campus.domain.schoolLab.SchoolExperimentPlanClass;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.mapper.schoolLab.SchoolExperimentPlanMapper; import yangtz.cs.liu.campus.mapper.schoolLab.SchoolExperimentPlanMapper;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolExperimentPlan; import yangtz.cs.liu.campus.domain.schoolLab.SchoolExperimentPlan;
import yangtz.cs.liu.campus.mapper.schoolLab.SchoolLabMapper; import yangtz.cs.liu.campus.mapper.schoolLab.SchoolLabMapper;
import yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMentorMapper; import yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMentorMapper;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanVo; import yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanVo;
/** /**
...@@ -44,9 +47,12 @@ public class SchoolExperimentPlanServiceImpl extends ServiceImpl<SchoolExperimen ...@@ -44,9 +47,12 @@ public class SchoolExperimentPlanServiceImpl extends ServiceImpl<SchoolExperimen
private SchoolLabMapper schoolLabMapper; private SchoolLabMapper schoolLabMapper;
@Autowired @Autowired
private SchoolGradeMentorMapper schoolGradeMentorMapper; private SchoolGradeMentorMapper schoolGradeMentorMapper;
@Autowired
UserInfoUtil userInfoUtil;
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@Autowired
private ISchoolGradeService schoolGradeService;
/** /**
* 查询实验计划 * 查询实验计划
* *
...@@ -78,6 +84,10 @@ public class SchoolExperimentPlanServiceImpl extends ServiceImpl<SchoolExperimen ...@@ -78,6 +84,10 @@ public class SchoolExperimentPlanServiceImpl extends ServiceImpl<SchoolExperimen
*/ */
@Override @Override
public List<Map<String, String>> selectNameByVo(SchoolExperimentPlanVo schoolExperimentPlanVo) { public List<Map<String, String>> selectNameByVo(SchoolExperimentPlanVo schoolExperimentPlanVo) {
//判斷當前老師所在的级部
Long userId = userInfoUtil.getMpLoginUser().getUserId();
Long gradeId = schoolGradeService.getGradeId(userId);
schoolExperimentPlanVo.setGradeId(gradeId);
return schoolExperimentPlanMapper.selectNameByVo(schoolExperimentPlanVo); return schoolExperimentPlanMapper.selectNameByVo(schoolExperimentPlanVo);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolLabClassYearServiceImpl.java
...@@ -107,6 +107,25 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea ...@@ -107,6 +107,25 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea
return schoolLabClassYearVo; return schoolLabClassYearVo;
} }
@Override
public List<String> convertMentor(List<String> id) {
List<String> list = new ArrayList<>();
for (String date :id){
switch (date){
case "6":
list.add("3");
break;
case "8":
list.add("1");
break;
case "9":
list.add("2");
break;
}
}
return list;
}
/** /**
* 查询年级实验室预约列表 * 查询年级实验室预约列表
* *
...@@ -284,6 +303,7 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea ...@@ -284,6 +303,7 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea
if (labSubs.size() > 0){ if (labSubs.size() > 0){
schoolLabClassYearVo.setSubs(labSubs); schoolLabClassYearVo.setSubs(labSubs);
} }
List<SchoolLabClassYearVo> labClassYear = schoolLabClassYearMapper.getLabClassYear(schoolLabClassYearVo); List<SchoolLabClassYearVo> labClassYear = schoolLabClassYearMapper.getLabClassYear(schoolLabClassYearVo);
labClassYear.forEach(list1 -> { labClassYear.forEach(list1 -> {
String semester = ""; String semester = "";
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolClass/ISchoolClassMentorService.java
...@@ -7,10 +7,12 @@ import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassMentorVo; ...@@ -7,10 +7,12 @@ import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassMentorVo;
import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo; import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo;
import java.util.List; import java.util.List;
import java.util.Map;
public interface ISchoolClassMentorService extends IService<SchoolClassMentor> { public interface ISchoolClassMentorService extends IService<SchoolClassMentor> {
public List<SchoolClassMentorVo> selectSchoolClassMentorList(SchoolClassMentorVo schoolClassMentorVo); public List<SchoolClassMentorVo> selectSchoolClassMentorList(SchoolClassMentorVo schoolClassMentorVo);
public Map<String,String> selectTeacherGroupMentot(Long userId);
public SchoolClassMentorVo selectSchoolClassMentorById(Long id); public SchoolClassMentorVo selectSchoolClassMentorById(Long id);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolLab/ISchoolLabClassYearService.java
...@@ -24,6 +24,7 @@ public interface ISchoolLabClassYearService extends IService<SchoolLabClassYear> ...@@ -24,6 +24,7 @@ public interface ISchoolLabClassYearService extends IService<SchoolLabClassYear>
* @return 年级实验室预约 * @return 年级实验室预约
*/ */
public SchoolLabClassYearVo selectSchoolLabClassYearById(Long id); public SchoolLabClassYearVo selectSchoolLabClassYearById(Long id);
public List<String> convertMentor(List<String> id);
/** /**
* 查询年级实验室预约列表 * 查询年级实验室预约列表
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DingJiaXiaoController.java
...@@ -239,8 +239,7 @@ public class DingJiaXiaoController { ...@@ -239,8 +239,7 @@ public class DingJiaXiaoController {
schoolClass.setGradeValue(date.getGradeValue()); schoolClass.setGradeValue(date.getGradeValue());
schoolClass.setGradeName(date.getGradeName()); schoolClass.setGradeName(date.getGradeName());
schoolClass.setClassValue(Integer.valueOf(jsonArrays.getJSONObject(i).getJSONObject("feature").get("class_level").toString())); schoolClass.setClassValue(Integer.valueOf(jsonArrays.getJSONObject(i).getJSONObject("feature").get("class_level").toString()));
String className = jsonArrays.getJSONObject(i).get("name").toString(); schoolClass.setClassName(jsonArrays.getJSONObject(i).getJSONObject("feature").get("class_level").toString()+"班");
schoolClass.setClassName(className.substring(className.length()-2));
schoolClass.setClassAlias(jsonArrays.getJSONObject(i).get("name").toString()); schoolClass.setClassAlias(jsonArrays.getJSONObject(i).get("name").toString());
schoolClass.setUpdateBy("admin"); schoolClass.setUpdateBy("admin");
schoolClass.setUpdateTime(new Date()); schoolClass.setUpdateTime(new Date());
...@@ -255,8 +254,7 @@ public class DingJiaXiaoController { ...@@ -255,8 +254,7 @@ public class DingJiaXiaoController {
schoolClass.setGradeValue(date.getGradeValue()); schoolClass.setGradeValue(date.getGradeValue());
schoolClass.setGradeName(date.getGradeName()); schoolClass.setGradeName(date.getGradeName());
schoolClass.setClassValue(Integer.valueOf(jsonArrays.getJSONObject(i).getJSONObject("feature").get("class_level").toString())); schoolClass.setClassValue(Integer.valueOf(jsonArrays.getJSONObject(i).getJSONObject("feature").get("class_level").toString()));
String className = jsonArrays.getJSONObject(i).get("name").toString(); schoolClass.setClassName(jsonArrays.getJSONObject(i).getJSONObject("feature").get("class_level").toString()+"班");
schoolClass.setClassName(className.substring(className.length()-2));
schoolClass.setClassAlias(jsonArrays.getJSONObject(i).get("name").toString()); schoolClass.setClassAlias(jsonArrays.getJSONObject(i).get("name").toString());
schoolClass.setCreateBy("admin"); schoolClass.setCreateBy("admin");
schoolClass.setCreateTime(new Date()); schoolClass.setCreateTime(new Date());
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/dingEvent/DingEventController.java
...@@ -5,12 +5,14 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,12 +5,14 @@ import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.dingding.config.Constant; import yangtz.cs.liu.dingding.config.Constant;
import yangtz.cs.liu.dingding.service.impl.dingDept.DdDeptServcieImpl; import yangtz.cs.liu.dingding.service.impl.dingDept.DdDeptServcieImpl;
import yangtz.cs.liu.dingding.service.impl.dingUser.DdUserServiceImpl; import yangtz.cs.liu.dingding.service.impl.dingUser.DdUserServiceImpl;
import yangtz.cs.liu.dingding.utils.DingCallbackCrypto; import yangtz.cs.liu.dingding.utils.DingCallbackCrypto;
import javax.annotation.PostConstruct;
import java.util.Map; import java.util.Map;
/** /**
...@@ -82,34 +84,32 @@ public class DingEventController { ...@@ -82,34 +84,32 @@ public class DingEventController {
ddUserService.xjUserAdd(eventJson); ddUserService.xjUserAdd(eventJson);
}else if ("edu_user_update".equals(eventType)){ }else if ("edu_user_update".equals(eventType)){
// 家校人员身份更新 // 家校人员身份更新
eventJson.get(""); ddUserService.xjUserUpdate(eventJson);
}else if ("edu_user_delete".equals(eventType)){ }else if ("edu_user_delete".equals(eventType)){
// 家校人员身份删除 // 家校人员身份删除
eventJson.get(""); ddUserService.xjUserDelete(eventJson);
}else if ("edu_user_relation_insert".equals(eventType)){ }else if ("edu_user_relation_insert".equals(eventType)){
// 家校人员关系新增 // 家校人员关系新增
eventJson.get(""); ddUserService.relationInsert(eventJson);
}else if ("edu_user_relation_update".equals(eventType)){ }else if ("edu_user_relation_update".equals(eventType)){
// 家校人员关系更新 // 家校人员关系更新
eventJson.get(""); ddUserService.relationUpdate(eventJson);
} }
else if ("edu_user_relation_delete".equals(eventType)){ else if ("edu_user_relation_delete".equals(eventType)){
// 家校人员关系删除 // 家校人员关系删除
eventJson.get(""); ddUserService.relationDelete(eventJson);
}else if ("edu_dept_insert".equals(eventType)){ }else if ("edu_dept_insert".equals(eventType)){
// 家校部门 节点新增 // 家校部门 节点新增
eventJson.get(""); ddDeptServcie.eduDeptInsert(eventJson);
} }
else if ("edu_dept_update".equals(eventType)){ else if ("edu_dept_update".equals(eventType)){
// 家校部门 节点更新 // 家校部门 节点更新 当前不做任何操作，钉钉改班级只会改别名，别名不做保存
eventJson.get(""); eventJson.get("");
}else if ("edu_dept_delete".equals(eventType)){ }else if ("edu_dept_delete".equals(eventType)){
// 家校部门 节点更新 // 家校部门 删除
eventJson.get(""); ddDeptServcie.eduDeptDelete(eventJson);
} }
else { else {
// 添加其他已注册的 // 添加其他已注册的
log.info("发生了：" + eventType + "事件"); log.info("发生了：" + eventType + "事件");
...@@ -124,4 +124,5 @@ public class DingEventController { ...@@ -124,4 +124,5 @@ public class DingEventController {
} }
return null; return null;
} }
} }
smart-campus/src/main/java/yangtz/cs/liu/dingding/service/impl/dingDept/DdDeptServcieImpl.java
package yangtz.cs.liu.dingding.service.impl.dingDept; package yangtz.cs.liu.dingding.service.impl.dingDept;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dingtalk.api.response.OapiV2DepartmentGetResponse; import com.dingtalk.api.response.OapiV2DepartmentGetResponse;
import com.dingtalk.api.response.OapiV2DepartmentListsubResponse; import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClasses;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.dingding.domain.dingDept.SysDdDept; import yangtz.cs.liu.dingding.domain.dingDept.SysDdDept;
import yangtz.cs.liu.dingding.mapper.dingDept.DdDeptMapper; import yangtz.cs.liu.dingding.mapper.dingDept.DdDeptMapper;
import yangtz.cs.liu.dingding.service.dingDept.IDdDeptService; import yangtz.cs.liu.dingding.service.dingDept.IDdDeptService;
import yangtz.cs.liu.dingding.utils.AccessTokenUtils;
import yangtz.cs.liu.dingding.utils.DingDeptUtils; import yangtz.cs.liu.dingding.utils.DingDeptUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
@Service @Service
...@@ -21,7 +31,15 @@ public class DdDeptServcieImpl implements IDdDeptService { ...@@ -21,7 +31,15 @@ public class DdDeptServcieImpl implements IDdDeptService {
private DingDeptUtils dingDeptUtils; private DingDeptUtils dingDeptUtils;
@Autowired @Autowired
private DdDeptMapper ddDeptMapper; private DdDeptMapper ddDeptMapper;
@Autowired
private AccessTokenUtils accessTokenUtils;
//年级表
@Autowired
ISchoolGradeService schoolGradeService;
//学校班级
@Autowired
ISchoolClassService iSchoolClassService;
/** /**
* 获取钉钉全部部门列表 * 获取钉钉全部部门列表
* @return * @return
...@@ -378,4 +396,167 @@ public class DdDeptServcieImpl implements IDdDeptService { ...@@ -378,4 +396,167 @@ public class DdDeptServcieImpl implements IDdDeptService {
} }
return i; return i;
} }
/**
* 家乡通讯录部门新增
*/
public Integer eduDeptInsert(JSONObject eventJson){
String token = accessTokenUtils.getToken();
Integer deptId = (Integer)eventJson.get("deptId");
JSONObject jxDeptDate = this.getJxDeptDate(deptId, token);
//部门别名
String nick = (String)jxDeptDate.get("nick");
//节点连，从顶层节点到当前节点的中间节点，其内容不包含当前节点。
String chain = (String)jxDeptDate.get("chain");
//部门ID。。
Integer deptIdd = (Integer)jxDeptDate.get("dept_id");
//部门类型节点类型。 campus：校区 period：学段 grade：年级 class：班级
String deptType = (String)jxDeptDate.get("dept_type");
//部 门 名称。
String name = (String)jxDeptDate.get("name");
//判断当前部 门 类型//只做 年级跟班级的判断
if (deptType.equals("grade")){
String gradeJi = name.substring(name.length() - 5);
String grade = gradeJi.substring(0,gradeJi.length()-1);
//年级直接新增
SchoolGrade schoolGrade = new SchoolGrade();
schoolGrade.setGradeValue(Integer.valueOf(this.gradeSubt(name)));
schoolGrade.setGradeYear(grade);
schoolGrade.setGradeName(gradeJi+"部");
schoolGrade.setRemark(name);
schoolGrade.setDdClassId(String.valueOf(deptId));
schoolGrade.setCreateTime(new Date());
schoolGrade.setCreateBy("admin");
schoolGrade.setDelFlag("0");
schoolGrade.setUpdateBy("admin");
schoolGrade.setUpdateTime(new Date());
schoolGradeService.save(schoolGrade);
}else if(deptType.equals("class")){
//找到级部
String[] arra = new String[]{chain};
String grDept = arra[arra.length-1];
//级部id
Long l = schoolGradeService.selectDdClassId(grDept);
SchoolGrade byId = schoolGradeService.getById(l);
//新增班级
SchoolClass schoolClass = new SchoolClass();
schoolClass.setSchoolYear(Integer.valueOf(byId.getSchoolYear()));
schoolClass.setClassType("4");
schoolClass.setGradeValue(byId.getGradeValue());
schoolClass.setGradeName(byId.getGradeName());
schoolClass.setClassValue(Integer.valueOf(jxDeptDate.getJSONObject("feature").get("class_level").toString()));
schoolClass.setClassName(jxDeptDate.getJSONObject("feature").get("class_level").toString()+"班");
schoolClass.setClassAlias(name);
schoolClass.setCreateBy("admin");
schoolClass.setCreateTime(new Date());
schoolClass.setUpdateBy("admin");
schoolClass.setUpdateTime(new Date());
schoolClass.setGradeId(byId.getId());
schoolClass.setDdClassId(deptIdd.toString());
iSchoolClassService.save(schoolClass);
}
return 0;
}
/**
* 删除部门 删除部门的时候人员必须清空才会去掉
* @param eventJson
* @return
*/
public Integer eduDeptDelete(JSONObject eventJson){
String token = accessTokenUtils.getToken();
Integer deptId = (Integer)eventJson.get("deptId");
JSONObject jxDeptDate = this.getJxDeptDate(deptId, token);
//部门别名
String nick = (String)jxDeptDate.get("nick");
//节点连，从顶层节点到当前节点的中间节点，其内容不包含当前节点。
String chain = (String)jxDeptDate.get("chain");
//部门ID。。
Integer deptIdd = (Integer)jxDeptDate.get("dept_id");
//部门类型节点类型。 campus：校区 period：学段 grade：年级 class：班级
String deptType = (String)jxDeptDate.get("dept_type");
//部 门 名称。
String name = (String)jxDeptDate.get("name");
//判断当前部 门 类型//只做 年级跟班级的判断
if (deptType.equals("grade")){
//删除年级下边所有的班级
Long l = schoolGradeService.selectDdClassId(deptIdd.toString());
SchoolGrade byId = schoolGradeService.getById(l);
//删除级部下的班级
LambdaQueryWrapper<SchoolClass> icsclqw=new LambdaQueryWrapper<>();
icsclqw.eq(SchoolClass::getGradeValue,byId.getGradeValue());
icsclqw.eq(SchoolClass::getGradeName,byId.getGradeName());
icsclqw.eq(SchoolClass::getSchoolYear,byId.getSchoolYear());
List<SchoolClass> list = iSchoolClassService.list(icsclqw);
//删除班级
for (SchoolClass date :list){
iSchoolClassService.removeById(date.getId());
}
//删除级部
schoolGradeService.removeById(l);
}else if(deptType.equals("class")){
//删除部门
Long l = iSchoolClassService.selectDdClassId(deptIdd.toString());
iSchoolClassService.removeById(l);
}
return 0;
}
/**
* 获取家校通讯录部门信息
*/
public JSONObject getJxDeptDate(Integer deptId,String token){
JSONObject bjParme = new JSONObject();
bjParme.put("dept_id",deptId);
String bjPost = HttpUtil.post("https://oapi.dingtalk.com/topapi/edu/dept/get?access_token="+token, bjParme);
JSONObject bjObject = JSONObject.parseObject(bjPost);
if ((Integer) bjObject.get("errcode") != 0){
throw new RuntimeException("获取部门失败:"+bjPost);
}
JSONObject jsonObject = bjObject.getJSONObject("result").getJSONObject("detail");
return jsonObject;
}
private String gradeSubt(String grade){
String gId = null;
switch (grade){
case "一年级": return gId = "1";
case "二年级": return gId = "2";
case "三年级": return gId = "3";
case "四年级": return gId = "4";
case "五年级": return gId = "5";
case "六年级": return gId = "6";
case "七年级": return gId = "7";
case "八年级": return gId = "8";
case "九年级": return gId = "9";
case "十年级": return gId = "10";
case "十一年级": return gId = "11";
case "十二年级": return gId = "12";
case "十三年级": return gId = "13";
case "十四年级": return gId = "14";
case "十五年级": return gId = "15";
case "十六年级": return gId = "16";
case "十七年级": return gId = "17";
case "十八年级": return gId = "18";
case "十九年级": return gId = "19";
case "二十年级": return gId = "20";
case "二十一年级": return gId = "21";
case "二十二级": return gId = "22";
case "二十三年级": return gId = "23";
case "二十四年级": return gId = "24";
case "二十五年级": return gId = "25";
case "二十六年级": return gId = "26";
case "二十七年级": return gId = "27";
case "二十八年级": return gId = "28";
case "二十九年级": return gId = "29";
case "三十年级": return gId = "30";
}
return gId;
}
} }
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/experiment/ExperimentAdministratorsControoler.java
...@@ -85,6 +85,7 @@ public class ExperimentAdministratorsControoler extends BaseController { ...@@ -85,6 +85,7 @@ public class ExperimentAdministratorsControoler extends BaseController {
Date stDate = ft.parse(dateArray); Date stDate = ft.parse(dateArray);
Date enDate = ft.parse(dateArray1); Date enDate = ft.parse(dateArray1);
schoolLabClassYear.setPlannedStartTime(stDate); schoolLabClassYear.setPlannedStartTime(stDate);
schoolLabClassYear.setDeclareState("3");
schoolLabClassYear.setPlannedEndTime(enDate); schoolLabClassYear.setPlannedEndTime(enDate);
return toAjax(schoolLabClassYearService.updateLabClassYear(schoolLabClassYear)); return toAjax(schoolLabClassYearService.updateLabClassYear(schoolLabClassYear));
} }
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/experiment/ExperimentLevelController.java
...@@ -97,6 +97,7 @@ public class ExperimentLevelController extends BaseController { ...@@ -97,6 +97,7 @@ public class ExperimentLevelController extends BaseController {
public AjaxResult pxperimentPlanList(SchoolExperimentPlanVo schoolExperimentPlanVo) public AjaxResult pxperimentPlanList(SchoolExperimentPlanVo schoolExperimentPlanVo)
{ {
schoolExperimentPlanVo.setSub(schoolLabClassYearService.getSub()); schoolExperimentPlanVo.setSub(schoolLabClassYearService.getSub());
schoolExperimentPlanVo.setIsAppointment("0");
return AjaxResult.success(schoolExperimentPlanService.selectNameByVo(schoolExperimentPlanVo)); return AjaxResult.success(schoolExperimentPlanService.selectNameByVo(schoolExperimentPlanVo));
} }
/** /**
...@@ -153,7 +154,8 @@ public class ExperimentLevelController extends BaseController { ...@@ -153,7 +154,8 @@ public class ExperimentLevelController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SchoolLabClassYearVo schoolLabClassYear) public AjaxResult list(SchoolLabClassYearVo schoolLabClassYear)
{ {
return AjaxResult.success(schoolLabClassYearService.getLabClassYear(schoolLabClassYear)); schoolLabClassYear.setApplyId(schoolLabClassYear.getUserId());
return AjaxResult.success(schoolLabClassYearService.selectSchoolLabClassYearList(schoolLabClassYear));
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/experiment/TeacherExperimentController.java
package yangtz.cs.liu.wechat.controller.experiment; package yangtz.cs.liu.wechat.controller.experiment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -12,18 +14,25 @@ import com.ruoyi.system.service.ISysRoleService; ...@@ -12,18 +14,25 @@ import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationActivationRecord;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYear; import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYear;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply; import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherLabApply; import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherLabApply;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherExperimentApplyService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherExperimentApplyService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherLabApplyService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherLabApplyService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo; import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherExperimentApplyVo; import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherExperimentApplyVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherLabApplyVo; import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherLabApplyVo;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 实验室 老师申请 * 实验室 老师申请
...@@ -46,12 +55,17 @@ public class TeacherExperimentController extends BaseController { ...@@ -46,12 +55,17 @@ public class TeacherExperimentController extends BaseController {
//学校班级 //学校班级
@Autowired @Autowired
ISchoolClassService iSchoolClassService; ISchoolClassService iSchoolClassService;
@Autowired
UserInfoUtil userInfoUtil;
/** /**
* 个人申请记录 * 个人申请记录
*/ */
@Autowired @Autowired
ISchoolTeacherExperimentApplyService schoolTeacherExperimentApplyService; ISchoolTeacherExperimentApplyService schoolTeacherExperimentApplyService;
@Autowired
private ISchoolGradeService schoolGradeService;
@Autowired
private ISchoolClassMentorService schoolClassMentorService;
/** /**
* 年级计划申请列表 * 年级计划申请列表
*/ */
...@@ -59,6 +73,18 @@ public class TeacherExperimentController extends BaseController { ...@@ -59,6 +73,18 @@ public class TeacherExperimentController extends BaseController {
@GetMapping(value = "/classYear/list") @GetMapping(value = "/classYear/list")
public AjaxResult classYearlist(SchoolLabClassYearVo schoolLabClassYearVo) public AjaxResult classYearlist(SchoolLabClassYearVo schoolLabClassYearVo)
{ {
//查看当前老师学科的任务 并且是老师级部的任务
Long userId = userInfoUtil.getMpLoginUser().getUserId();
Long gradeId = schoolGradeService.getGradeId(userId);
//设置级部
schoolLabClassYearVo.setGradeId(gradeId);
//获取学科
Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
String s = map.get("courseId");
List<String> list = Arrays.asList(s.split(","));
List<String> myList = list.stream().distinct().collect(Collectors.toList());
List<String> strings = schoolLabClassYearService.convertMentor(myList);
schoolLabClassYearVo.setSubs(strings);
List<SchoolLabClassYearVo> schoolLabClassYears = schoolLabClassYearService.selectSchoolLabClassYearList( List<SchoolLabClassYearVo> schoolLabClassYears = schoolLabClassYearService.selectSchoolLabClassYearList(
schoolLabClassYearVo); schoolLabClassYearVo);
return AjaxResult.success(schoolLabClassYears); return AjaxResult.success(schoolLabClassYears);
...@@ -94,8 +120,6 @@ public class TeacherExperimentController extends BaseController { ...@@ -94,8 +120,6 @@ public class TeacherExperimentController extends BaseController {
} }
@Autowired @Autowired
UserInfoUtil userInfoUtil;
@Autowired
ISysUserService userService; ISysUserService userService;
@Autowired @Autowired
......
smart-campus/src/main/resources/mapper/schoolClass/SchoolClassMentorMapper.xml
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
where a.id = #{id} where a.id = #{id}
</select> </select>
<select id="selectTeacherGroupMentot" parameterType="Long" resultType="Map">
SELECT teacher_id as teacherId,GROUP_CONCAT(course_id) AS courseId FROM school_class_mentor where teacher_id = #{userId} GROUP BY teacher_id
</select>
<select id="selectSchoolClassById" parameterType="Long" resultType="SchoolClassMentorVo"> <select id="selectSchoolClassById" parameterType="Long" resultType="SchoolClassMentorVo">
select sgm.id, select sgm.id,
sgm.teacher_id, sgm.teacher_id,
......
smart-campus/src/main/resources/mapper/schoolLab/SchoolLabClassYearMapper.xml
...@@ -78,6 +78,12 @@ ...@@ -78,6 +78,12 @@
#{declareState} #{declareState}
</foreach> </foreach>
</if> </if>
<if test="subs != null">
and sub in
<foreach item="sub" collection="subs" open="(" separator="," close=")">
#{sub}
</foreach>
</if>
</where> </where>
order by create_time DESC order by create_time DESC
</select> </select>
......
smart-campus/src/main/resources/mapper/schoolgrade/SchoolGradeMapper.xml
...@@ -63,11 +63,11 @@ ...@@ -63,11 +63,11 @@
where school_year = (select max(school_year) from school_grade ) where school_year = (select max(school_year) from school_grade )
</select> </select>
<select id="selectDdClassId" resultType="java.lang.Long"> <select id="selectDdClassId" resultType="java.lang.Long">
select sg.id from school_grade_copy sg select sg.id from school_grade sg
where sg.del_flag = '0' and sg.dd_class_id=#{ddClssId} where sg.del_flag = '0' and sg.dd_class_id=#{ddClssId}
</select> </select>
<select id="selectUpToYear" resultType="java.lang.String"> <select id="selectUpToYear" resultType="java.lang.String">
select max(school_year) nowYear from school_grade_copy where del_flag = '0' select max(school_year) nowYear from school_grade where del_flag = '0'
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment