add:app首页资讯接口

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.cms.controller;
 
 import com.yonge.cooleshow.cms.dal.entity.NewsStatusEnum;
+import com.yonge.cooleshow.cms.dto.AppHomeDto;
 import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -10,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,4 +128,35 @@ public class NewsController extends BaseController {
 		}
 		return succeed(sysNewsInformationService.updateStatus(id));
 	}
+
+	@ApiOperation("app首页banner、按钮、资讯")
+	@PostMapping(value = "/app/home")
+	public HttpResponseResult<AppHomeDto> appHome() {
+		AppHomeDto appHomeDto = new AppHomeDto();
+		NewsInformationQueryInfo queryInfo = new NewsInformationQueryInfo();
+		queryInfo.setStatus(NewsStatusEnum.SHOW);
+		queryInfo.setPlatformType("STUDENT");
+		// 1热门资讯
+		queryInfo.setType(1);
+		queryInfo.setPage(1);
+		queryInfo.setRows(3);
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+		List<SysNewsInformationDto> rows = sysNewsInformationService.selectPage(queryInfo).getRows();
+		appHomeDto.setInformation(rows);
+
+		// 轮播图
+		queryInfo.setType(4);
+		queryInfo.setRows(999);
+		params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+		appHomeDto.setBanner(sysNewsInformationService.selectPage(queryInfo).getRows());
+		// 闪页
+		queryInfo.setType(3);
+		queryInfo.setRows(999);
+		params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+		appHomeDto.setFlashPage(sysNewsInformationService.selectPage(queryInfo).getRows());
+		return succeed(appHomeDto);
+	}
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dto/AppHomeDto.java

@@ -0,0 +1,50 @@
+package com.yonge.cooleshow.cms.dto;
+
+import com.yonge.cooleshow.cms.controller.queryinfo.NewsInformationQueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-04-24
+ */
+@ApiModel("app首页信息")
+public class AppHomeDto {
+
+    @ApiModelProperty("资讯")
+    private List<SysNewsInformationDto> information;
+
+    @ApiModelProperty("banner")
+    private List<SysNewsInformationDto> banner;
+
+    @ApiModelProperty("闪页")
+    private List<SysNewsInformationDto> flashPage;
+
+    public List<SysNewsInformationDto> getInformation() {
+        return information;
+    }
+
+    public void setInformation(List<SysNewsInformationDto> information) {
+        this.information = information;
+    }
+
+    public List<SysNewsInformationDto> getBanner() {
+        return banner;
+    }
+
+    public void setBanner(List<SysNewsInformationDto> banner) {
+        this.banner = banner;
+    }
+
+    public List<SysNewsInformationDto> getFlashPage() {
+        return flashPage;
+    }
+
+    public void setFlashPage(List<SysNewsInformationDto> flashPage) {
+        this.flashPage = flashPage;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -232,7 +232,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         if (musicSheet == null) {
             throw  new BizException("未找到曲目信息");
         }
-        if (AuthStatusEnum.DOING.getCode().equals(musicSheet.getAuditStatus().getCode())) {
+        if (!AuthStatusEnum.DOING.getCode().equals(musicSheet.getAuditStatus().getCode())) {
             throw  new BizException("曲目已经过审批");
         }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -111,7 +111,7 @@
     </sql>
 
     <select id="selectAlbumDetailPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
-        select <include refid="Base_Column_List"/>
+        select distinct <include refid="Base_Column_List"/>
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
         ,(select group_concat(s.name_) from subject s
@@ -147,8 +147,8 @@
                     order by amr.create_time_
                 </if>
                 <if test="param.type == 1">
-                    and not exists(select amr2.music_sheet_id_  from album_music_relate amr2
-                        where amr2.album_id_ = #{param.id} and t.id_ = amr2.music_sheet_id_)
+                    and t.id_ not in(select amr2.music_sheet_id_  from album_music_relate amr2
+                        where amr2.album_id_ = #{param.id})
                 </if>
             </if>
         </where>