Merge remote-tracking branch 'origin/master'

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

@@ -44,6 +44,9 @@ public class StudentManageListDto {
 
     @ApiModelProperty(value = "课程余额")
     private BigDecimal courseBalance;
+
+    @ApiModelProperty(value = "账户余额")
+    private BigDecimal balance;
     
     private YesOrNoEnum isActive;
 
@@ -74,6 +77,14 @@ public class StudentManageListDto {
     
     private Integer teacherId;
 
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+
     public YesOrNoEnum getServiceTag() {
         return serviceTag;
     }

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

@@ -115,10 +115,11 @@
         SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,
         su.birthdate_,su.nation_,su.organ_id_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
-        IF(st.service_tag_=2,0,st.service_tag_) service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_
+        IF(st.service_tag_=2,0,st.service_tag_) service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_,suca.balance_
         FROM sys_user su
         LEFT JOIN student st ON st.user_id_ = su.id_
-        left join sys_user tu on tu.id_ = st.teacher_id_
+        LEFT JOIN sys_user tu ON tu.id_ = st.teacher_id_
+        LEFT JOIN sys_user_cash_account suca ON su.id_ = suca.user_id_
         <include refid="findStudentsByOrganIdSql"/>
         ORDER BY su.create_time_ DESC
         <include refid="global.limit"/>
@@ -747,6 +748,7 @@
         <result property="organId" column="organ_id_"/>
         <result property="subjectName" column="music_group_subject_"/>
         <result property="courseBalance" column="course_balance_"/>
+        <result property="balance" column="balance_"/>
         <result property="serviceTag" column="service_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="operatingTag" column="operating_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="teacherName" column="teacher_name_"/>

mec-im/src/main/java/com/ym/pojo/DeviceTypeEnum.java

@@ -8,4 +8,5 @@ public enum DeviceTypeEnum {
     Camera,
     MusicMode,
     HandUp,
+    PlayMidi,
 }

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -631,7 +631,7 @@ public class RoomServiceImpl implements RoomService {
             display += "?userId=" + targetUserId + "?uri=" + uri;
             roomDao.updateDisplayByRid(roomId, display);
             DisplayMessage displayMessage = new DisplayMessage(display);
-            imHelper.publishMessage(targetUserId, roomId, displayMessage);
+            imHelper.publishMessage(userId, roomId, displayMessage);
             log.info("change display to screen: roomId={}, display={}", roomId, display);
         } else {
             display += "?userId=" + userId + "?uri=" + uri;
@@ -1415,9 +1415,13 @@ public class RoomServiceImpl implements RoomService {
         groupMessage.setTargetId(roomId.split(","));
         groupMessage.setSenderId(sysUser.getId().toString());
         groupMessage.setObjectName("DY:PlayMidiMessage");
-        messageService.groupSend(groupMessage);
-        //记录节拍器消息
         String userId = playMidiMessageData.getUserId();
+        DeviceStateChangedMessage deviceResourceMessage = new DeviceStateChangedMessage(DeviceTypeEnum.PlayMidi.ordinal(), customMessage.getEnable());
+        deviceResourceMessage.setUserId(userId);
+        imHelper.publishMessage(userId, roomId, deviceResourceMessage, 1);
+//        messageService.groupSend(groupMessage);
+        //记录节拍器消息
+
 //        long courseId = Long.parseLong(roomId.substring(1));
         courseScheduleStudentPaymentDao.adjustPlayMidi(Long.parseLong(roomId.substring(1)),userId,content);
         /*if(StringUtils.isEmpty(userId)){

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -374,10 +374,10 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
-                    "家长联系电话", "是否激活", "是否有课", "是否有网管课", "课程余额(元)",
+                    "家长联系电话", "是否激活", "是否有课", "是否有网管课", "课程余额(元)", "账户余额(元)",
                     "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态", "服务标签", "运营标签","指导老师"}, new String[]{
                     "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone",
-                    "isActive.msg", "hasCourse.msg", "hasPracticeCourse.msg", "courseBalance", "musicGroupName",
+                    "isActive.msg", "hasCourse.msg", "hasPracticeCourse.msg", "courseBalance", "balance", "musicGroupName",
                     "subjectName", "musicGroupStatus", "vipGroupName", "vipGroupStatus", "serviceTag.msg", "operatingTag.msg","teacherName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");