Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/ExamRoomService.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.service;
 
 
+import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.api.entity.ExamRoom;
@@ -62,7 +63,7 @@ public interface ExamRoomService extends BaseService<Long, ExamRoom> {
      * @date 2020.06.29
      * @return void
      */
-    void sendExamPlan(Integer organId, Integer examId, Integer operatorId);
+    HttpResponseResult sendExamPlan(Integer organId, Integer examId, Integer operatorId);
 
     /**
      * @describe 明日考试提醒

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -5,7 +5,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.entity.HttpResponseResult;
+import com.keao.edu.common.entity.SysConfig;
 import com.keao.edu.common.enums.MessageTypeEnum;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.page.PageInfo;
@@ -84,6 +87,8 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 	private ExamLocationDao examLocationDao;
 	@Autowired
 	private IdGeneratorService idGeneratorService;
+	@Autowired
+	private SysConfigService sysConfigService;
 
 	@Override
 	public BaseDAO<Long, ExamRoom> getDAO() {
@@ -409,7 +414,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void sendExamPlan(Integer organId, Integer examId, Integer operatorId) {
+	public HttpResponseResult sendExamPlan(Integer organId, Integer examId, Integer operatorId) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");
 		}
@@ -431,7 +436,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		List<ExamRoomStudentRelation> examRoomStudentWithOrgans = examRoomStudentRelationDao.getNoSendExamPlanRooms(examId.longValue(), null);
 
 		if(CollectionUtils.isEmpty(examRoomStudentWithOrgans)){
-			return;
+			return BaseController.succeed("所有考场都已发送考试安排");
 		}
 
 		Set<Integer> locationIds = examRoomStudentWithOrgans.stream().filter(e -> Objects.nonNull(e.getExamLocationId())).map(ExamRoomStudentRelation::getExamLocationId).collect(Collectors.toSet());
@@ -453,7 +458,14 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		List<ExamCertification> examCertifications=new ArrayList<>();
 		List<StudentExamResult> studentExamResults=new ArrayList<>();
 
+		SysConfig baseH5UrlConfig = sysConfigService.findByParamName(SysConfigService.BASE_H5_URL);
+		String baseH5Url = "";
+		if(Objects.nonNull(baseH5UrlConfig)){
+			baseH5Url = baseH5UrlConfig.getParanValue();
+		}
+
 		String baseUrl = "2?examRegistrationId=";
+		String downloadUrl = baseH5Url + "/#/downLoad?memo=2&examRegistrationId=";
 
 		for (Map.Entry<Long, List<ExamRoomStudentRelation>> examRoomStudentEntry : examRoomStudentMap.entrySet()) {
 			List<ExamRoomStudentRelation> students = examRoomStudentEntry.getValue();
@@ -534,12 +546,13 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 				smsMessageType = MessageTypeEnum.EXAM_ROOM_CONFIRM_OFFLINE_STUDENT_SMS;
 				locationName=idLocationMap.get(examRoom.getExamLocationId());
 			}
+			String url = baseUrl + students.get(0).getExamRegistrationId();
 			sysMessageService.batchSendMessage(pushMessageType,
-					receiverMap, null, 0, baseUrl+students.get(0).getExamRegistrationId(), JiguangPushPlugin.PLUGIN_NAME,
+					receiverMap, null, 0, url, JiguangPushPlugin.PLUGIN_NAME,
 					examName, examDayStr, examTimeStr, locationName);
 			sysMessageService.batchSendMessage(smsMessageType,
 					phoneMap, null, 0, null, YimeiSmsPlugin.PLUGIN_NAME,
-					examName, examDayStr, examTimeStr, locationName);
+					examName, examDayStr, examTimeStr, locationName, downloadUrl + students.get(0).getExamRegistrationId());
 		}
 
 		Map<Integer, String> idTeacherPhoneMap = this.getMap("sys_user", "id_", "phone_", new ArrayList(teacherExamRoomsMap.keySet()), Integer.class, String.class);
@@ -567,6 +580,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		if(!CollectionUtils.isEmpty(studentExamResults)){
 			studentExamResultDao.batchInsert(studentExamResults);
 		}
+		return BaseController.succeed("发送成功");
 	}
 
 	@Override

edu-user/edu-user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -49,7 +49,7 @@
 	<sql id="queryCondition">
 		<where>
 			<if test="search != null and search != ''">
-				AND (stu.user_id_ = #{search} OR su.real_name_ LIKE CONCAT (#{search}, '%'))
+				AND (stu.user_id_ = #{search} OR su.real_name_ LIKE CONCAT ('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
 		</where>
 	</sql>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -60,8 +60,7 @@ public class ExamRoomController extends BaseController {
         if(Objects.isNull(employee)){
             return failed("用户信息异常");
         }
-        examRoomService.sendExamPlan(employee.getOrganId(), examId, sysUser.getId());
-        return succeed();
+        return examRoomService.sendExamPlan(employee.getOrganId(), examId, sysUser.getId());
     }
 
     @ApiOperation("获取考级项目教室列表")