fix: 关闭课程 状态同步

dbscript/20.6.18.sql

@@ -15,7 +15,8 @@ INSERT INTO `b_message` VALUES (uuid(), '', '2020-06-17 11:07:11', '104983787261
 
 
 -- 添加菜单表中 新消息设置
-INSERT INTO `s_menu` VALUES ('0055', '0005', NULL, '新消息管理', 'F-NEW-MANAGE', 'newManage', NULL, NULL, 4, '1', '1', 'F-NEW-MANAGE', NULL, '2019-11-25 10:45:07', NULL, '2019-11-25 10:45:15', NULL, '0', '1', '20', 2);
+INSERT INTO `s_menu` VALUES ('0055', '0005', NULL, '新消息管理', 'F-NEW-MANAGE', 'newManage', NULL, NULL, 5, '1', '1', 'F-NEW-MANAGE', NULL, '2019-11-25 10:45:07', NULL, '2019-11-25 10:45:15', NULL, '0', '1', '20', 2);
+INSERT INTO `s_menu` VALUES ('0056', '0005', NULL, '资源共享管理', 'F-SYCN-MANAGE', 'newManage', NULL, NULL, 6, '1', '1', 'F-SYCN-MANAGE', NULL, '2019-11-25 10:45:07', NULL, '2019-11-25 10:45:15', NULL, '0', '1', '20', 2);
 
 -- 为 主管理员添加 新消息管理菜单 权限
 update tm_admin_role set r_privilege ='M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-APPOINT,P-UNDER-TRACK,P-UNDER-RECOMMEND,P-UNDER-CLOSE,P-UNDER-DEL,F-CATEGORY,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,P-OUTER-LINK,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT,P-PAPER-CLONE,P-ROLE-DEL,F-NOTICE-MANAGE,F-NEW-MANAGE，F-SYNCH-MANAGE' where r_type = 0;
@@ -25,9 +26,16 @@ update tm_admin_role set r_privilege ='M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LES
 -- lesson 新增字段 is_push 、push_lable
 ALTER TABLE b_lesson ADD is_push VARCHAR(2)  COMMENT '平台推荐标志 (1:推荐 其他：非推荐)' ;
 ALTER TABLE b_lesson ADD push_lable VARCHAR(255)  COMMENT '平台推荐自带标签' ;
+ALTER TABLE b_lesson ADD from_corp VARCHAR(64)  COMMENT '数据来源企业' ;
 
--- banner 、b_external_link 增加 is_push 、supper_id
+-- banner 、b_external_link b_lable is_push 、supper_id
 ALTER TABLE b_banner ADD is_push VARCHAR(2)  COMMENT '平台推荐标志 (1:推荐 其他：非推荐)' ;
 ALTER TABLE b_banner ADD supper_id VARCHAR(64)  COMMENT '推荐源主键id' ;
 ALTER TABLE b_external_link ADD is_push VARCHAR(2)  COMMENT '平台推荐标志 (1:推荐 其他：非推荐)' ;
 ALTER TABLE b_external_link ADD supper_id VARCHAR(64)  COMMENT '推荐源主键id' ;
+ALTER TABLE b_lable ADD is_push VARCHAR(2)  COMMENT '平台推荐标志 (1:推荐 其他：非推荐)' ;
+ALTER TABLE b_lable ADD supper_id VARCHAR(64)  COMMENT '推荐源主键id' ;
+
+
+-- b_lesson_lable 添加corp_id
+ALTER TABLE b_lesson_lable ADD corp_id VARCHAR(64)  COMMENT '平台推荐至企业课程 对应企业' ;

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -439,16 +439,18 @@ public class BLessonServiceImpl implements BLessonService {
             model.setCorpId(bLessonRepository.selectByPrimaryKey(model.getBusinessId()).getCorpId());
             UserUtil.setCurrentMergeOperation(model);
             line = bLessonRepository.updateByPrimaryKeySelective(model);
-            //查询 当前资源共享状态
-            String flag = bMessageRepository.getSycnValue(curUser.getCorpId());
-            //开启共享状态 编辑课程时 添加日志
-            if(LessonSycnEnum.OPEN.getCode().equals(flag) && LessonTypeEnum.LESSON.getCode().equals(model.getLessonType())){
-                // 保存日志
-                bLessonLogRepository.insertSelective(BLessonLog.generate("编辑课程",model.getBusinessId()));
-                // 同步 资源共享 更新 缓存课程 表
-                BPLesson bpModel = new BPLesson();
-                BeanUtil.copyProperties(model,bpModel);
-                bpLessonRepository.updateByPrimaryKeySelective(bpModel);
+            if(!ReleaseStateEnum.UNRELEASED.getCode().equals(model.getReleaseState())){
+                //查询 当前资源共享状态
+                String flag = bMessageRepository.getSycnValue(curUser.getCorpId());
+                //开启共享状态 编辑课程时 添加日志
+                if(LessonSycnEnum.OPEN.getCode().equals(flag) && LessonTypeEnum.LESSON.getCode().equals(model.getLessonType())){
+                    // 保存日志
+                    bLessonLogRepository.insertSelective(BLessonLog.generate("编辑课程",model.getBusinessId()));
+                    // 同步 资源共享 更新 缓存课程 表
+                    BPLesson bpModel = new BPLesson();
+                    BeanUtil.copyProperties(model,bpModel);
+                    bpLessonRepository.updateByPrimaryKeySelective(bpModel);
+                }
             }
             //若培训结束时间改变 修改学生签到状态
             //查询课程信息
@@ -617,7 +619,7 @@ public class BLessonServiceImpl implements BLessonService {
         bLesson.setDeleted();
         UserUtil.setCurrentMergeOperation(bLesson);
         // 保存日志
-        bLessonLogRepository.insertSelective(BLessonLog.generate("关闭课程",bLesson.getBusinessId()));
+        bLessonLogRepository.insertSelective(BLessonLog.generate("删除课程",bLesson.getBusinessId()));
         //查询 当前资源共享状态
         String flag = bMessageRepository.getSycnValue(bLesson.getCorpId());
         if(LessonSycnEnum.OPEN.getCode().equals(flag)){
@@ -662,8 +664,7 @@ public class BLessonServiceImpl implements BLessonService {
     @Override
     @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
     public PersistModel closeBLesson(String id) {
-        BLesson bLesson = new BLesson();
-        bLesson.setBusinessId(id);
+        BLesson bLesson = bLessonRepository.selectByPrimaryKey(id);
         bLesson.setCloseDate(new Date());
         UserUtil.setCurrentMergeOperation(bLesson);
         // 保存日志
@@ -709,11 +710,11 @@ public class BLessonServiceImpl implements BLessonService {
         //发布成功 添加日志 和 同步操作
         //查询 当前资源共享状态
         String flag = bMessageRepository.getSycnValue(curUser.getCorpId());
-        //开启共享状态 编辑课程时 添加日志
+        //开启共享状态 发布课程时 添加日志
         if(LessonSycnEnum.OPEN.getCode().equals(flag) && LessonTypeEnum.LESSON.getCode().equals(bLesson.getLessonType())){
             // 保存日志
             bLessonLogRepository.insertSelective(BLessonLog.generate("发布课程",bLesson.getBusinessId()));
-            // 同步 资源共享 更新 缓存课程 章节 文件 三个表（未发布的课程 之前不会被同步到缓存表中）
+            // 同步 资源共享 更新 缓存课程 章节 文件 三个表（关闭的课程也属于 未发布的课程）
             List<BChapter> chapters = new ArrayList<>();
             List<BFile> files  = new ArrayList<>();
             //step2 根据课程查询对应的章节和课件
@@ -728,6 +729,11 @@ public class BLessonServiceImpl implements BLessonService {
             BPLesson bpLesson = new BPLesson();
             BeanUtil.copyProperties(bLesson,bpLesson);
             bpLesson.setReleaseState("2");
+            //删除旧数据
+            bpLessonRepository.deleteByPrimaryKey(bpLesson.getBusinessId());
+            bpChapterRepository.deleteList(chapters);
+            bpFileRepository.deleteList(files);
+            //新增数据
             bpLessonRepository.insertSelective(bpLesson);
             bpChapterRepository.insertList(chapters);
             bpFileRepository.insertList(files);