update

cms/src/main/java/com/ym/mec/cms/dal/entity/NewsTypeEnum.java

@@ -1,20 +0,0 @@
-package com.ym.mec.cms.dal.entity;
-
-import com.ym.mec.common.enums.BaseEnum;
-
-public enum NewsTypeEnum implements BaseEnum<Integer, NewsTypeEnum> {
-
-	ACTIVITY(1), INFORMATION(0);
-
-	private Integer code;
-
-	NewsTypeEnum(int code) {
-		this.code = code;
-	}
-
-	@Override
-	public Integer getCode() {
-		return code;
-	}
-
-}

cms/src/main/java/com/ym/mec/cms/dal/entity/SysNewsInformation.java

@@ -1,7 +1,6 @@
 package com.ym.mec.cms.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -25,8 +24,8 @@ public class SysNewsInformation {
 	private String coverImage;
 
 	/** 类型 */
-	@ApiModelProperty(value = "类型", required = true)
-	private NewsTypeEnum type;
+	@ApiModelProperty(value = "类型,1精彩活动，2热门资讯", required = true)
+	private Integer type;
 
 	/** 状态（1-可见 0-不可见） */
 	@ApiModelProperty(value = "状态（1-可见 0-不可见）", required = true)
@@ -70,11 +69,11 @@ public class SysNewsInformation {
 		return this.coverImage;
 	}
 
-	public void setType(NewsTypeEnum type) {
+	public void setType(Integer type) {
 		this.type = type;
 	}
 
-	public NewsTypeEnum getType() {
+	public Integer getType() {
 		return this.type;
 	}
 

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -11,7 +11,7 @@
 		<result column="title_" property="title" />
 		<result column="content_" property="content" />
 		<result column="cover_image_" property="coverImage" />
-		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="type_" property="type"/>
 		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -20,7 +20,7 @@
 	<sql id="queryCondition">
 		<where>
 			<if test="type != null">
-				and type_ = #{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				and type_ = #{type}
 			</if>
 			<if test="status != null">
 				and status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
@@ -49,7 +49,7 @@
 		</selectKey>
 		-->
 		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_)
-		VALUES(#{id},#{title},#{content},#{coverImage},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now)
+		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now)
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -72,7 +72,7 @@
 				cover_image_ = #{coverImage},
 			</if>
 			<if test="type != null">
-				type_ = #{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+				type_ = #{type},
 			</if>
 		</set>
 		WHERE id_ = #{id}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/MenuController.java

@@ -59,7 +59,7 @@ public class MenuController extends BaseController {
     }
 
     @ApiOperation("查询用户可访问菜单树状结构")
-    @GetMapping(value = "/findByUser",consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "/findByUser")
     public Object findByUser(@RequestBody(required = false) MenuQueryInfo menuQueryInfo) {
         AuthUser user = SecurityUtils.getUser();
         if(user != null){

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/SmsCodeController.java

@@ -38,7 +38,6 @@ public class SmsCodeController extends BaseController {
     @ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String")
     @PostMapping(value = "/sendSms",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    @PreAuthorize("@pcs.hasPermissions('sys_user_manage')")
     public Object sendLoginVerifyCode(String mobile) {
         smsCodeService.sendValidCode(mobile);
         return succeed();

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -1,9 +1,17 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.common.dal.BaseDAO;
 
+import java.util.List;
+
 public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
-	
+    /**
+     * 获取学员所在乐团详情列表
+     * @param userId
+     * @return
+     */
+    List<MusicCardDto> queryUserMusicGroups(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicCardDto.java

@@ -0,0 +1,73 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+public class MusicCardDto {
+
+    @ApiModelProperty(value = "用户姓名",required = true)
+    private String userName;
+
+    @ApiModelProperty(value = "乐团名称",required = true)
+    private String musicGroupName;
+
+    @ApiModelProperty(value = "科目名称",required = true)
+    private String subjectName;
+
+    @ApiModelProperty(value = "所在年级",required = true)
+    private String currentGrade;
+
+    @ApiModelProperty(value = "所在班级",required = true)
+    private String currentClass;
+
+    @ApiModelProperty(value = "是否缴费",required = true)
+    private YesOrNoEnum paymentStatus;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getCurrentGrade() {
+        return currentGrade;
+    }
+
+    public void setCurrentGrade(String currentGrade) {
+        this.currentGrade = currentGrade;
+    }
+
+    public String getCurrentClass() {
+        return currentClass;
+    }
+
+    public void setCurrentClass(String currentClass) {
+        this.currentClass = currentClass;
+    }
+
+    public YesOrNoEnum getPaymentStatus() {
+        return paymentStatus;
+    }
+
+    public void setPaymentStatus(YesOrNoEnum paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+}

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

@@ -10,7 +10,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 /**
  * 对应数据库表(music_group):
  */
-public class MusicGroup {
+public class 	MusicGroup {
 
 	/**  */
 	private String id;

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -1,9 +1,12 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface MusicGroupService extends BaseService<String, MusicGroup> {
 
     /**
@@ -17,4 +20,10 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
      * @param subFeeSettingDto
      */
     void createGroup(SubFeeSettingDto subFeeSettingDto);
+
+    /**
+     * 获取学生所在乐团详情
+     * @return
+     */
+    List<MusicCardDto> queryUserMusicGroups(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.service.MusicGroupService;
@@ -87,4 +88,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>
 			});
 		}
 	}
+
+	@Override
+	public List<MusicCardDto> queryUserMusicGroups(Integer userId) {
+		return musicGroupDao.queryUserMusicGroups(userId);
+	}
 }

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

@@ -15,12 +15,12 @@
 		<result column="course_form_" property="courseForm" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="status_" property="status" />
+		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="bill_start_date_" property="billStartDate" />
 		<result column="improvent_classes_num_" property="improventClassesNum" />
 		<result column="enroll_classes_" property="enrollClasses" />
 		<result column="payment_expire_date_" property="paymentExpireDate" />
-		<result column="is_extra_class_" property="isExtraClass" />
+		<result column="is_extra_class_" property="isExtraClass" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="cooperation_organ_id_" property="cooperationOrganId" />
 		<result column="enlightenment_course_time_" property="enlightenmentCourseTime" />
 		<result column="parent_meeting_time_" property="parentMeetingTime" />
@@ -45,7 +45,7 @@
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO music_group
 		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_)
-		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},#{createTime},#{updateTime},#{status},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},#{isExtraClass},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime})
+		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -53,7 +53,7 @@
 		UPDATE music_group
 		<set>
 			<if test="status != null">
-				status_ = #{status},
+				status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
@@ -61,9 +61,6 @@
 			<if test="improventClassesNum != null">
 				improvent_classes_num_ = #{improventClassesNum},
 			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
 			<if test="courseForm != null">
 				course_form_ = #{courseForm},
 			</if>
@@ -79,11 +76,8 @@
 			<if test="name != null">
 				name_ = #{name},
 			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
 			<if test="isExtraClass != null">
-				is_extra_class_ = #{isExtraClass},
+				is_extra_class_ = #{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="paymentExpireDate != null">
 				payment_expire_date_ = #{paymentExpireDate},
@@ -132,4 +126,21 @@
 		SELECT COUNT(*) FROM
 		music_group
 	</select>
+
+	<resultMap type="com.ym.mec.biz.dal.dto.MusicCardDto" id="queryUserMusicGroupsMap">
+		<result column="user_name_" property="userName" />
+		<result column="subject_name_" property="subjectName" />
+		<result column="current_class_" property="currentClass" />
+		<result column="current_grade_" property="currentGrade" />
+		<result column="music_group_name_" property="musicGroupName" />
+		<result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+	</resultMap>
+    <select id="queryUserMusicGroups" resultMap="queryUserMusicGroupsMap">
+		SELECT sr.name_ user_name_,sr.current_class_,sr.current_grade_,
+		sr.payment_status_,mg.name_ music_group_name_,s.name_ subject_name_
+		FROM student_registration sr
+		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
+		WHERE sr.user_id_ = #{userId}
+	</select>
 </mapper>

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

@@ -103,6 +103,6 @@
 		SELECT COUNT(*) FROM sys_message
 	</select>
     <select id="findNewMessageNum" resultType="java.lang.Integer">
-SELECT * FROM sys_message WHERE status_ = 4 AND read_status_ = 0
+        SELECT COUNT(id_) FROM sys_message WHERE status_ = 4 AND read_status_ = 0
     </select>
 </mapper>

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

@@ -1,13 +0,0 @@
-package com.ym.mec.student.controller;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}

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

@@ -0,0 +1,33 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.service.MusicGroupService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("musicGroup")
+@Api(tags = "乐团服务")
+@RestController
+public class MusicGroupController extends BaseController {
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private MusicGroupService musicGroupService;
+
+    @ApiOperation("获取学生所在乐团列表")
+    @GetMapping(value = "/queryUserMusicGroups")
+    private Object queryUserMusicGroups(){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("请重新登录");
+        }
+        return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
+    }
+}