Merge branch 'zx_saas_sql' of http://git.dayaedu.com/yonge/mec into test

audio-analysis/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

cms/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-application/src/main/java/com/ym/mec/AppServerApplication.java

@@ -5,6 +5,8 @@ import com.ym.mec.config.AppBeanNameGenerator;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.logging.LogLevel;
+import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
@@ -22,5 +24,12 @@ public class AppServerApplication {
         new SpringApplicationBuilder(AppServerApplication.class)
                 .beanNameGenerator(new AppBeanNameGenerator())
                 .run(args);
+        configureGlobalLogger();
+    }
+
+    private static void configureGlobalLogger() {
+        LoggingSystem loggingSystem = LoggingSystem.get(ClassLoader.getSystemClassLoader());
+        // 设置业务日志记录器的日志级别为INFO
+        loggingSystem.setLogLevel("businessLogger", LogLevel.INFO);
     }
 }

mec-application/src/main/java/com/ym/mec/vo/PageUtil.java

@@ -0,0 +1,26 @@
+package com.ym.mec.vo;
+
+import com.ym.mec.common.page.PageInfo;
+
+import java.util.Objects;
+
+/**
+ * @author hgw
+ * Created by 2021-12-03
+ */
+public class PageUtil {
+
+    public static <T> PageInfo<T> pageInfo(com.microsvc.toolkit.common.response.paging.PageInfo<T> source) {
+        if (Objects.isNull(source)) {
+            return new PageInfo<>(1, 20);
+        }
+        int total = Integer.parseInt(String.valueOf(source.getTotal()));
+        int limit = Integer.parseInt(String.valueOf(source.getLimit()));
+        PageInfo<T> resultPage = new PageInfo<>();
+        resultPage.setRows(source.getRows());
+        resultPage.setPageNo(Long.valueOf(source.getCurrent()).intValue());
+        resultPage.setLimit(limit);
+        resultPage.setTotal(total);
+        return resultPage;
+    }
+}

mec-application/src/main/java/com/ym/mec/web/controller/LessonCoursewareController.java

@@ -39,7 +39,7 @@ public class LessonCoursewareController extends BaseController {
 	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/queryPage')")
 	public HttpResponseResult<PageInfo<CbsLessonCoursewareWrapper.LessonCourseware>> queryPage(@RequestBody CbsLessonCoursewareWrapper.LessonCoursewareQuery query) throws Exception {
 		query.setEnableFlag(true);
-		return succeed(PageUtil.pageInfo(coursewareFeignService.lessonCoursewarePage(query).feignData()));
+		return succeed(com.ym.mec.vo.PageUtil.pageInfo(coursewareFeignService.lessonCoursewarePage(query).feignData()));
 	}
 
 	@ApiOperation(value = "获取已添加的课件id列表")

mec-auth/mec-auth-server/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

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

@@ -146,9 +146,16 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
                                                 @Param("groupType")GroupType groupType,
                                                 @Param("courseStatus") CourseStatusEnum courseStatus,@Param("tenantId") Integer tenantId);
 
+    List<IndexBaseMonthData> getGroupCourseData1(@Param("dayStr") String dayStr,
+                                                @Param("groupType")GroupType groupType,
+                                                @Param("courseStatus") CourseStatusEnum courseStatus,@Param("tenantId") Integer tenantId);
+
     List<IndexBaseMonthData> getGroupSurplusCourseData(@Param("dayStr") String dayStr,
                                                 @Param("groupType")GroupType groupType,
                                                 @Param("courseStatus") CourseStatusEnum courseStatus,@Param("tenantId") Integer tenantId);
+    List<IndexBaseMonthData> getGroupSurplusCourseData1(@Param("dayStr") String dayStr,
+                                                @Param("groupType")GroupType groupType,
+                                                @Param("courseStatus") CourseStatusEnum courseStatus,@Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getGroupCourseDataWithGroup(@Param("dayStr") String dayStr,
                                                         @Param("startDate") String startDate,

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupSalaryQueryInfo.java

@@ -14,7 +14,7 @@ import java.util.Date;
 public class VipGroupSalaryQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "vip课编号")
-    private Long vipGroupId;
+    private String vipGroupId;
 
     @ApiModelProperty(value = "部门编号")
     private Long organId;

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

@@ -573,16 +573,16 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	//剩余课时
 	public void subCourseData(String dayStr,Integer tenantId){
 		saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, null, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_COURSE_NUM, tenantId);
-		saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.MUSIC, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_MUSIC_COURSE_NUM, tenantId);
-		saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.VIP, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_VIP_COURSE_NUM, tenantId);
+		saveData(indexBaseMonthDataDao.getGroupCourseData1(dayStr, GroupType.MUSIC, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_MUSIC_COURSE_NUM, tenantId);
+		saveData(indexBaseMonthDataDao.getGroupCourseData1(dayStr, GroupType.VIP, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_VIP_COURSE_NUM, tenantId);
 		saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.PRACTICE, CourseStatusEnum.NOT_START,tenantId), dayStr, IndexDataType.SURPLUS_PRACTICE_COURSE_NUM, tenantId);
 	}
 
 	//已消耗课时
 	public void consumeCourseData(String dayStr,Integer tenantId){
 		saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, null, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_COURSE_NUM, tenantId);
-		saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.MUSIC, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_MUSIC_COURSE_NUM, tenantId);
-		saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.VIP, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_VIP_COURSE_NUM, tenantId);
+		saveData(indexBaseMonthDataDao.getGroupSurplusCourseData1(dayStr, GroupType.MUSIC, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_MUSIC_COURSE_NUM, tenantId);
+		saveData(indexBaseMonthDataDao.getGroupSurplusCourseData1(dayStr, GroupType.VIP, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_VIP_COURSE_NUM, tenantId);
 		saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.PRACTICE, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_PRACTICE_COURSE_NUM, tenantId);
 	}
 

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

@@ -224,8 +224,15 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
     @Override
     public List<TempUserTrainingTimeDetailVo> queryUserTrainingTime(Map<String, Object> param) {
         Integer userId = WrapperUtil.toInt(param, "userId", "学员id不能为空");
+        Object campId = param.get("campId");
+        if (Objects.isNull(campId)) {
+            throw new BizException("训练营id不能为空");
+        }
         //获取训练营
-        TempLittleArtistTrainingCamp camp = this.lambdaQuery().eq(TempLittleArtistTrainingCamp::getId, param.get("campId")).one();
+        TempLittleArtistTrainingCamp camp = this.lambdaQuery().eq(TempLittleArtistTrainingCamp::getId, campId).one();
+        if (Objects.isNull(camp)) {
+            throw new BizException("训练营不存在");
+        }
         String startDateStr = DateUtil.dateToString(camp.getTrainStartDate());
         String endDateStr = DateUtil.dateToString(camp.getTrainEndDate());
         //生成训练时间集合

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

@@ -3779,10 +3779,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
     @Override
     public Map<String, Object> findVipGroupSalarys(VipGroupSalaryQueryInfo queryInfo) {
-        if (Objects.isNull(queryInfo.getVipGroupId())) {
+        if (StringUtils.isEmpty(queryInfo.getVipGroupId())) {
             throw new BizException("请指定课程组");
         }
-        VipGroup vipGroup = vipGroupDao.get(queryInfo.getVipGroupId());
+        VipGroup vipGroup = vipGroupDao.get(Long.parseLong(queryInfo.getVipGroupId()));
         if (Objects.isNull(vipGroup)) {
             throw new BizException("未找到指定课程组");
         }
@@ -3824,7 +3824,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         pageInfo.setRows(dataList);
 
-        VipGroupSalaryBaseInfo vipGroupSalaryBaseInfo = vipGroupDao.getVipGroupSalaryInfo(queryInfo.getVipGroupId());
+        VipGroupSalaryBaseInfo vipGroupSalaryBaseInfo = vipGroupDao.getVipGroupSalaryInfo(vipGroup.getId());
         if (Objects.isNull(vipGroupSalaryBaseInfo)) {
             vipGroupSalaryBaseInfo = new VipGroupSalaryBaseInfo();
         }

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

@@ -567,7 +567,7 @@
             </foreach>
     </select>
     <select id="exportCloudCoachActivationDetails" resultType="com.ym.mec.biz.dal.dto.CloudCoachActivationDetailsDto">
-        select o.name_ organName,cto.amount_ amount,cto.student_id_ studentId,cto.create_time_ createTime,su.username_ studentName,
+        select o.name_ organName,cto.amount_ amount,cto.student_id_ studentId,cto.start_time_ createTime,su.username_ studentName,
         CASE WHEN cto.type_ = 'MONTH' THEN CONCAT(cto.time_,'月')
         WHEN cto.type_ = 'YEAR' THEN CONCAT(cto.time_ * 12,'月')
         WHEN cto.type_ = 'YEAR_HALF' THEN CONCAT(cto.time_ * 6,'月')
@@ -581,8 +581,8 @@
             AND FIND_IN_SET(cto.organ_id_,#{organId})
         </if>
         <if test="month != null and month != ''">
-            AND DATE_FORMAT(cto.create_time_,'%Y-%m') = #{month}
+            AND DATE_FORMAT(cto.start_time_,'%Y-%m') = #{month}
         </if>
-        ORDER BY o.id_ DESC,cto.create_time_ DESC
+        ORDER BY o.id_ DESC,cto.start_time_ DESC
     </select>
 </mapper>

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

@@ -119,7 +119,7 @@
 
 	<sql id="queryCondition">
 		<where>
-			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+			cs.del_flag_ = '0'
 			<if test="createTime != null">
 				AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
 			</if>
@@ -209,8 +209,7 @@
 			LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_=csts.course_schedule_id_
 			LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
 			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-			WHERE
-			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+			WHERE cs.del_flag_ = '0'
 			AND csts.user_id_=#{userId}
 			<if test="classGroupId!=null">
 				AND ch.class_group_id_=#{classGroupId}

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

@@ -627,8 +627,7 @@
             <if test="transactionTeacherId!=null">
                 LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
             </if>
-        WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="organIds!=null and organIds.size()>0">
                 AND cs.organ_id_ IN
                 <foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -668,8 +667,7 @@
         <if test="transactionTeacherId!=null">
             LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
         </if>
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
         AND cs.id_ IS NOT NULL
         <if test="organIds!=null and organIds.size()>0">
             AND cs.organ_id_ IN
@@ -725,9 +723,8 @@
             LEFT JOIN course_schedule_complaints csc ON csc.course_schedule_id_=cssp.course_schedule_id_ AND
             csc.user_id_=#{studentId}
         LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.user_id_=#{studentId}
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0'
+        AND cs.is_lock_ = 0
         AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
         AND cssp.user_id_ = #{studentId} AND cs.pre_course_flag_ != 1
         <if test="quitClassGroupIds != null and quitClassGroupIds.size()>0">
@@ -773,9 +770,7 @@
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         LEFT JOIN school s ON cs.schoole_id_ = s.id_
         LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
         AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
@@ -811,9 +806,8 @@
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         LEFT JOIN school s ON cs.schoole_id_ = s.id_
         LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL) and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0'
+        AND cs.is_lock_ = 0 and cs.tenant_id_ = #{tenantId}
         <if test="teacherId!=null">
             AND cs.actual_teacher_id_=#{teacherId}
         </if>
@@ -865,8 +859,8 @@
                  LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
                  LEFT JOIN school s ON cs.schoole_id_ = s.id_
                  LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_ AND ta.teacher_id_ = #{teacherId}
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-            AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0'
+            AND cs.is_lock_ = 0
           AND cs.class_date_ = DATE_FORMAT(#{classDate}, '%Y%m%d')
           AND csts.user_id_ = #{teacherId}
           AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) &lt; NOW() AND cs.pre_course_flag_ != 1
@@ -1020,15 +1014,13 @@
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
         AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
         <if test="month==null">
-            AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="month!=null">
-            AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
@@ -1042,18 +1034,16 @@
         FROM
         course_schedule cs
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
-        AND cg.del_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
+        AND cg.del_flag_ = '0' and cs.tenant_id_ = #{tenantId}
         <if test="teacherId!=null">
             AND cs.actual_teacher_id_=#{teacherId}
         </if>
         <if test="month==null">
-            AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="month!=null">
-            AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="groupId!=null">
             AND cs.music_group_id_=#{groupId}
@@ -1071,17 +1061,15 @@
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
         AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
         AND csts.user_id_ = #{teacherId}
-        AND cg.del_flag_ = 0 AND cs.pre_course_flag_ != 1
+        AND cg.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         <if test="month==null">
-            AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="month!=null">
-            AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
         </if>
         GROUP BY cs.class_date_
     </select>
@@ -1092,17 +1080,16 @@
         FROM
             course_schedule cs
             LEFT JOIN teacher t ON cs.actual_teacher_id_=t.id_
-        WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
             AND cs.class_group_id_ IN
             <foreach collection="classGroupIds" item="classGroupId" separator="," open="(" close=")">
                 #{classGroupId}
             </foreach>
             <if test="month==null">
-                AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+                AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
             </if>
             <if test="month!=null">
-                AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+                AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
             </if>
             <if test="type!=null and type!=''">
                 AND cs.group_type_=#{type}
@@ -1119,8 +1106,7 @@
             <if test="transactionTeacherId!=null">
                 LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
             </if>
-        WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="organIds!=null and organIds.size()>0">
                 AND cs.organ_id_ IN
                 <foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -1128,10 +1114,10 @@
                 </foreach>
             </if>
             <if test="month==null">
-                AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+                AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
             </if>
             <if test="month!=null">
-                AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+                AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
             </if>
             <if test="type!=null and type!=''">
                 AND cs.group_type_=#{type}
@@ -1250,7 +1236,7 @@
         SELECT cs.*
         FROM class_group cg
                  LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cg.music_group_id_ = #{musicGroupId}
     </select>
     <select id="countClassTimes" resultType="int">
@@ -1512,8 +1498,7 @@
 
     <sql id="teacherClassCourseScheduleQueryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-            AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+            cs.del_flag_ = '0' AND cs.is_lock_ = 0
             AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
             <if test="userId != null">
                 AND csts.user_id_ = #{userId}
@@ -1651,8 +1636,7 @@
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         LEFT JOIN sys_user ssu ON sa.user_id_=ssu.id_
         LEFT JOIN school s ON cs.schoole_id_ = s.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         AND sa.class_group_id_=#{classGroupId}
         <if test="userId != null">
             AND sa.teacher_id_=#{userId}
@@ -1685,8 +1669,7 @@
         FROM
         student_attendance sa
         LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         AND sa.class_group_id_=#{classGroupId}
         <if test="userId != null">
             AND sa.teacher_id_=#{userId}
@@ -1706,7 +1689,7 @@
                COUNT(cs.id_) as 'value'
         FROM class_group cg
                  LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cg.music_group_id_ = #{musicGroupId} AND cs.pre_course_flag_ != 1
         GROUP BY cg.id_
     </select>
@@ -1757,8 +1740,7 @@
         FROM course_schedule cs
         LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
         LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
         AND cs.teacher_id_=#{teacherId} AND cs.pre_course_flag_ != 1
         and CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) between #{startTime} and #{endTime}
         <if test="type != null">
@@ -1866,7 +1848,7 @@
         SELECT COUNT(csts.course_schedule_id_)
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND csts.user_id_ = #{teacherId}
           AND cs.class_date_ = DATE_FORMAT(#{classDate}, '%Y-%m-%d')
           AND DATE_FORMAT(#{startTime}, '%H:%i:%S') &lt;= DATE_FORMAT(cs.end_class_time_, '%H:%i:%S')
@@ -2152,7 +2134,7 @@
         SELECT cs.*
         FROM course_schedule_student_payment cssp
                  LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cssp.music_group_id_ = #{musicGroupId}
           AND cssp.group_type_ = #{groupType}
           AND cs.status_ = #{status}
@@ -2248,7 +2230,7 @@
                cs.schoole_id_
         FROM course_schedule cs
         WHERE cs.class_group_id_ = #{classGroupId}
-          AND (cs.del_flag_ = '0' OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+          AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="countVipGroupCourses" resultType="int">
         SELECT count(cs.id_)
@@ -2426,7 +2408,7 @@
                cssp.expect_price_
         FROM course_schedule cs
                  LEFT JOIN course_schedule_student_payment cssp ON cs.id_ = cssp.course_schedule_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
           <if test="groupType != null">
           AND cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           </if>
@@ -2454,8 +2436,7 @@
         FROM
         course_schedule cs
         LEFT JOIN course_schedule_student_payment cssp ON cs.id_ = cssp.course_schedule_id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
         AND cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         AND cs.music_group_id_ = #{groupId}
         AND cssp.user_id_=#{userId}
@@ -2482,7 +2463,7 @@
     <select id="findSurplusCourseWithGroup" resultMap="CourseSchedule">
         SELECT <include refid="resultSql"/>
         FROM course_schedule cs
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
           AND cs.music_group_id_ = #{groupId}
@@ -2491,7 +2472,7 @@
     <select id="getSurplusCourseWithGroup" resultMap="CourseSchedule">
         SELECT <include refid="resultSql"/>
         FROM course_schedule cs
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
           AND cs.id_ = #{courseScheduleId}
     </select>
@@ -2746,8 +2727,7 @@
         FROM
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
         AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND DATE_FORMAT(#{endTime},"%Y-%m-%d")
         AND csts.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
@@ -2758,7 +2738,7 @@
         SELECT COUNT(1)
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cs.group_type_ = 'PRACTICE'
           AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") AND DATE_FORMAT(#{endTime}, "%Y-%m-%d")
           AND csts.user_id_ = #{userId}
@@ -2772,7 +2752,7 @@
                cs.group_type_
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") AND DATE_FORMAT(#{endTime}, "%Y-%m-%d")
           AND csts.user_id_ = #{userId}
     </select>
@@ -2786,7 +2766,7 @@
                cs.group_type_
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") AND DATE_FORMAT(#{endTime}, "%Y-%m-%d")
           AND csts.user_id_ = #{userId}
     </select>
@@ -2841,7 +2821,7 @@
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
                  LEFT JOIN class_group cg ON cg.id_ = csts.class_group_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND csts.user_id_ = #{userId}
           <if test="groupType != null">
           	and cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
@@ -2955,7 +2935,7 @@
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ != 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCourses2" resultMap="CourseSchedule">
         SELECT
@@ -2978,7 +2958,7 @@
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ != 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCourses3" resultMap="CourseSchedule">
         SELECT
@@ -3000,7 +2980,7 @@
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ != 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCoursesWithPay" resultMap="CourseSchedule">
         SELECT
@@ -3023,7 +3003,7 @@
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL )
+        AND cs.del_flag_ = '0'
     </select>
 
     <select id="queryTeacherName" resultType="java.util.Map">
@@ -3075,7 +3055,7 @@
         <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
             #{classGroupId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ != 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         ORDER BY start_class_time_
     </select>
 

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

@@ -253,7 +253,7 @@
 			course_schedule_student_payment cssp
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 		WHERE
-			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+			cs.del_flag_ = '0'
 			AND cssp.user_id_ = #{userId}
 			AND CONCAT(cs.class_date_	,' ',cs.start_class_time_) > NOW()
 			AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
@@ -264,8 +264,7 @@
 		FROM
 			course_schedule_student_payment cssp
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-		WHERE
-		(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+		WHERE cs.del_flag_ = '0'
 		AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
     </select>
 	<select id="findNotStartCourseStudentPaymentIdsWithClassGroupAndStudent" resultType="int">
@@ -729,7 +728,7 @@
 		  </if>
 		  AND cs.class_date_&lt;#{monday}
 		  AND cs.type_=#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-		  AND (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+		  AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
 		ORDER BY CONCAT(cs.class_date_, ' ', cs.start_class_time_) DESC LIMIT 1
 	</select>
 

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

@@ -188,7 +188,7 @@
 
 	<sql id="courseScheduleTeacherSalaryQueryPage">
 		<where>
-			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+			cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
 			AND csts.settlement_time_ IS NOT NULL AND csts.teacher_role_ IS NOT NULL AND cs.type_ IS NOT NULL
 			<if test="organId != null">
 				AND su.organ_id_ = #{organId}
@@ -262,7 +262,7 @@
 
 	<sql id="vipGroupSalaryQueryCondition">
 		<where>
-			vg.id_ = #{vipGroupId}
+			cs.music_group_id_ = #{vipGroupId}
 			<if test="groupType != null and groupType != ''">
 				AND cs.group_type_= #{groupType}
 			</if>
@@ -274,17 +274,14 @@
 
 	<select id="findVipGroupSalarys" resultMap="VipGroupSalaryDto">
 		SELECT
-
 			cs.id_ course_schedule_id_,
 			CONCAT(cs.class_date_," ",cs.start_class_time_) class_date_,
 			cs.teach_mode_,
 			csts.*
-		FROM
-			vip_group vg
-			LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_
+		FROM course_schedule cs
 			LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
 			<include refid="vipGroupSalaryQueryCondition"/>
-		ORDER BY class_date_
+		ORDER BY cs.class_date_
 		<include refid="global.limit"/>
 	</select>
 	<select id="countVipGroupSalarys" resultType="int">

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

@@ -274,8 +274,7 @@
             LEFT JOIN class_group cg ON dg.id_=cg.music_group_id_ AND cg.group_type_='DEMO'
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
             LEFT JOIN `subject` s ON s.id_ = dg.subject_id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
         AND cs.type_ = 'DEMO' AND dg.user_id_ = #{teacherId}
         GROUP BY cs.class_date_
         <include refid="global.limit"/>

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

@@ -216,7 +216,7 @@
         FROM financial_expenditure
         WHERE payment_time_ >= #{startTime}
           AND payment_time_ <= #{endTime}
-          AND del_flag_ = 0 and tenant_id_ = #{tenantId}
+          AND del_flag_ = 0 and tenant_id_ = #{tenantId} AND organ_id_ IS NOT NULL
         GROUP BY organ_id_, cooperation_organ_id_, type_
         ]]></select>
         

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

@@ -458,7 +458,7 @@
 		  	AND m.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			AND m.merge_flag_ IN (0,1)
 			AND NOT EXISTS (SELECT id_ FROM practice_group WHERE m.group_type_='PRACTICE' AND m.music_group_id_=id_ AND type_='TRIAL')
-			AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ != 1 and m.tenant_id_ = #{tenantId}
+			AND m.pre_course_flag_ != 1 and m.tenant_id_ = #{tenantId}
 			<if test="groupType!=null">
 				AND m.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
@@ -468,7 +468,34 @@
 		GROUP BY
 			m.organ_id_
 		ORDER BY
-			m.organ_id_;
+			m.organ_id_
+	</select>
+
+	<select id="getGroupCourseData1" resultMap="IndexBaseMonthData">
+		SELECT
+			m.organ_id_,m.tenant_id_,
+			#{dayStr} month_,
+			COUNT( m.id_ ) total_num_,
+			COUNT( m.id_ ) activate_num_,
+			COUNT( m.id_ ) percent_
+		FROM
+			course_schedule m
+		WHERE
+			m.del_flag_ = '0'
+			AND m.is_lock_ = 0
+		  	AND m.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			AND m.merge_flag_ IN (0,1)
+			AND m.pre_course_flag_ != 1 and m.tenant_id_ = #{tenantId}
+			<if test="groupType!=null">
+				AND m.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
+			<if test="dayStr!=null and dayStr!=''">
+				AND m.class_date_ &gt;= #{dayStr}
+			</if>
+		GROUP BY
+			m.organ_id_
+		ORDER BY
+			m.organ_id_
 	</select>
 
 	<select id="getGroupSurplusCourseData" resultMap="IndexBaseMonthData">
@@ -494,7 +521,32 @@
 				AND m.class_date_ &lt;= #{dayStr}
 			</if>
 		GROUP BY m.organ_id_
-		ORDER BY m.organ_id_;
+		ORDER BY m.organ_id_
+	</select>
+
+	<select id="getGroupSurplusCourseData1" resultMap="IndexBaseMonthData">
+		SELECT
+			m.organ_id_,m.tenant_id_,
+			#{dayStr} month_,
+			COUNT( m.id_ ) total_num_,
+			COUNT( m.id_ ) activate_num_,
+			COUNT( m.id_ ) percent_
+		FROM
+			course_schedule m
+		WHERE
+			m.del_flag_ = '0' and m.tenant_id_ = #{tenantId}
+			AND m.is_lock_ = 0
+			AND m.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			AND m.merge_flag_ IN (0,1)
+			AND m.pre_course_flag_ != 1
+			<if test="groupType!=null">
+				AND m.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
+			<if test="dayStr!=null and dayStr!=''">
+				AND m.class_date_ &lt;= #{dayStr}
+			</if>
+		GROUP BY m.organ_id_
+		ORDER BY m.organ_id_
 	</select>
 
 	<select id="getGroupCourseDataWithGroup" resultMap="IndexBaseMonthData">

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

@@ -61,9 +61,7 @@
     LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
     LEFT JOIN school s ON cs.schoole_id_ = s.id_
     LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{param.teacherId}
-    WHERE
-    (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-    AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+    WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
     and cs.type_ = 'LIVE'
     <if test="param.startTime != null">
         AND cs.class_date_ &gt;= date_format(#{param.startTime},'%Y-%m-%d')

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

@@ -289,7 +289,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="studentID != null">
                 and sa.user_id_ = #{studentID}
             </if>
@@ -352,7 +352,7 @@
             student_attendance sa
             LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
             WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
             AND sa.class_group_id_=#{classGroupId}
             AND sa.user_id_ IN
             <foreach collection="userIds" item="userId" open="(" close=")" separator=",">

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

@@ -180,7 +180,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="createTime != null">
                 AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
             </if>

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

@@ -862,7 +862,7 @@
         ) music_cs ON FIND_IN_SET(music_cs.id_, se.course_ids_)
         WHERE se.teacher_id_ = #{teacherId}
         AND se.expect_exercises_num_ > se.actual_exercises_num_
-        AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN se.monday_ AND se.sunday_
+        AND se.monday_ >= CONCAT(CURDATE(),' 00:00:00') AND se.sunday_ <= CONCAT(CURDATE(),' 23:59:59')
         AND se.serve_type_ = 'HOMEWORK'
         AND music_cs.id_ IS NOT NULL
         UNION ALL
@@ -875,7 +875,7 @@
         ) non_music_cs ON FIND_IN_SET(non_music_cs.id_, se.course_ids_)
         WHERE se.teacher_id_ = #{teacherId}
         AND se.expect_exercises_num_ > se.actual_exercises_num_
-        AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN se.monday_ AND se.sunday_
+        AND se.monday_ >= CONCAT(CURDATE(),' 00:00:00') AND se.sunday_ <= CONCAT(CURDATE(),' 23:59:59')
         AND se.serve_type_ = 'HOMEWORK'
         AND non_music_cs.id_ IS NOT NULL
         ) t

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

@@ -301,7 +301,7 @@
 
     <sql id="studentManageCourseQueryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
             AND cgsm.status_ != 'QUIT' and cg.tenant_id_ = #{tenantId}
             <if test="studentId!=null">
                 and cgsm.user_id_ = #{studentId}
@@ -355,7 +355,7 @@
 
     <sql id="studentManageAttendanceQueryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cssp.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cssp.tenant_id_ = #{tenantId}
             <if test="studentId!=null">
                 AND cssp.user_id_ = #{studentId}
             </if>
@@ -456,7 +456,7 @@
     </select>
     <sql id="studentPaymentSql">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cssp.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cssp.tenant_id_ = #{tenantId}
             AND cs.id_ IS NOT NULL AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
             <if test="classGroupType != null">
                 AND cs.type_ = #{classGroupType}
@@ -654,7 +654,7 @@
 
     <sql id="queryMusicGroupStudentsSignSql">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and sa.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and sa.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 AND sa.music_group_id_ = #{musicGroupId}
             </if>

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

@@ -354,10 +354,10 @@
                 AND FIND_IN_SET(spo.organ_id_,#{organId})
             </if>
             <if test="orderStartDate != null">
-                AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') &gt;= #{orderStartDate}
+                AND spo.create_time_ &gt;= CONCAT(#{orderStartDate},' 00:00:00')
             </if>
             <if test="orderEndDate != null">
-                AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') &lt;= #{orderEndDate}
+                AND spo.create_time_ &lt;= CONCAT(#{orderEndDate},' 23:59:59')
             </if>
             <if test="notGroupType != null and notGroupType != ''">
                 AND spo.group_type_ != #{notGroupType}
@@ -423,13 +423,13 @@
                 AND FIND_IN_SET(spo.organ_id_,#{organId})
             </if>
             <if test="orderStartDate != null">
-                AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') &gt;= #{orderStartDate}
+                AND spo.create_time_ &gt;= CONCAT(#{orderStartDate},' 00:00:00')
             </if>
             <if test="orderEndDate != null">
-                AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') &lt;= #{orderEndDate}
+                AND spo.create_time_ &lt;= CONCAT(#{orderEndDate},' 23:59:59')
             </if>
             <if test="month != null and month != ''">
-                AND DATE_FORMAT(spo.create_time_,'%Y-%m') = #{month} AND spo.status_ = 'SUCCESS'
+                AND spo.create_time_ BETWEEN CONCAT(#{month},'-01 00:00:00') AND CONCAT(#{month},'-31 23:59:59') AND spo.status_ = 'SUCCESS'
             </if>
             <if test="notGroupType != null and notGroupType != ''">
                 AND spo.group_type_ != #{notGroupType}

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

@@ -258,7 +258,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.actual_teacher_id_ = ta.teacher_id_ AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.actual_teacher_id_ = ta.teacher_id_ AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="teacherId != null">
                 AND cs.actual_teacher_id_ = #{teacherId}
             </if>
@@ -421,8 +421,7 @@
             LEFT JOIN course_schedule cs ON ta.course_schedule_id_ = cs.id_
             LEFT JOIN music_group mg ON ta.music_group_id_ = mg.id_
             LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
-        WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
             AND mg.organ_id_ = #{organId}
             AND ta.sign_in_status_ = #{signInStatus}
             <if test="date==null">

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageUtil.java

@@ -2,7 +2,6 @@ package com.ym.mec.common.page;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ym.mec.common.tenant.TenantContextHolder;
 
 import java.util.Map;
 import java.util.Objects;
@@ -47,20 +46,6 @@ public class PageUtil {
         return resultPage;
     }
 
-    public static <T> PageInfo<T> pageInfo(com.microsvc.toolkit.common.response.paging.PageInfo<T> source) {
-        if (Objects.isNull(source)) {
-            return new PageInfo<>(1, 20);
-        }
-        int total = Integer.parseInt(String.valueOf(source.getTotal()));
-        int limit = Integer.parseInt(String.valueOf(source.getLimit()));
-        PageInfo<T> resultPage = new PageInfo<>();
-        resultPage.setRows(source.getRows());
-        resultPage.setPageNo(Long.valueOf(source.getCurrent()).intValue());
-        resultPage.setLimit(limit);
-        resultPage.setTotal(total);
-        return resultPage;
-    }
-
     /**
      * 分页有需要拼接时分秒要求的可以使用这个方法
      */

mec-eureka/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-gateway/mec-gateway-web/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-im/src/main/java/com/ym/SealClassApplication.java

@@ -4,6 +4,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.logging.LogLevel;
+import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -29,9 +31,16 @@ public class SealClassApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(SealClassApplication.class, args);
+		configureGlobalLogger();
 		log.info("SealClassApplication started");
 	}
 
+	private static void configureGlobalLogger() {
+		LoggingSystem loggingSystem = LoggingSystem.get(ClassLoader.getSystemClassLoader());
+		// 设置业务日志记录器的日志级别为INFO
+		loggingSystem.setLogLevel("businessLogger", LogLevel.INFO);
+	}
+
 	@Bean
 	@LoadBalanced
 	public RestTemplate restTemplate(){

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -10,8 +10,9 @@ import com.ym.service.RoomService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,13 +21,14 @@ import java.util.Objects;
 
 @RestController
 @RequestMapping("/room")
-@Slf4j
 public class RoomController{
     @Autowired
     RoomService roomService;
     @Autowired
     MessageService messageService;
 
+    private final static Logger businessLogger = LoggerFactory.getLogger(RoomController.class);
+
     @RequestMapping(value = "/join", method = RequestMethod.POST)
     public BaseResponse joinRoom(@RequestBody ReqUserData data) throws Exception {
         return roomService.joinRoom(data.getRoomId(), true);
@@ -70,7 +72,7 @@ public class RoomController{
 
     @RequestMapping(value = "/sendImPlayMidiMessage", method = RequestMethod.POST)
     public Object sendImPlayMidiMessage(@RequestBody PlayMidiMessageData playMidiMessageData) throws Exception {
-        log.info("sendImPlayMidiMessage: {}",JSONObject.toJSON(playMidiMessageData));
+        businessLogger.info("sendImPlayMidiMessage: {}",JSONObject.toJSON(playMidiMessageData));
         roomService.sendImPlayMidiMessage(playMidiMessageData);
         return new BaseResponse<>();
     }
@@ -90,7 +92,7 @@ public class RoomController{
 
     @RequestMapping(value = "joinRoomStatusNotify", method = RequestMethod.POST)
     public Object joinRoomStatusNotify(@RequestBody RoomStatusNotify roomStatusNotify) throws Exception {
-        log.info("joinRoomStatusNotify: {}",JSONObject.toJSON(roomStatusNotify));
+        businessLogger.info("joinRoomStatusNotify: {}",JSONObject.toJSON(roomStatusNotify));
         String roomId = roomStatusNotify.getRoomId();
         String userId = roomStatusNotify.getUserId();
         String deviceNum = roomStatusNotify.getDeviceNum();
@@ -106,7 +108,7 @@ public class RoomController{
     public void statusSync(@RequestBody String body) throws Exception {
         try {
             ChannelStateNotify notify = JSONObject.parseObject(body, ChannelStateNotify.class);
-            log.info("statusSyncParam: {}",JSONObject.toJSON(notify));
+            businessLogger.info("statusSyncParam: {}",JSONObject.toJSON(notify));
             String roomId = notify.getChannelId();
             String userId = notify.getUserId();
             switch (notify.getEvent()){
@@ -120,7 +122,7 @@ public class RoomController{
                     break;
             }
         }catch (Exception e){
-            log.error(e.getLocalizedMessage());
+            businessLogger.error(e.getLocalizedMessage());
         }
     }
 
@@ -129,10 +131,10 @@ public class RoomController{
     public void statusSyncTencent(@RequestBody TencentData.TRTCEventInfo eventInfo) {
         try {
             if (Objects.isNull(eventInfo.getEventInfo())) {
-                log.warn("statusSyncTencent eventInfo is null, time={}", DateTime.now().toString("yyy-MM-dd HH:mm:ss"));
+                businessLogger.warn("statusSyncTencent eventInfo is null, time={}", DateTime.now().toString("yyy-MM-dd HH:mm:ss"));
                 return;
             }
-            log.info("statusSyncTencent: {}", eventInfo.jsonString());
+            businessLogger.info("statusSyncTencent: {}", eventInfo.jsonString());
             String roomId = eventInfo.getEventInfo().getRoomId();
 
             // 网络教室回调整消息
@@ -189,7 +191,7 @@ public class RoomController{
             }
 
         }catch (Exception e){
-            log.error("statusSyncTencent event={}", eventInfo.jsonString(), e);
+            businessLogger.error("statusSyncTencent event={}", eventInfo.jsonString(), e);
         }
     }
 
@@ -258,14 +260,14 @@ public class RoomController{
     @RequestMapping(value = "/device/control", method = RequestMethod.POST)
     public Object controlDevice(@RequestBody ReqDeviceControlData data)
             throws Exception {
-        log.info("device_control: {}",JSONObject.toJSON(data));
+        businessLogger.info("device_control: {}",JSONObject.toJSON(data));
         return new BaseResponse<>(roomService.controlDevice(data));
     }
 
     @ApiOperation(value = "学员伴奏下载状态回调")
     @RequestMapping(value = "adjustExamSong", method = RequestMethod.POST)
     public Object adjustExamSong(@RequestBody ExamSongData examSongData) throws Exception {
-        log.info("adjustExamSong: {}",JSONObject.toJSON(examSongData));
+        businessLogger.info("adjustExamSong: {}",JSONObject.toJSON(examSongData));
         roomService.adjustExamSong(examSongData.getRoomId(),examSongData.getStatus(),examSongData.getExamSongId());
         return new BaseResponse<>();
     }
@@ -280,14 +282,14 @@ public class RoomController{
     @ApiOperation(value = "学员麦克风、摄像头等开关批量控制")
     @RequestMapping(value = "/device/batchControl", method = RequestMethod.POST)
     public Object batchControlDevice(@RequestBody ReqDeviceControlData data)throws Exception {
-        log.info("batchControl: {}",JSONObject.toJSON(data));
+        businessLogger.info("batchControl: {}",JSONObject.toJSON(data));
         return new BaseResponse<>(roomService.batchControlDevice(data));
     }
 
     @RequestMapping(value = "/device/sync", method = RequestMethod.POST)
     public Object syncDeviceState(@RequestBody ReqDeviceControlData data)
             throws Exception {
-        log.info("syncDeviceState: {}",JSONObject.toJSON(data));
+        businessLogger.info("syncDeviceState: {}",JSONObject.toJSON(data));
         return new BaseResponse<>(roomService.syncDeviceState(data));
     }
 

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

@@ -45,18 +45,18 @@ import com.ym.mec.im.message.*;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.pojo.*;
-import com.ym.service.RoomMemberService;
 import com.ym.service.RoomService;
 import com.ym.utils.CheckUtils;
 import com.ym.utils.CodeUtil;
 import com.ym.utils.DateTimeUtils;
 import com.ym.utils.IdentifierUtils;
 import com.ym.whiteboard.WhiteBoardHelper;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -75,9 +75,11 @@ import static com.ym.enums.RoleEnum.RoleTeacher;
 /**
  * Created by super_zou on 2019/11/28.
  */
-@Slf4j
 @Service
 public class RoomServiceImpl implements RoomService {
+
+    private final static Logger businessLogger = LoggerFactory.getLogger(RoomServiceImpl.class);
+
     @Autowired
     private IMHelper imHelper;
     @Autowired
@@ -87,8 +89,6 @@ public class RoomServiceImpl implements RoomService {
     @Autowired
     private RoomMemberDao roomMemberDao;
     @Autowired
-    private RoomMemberService roomMemberService;
-    @Autowired
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
     @Autowired
     private WhiteBoardHelper whiteBoardHelper;
@@ -191,7 +191,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         String userId = sysUser.getId().toString();
-        log.info("joinRoom: roomId={}, userId={}", roomId, userId);
+        businessLogger.info("joinRoom: roomId={}, userId={}", roomId, userId);
 
         Teacher teacher = teacherDao.get(Integer.parseInt(userId));
         CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
@@ -246,7 +246,7 @@ public class RoomServiceImpl implements RoomService {
             roomId = "S" + roomId;
         }
         redisTemplate.opsForValue().setIfAbsent(roomId + userId, courseSchedule.getId().toString());
-        log.info("joinRoom current: roomId={}, userId={}", roomId, userId);
+        businessLogger.info("joinRoom current: roomId={}, userId={}", roomId, userId);
 
         // 主讲老师信息
         SysUser teacherInfo = sysUserFeignService.queryUserById(courseSchedule.getActualTeacherId());
@@ -365,7 +365,7 @@ public class RoomServiceImpl implements RoomService {
             genRtcRoomMemberInfoConfig(roomId, joinRoom, sysUser, userId, teacher, schedule, curTime, roomResult, courseId);
         }
 
-        log.info("join room: roomId = {}, userId = {}", roomId, userId);
+        businessLogger.info("join room: roomId = {}, userId = {}", roomId, userId);
         return new BaseResponse(roomResult);
     }
 
@@ -461,7 +461,7 @@ public class RoomServiceImpl implements RoomService {
             schedule.setLiveRoomId(roomUid);
             courseScheduleDao.update(schedule);
         }catch (Exception e) {
-            log.error("创建直播间失败", e);
+            businessLogger.error("创建直播间失败", e);
             liveRoom = imLiveBroadcastRoomService.lambdaQuery()
                     .eq(ImLiveBroadcastRoom::getRoomUid, roomUid)
                     .last("LIMIT 1")
@@ -507,7 +507,7 @@ public class RoomServiceImpl implements RoomService {
         if (member == null) {
             int count = roomMemberDao.countByRidAndExcludeRole(roomId, RoleEnum.RoleAudience.getValue());
             if (count == roomProperties.getMaxCount()) {
-                log.info("join error Over max count: roomId = {}, userId = {}", roomId, userId);
+                businessLogger.info("join error Over max count: roomId = {}, userId = {}", roomId, userId);
                 throw new BizException(ErrorEnum.ERR_OVER_MAX_COUNT.getErrCode(), ErrorEnum.ERR_OVER_MAX_COUNT.getErrMsg());
                 //return new BaseResponse(ErrorEnum.ERR_OVER_MAX_COUNT, ErrorEnum.ERR_OVER_MAX_COUNT.getErrMsg(), null);
             }
@@ -555,7 +555,7 @@ public class RoomServiceImpl implements RoomService {
             try {
                 userSig = pluginService.register(String.valueOf(sysUser.getId()), sysUser.getRealName(), sysUser.getAvatar());
             } catch (Exception e) {
-                log.error("直播房间用户注册失败: userId={}", sysUser.getId(), e);
+                businessLogger.error("直播房间用户注册失败: userId={}", sysUser.getId(), e);
             }
 
             // 返回配置参数
@@ -665,7 +665,7 @@ public class RoomServiceImpl implements RoomService {
         }else {
             roomResult.setRandomNumeric("1");
         }
-        log.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
+        businessLogger.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
     }
 
     private void joinImGroup(String roomId, Integer actualTeacherId, CourseSchedule courseSchedule) throws Exception {
@@ -679,7 +679,7 @@ public class RoomServiceImpl implements RoomService {
 
             try {
                 // 创建群组
-                log.info("createImGroup: roomId = {}, userId = {}", roomId, actualTeacherId);
+                businessLogger.info("createImGroup: roomId = {}, userId = {}", roomId, actualTeacherId);
                 if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
 
 
@@ -707,7 +707,7 @@ public class RoomServiceImpl implements RoomService {
                     }
 
                     // 加入群组成员
-                    log.info("joinImGroup: roomId = {}, serviceProvider={}, userIds = {}", roomId, courseSchedule.getServiceProvider(), groupMembers);
+                    businessLogger.info("joinImGroup: roomId = {}, serviceProvider={}, userIds = {}", roomId, courseSchedule.getServiceProvider(), groupMembers);
                     pluginService.chatRoomGroupJoin(roomId, courseSchedule.getName(), groupMembers);
                 } else {
 
@@ -733,7 +733,7 @@ public class RoomServiceImpl implements RoomService {
 
         CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);
         if (Objects.isNull(courseSchedule)) {
-            log.warn("createRtcGroup courseSchedule is null: courseScheduleId = {}", courseScheduleId);
+            businessLogger.warn("createRtcGroup courseSchedule is null: courseScheduleId = {}", courseScheduleId);
             return;
         }
 
@@ -744,7 +744,7 @@ public class RoomServiceImpl implements RoomService {
             try {
                 pluginService.register(courseSchedule.getTeacherId().toString(), teacher.getRealName(), teacher.getAvatar());
             } catch (Exception e) {
-                log.error("直播房间群主注册失败: userId={}", courseSchedule.getTeacherId(), e);
+                businessLogger.error("直播房间群主注册失败: userId={}", courseSchedule.getTeacherId(), e);
             }
         }
 
@@ -789,15 +789,15 @@ public class RoomServiceImpl implements RoomService {
                         .groupId(roomId)
                         .appDefinedData(definedDataList)
                         .build());
-                log.info("updateChatRoomGroupData ret={}, roomId={}, definedDataList={}", ret, roomId, definedDataList);
+                businessLogger.info("updateChatRoomGroupData ret={}, roomId={}, definedDataList={}", ret, roomId, definedDataList);
             } catch (Exception e) {
-                log.error("直播网管课自定义字段设置失败: roomId={}", roomId, e);
+                businessLogger.error("直播网管课自定义字段设置失败: roomId={}", roomId, e);
             }
         }
     }
 
     private void dismissImGroup(String userId,String roomId, String serviceProvider) throws Exception {
-        log.info("dismissImGroup: roomId = {}, userId = {}", roomId, userId);
+        businessLogger.info("dismissImGroup: roomId = {}, userId = {}", roomId, userId);
         String joinImGroupKey = "joinImGroup:" + roomId;
         redisTemplate.delete(joinImGroupKey);
 
@@ -853,7 +853,7 @@ public class RoomServiceImpl implements RoomService {
         if (roomMember == null) {
             return;
         }
-        log.info("joinRoomFailure : roomId={}, userId={}", roomId, userId);
+        businessLogger.info("joinRoomFailure : roomId={}, userId={}", roomId, userId);
         //如果加入失败，删除该用户数据
         roomMemberDao.deleteUserByRidAndUid(roomId, userId);
     }
@@ -861,7 +861,7 @@ public class RoomServiceImpl implements RoomService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void joinRoomSuccess(String roomId, String userId, String deviceNum) throws Exception {
-        log.info("joinRoomSuccess: roomId={}, userId={}, deviceNum={}", roomId, userId, deviceNum);
+        businessLogger.info("joinRoomSuccess: roomId={}, userId={}, deviceNum={}", roomId, userId, deviceNum);
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         if (roomMember == null) {
             roomMember = saveRoomMember(roomId, userId);
@@ -893,7 +893,7 @@ public class RoomServiceImpl implements RoomService {
             }
             Date curTime = DateTimeUtils.currentUTC();
             Room room = roomDao.findByRid(roomId);
-            log.info("joinRoomSuccess: roomId={}, userId={}, roleEnum={}, room={}", roomId, userId, roleEnum.name(), Objects.isNull(room));
+            businessLogger.info("joinRoomSuccess: roomId={}, userId={}, roleEnum={}, room={}", roomId, userId, roleEnum.name(), Objects.isNull(room));
             if (room == null) {
                 saveRoom(roomId, roomId, curTime, display);
                 this.joinImGroup(roomId, schedule.getActualTeacherId(), schedule);
@@ -977,7 +977,7 @@ public class RoomServiceImpl implements RoomService {
             }
         }
 
-        log.info("join room success: roomId = {}, userId = {}, role = {}", roomId, userId, roleEnum);
+        businessLogger.info("join room success: roomId = {}, userId = {}, role = {}", roomId, userId, roleEnum);
         signInSuccess(roomMember, deviceNum);
     }
 
@@ -991,10 +991,10 @@ public class RoomServiceImpl implements RoomService {
         if (redisTemplate.hasKey(currentRoomIdKey)) {
             currentRoomId = Long.parseLong(redisTemplate.opsForValue().get(currentRoomIdKey));
         } else {
-            log.error("signInFailure: roomId={}, userId={}", roomId, userId);
+            businessLogger.error("signInFailure: roomId={}, userId={}", roomId, userId);
             currentRoomId = firstCourseId;
         }
-        log.info("signInSuccess: roomId={}, userId={},currentRoomId={}", roomId, userId, currentRoomId);
+        businessLogger.info("signInSuccess: roomId={}, userId={},currentRoomId={}", roomId, userId, currentRoomId);
         Integer userIdInt = Integer.parseInt(userId);
 
         RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
@@ -1044,10 +1044,10 @@ public class RoomServiceImpl implements RoomService {
         // 用户退出房间多次触发调用判定
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         if (Objects.isNull(roomMember)) {
-            log.warn("leaveRoomSuccess: REPEATED_EXECUTION roomId={}, userId={}, deviceNum={}", roomId, userId, deviceNum);
+            businessLogger.warn("leaveRoomSuccess: REPEATED_EXECUTION roomId={}, userId={}, deviceNum={}", roomId, userId, deviceNum);
             return;
         }
-        log.info("leaveRoomSuccess: roomId={}, userId={}, deviceNum={}", roomId, userId, deviceNum);
+        businessLogger.info("leaveRoomSuccess: roomId={}, userId={}, deviceNum={}", roomId, userId, deviceNum);
 
         Integer firstCourseId = Integer.parseInt(roomId.substring(1));
         RoleEnum roleEnum;
@@ -1063,7 +1063,7 @@ public class RoomServiceImpl implements RoomService {
 
         String leaveSuccessKey = "leaveRoomSuccess" + roomId + userId;
         Boolean exist = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 1L, TimeUnit.SECONDS);
-        log.info("leaveRoomSuccess: roomId={}, userId={},deviceNum={},aBoolean={}", roomId, userId, deviceNum, exist);
+        businessLogger.info("leaveRoomSuccess: roomId={}, userId={},deviceNum={},aBoolean={}", roomId, userId, deviceNum, exist);
         if (Boolean.FALSE.equals(exist)) {
             if (StringUtils.isNotEmpty(deviceNum)) {
                 //如果设备号不为空，更新设备号
@@ -1118,7 +1118,7 @@ public class RoomServiceImpl implements RoomService {
                 //关闭所有曲目播放
                 courseScheduleStudentMusicScoreDao.closePlayStatus(courseSchedule.getId(), null, null);
             }
-            log.info("leaveRoomSuccess dismiss the room: {}, userId: {}, role={}", roomId, userId, roleEnum.name());
+            businessLogger.info("leaveRoomSuccess dismiss the room: {}, userId: {}, role={}", roomId, userId, roleEnum.name());
 
         } else {
             roomMemberDao.deleteUserByRidAndUid(roomId, userId);
@@ -1160,7 +1160,7 @@ public class RoomServiceImpl implements RoomService {
                 }
             }
 
-            log.info("leaveRoomSuccess quit group: roomId={}, userId: {}, roomMembers={}", roomId, userId, roomMembers);
+            businessLogger.info("leaveRoomSuccess quit group: roomId={}, userId: {}, roomMembers={}", roomId, userId, roomMembers);
         }
         userDao.deleteByUid(userId);
     }
@@ -1181,18 +1181,18 @@ public class RoomServiceImpl implements RoomService {
         // 用户退出房间多次触发调用判定
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         if (Objects.isNull(roomMember)) {
-            log.warn("leaveRoomSuccess: REPEATED_EXECUTION roomId={}, userId={}, deviceNum={}", roomId, userId, deviceNum);
+            businessLogger.warn("leaveRoomSuccess: REPEATED_EXECUTION roomId={}, userId={}, deviceNum={}", roomId, userId, deviceNum);
             return;
         }
 
         // 回调整事件延迟通知
         if (callbackTs < roomMember.getJoinDt().getTime()) {
-            log.warn("leaveRoomSuccess: q roomId={}, userId={}, deviceNum={}, callbackTs={}, joinTs={}",
+            businessLogger.warn("leaveRoomSuccess: q roomId={}, userId={}, deviceNum={}, callbackTs={}, joinTs={}",
                     roomId, userId, deviceNum, callbackTs, roomMember.getJoinDt().getTime());
             return;
         }
 
-        log.info("leaveRoomSuccess: roomId={}, userId={}, deviceNum={}, joinTs={}, callbackTs={}", roomId, userId, deviceNum,
+        businessLogger.info("leaveRoomSuccess: roomId={}, userId={}, deviceNum={}, joinTs={}, callbackTs={}", roomId, userId, deviceNum,
                 roomMember.getJoinDt().getTime(), callbackTs);
 
         // 若用户已经离开房间，先添加用户到房间
@@ -1229,12 +1229,12 @@ public class RoomServiceImpl implements RoomService {
                 try {
                     this.dismissImGroup(list.get(0).getUid(), roomId, courseSchedule.getServiceProvider());
                 } catch (Exception e) {
-                    log.error("destroyRoom: {}", e.getMessage());
+                    businessLogger.error("destroyRoom: {}", e.getMessage());
                     e.printStackTrace();
                 }
             }
             roomMemberDao.deleteByRid(roomId);
-            log.info("destroyRoom: {}", roomId);
+            businessLogger.info("destroyRoom: {}", roomId);
         }
     }
 
@@ -1256,7 +1256,7 @@ public class RoomServiceImpl implements RoomService {
             String changedUserId = user.getUserId();
             RoleEnum changedRole = RoleEnum.getEnumByValue(user.getRole());
             if (changedUserId.equals(userId)) {
-                log.error("can not change self role: {}, {}, {}", roomId, userId, changedRole);
+                businessLogger.error("can not change self role: {}, {}, {}", roomId, userId, changedRole);
                 throw new ApiException(ErrorEnum.ERR_CHANGE_SELF_ROLE);
             } else {
                 RoomMember oldUser = roomMemberDao.findByRidAndUid(roomId, changedUserId);
@@ -1269,16 +1269,16 @@ public class RoomServiceImpl implements RoomService {
                             u.setUserName(userInfo.getName());
                         }
                         changedUsers.add(u);
-                        log.info("change the role: {}, {}, {}, result: {}", roomId, userId, changedRole, r);
+                        businessLogger.info("change the role: {}, {}, {}, result: {}", roomId, userId, changedRole, r);
                         result = true;
                     }
                     if (oldUser.getRole() == RoleTeacher.getValue() && isUserDisplay(room, oldUser.getUid())) {
                         updateDisplay(roomId, userId, "", 1);
                     } else {
-                        log.info("don't update display: room={}, userRole={}", room, RoleEnum.getEnumByValue(oldUser.getRole()));
+                        businessLogger.info("don't update display: room={}, userRole={}", room, RoleEnum.getEnumByValue(oldUser.getRole()));
                     }
                 } else {
-                    log.info("role changed fail, not exist: {} - {} - {}", roomId, userId, changedRole);
+                    businessLogger.info("role changed fail, not exist: {} - {} - {}", roomId, userId, changedRole);
                 }
             }
         }
@@ -1297,7 +1297,7 @@ public class RoomServiceImpl implements RoomService {
         String userId = authUser.getId().toString();
         CheckUtils.checkArgument(userId != null, "userId must't be null");
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
-        log.info("kickMember: roomId={}, userId={}", roomId, userId);
+        businessLogger.info("kickMember: roomId={}, userId={}", roomId, userId);
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         if (roomMember == null) {
             return true;
@@ -1364,7 +1364,7 @@ public class RoomServiceImpl implements RoomService {
 
         SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
-        log.info("display in room: {}, type = {}, uri = {}", roomId, type, uri);
+        businessLogger.info("display in room: {}, type = {}, uri = {}", roomId, type, uri);
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         CheckUtils.checkArgument(type >= 0 && type < DisplayEnum.values().length, "type not exist");
         DisplayEnum displayEnum = DisplayEnum.values()[type];
@@ -1403,7 +1403,7 @@ public class RoomServiceImpl implements RoomService {
                     DisplayMessage displayMessage = new DisplayMessage(display);
                     imHelper.publishMessage(userId, roomId, displayMessage);
                 }
-                log.info("change display to teacher: roomId={}, display={}", roomId, display);
+                businessLogger.info("change display to teacher: roomId={}, display={}", roomId, display);
 
             }
         } else if (displayEnum.equals(DisplayEnum.Assistant)) {
@@ -1420,7 +1420,7 @@ public class RoomServiceImpl implements RoomService {
                     DisplayMessage displayMessage = new DisplayMessage(display);
                     imHelper.publishMessage(userId, roomId, displayMessage);
                 }
-                log.info("change display to assistant: roomId={}, display={}", roomId, display);
+                businessLogger.info("change display to assistant: roomId={}, display={}", roomId, display);
             }
         } else if (displayEnum.equals(DisplayEnum.Screen)) {
             display += "?userId=" + userId + "?uri=";
@@ -1432,7 +1432,7 @@ public class RoomServiceImpl implements RoomService {
                 DisplayMessage displayMessage = new DisplayMessage(display);
                 imHelper.publishMessage(userId, roomId, displayMessage);
             }
-            log.info("change display to screen: roomId={}, display={}", roomId, display);
+            businessLogger.info("change display to screen: roomId={}, display={}", roomId, display);
         } else if (displayEnum.equals(DisplayEnum.STUDENT)) {
             display += "?userId=" + targetUserId + "?uri=" + uri;
             roomDao.updateDisplayByRid(roomId, display);
@@ -1443,7 +1443,7 @@ public class RoomServiceImpl implements RoomService {
                 DisplayMessage displayMessage = new DisplayMessage(display);
                 imHelper.publishMessage(userId, roomId, displayMessage);
             }
-            log.info("change display to screen: roomId={}, display={}", roomId, display);
+            businessLogger.info("change display to screen: roomId={}, display={}", roomId, display);
         } else {
             display += "?userId=" + userId + "?uri=" + uri;
 //            CheckUtils.checkArgument(uri != null, "uri must't be null");
@@ -1457,7 +1457,7 @@ public class RoomServiceImpl implements RoomService {
                 imHelper.publishMessage(userId, roomId, displayMessage);
             }
         }
-        log.info("result display in room: {}, type = {}, uri = {}", roomId, type, uri);
+        businessLogger.info("result display in room: {}, type = {}, uri = {}", roomId, type, uri);
         return true;
     }
 
@@ -1503,7 +1503,7 @@ public class RoomServiceImpl implements RoomService {
         SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
 
-        log.info("createWhiteBoard: roomId = {}", roomId);
+        businessLogger.info("createWhiteBoard: roomId = {}", roomId);
 
         String wbRoom = IdentifierUtils.uuid();
         WhiteBoardApiResultInfo resultInfo = whiteBoardHelper.create(wbRoom);
@@ -1561,12 +1561,12 @@ public class RoomServiceImpl implements RoomService {
         Room room = roomDao.findByRid(roomId);
         CheckUtils.checkArgument(room != null, "room not exist");
 
-        log.info("deleteWhiteboard: room={}, whiteBoardId={}", room, whiteBoardId);
+        businessLogger.info("deleteWhiteboard: room={}, whiteBoardId={}", room, whiteBoardId);
 
         String display = room.getDisplay();
         if (display.contains("uri=" + whiteBoardId)) {
             int result = roomDao.updateDisplayByRid(roomId, "");
-            log.info("clear room display, room: {}, result: {}", roomId, result);
+            businessLogger.info("clear room display, room: {}, result: {}", roomId, result);
 
             RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
 
@@ -1579,14 +1579,14 @@ public class RoomServiceImpl implements RoomService {
                 imHelper.publishMessage(userId, roomId, displayMessage, 1);
             }
         } else {
-            log.info("no display to clean: room={}", room);
+            businessLogger.info("no display to clean: room={}", room);
         }
 
         String wbRoom = whiteboardList.get(0).getWbRoom();
         WhiteBoardApiResultInfo resultInfo = whiteBoardHelper.destroy(wbRoom);
         if (resultInfo.isSuccess()) {
             int result = whiteboardDao.deleteByWbid(whiteBoardId);
-            log.info("delete whiteboard: roomId = {}, whiteBoardId = {}, result = {}", roomId, whiteBoardId, result);
+            businessLogger.info("delete whiteboard: roomId = {}, whiteBoardId = {}, result = {}", roomId, whiteBoardId, result);
             WhiteboardMessage wbmsg = new WhiteboardMessage(WhiteboardMessage.Delete);
             wbmsg.setWhiteboardId(whiteBoardId);
             imHelper.publishMessage(userId, roomId, wbmsg, 1);
@@ -1625,7 +1625,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(room != null, "room not exist");
 
         int result = whiteboardDao.updatePageByRidAndWbid(roomId, whiteBoardId, page);
-        log.info("turn page to: {}, room: {}, wb : {}; r: {}", page, roomId, whiteBoardId, result);
+        businessLogger.info("turn page to: {}, room: {}, wb : {}; r: {}", page, roomId, whiteBoardId, result);
 
         TurnPageMessage turnPageMessage = new TurnPageMessage(whiteBoardId, userId, page);
         imHelper.publishMessage(userId, roomId, turnPageMessage);
@@ -1692,7 +1692,7 @@ public class RoomServiceImpl implements RoomService {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }
         SysUser authUser = sysUserFeignService.queryUserInfo();
-        log.info("controlDevice: userId = {}, typeEnum = {}, enable = {} ,roomId = {}", userId, typeEnum, enable, roomId);
+        businessLogger.info("controlDevice: userId = {}, typeEnum = {}, enable = {} ,roomId = {}", userId, typeEnum, enable, roomId);
 
         // RTC服务对象
         RTCRoomPluginService pluginService = rtcRoomPluginContext.getPluginService(data.getServiceProvider());
@@ -1969,7 +1969,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(ticket != null, "ticket must't be null");
         SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
-        log.info("approveControlDevice: ticket={}", ticket);
+        businessLogger.info("approveControlDevice: ticket={}", ticket);
         ControlDeviceTaskInfo taskInfo = (ControlDeviceTaskInfo) scheduleManager.executeTask(ticket);
         if (taskInfo.getTypeEnum().equals(DeviceTypeEnum.Camera)) {
             roomMemberDao.updateCameraByRidAndUid(roomId, userId, taskInfo.isOnOff());
@@ -2053,7 +2053,7 @@ public class RoomServiceImpl implements RoomService {
         SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
 
-        log.info("rejectControlDevice: ticket={}", ticket);
+        businessLogger.info("rejectControlDevice: ticket={}", ticket);
         ControlDeviceTaskInfo taskInfo = (ControlDeviceTaskInfo) scheduleManager.executeTask(ticket);
         ControlDeviceNotifyMessage msg = new ControlDeviceNotifyMessage(ActionEnum.Reject.ordinal());
         msg.setType(taskInfo.getTypeEnum().ordinal());
@@ -2182,7 +2182,7 @@ public class RoomServiceImpl implements RoomService {
             imHelper.publishMessage(userId, roomId, deviceResourceMessage, 1);
         }
 
-        log.info("syncDeviceState : {}, {}", roomId, enable);
+        businessLogger.info("syncDeviceState : {}, {}", roomId, enable);
         return true;
     }
 
@@ -2252,14 +2252,14 @@ public class RoomServiceImpl implements RoomService {
         scheduledTaskInfo.setTargetUserId(assistants.get(0).getUid());
         scheduleManager.addTask(scheduledTaskInfo);
 
-        log.info("applySpeech: task = {}", scheduledTaskInfo);
+        businessLogger.info("applySpeech: task = {}", scheduledTaskInfo);
 
         ApplyForSpeechMessage msg = new ApplyForSpeechMessage();
         msg.setTicket(ticket);
         msg.setReqUserId(userId);
         IMApiResultInfo resultInfo = imHelper.publishMessage(userId, assistants.get(0).getUid(), roomId, msg);
 
-        log.info("apply for speech: {}, task = {}", roomId, scheduledTaskInfo);
+        businessLogger.info("apply for speech: {}, task = {}", roomId, scheduledTaskInfo);
         if (resultInfo.isSuccess()) {
             return true;
         } else {
@@ -2277,12 +2277,12 @@ public class RoomServiceImpl implements RoomService {
 
         int count = roomMemberDao.countByRidAndExcludeRole(roomId, RoleEnum.RoleAudience.getValue());
         if (count == roomProperties.getMaxCount()) {
-            log.error("approveSpeech error: roomId = {}, ticket={}", roomId, ticket);
+            businessLogger.error("approveSpeech error: roomId = {}, ticket={}", roomId, ticket);
             throw new ApiException(ErrorEnum.ERR_OVER_MAX_COUNT);
         }
 
         ScheduledTaskInfo taskInfo = scheduleManager.executeTask(ticket);
-        log.info("approveSpeech: task = {}", taskInfo);
+        businessLogger.info("approveSpeech: task = {}", taskInfo);
         roomMemberDao.updateRoleByRidAndUid(roomId, taskInfo.getApplyUserId(), RoleStudent.getValue());
 
         SpeechResultMessage msg = new SpeechResultMessage(SpeechResultMessage.Action_Approve);
@@ -2321,7 +2321,7 @@ public class RoomServiceImpl implements RoomService {
         String userId = authUser.getId().toString();
         ScheduledTaskInfo taskInfo = scheduleManager.executeTask(ticket);
 
-        log.info("rejectSpeech: task = {}", taskInfo);
+        businessLogger.info("rejectSpeech: task = {}", taskInfo);
         SpeechResultMessage msg = new SpeechResultMessage(SpeechResultMessage.Action_Reject);
         msg.setOpUserId(userId);
         msg.setOpUserName(authUser.getUsername());
@@ -2338,7 +2338,7 @@ public class RoomServiceImpl implements RoomService {
         if (RoleEnum.getEnumByValue(targetUser.getRole()).equals(RoleEnum.RoleAudience)) {
             int count = roomMemberDao.countByRidAndExcludeRole(roomId, RoleEnum.RoleAudience.getValue());
             if (count == roomProperties.getMaxCount()) {
-                log.error("assign error: roomId = {}, userId = {}, role = {}", roomId, targetUser.getRid(), targetUser.getRole());
+                businessLogger.error("assign error: roomId = {}, userId = {}, role = {}", roomId, targetUser.getRid(), targetUser.getRole());
                 throw new ApiException(ErrorEnum.ERR_OVER_MAX_COUNT);
             }
         } else if (targetRole > targetUser.getRole()) {
@@ -2353,23 +2353,23 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(userId != null, "userId must't be null");
         CheckUtils.checkArgument(!userId.equals(userId), "can't set self role");
 
-        log.info("transfer: roomId = {}, userId = {}", roomId, userId);
+        businessLogger.info("transfer: roomId = {}, userId = {}", roomId, userId);
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         if (roomMember == null) {
-            log.error("assistant transfer error: {} toUser = {}, opUser={}", roomId, userId, userId);
+            businessLogger.error("assistant transfer error: {} toUser = {}, opUser={}", roomId, userId, userId);
             throw new ApiException(ErrorEnum.ERR_USER_NOT_EXIST_IN_ROOM);
         }
 
         Room room = roomDao.findByRid(roomId);
         if (room == null) {
-            log.error("assistant transfer error: {} toUser = {}, opUser={}", roomId, userId, userId);
+            businessLogger.error("assistant transfer error: {} toUser = {}, opUser={}", roomId, userId, userId);
             throw new ApiException(ErrorEnum.ERR_ROOM_NOT_EXIST);
         }
 
         if (isUserDisplay(room, userId) || isUserDisplay(room, userId)) {
             updateDisplay(roomId, userId, "", 1);
         } else {
-            log.info("don't update display: room={}", room);
+            businessLogger.info("don't update display: room={}", room);
         }
 
         roomMemberDao.updateRoleByRidAndUid(roomId, userId, RoleStudent.getValue());
@@ -2394,7 +2394,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomMemberDao.existsByRidAndUid(roomId, targetUserId), "room member not exist");
         SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
-        log.info("inviteUpgradeRole roomId = {}, targetUserId = {}, targetRole = {}", roomId, targetUserId, targetRole);
+        businessLogger.info("inviteUpgradeRole roomId = {}, targetUserId = {}, targetRole = {}", roomId, targetUserId, targetRole);
 
         RoomMember targetUser = roomMemberDao.findByRidAndUid(roomId, targetUserId);
         if (targetUser == null) {
@@ -2435,7 +2435,7 @@ public class RoomServiceImpl implements RoomService {
         SysUser authUser = sysUserFeignService.queryUserInfo();
         String userId = authUser.getId().toString();
         UpgradeRoleTaskInfo taskInfo = (UpgradeRoleTaskInfo) scheduleManager.executeTask(ticket);
-        log.info("approveUpgradeRole roomId = {}, task={}", roomId, taskInfo);
+        businessLogger.info("approveUpgradeRole roomId = {}, task={}", roomId, taskInfo);
 
         RoomMember targetUser = roomMemberDao.findByRidAndUid(roomId, userId);
         if (targetUser == null) {
@@ -2507,12 +2507,12 @@ public class RoomServiceImpl implements RoomService {
             throw new ApiException(ErrorEnum.ERR_USER_NOT_EXIST_IN_ROOM);
         } else {
             if (!RoleEnum.getEnumByValue(targetUser.getRole()).equals(RoleStudent)) {
-                log.error("change role error: targetUserId={}, targetRole = {}", targetUser, RoleEnum.getEnumByValue(targetRole));
+                businessLogger.error("change role error: targetUserId={}, targetRole = {}", targetUser, RoleEnum.getEnumByValue(targetRole));
                 throw new ApiException(ErrorEnum.ERR_CHANGE_ROLE);
             }
         }
 
-        log.info("changeRole: roomId={}, targetUserId={}", roomId, targetUserId);
+        businessLogger.info("changeRole: roomId={}, targetUserId={}", roomId, targetUserId);
         List<RoleChangedMessage.ChangedUser> changedUserList = new ArrayList<>();
         RoleChangedMessage msg = new RoleChangedMessage(userId);
 
@@ -2526,7 +2526,7 @@ public class RoomServiceImpl implements RoomService {
             }
             changedUserList.add(user);
         } else {
-            log.info("change directly cause no teacher exist in room, roomId={}", roomId);
+            businessLogger.info("change directly cause no teacher exist in room, roomId={}", roomId);
         }
 
         roomMemberDao.updateRoleByRidAndUid(roomId, targetUserId, targetRole);
@@ -2552,7 +2552,7 @@ public class RoomServiceImpl implements RoomService {
             DisplayMessage displayMessage = new DisplayMessage(display);
             imHelper.publishMessage(userId, roomId, displayMessage, 1);
         }
-        log.info("changeRole, display changed: roomId={}, {}, targetUserId={}", roomId, display, targetUserId);
+        businessLogger.info("changeRole, display changed: roomId={}, {}, targetUserId={}", roomId, display, targetUserId);
 
         return true;
     }
@@ -2563,7 +2563,7 @@ public class RoomServiceImpl implements RoomService {
         String sign = imProperties.getSecret() + nonce + timestamp;
         String signSHA1 = CodeUtil.hexSHA1(sign);
         if (!signSHA1.equals(signature)) {
-            log.info("memberOnlineStatus signature error");
+            businessLogger.info("memberOnlineStatus signature error");
             return true;
         }
 
@@ -2571,7 +2571,7 @@ public class RoomServiceImpl implements RoomService {
             int s = Integer.parseInt(status.getStatus());
             String userId = status.getUserId();
 
-            log.info("memberOnlineStatus, userId={}, status={}", userId, status);
+            businessLogger.info("memberOnlineStatus, userId={}, status={}", userId, status);
             //1：offline 离线； 0: online 在线
             if (s == 1) {
                 List<RoomMember> members = roomMemberDao.findByUid(userId);
@@ -2604,7 +2604,7 @@ public class RoomServiceImpl implements RoomService {
 
         for (RoomMember member : members) {
             int userRole = member.getRole();
-            log.info("userIMOfflineKick: roomId={}, {}, role={}", member.getRid(), userId, RoleEnum.getEnumByValue(userRole));
+            businessLogger.info("userIMOfflineKick: roomId={}, {}, role={}", member.getRid(), userId, RoleEnum.getEnumByValue(userRole));
             try {
                 if (userRole == RoleTeacher.getValue() || userRole == RoleEnum.RoleAssistant.getValue()) {
                     Room room = roomDao.findByRid(member.getRid());
@@ -2613,7 +2613,7 @@ public class RoomServiceImpl implements RoomService {
                     }
                     if (isUserDisplay(room, member.getUid())) {
                         updateDisplay(member.getRid(), member.getUid(), "", 0);
-                        log.info("memberOnlineStatus offline: roomId={}, {}", member.getRid(), member.getUid());
+                        businessLogger.info("memberOnlineStatus offline: roomId={}, {}", member.getRid(), member.getUid());
                     }
                 }
                 if (roomMemberDao.countByRid(member.getRid()) == 1) {
@@ -2624,7 +2624,7 @@ public class RoomServiceImpl implements RoomService {
                     roomMemberDao.deleteUserByRidAndUid(member.getRid(), member.getUid());
                     roomDao.deleteByRid(member.getRid());
                     deleteWhiteboardByUser(member.getRid(), member.getUid());
-                    log.info("dismiss the room: {},userId: {}", member.getRid(), userId);
+                    businessLogger.info("dismiss the room: {},userId: {}", member.getRid(), userId);
                 } else {
                     roomMemberDao.deleteUserByRidAndUid(member.getRid(), member.getUid());
                     MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, member.getUid(), userRole);
@@ -2640,7 +2640,7 @@ public class RoomServiceImpl implements RoomService {
                 }
                 userDao.deleteByUid(member.getUid());
             } catch (Exception e) {
-                log.error("userIMOfflineKick error: userId={}", userId);
+                businessLogger.error("userIMOfflineKick error: userId={}", userId);
             }
         }
     }

mec-im/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
@@ -14,3 +14,4 @@ spring.cloud.nacos.config.file-extension=yaml
 spring.cloud.refresh.enabled=true
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 spring.cloud.nacos.config.enabled=true
+logging.config=classpath:logback-spring.xml

mec-im/src/main/resources/logback-spring.xml

@@ -38,7 +38,7 @@
         <runModel>2</runModel>
     </appender>
 
-    <logger name="com.ym.mec" level="WARN" />
+    <logger name="com.ym.mec" level="INFO" />
 
     <!--本地环境:打印控制台 -->
     <springProfile name="local">
@@ -71,14 +71,14 @@
 
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
-        <root level="WARN">
+        <root level="INFO">
             <appender-ref ref="file" />
             <appender-ref ref="plumelog" />
         </root>
     </springProfile>
     <!--生产环境:输出到文件 -->
-    <springProfile name="prd">
-        <root level="WARN">
+    <springProfile name="pre">
+        <root level="INFO">
             <appender-ref ref="file" />
             <appender-ref ref="plumelog" />
         </root>

mec-mall/mall-admin/src/main/resources/bootstrap-prod.yml

@@ -3,7 +3,7 @@ spring:
     nacos:
       config:
         server-addr: 10.206.0.12:8848
-        namespace: b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+        namespace: f40a7594-4bd0-4bc6-8397-9353c6d2e63a
         group: DEFAULT_GROUP
         prefix: mall-admin
         file-extension: yaml

mec-mall/mall-portal/src/main/resources/bootstrap-prod.yml

@@ -3,7 +3,7 @@ spring:
     nacos:
       config:
         server-addr: 10.206.0.12:8848
-        namespace: b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+        namespace: f40a7594-4bd0-4bc6-8397-9353c6d2e63a
         group: DEFAULT_GROUP
         prefix: mall-portal
         file-extension: yaml

mec-task/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-websocket/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}