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

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -16,6 +16,7 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 
 	@Override
 	public Object test() {
+		System.out.println("******进入服务降级方法******");
 		return "服务正在拍";
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup.java

@@ -63,6 +63,17 @@ public class ClassGroup {
 	@ApiModelProperty(value = "总统课次",required = false)
 	private Integer totalClassTimes;
 
+	@ApiModelProperty(value = "当前课次",required = false)
+	private Integer currentClassTimes;
+
+	public Integer getCurrentClassTimes() {
+		return currentClassTimes;
+	}
+
+	public void setCurrentClassTimes(Integer currentClassTimes) {
+		this.currentClassTimes = currentClassTimes;
+	}
+
 	public Integer getTotalClassTimes() {
 		return totalClassTimes;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/School.java

@@ -52,8 +52,10 @@ public class School {
 	@ApiModelProperty(value = "补贴", required = false)
 	private BigDecimal subsidy;
 	
+	@ApiModelProperty(value = "合作单位编号", required = false)
 	private Integer cooperationOrganId;
 	
+	@ApiModelProperty(value = "备注", required = false)
 	private String remark;
 
 	public void setId(Integer id) {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -35,11 +35,11 @@ public class StudentRegistration {
 	private String currentClass;
 	
 	/** 报名科目 */
-	@ApiModelProperty(value = "报名科目",required = false)
+	@ApiModelProperty(value = "报名科目",required = true)
 	private Integer subjectId;
 
 	/** 报名科目 */
-	@ApiModelProperty(value = "实际科目",required = false)
+	@ApiModelProperty(value = "实际科目",hidden = true)
 	private Integer actualSubjectId;
 	
 	/** 是否允许调剂 */

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -51,6 +51,7 @@
             <if test="type!=null">type_,</if>
             <if test="expectStudentNum!=null">expect_student_num_,</if>
             <if test="totalClassTimes!=null">total_class_times_,</if>
+            <if test="currentClassTimes!=null">current_class_times_,</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -64,6 +65,7 @@
             <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
             <if test="expectStudentNum!=null">#{expectStudentNum},</if>
             <if test="totalClassTimes!=null">#{totalClassTimes},</if>
+            <if test="currentClassTimes!=null">#{currentClassTimes},</if>
         </trim>
     </insert>
 
@@ -107,6 +109,9 @@
             <if test="totalClassTimes != null">
                 total_class_times_ = #{totalClassTimes},
             </if>
+            <if test="currentClassTimes!=null">
+                current_class_times_=#{currentClassTimes},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-common/common-core/src/main/java/com/ym/mec/common/config/FeignConfiguration.java

@@ -17,6 +17,9 @@ public class FeignConfiguration implements RequestInterceptor {
 	@Override
 	public void apply(RequestTemplate template) {
 		ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+		if (attributes == null) {
+			return;
+		}
 		HttpServletRequest request = attributes.getRequest();
 		Enumeration<String> headerNames = request.getHeaderNames();
 		if (headerNames != null) {

mec-education/src/main/resources/application.yml

@@ -72,4 +72,8 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+  
+feign:
+  hystrix:
+    enabled: true

mec-student/src/main/java/com/ym/mec/student/controller/RegisterController.java

@@ -0,0 +1,28 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.service.StudentRegistrationService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("register")
+@Api(tags = "乐团服务")
+@RestController
+public class RegisterController extends BaseController {
+
+    @Autowired
+    private StudentRegistrationService studentRegistrationService;
+
+
+    @ApiOperation(value = "新增学生报名信息")
+    @PostMapping("/add")
+    public Object add(StudentRegistration studentRegistration) {
+        studentRegistrationService.insert(studentRegistration);
+        return succeed();
+    }
+}

mec-student/src/main/resources/application.yml

@@ -72,4 +72,8 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+  
+feign:
+  hystrix:
+    enabled: true

mec-task/src/main/resources/application.yml

@@ -50,4 +50,8 @@ security:
       token-info-uri: http://localhost:8001/oauth/check_token
       
 swagger:
-  base-package: com.ym.mec.task.controller
+  base-package: com.ym.mec.task.controller
+  
+feign:
+  hystrix:
+    enabled: true

mec-teacher/src/main/resources/application.yml

@@ -72,4 +72,8 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+  
+feign:
+  hystrix:
+    enabled: true

mec-web/src/main/resources/application.yml

@@ -72,4 +72,8 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+  
+feign:
+  hystrix:
+    enabled: true