update

cms/src/main/java/com/ym/mec/cms/config/ResourceServerConfig.java

@@ -25,7 +25,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.authorizeRequests()
-				.antMatchers("/v2/api-docs", "/news/list", "/news/query")
+				.antMatchers("/v2/api-docs", "/news/list", "/news/query", "/news/homeList")
 				.permitAll()
 				// 任何人不登录都可以获取的资源
 				// .antMatchers("/ipController/**").hasIpAddress("127.0.0.1") //特定ip可以不登录获取资源

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -27,6 +27,12 @@ public class NewsController extends BaseController {
 		return succeed(sysNewsInformationService.queryPage(queryInfo));
 	}
 
+	@ApiOperation("资讯列表分页查询")
+	@GetMapping(value = "/homeList")
+	public Object getHomeList(NewsInformationQueryInfo queryInfo) {
+		return succeed(sysNewsInformationService.getHomeList(queryInfo));
+	}
+
 	@ApiOperation("查询资讯详情")
 	@ApiImplicitParam(name = "id", value = "资讯ID编号", required = true, dataType = "Long", paramType = "path")
 	@GetMapping(value = "/query")

cms/src/main/java/com/ym/mec/cms/service/SysNewsInformationService.java

@@ -1,8 +1,11 @@
 package com.ym.mec.cms.service;
 
 import java.util.List;
+import java.util.Map;
 
+import com.ym.mec.cms.controller.queryinfo.NewsInformationQueryInfo;
 import com.ym.mec.cms.dal.entity.SysNewsInformation;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface SysNewsInformationService extends BaseService<Long, SysNewsInformation> {
@@ -20,4 +23,11 @@ public interface SysNewsInformationService extends BaseService<Long, SysNewsInfo
 	 * @return
 	 */
 	boolean deleteWithLogical(Long id);
+
+	/**
+	 * 获取首页新闻列表
+	 * @param queryInfo
+	 * @return
+	 */
+	Map<String,PageInfo<SysNewsInformation>> getHomeList(NewsInformationQueryInfo queryInfo);
 }

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -1,7 +1,12 @@
 package com.ym.mec.cms.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import com.ym.mec.cms.controller.queryinfo.NewsInformationQueryInfo;
+import com.ym.mec.cms.dal.entity.NewsStatusEnum;
+import com.ym.mec.common.page.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,4 +38,17 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		return true;
 	}
 
+	@Override
+	public Map<String,PageInfo<SysNewsInformation>> getHomeList(NewsInformationQueryInfo queryInfo) {
+		//1精彩活动，2热门资讯,3banner类型
+		Map<String,PageInfo<SysNewsInformation>> homeList = new HashMap<>();
+		queryInfo.setType(1);
+		homeList.put("active",queryPage(queryInfo));
+		queryInfo.setType(2);
+		homeList.put("hot",queryPage(queryInfo));
+		queryInfo.setType(3);
+		homeList.put("banner",queryPage(queryInfo));
+		return homeList;
+	}
+
 }

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

@@ -1521,6 +1521,7 @@
                 <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
                     #{classGroupId}
                 </foreach>
+                AND del_flag_ = 0
             </if>
         </where>
 
@@ -1664,7 +1665,7 @@
         <foreach collection="vipGroupIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        AND cs.group_type_ = 'VIP'
+        AND cs.group_type_ = 'VIP' AND cs.del_flag_ = 0
         GROUP BY cs.music_group_id_
     </select>
     <select id="countCourseScheduleNum" resultType="java.util.Map">
@@ -1672,7 +1673,7 @@
         <foreach collection="vipGroupIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        AND cs.group_type_ = 'VIP' AND cs.status_ != 'NOT_START'
+        AND cs.group_type_ = 'VIP' AND cs.status_ != 'NOT_START' AND cs.del_flag_ = 0
         GROUP BY cs.music_group_id_
     </select>
     <select id="countTotalNumByClassGroupId" resultType="java.util.Map">
@@ -1684,6 +1685,7 @@
         <if test="classDate != null">
             AND cs.class_date_ = DATE_FORMAT(#{classDate}, '%Y%m%d')
         </if>
+        AND cs.del_flag_ = 0
         GROUP BY cs.class_group_id_
     </select>
     <select id="countCurrentNumByClassGroupId" resultType="java.util.Map">
@@ -1695,7 +1697,7 @@
         <if test="classDate != null">
             AND cs.class_date_ = DATE_FORMAT(#{classDate}, '%Y%m%d')
         </if>
-        AND cs.status_ = 'NOT_START'
+        AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0
         GROUP BY cs.class_group_id_
     </select>
 

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

@@ -186,7 +186,7 @@
 		<foreach collection="musicGroupIds" separator="," item="item" open="(" close=")">
 			#{item}
 		</foreach>
-		AND cs.group_type_ = #{groupType} AND cssp.user_id_ = #{userId} AND cs.status_ = 'NOT_START'
+		AND cs.group_type_ = #{groupType} AND cssp.user_id_ = #{userId} AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0
 		GROUP BY cssp.music_group_id_
 	</select>