add:添加首页曲目统计

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/HomeController.java

@@ -2,6 +2,8 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.yonge.cooleshow.biz.dal.dto.req.TotalReq;
 import com.yonge.cooleshow.biz.dal.service.HomeService;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.vo.HomeMusicSheetVo;
 import com.yonge.cooleshow.biz.dal.vo.res.HomeTotalStudent;
 import com.yonge.cooleshow.biz.dal.vo.res.HomeTotalTeacher;
 import com.yonge.cooleshow.biz.dal.vo.res.HomeUserToDoNum;
@@ -21,6 +23,9 @@ public class HomeController extends BaseController {
     @Autowired
     private HomeService homeService;
 
+    @Autowired
+    private MusicSheetService musicSheetService;
+
     @ApiOperation(value = "查询用户待办事项数")
     @PostMapping("/getUserToDoNum")
     @PreAuthorize("@pcs.hasPermissions('home/getUserToDoNum')")
@@ -42,4 +47,11 @@ public class HomeController extends BaseController {
         return homeService.totalStudent(totalReq);
     }
 
+
+    @ApiOperation(value = "首页曲目点播数据")
+    @PostMapping("/musicSheet")
+    public HttpResponseResult<HomeMusicSheetVo> musicSheet() {
+        return succeed(musicSheetService.getMusicSheetHome());
+    }
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetDao.java

@@ -121,4 +121,11 @@ public interface MusicSheetDao extends BaseMapper<MusicSheet> {
      * @return
      */
     HomeMusicSheetVo selectMusicNum();
+
+    /**
+     * 查询付费人数最多的前5个曲目
+     *
+     * @return
+     */
+    List<HomeMusicSheetVo.MusicSheetSmall> selectPayMusicSheet();
 }

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

@@ -547,7 +547,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     public HomeMusicSheetVo getMusicSheetHome() {
 
         HomeMusicSheetVo homeMusicSheetVo = baseMapper.selectMusicNum();
-        // homeMusicSheetVo.
+        homeMusicSheetVo.setMusicSheetSmallList(baseMapper.selectPayMusicSheet());
 
         return homeMusicSheetVo;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/HomeMusicSheetVo.java

@@ -26,7 +26,7 @@ public class HomeMusicSheetVo {
     @ApiModelProperty("集合")
     private List<MusicSheetSmall> musicSheetSmallList;
 
-    static class MusicSheetSmall{
+    public static class MusicSheetSmall{
 
         @ApiModelProperty("曲目编号")
         private Long  musicSheetId;

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

@@ -270,7 +270,7 @@
             <include refid="QueryInfo"/>
             <if test="param.studentId != null">
                 and mspr.student_id_ = #{param.studentId}
-                and mspr.order_status_ = 1
+                and mspr.order_status_ = 'PAID'
             </if>
         </where>
         order by  mspr.id_ desc
@@ -470,4 +470,20 @@
 
 
     </select>
+
+    <select id="selectPayMusicSheet" resultType="com.yonge.cooleshow.biz.dal.vo.HomeMusicSheetVo$MusicSheetSmall">
+
+        select distinct
+            ms.id_ as musicSheetId,
+            ms.music_sheet_name_ as musicSheetName,
+            count(1) as num
+        from music_sheet ms
+        left join music_sheet_purchase_record mspr on mspr.music_sheet_id_ = ms.id_
+            and state_ = 1 and audit_status_ = 'PASS' and del_flag_ = 0 and mspr.order_status_ = 'PAID'
+
+            group by ms.id_, ms.music_sheet_name_
+            order by  count(ms.id_)
+        limit 5
+
+    </select>
 </mapper>

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

@@ -158,7 +158,7 @@
 
     <update id="updateOneStatus">
        update sys_message set read_status_=#{status}
-		where id_ =#{id} and send_time_ &gt;= now()
+		where id_ =#{id}
     </update>
 
     <select id="queryCount" parameterType="map" resultType="int">

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SysMessageController.java

@@ -81,7 +81,7 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT") > 0 ? succeed() : failed();
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT") > 0 );
 	}
 
 	@ApiOperation("设置已读")
@@ -92,7 +92,7 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return sysMessageService.updateOneStatus(id, status) > 0 ? succeed() : failed();
+		return succeed(sysMessageService.updateOneStatus(id, status) > 0);
 	}
 
 	@ApiOperation(value = "查询用户未读消息条数")

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysMessageController.java

@@ -81,7 +81,7 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER") > 0 ? succeed() : failed();
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER") > 0 );
 	}
 
 	@ApiOperation("设置已读")
@@ -92,7 +92,7 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return sysMessageService.updateOneStatus(id, status) > 0 ? succeed() : failed();
+		return succeed(sysMessageService.updateOneStatus(id, status) >0) ;
 	}
 
 	@ApiOperation(value = "查询用户未读消息条数")
@@ -121,6 +121,6 @@ public class SysMessageController extends BaseController {
 			throw new BizException("请输入正确的手机号");
 		}
 		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group, "TEACHER");
-		return succeed();
+		return succeed(true);
 	}
 }