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

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/client/SysMessageFeignService.java

@@ -3,19 +3,13 @@ package com.keao.edu.auth.api.client;
 import com.keao.edu.auth.api.client.fallback.SysMessageFeignServiceFallback;
 import com.keao.edu.auth.api.entity.SysMessageParams;
 import com.keao.edu.common.config.FeignConfiguration;
-import com.keao.edu.common.enums.MessageTypeEnum;
-import com.keao.edu.thirdparty.message.MessageSenderPluginContext;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import java.util.Date;
-import java.util.Map;
-
 @FeignClient(contextId = "SysMessageFeignService", name = "auth-server", configuration = { FeignConfiguration.class }, fallback = SysMessageFeignServiceFallback.class)
 public interface SysMessageFeignService {
 
-
     @GetMapping(value = "sysMessage/batchSendMessage", consumes = MediaType.APPLICATION_JSON_VALUE)
     void batchSendMessage(SysMessageParams sysMessageParams);
 }

edu-common/src/main/java/com/keao/edu/common/enums/MessageTypeEnum.java

@@ -3,7 +3,7 @@ package com.keao.edu.common.enums;
 public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 
     SMS_VERIFY_CODE_LOGIN("SMS_VERIFY_CODE_LOGIN", "验证码登录"),
-    EXAM_REGISTRATION_URL_PUSH("EXAM_REGISTRATION_URL_PUSH", "报名连接推送"),
+    EXAM_REGISTRATION_URL_SMS("EXAM_REGISTRATION_URL_SMS", "报名连接推送"),
     STUDENT_EXAM_START("STUDENT_EXAM_START", "考试已开始");
 
     MessageTypeEnum(String code, String msg) {

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

@@ -11,10 +11,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author Joburgess
@@ -37,6 +39,12 @@ public class ExamLocationController extends BaseController {
         return succeed(examLocationService.queryPage(queryInfo));
     }
 
+    @ApiOperation("获取所在机构所有考点")
+    @GetMapping(value = "/getTenantAllLocations")
+    public HttpResponseResult<List<ExamLocation>> getTenantAllLocations(@Param("tenantId") String tenantId){
+        return succeed(examLocationService.getTenantAllLocations(TenantContextHolder.getTenantId()));
+    }
+
     @ApiOperation("查询考点详情")
     @ApiImplicitParam(name = "id", value = "机构ID", required = true, dataType = "Integer", paramType = "path")
     @GetMapping(value = "/query")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamLocationDao.java

@@ -15,4 +15,6 @@ public interface ExamLocationDao extends BaseDAO<Integer, ExamLocation> {
      * @return
      */
     List<ExamLocation> getExamLocationByIds(@Param("ids") String ids);
+
+    List<ExamLocation> getTenantAllLocations(@Param("tenantId") String tenantId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamRegistrationPaymentQueryInfo.java

@@ -2,8 +2,11 @@ package com.keao.edu.user.page;
 
 import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
+import com.keao.edu.user.enums.TransStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 
 public class ExamRegistrationPaymentQueryInfo extends QueryInfo {
 
@@ -25,6 +28,17 @@ public class ExamRegistrationPaymentQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "学员编号")
     private Integer studentId;
 
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "订单状态")
+    private TransStatusEnum transStatus;
+
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
 
     public Integer getExamRegistrationId() {
         return examRegistrationId;
@@ -73,4 +87,36 @@ public class ExamRegistrationPaymentQueryInfo extends QueryInfo {
     public void setExamName(String examName) {
         ExamName = examName;
     }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public TransStatusEnum getTransStatus() {
+        return transStatus;
+    }
+
+    public void setTransStatus(TransStatusEnum transStatus) {
+        this.transStatus = transStatus;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamLocationService.java

@@ -3,7 +3,12 @@ package com.keao.edu.user.service;
 
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.entity.ExamLocation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface ExamLocationService extends BaseService<Integer, ExamLocation> {
 
+    List<ExamLocation> getTenantAllLocations(@Param("tenantId") String tenantId);
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamLocationServiceImpl.java

@@ -8,6 +8,8 @@ import com.keao.edu.user.service.ExamLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ExamLocationServiceImpl extends BaseServiceImpl<Integer, ExamLocation> implements ExamLocationService {
 	
@@ -18,5 +20,9 @@ public class ExamLocationServiceImpl extends BaseServiceImpl<Integer, ExamLocati
 	public BaseDAO<Integer, ExamLocation> getDAO() {
 		return examLocationDao;
 	}
-	
+
+	@Override
+	public List<ExamLocation> getTenantAllLocations(String tenantId) {
+		return examLocationDao.getTenantAllLocations(tenantId);
+	}
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -287,7 +287,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			Map<Integer, String> userPhoneMap = new HashMap<>();
 			userPhoneMap.put(examOrgan.getOrganId(), organUser.getPhone());
 
-			SysMessageParams sysMessageParams=new SysMessageParams(MessageTypeEnum.EXAM_REGISTRATION_URL_PUSH,
+			SysMessageParams sysMessageParams=new SysMessageParams(MessageTypeEnum.EXAM_REGISTRATION_URL_SMS,
 					userPhoneMap, null, 0, null, JiguangPushPlugin.PLUGIN_NAME,
 					tenantInfo.getName(), examinationBasic.getName(), expectRegistTime.toString(), examOrgan.getUrl());
 			sysMessageFeignService.batchSendMessage(sysMessageParams);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -301,7 +301,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			//推送消息
 			Map<Integer, String> userPhoneMap = new HashMap<>();
 			userPhoneMap.put(studentId, studentId.toString());
-			SysMessageParams sysMessageParams=new SysMessageParams(MessageTypeEnum.EXAM_REGISTRATION_URL_PUSH,
+			SysMessageParams sysMessageParams=new SysMessageParams(MessageTypeEnum.EXAM_REGISTRATION_URL_SMS,
 					userPhoneMap, null, 0, null, null);
 			sysMessageFeignService.batchSendMessage(sysMessageParams);
 		}

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamLocationMapper.xml

@@ -11,6 +11,7 @@
 		<result column="name_" property="name" />
 		<result column="contact_name_" property="contactName" />
 		<result column="contact_phone_" property="contactPhone" />
+		<result column="is_available_" property="isAvailable" />
 		<result column="address_" property="address" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -100,4 +101,8 @@
 	<select id="getExamLocationByIds" resultMap="ExamLocation">
 		SELECT * FROM exam_location WHERE FIND_IN_SET(id_,#{ids})
 	</select>
+
+	<select id="getTenantAllLocations" resultMap="ExamLocation">
+		SELECT * FROM exam_location WHERE tenant_id_ = #{tenantId}
+	</select>
 </mapper>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -125,6 +125,18 @@
             <if test="cardNo!=null">
                 AND ec.card_no_=#{cardNo}
             </if>
+            <if test="orderNo!=null">
+                AND erp.order_no_=#{orderNo}
+            </if>
+            <if test="transStatus!=null">
+                AND erp.trans_status_=#{transStatus,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+            </if>
+            <if test="startTime!=null">
+                AND erp.create_time_ >=#{startTime}
+            </if>
+            <if test="endTime!=null">
+                <![CDATA[AND erp.create_time_ <= #{endTime}]]>
+            </if>
             <if test="examName!=null">
                 AND eb.name_=#{examName}
             </if>
@@ -145,7 +157,7 @@
         SELECT erp.*,eb.exam_location_id_list_ FROM exam_registration_payment erp
         LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
         LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
-        <include refid="queryCondition" />
+        <include refid="queryCondition"/>
         <include refid="global.limit"/>
     </select>
 
@@ -154,7 +166,7 @@
         SELECT erp.*,eb.exam_location_id_list_,ec.card_no_ FROM exam_registration_payment erp
         LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
         LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
-        <include refid="queryCondition" />
+        <include refid="queryCondition"/>
         <include refid="global.limit"/>
     </select>
 
@@ -163,7 +175,7 @@
         SELECT COUNT(*) FROM exam_registration_payment erp
         LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
         LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
-        <include refid="queryCondition" />
+        <include refid="queryCondition"/>
     </select>
 
     <!-- 获取项目用户未支付的订单 -->
@@ -172,19 +184,24 @@
         FROM exam_registration_payment
         WHERE student_id_ = #{userId}
           AND examination_basic_id_ = #{examinationBasicId}
-          AND trans_status_ = 'ING' LIMIT 1
+          AND trans_status_ = 'ING'
+        LIMIT 1
     </select>
 
     <!-- 根据订单号获取订单 -->
     <select id="getByOrderNo" resultMap="ExamRegistrationPayment">
         SELECT *
         FROM exam_registration_payment
-        WHERE order_no_ = #{orderNo} FOR UPDATE
+        WHERE order_no_ = #{orderNo} FOR
+        UPDATE
     </select>
 
     <!-- 根据状态获取订单 -->
     <select id="getOrdersByStatus" resultMap="ExamRegistrationPayment">
-        SELECT * FROM exam_registration_payment WHERE pay_type_ = #{payType} AND trans_status_ = #{status}
+        SELECT *
+        FROM exam_registration_payment
+        WHERE pay_type_ = #{payType}
+          AND trans_status_ = #{status}
     </select>
 
     <!-- 获取超时未支付的订单 -->
@@ -197,9 +214,13 @@
         <![CDATA[ AND create_time_ <= ]]> #{beforeTime}
     </select>
 
-    <resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto" extends="ExamRegistrationPayment">
+    <resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto"
+               extends="ExamRegistrationPayment">
         <result column="card_no_" property="cardNo"/>
-        <association property="examRegistration" select="com.keao.edu.user.dao.ExamRegistrationDao.getExamRegistrationInfo" column="{id=exam_registration_id_}"/>
-        <association property="examLocations"  select="com.keao.edu.user.dao.ExamLocationDao.getExamLocationByIds" column="{ids=exam_location_id_list_}"/>
+        <association property="examRegistration"
+                     select="com.keao.edu.user.dao.ExamRegistrationDao.getExamRegistrationInfo"
+                     column="{id=exam_registration_id_}"/>
+        <association property="examLocations" select="com.keao.edu.user.dao.ExamLocationDao.getExamLocationByIds"
+                     column="{ids=exam_location_id_list_}"/>
     </resultMap>
 </mapper>