Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfCcOrderMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfCcOrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfCcOrder">
-        <result column="order_Id" property="orderId" />
-        <result column="actor_Id" property="actorId" />
-        <result column="creator" property="creator" />
-        <result column="create_Time" property="createTime" />
-        <result column="finish_Time" property="finishTime" />
-        <result column="status" property="status" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        order_Id, actor_Id, creator, create_Time, finish_Time, status
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfHistOrderMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfHistOrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfHistOrder">
-        <id column="id" property="id" />
-        <result column="process_Id" property="processId" />
-        <result column="order_State" property="orderState" />
-        <result column="creator" property="creator" />
-        <result column="create_Time" property="createTime" />
-        <result column="end_Time" property="endTime" />
-        <result column="expire_Time" property="expireTime" />
-        <result column="priority" property="priority" />
-        <result column="parent_Id" property="parentId" />
-        <result column="order_No" property="orderNo" />
-        <result column="variable" property="variable" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, process_Id, order_State, creator, create_Time, end_Time, expire_Time, priority, parent_Id, order_No, variable
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfHistTaskActorMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfHistTaskActorMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfHistTaskActor">
-        <result column="task_Id" property="taskId" />
-        <result column="actor_Id" property="actorId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        task_Id, actor_Id
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfHistTaskMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfHistTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfHistTask">
-        <id column="id" property="id" />
-        <result column="order_Id" property="orderId" />
-        <result column="task_Name" property="taskName" />
-        <result column="display_Name" property="displayName" />
-        <result column="task_Type" property="taskType" />
-        <result column="perform_Type" property="performType" />
-        <result column="task_State" property="taskState" />
-        <result column="operator" property="operator" />
-        <result column="create_Time" property="createTime" />
-        <result column="finish_Time" property="finishTime" />
-        <result column="expire_Time" property="expireTime" />
-        <result column="action_Url" property="actionUrl" />
-        <result column="parent_Task_Id" property="parentTaskId" />
-        <result column="variable" property="variable" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, order_Id, task_Name, display_Name, task_Type, perform_Type, task_State, operator, create_Time, finish_Time, expire_Time, action_Url, parent_Task_Id, variable
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfOrderMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfOrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfOrder">
-        <id column="id" property="id" />
-        <result column="parent_Id" property="parentId" />
-        <result column="process_Id" property="processId" />
-        <result column="creator" property="creator" />
-        <result column="create_Time" property="createTime" />
-        <result column="expire_Time" property="expireTime" />
-        <result column="last_Update_Time" property="lastUpdateTime" />
-        <result column="last_Updator" property="lastUpdator" />
-        <result column="priority" property="priority" />
-        <result column="parent_Node_Name" property="parentNodeName" />
-        <result column="order_No" property="orderNo" />
-        <result column="variable" property="variable" />
-        <result column="version" property="version" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, parent_Id, process_Id, creator, create_Time, expire_Time, last_Update_Time, last_Updator, priority, parent_Node_Name, order_No, variable, version
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfProcessMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfProcessMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfProcess">
-        <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="display_Name" property="displayName" />
-        <result column="type" property="type" />
-        <result column="instance_Url" property="instanceUrl" />
-        <result column="state" property="state" />
-        <result column="content" property="content" />
-        <result column="version" property="version" />
-        <result column="create_Time" property="createTime" />
-        <result column="creator" property="creator" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, display_Name, type, instance_Url, state, content, version, create_Time, creator
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfSurrogateMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfSurrogateMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfSurrogate">
-        <id column="id" property="id" />
-        <result column="process_Name" property="processName" />
-        <result column="operator" property="operator" />
-        <result column="surrogate" property="surrogate" />
-        <result column="odate" property="odate" />
-        <result column="sdate" property="sdate" />
-        <result column="edate" property="edate" />
-        <result column="state" property="state" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, process_Name, operator, surrogate, odate, sdate, edate, state
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfTaskActorMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfTaskActorMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfTaskActor">
-        <result column="task_Id" property="taskId" />
-        <result column="actor_Id" property="actorId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        task_Id, actor_Id
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/mapper/xml/WfTaskMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ym.mec.education.mapper.WfTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.WfTask">
-        <id column="id" property="id" />
-        <result column="order_Id" property="orderId" />
-        <result column="task_Name" property="taskName" />
-        <result column="display_Name" property="displayName" />
-        <result column="task_Type" property="taskType" />
-        <result column="perform_Type" property="performType" />
-        <result column="operator" property="operator" />
-        <result column="create_Time" property="createTime" />
-        <result column="finish_Time" property="finishTime" />
-        <result column="expire_Time" property="expireTime" />
-        <result column="action_Url" property="actionUrl" />
-        <result column="parent_Task_Id" property="parentTaskId" />
-        <result column="variable" property="variable" />
-        <result column="version" property="version" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, order_Id, task_Name, display_Name, task_Type, perform_Type, operator, create_Time, finish_Time, expire_Time, action_Url, parent_Task_Id, variable, version
-    </sql>
-
-</mapper>

mec-education/src/main/java/com/ym/mec/education/resp/CourseScheduleResp.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @program: mec
@@ -25,8 +26,8 @@ public class CourseScheduleResp implements Serializable {
     @ApiModelProperty(value = "上课时间",required = true)
     private String classTime;
 
-    @ApiModelProperty(value = "班级名称",required = true)
-    private String classGroupName;
+    @ApiModelProperty(value = "声部名称",required = true)
+    private List<String> subjectName;
 
     @ApiModelProperty(value = "上课老师",required = true)
     private String teacher;

mec-education/src/main/java/com/ym/mec/education/resp/StudentAttendanceResq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @program: mec
@@ -23,8 +24,8 @@ public class StudentAttendanceResq implements Serializable {
     @ApiModelProperty(value = "上课时间", required = true)
     private String classTime;
 
-    @ApiModelProperty(value = "班级名称", required = true)
-    private String classGroupName;
+    @ApiModelProperty(value = "声部名称",required = true)
+    private List<String> subjectName;
 
     @ApiModelProperty(value = "到课比", required = true)
     private String attendanceRate;

mec-education/src/main/java/com/ym/mec/education/service/ISubjectService.java

@@ -2,6 +2,7 @@ package com.ym.mec.education.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.Subject;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +14,11 @@ import com.ym.mec.education.entity.Subject;
  */
 public interface ISubjectService extends IService<Subject> {
 
+    /**
+     * 根据声部id List查询声部名称
+     * @param subjectIdArr
+     * @return
+     */
+    List<String> getSubjectNameList(String subjectIdArr);
+
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseScheduleServiceImpl.java

@@ -14,10 +14,7 @@ import com.ym.mec.education.enums.TeachTypeEnum;
 import com.ym.mec.education.mapper.CourseScheduleMapper;
 import com.ym.mec.education.req.ClassGroupReq;
 import com.ym.mec.education.resp.CourseScheduleResp;
-import com.ym.mec.education.service.IClassGroupService;
-import com.ym.mec.education.service.IClassGroupTeacherMapperService;
-import com.ym.mec.education.service.ICourseScheduleService;
-import com.ym.mec.education.service.ISysUserService;
+import com.ym.mec.education.service.*;
 import com.ym.mec.education.utils.DateUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +39,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
     private IClassGroupTeacherMapperService classGroupTeacherMapperService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISubjectService subjectService;
 
     @Override
     public PageResponse getPage(ClassGroupReq classGroupReq) {
@@ -53,19 +52,19 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
         List<CourseScheduleResp> courseScheduleRespList = Lists.newArrayList();
         BeanUtils.copyProperties(courseScheduleIPage, pageResult);
         ClassGroup classGroup = groupService.getById(classGroupReq.getGroupId());
-        courseScheduleIPage.getRecords().forEach(item ->{
+        courseScheduleIPage.getRecords().forEach(item -> {
             CourseScheduleResp courseScheduleResp = new CourseScheduleResp();
             courseScheduleResp.setClassDate(DateUtil.date2String(item.getClassDate())
                     + " " + DateUtil.date2Week(item.getClassDate()))
                     .setClassTime(DateUtil.time2String(item.getStartClassTime()) + "-" + DateUtil.time2String(item.getEndClassTime()))
-                    .setClassGroupName(classGroup.getName());
+                    .setSubjectName(subjectService.getSubjectNameList(classGroup.getSubjectIdList()));
             QueryWrapper<ClassGroupTeacherMapper> classGroupTeacherMapperQueryWrapper = new QueryWrapper<>();
             classGroupTeacherMapperQueryWrapper.lambda().eq(true, ClassGroupTeacherMapper::getClassGroupId, item.getClassGroupId())
                     .eq(true, ClassGroupTeacherMapper::getTeacherRole, TeachTypeEnum.BISHOP.getCode());
             ClassGroupTeacherMapper classGroupTeacherMapper = classGroupTeacherMapperService.getOne(classGroupTeacherMapperQueryWrapper);
-            if (Objects.nonNull(classGroupTeacherMapper)){
+            if (Objects.nonNull(classGroupTeacherMapper)) {
                 SysUser sysUser = sysUserService.getById(classGroupTeacherMapper.getUserId());
-                if (Objects.nonNull(sysUser)){
+                if (Objects.nonNull(sysUser)) {
                     courseScheduleResp.setTeacher(sysUser.getRealName());
                 }
             }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -16,11 +16,11 @@ import com.ym.mec.education.resp.StudentAttendanceResq;
 import com.ym.mec.education.service.IClassGroupService;
 import com.ym.mec.education.service.ICourseScheduleService;
 import com.ym.mec.education.service.IStudentAttendanceService;
+import com.ym.mec.education.service.ISubjectService;
 import com.ym.mec.education.utils.DateUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 import java.util.Objects;
 
@@ -39,6 +39,8 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
     private ICourseScheduleService courseScheduleService;
     @Autowired
     private IClassGroupService groupService;
+    @Autowired
+    private ISubjectService subjectService;
 
     @Override
     public PageResponse getPage(ClassGroupReq classGroupReq) {
@@ -76,7 +78,7 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
             }
             ClassGroup classGroup = groupService.getById(classGroupReq.getGroupId());
             if (Objects.nonNull(classGroup)) {
-                studentAttendanceResq.setClassGroupName(classGroup.getName());
+                studentAttendanceResq.setSubjectName(subjectService.getSubjectNameList(classGroup.getSubjectIdList()));
                 list.add(studentAttendanceResq);
             }
         });

mec-education/src/main/java/com/ym/mec/education/service/impl/SubjectServiceImpl.java

@@ -1,11 +1,18 @@
 package com.ym.mec.education.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.ym.mec.education.entity.Subject;
 import com.ym.mec.education.mapper.SubjectMapper;
 import com.ym.mec.education.service.ISubjectService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * <p>
  * 科目(声部) 服务实现类
@@ -17,4 +24,20 @@ import org.springframework.stereotype.Service;
 @Service("ISubjectService")
 public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> implements ISubjectService {
 
+    @Override
+    public List<String> getSubjectNameList(String subjectIdArr) {
+        if (StringUtils.isNotBlank(subjectIdArr)) {
+            List<String> subjectName = Lists.newArrayList();
+            List<String> subjectIdList = Arrays.asList(subjectIdArr.split(","));
+            subjectIdList.forEach(subjectId -> {
+                Subject subject = getById(Integer.parseInt(subjectId));
+                if (Objects.nonNull(subject)) {
+                    subjectName.add(subject.getName());
+                }
+            });
+            return subjectName;
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/ESealPlugin.java

@@ -0,0 +1,6 @@
+package com.ym.mec.thirdparty.eseal;
+
+public interface ESealPlugin {
+
+	
+}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPluginContext.java

@@ -11,9 +11,9 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
 import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.message.vendors.JiguangPushPlugin;
-import com.ym.mec.thirdparty.message.vendors.MOxintongSMSPlugin;
-import com.ym.mec.thirdparty.message.vendors.ShiyuanSMSPlugin;
+import com.ym.mec.thirdparty.message.provider.JiguangPushPlugin;
+import com.ym.mec.thirdparty.message.provider.MOxintongSMSPlugin;
+import com.ym.mec.thirdparty.message.provider.ShiyuanSMSPlugin;
 
 @Component
 public class MessageSenderPluginContext implements ApplicationContextAware {

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/vendors/JiguangPushPlugin.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.vendors;
+package com.ym.mec.thirdparty.message.provider;
 
 import java.io.IOException;
 import java.util.HashMap;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/vendors/MOxintongSMSPlugin.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/MOxintongSMSPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.vendors;
+package com.ym.mec.thirdparty.message.provider;
 
 import java.io.IOException;
 import java.util.HashMap;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/vendors/ShiyuanSMSPlugin.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/ShiyuanSMSPlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.message.vendors;
+package com.ym.mec.thirdparty.message.provider;
 
 import java.io.IOException;
 import java.util.HashMap;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/StoragePluginContext.java

@@ -14,7 +14,7 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
 import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.storage.vendors.AliyunOssStoragePlugin;
+import com.ym.mec.thirdparty.storage.provider.AliyunOssStoragePlugin;
 
 @Component
 public class StoragePluginContext implements ApplicationContextAware, InitializingBean {

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/vendors/AliyunOssStoragePlugin.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.storage.vendors;
+package com.ym.mec.thirdparty.storage.provider;
 
 import java.io.File;
 import java.io.IOException;