feat: 新增 新消息管理菜单

dbscript/20.6.18.sql

+-- 新建表 look
+
+-- 添加 消息中字段
+
+-- 添加菜单表中 新消息设置 
\ No newline at end of file

src/main/java/org/rcisoft/business/bcourse/service/impl/BCourseServiceImpl.java

@@ -19,6 +19,7 @@ import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.UserUtil;
+import org.rcisoft.sys.user.bean.CurUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +45,7 @@ public class BCourseServiceImpl implements BCourseService {
         }
         param.put("corpId", model.getCorpId());
         List<QueryCourseResDTO> ret = bCourseRepository.queryCourses(param);
+        ret = addNewFolder(ret);
         List<Map<String,Object>> maplist = new ArrayList<>();
         for(QueryCourseResDTO dto :ret){
             Map<String,Object> map = new HashMap<>();
@@ -60,6 +62,7 @@ public class BCourseServiceImpl implements BCourseService {
                             map3.put("courseLevel",dto3.getCourseLevel());
                             map3.put("sort",dto3.getSort());
                             map3.put("title",dto3.getTitle());
+                            map3.put("newCount",dto3.getNewCount());
                             maplist3.add(map3);
                         }
                         map2.put("children",maplist3);
@@ -69,6 +72,7 @@ public class BCourseServiceImpl implements BCourseService {
                     map2.put("courseLevel",dto2.getCourseLevel());
                     map2.put("sort",dto2.getSort());
                     map2.put("title",dto2.getTitle());
+                    map2.put("newCount",dto2.getNewCount());
                     maplist2.add(map2);
                 }
                 map.put("children",maplist2);
@@ -78,6 +82,7 @@ public class BCourseServiceImpl implements BCourseService {
             map.put("courseLevel",dto.getCourseLevel());
             map.put("sort",dto.getSort());
             map.put("title",dto.getTitle());
+            map.put("newCount",dto.getNewCount());
             maplist.add(map);
         }
         return maplist;
@@ -266,7 +271,7 @@ public class BCourseServiceImpl implements BCourseService {
      */
     public List<QueryCourseResDTO> addNewFolder(List<QueryCourseResDTO> resDTOS){
         log.info("-----------addNewFolder----------当前接口查询的一级分类个数---------"+resDTOS.size()+"--------------------");
-        List<BLesson> lessons = bLessonService.queryHomeBLessons();//查询首页显示的所有 课程（isNew 已赋值）
+        List<BLesson> lessons = bLessonService.queryHomeBLessons(UserUtil.getCurUser());//查询首页显示的所有 课程（isNew 已赋值）
         for (QueryCourseResDTO dto : resDTOS){  //一级分类
             int num = 0; //属于当前分类的课程数
             int secNum = 0 ;//下层分类中的课程数

src/main/java/org/rcisoft/business/blabel/service/impl/BLabelServiceImpl.java

@@ -38,9 +38,9 @@ public class BLabelServiceImpl implements BLabelService {
 
     @Override
     public List<BLabel> queryBlabels(String lName, String corpId) {
-
+        CurUser curUser = UserUtil.getCurUser();
         List<BLabel> labels = bLabelRepository.queryBlabels(lName, corpId);
-        List<BLesson> lessons = bLessonService.queryHomeBLessons();
+        List<BLesson> lessons = bLessonService.queryHomeBLessons(curUser);
         log.info("-----------addNewLable----------首页所有课程总个数--"+lessons.size()+"--------------------");
 
         for (BLabel label : labels) {

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -784,11 +784,11 @@ public class BLessonController extends PaginationController<BLesson> {
 
     @ApiOperation(value = "645555 点击课程", notes = "取消new显示")
     @PostMapping(value = "/test")
-    public Result test () {
+    public Result test (CurUser curUser) {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                bLessonService.test());
+                bLessonService.queryHomeBLessons(curUser));
     }
 
 

src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java

@@ -362,12 +362,10 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             " ,suc.name createByName " +
             " from b_lesson bl " +
             " left join s_user su on su.business_id = bl.lecturer_id " +
-//            " and su.del_flag != 1 and su.flag = 1  " +
 
             " and su.corp_id = #{param.corpId} "+
 
             " left join s_user suc on suc.business_id = bl.create_by " +
-//            " and suc.del_flag != 1 and suc.flag = 1  " +
 
             " and suc.corp_id = #{param.corpId} "+
 

src/main/java/org/rcisoft/business/blesson/service/BLessonService.java

@@ -305,4 +305,6 @@ public interface BLessonService{
 
     List<BLesson> test();
 
+    List<BLesson> queryHomeBLessons(CurUser curUser);
+
 }

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

@@ -1802,10 +1802,8 @@ public class BLessonServiceImpl implements BLessonService {
     public List<BLesson> addNew(List<BLesson> result) {
         //获取当前登录人信息
         CurUser curUser = UserUtil.getCurUser();
-//        String userId = curUser.getUserId();
-//        String corpId = curUser.getCorpId();
-        String userId = "123";
-        String corpId = "6";
+        String userId = curUser.getUserId();
+        String corpId = curUser.getCorpId();
         log.info("-----------addNew---------当前登录人信息curUser----------"+curUser+"--------------------");
         BMessage bMessage = new BMessage();
         bMessage.setName(MessageEnum.NEWNOTICE.getName());
@@ -1823,8 +1821,8 @@ public class BLessonServiceImpl implements BLessonService {
             int flag = bLessonRepository.getCountByUserAndLesson(userId, b.getBusinessId(), "0");
             //step 2 存在则返回，不存在则判断时间 满足条件 setIsNew() flag <= 0 说明此用户未点击过该课程
             if (flag <= 0) {
-                //获取课程的添加时间
-                Calendar c1 = DateUtil.calendar(b.getCreateDate());
+                //获取课程的 发布时间
+                Calendar c1 = DateUtil.calendar(b.getReleaseDate());
                 c1.setTime(b.getCreateDate());
                 switch (newNotice.getValueType()){
                     case "1" : c1.add(Calendar.HOUR, time); break;
@@ -1842,9 +1840,10 @@ public class BLessonServiceImpl implements BLessonService {
         return result;
     }
 
+
+    @Override
     @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
-    public List<BLesson> queryHomeBLessons() {
-        CurUser  curUser = UserUtil.getCurUser();
+    public List<BLesson> queryHomeBLessons(CurUser curUser) {
         log.info("--------获取当前用户人---"+curUser);
         List<String> ids = Arrays.asList(new String[]{curUser.getUserId()});
         MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO();
@@ -1852,7 +1851,7 @@ public class BLessonServiceImpl implements BLessonService {
         mtUserGetsReqDTO.setIds(ids);
         log.info("------------mtUserGetsReqDTO--------"+mtUserGetsReqDTO);
         List<MTUserInfoRspDTO> mtUserInfoRspDTOList = cotactApiRequestClient.userGets(mtUserGetsReqDTO);
-        log.info("------------mtUserInfoRspDTOList--------"+mtUserInfoRspDTOList);
+        log.info("------------mtUserInfoRspDTOList--------"+mtUserInfoRspDTOList==null?null:mtUserInfoRspDTOList.toString());
         List<String> departs = new ArrayList<>();
         if (mtUserInfoRspDTOList != null && mtUserInfoRspDTOList.size() > 0) {
             departs = QueryDepart.queryDepart(mtUserInfoRspDTOList);
@@ -1861,6 +1860,8 @@ public class BLessonServiceImpl implements BLessonService {
         }
         FirstPageQueryDTO firstPageQueryDTO = new FirstPageQueryDTO();
         firstPageQueryDTO.setDeparts(departs);
+        firstPageQueryDTO.setCorpId(curUser.getCorpId());
+        firstPageQueryDTO.setUserId(curUser.getUserId());
         List<String> courseIds = null;
         log.info("----------firstPageQueryDTO---------"+firstPageQueryDTO);
         List<BLesson> result = bLessonRepository.queryHomeBLesson(firstPageQueryDTO, courseIds);

src/main/java/org/rcisoft/common/model/MenuMap.java

@@ -40,6 +40,6 @@ public class MenuMap {
         menuMap.put("F-USER-MANAGE", "0052");
         menuMap.put("F-ROLE-MANAGE", "0053");
         menuMap.put("F-NOTICE-MANAGE", "0054");
-        menuMap.put("F-GALLERY-MANAGE", "0055");
+        menuMap.put("F-NEW-MANAGE", "0055");
     }
 }

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -191,7 +191,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT,rollbackFor = Exception.class)
     public int addAdminRoleMenuUser(CurUser curUser) {
 
-        String 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-DAILY-QUESTION,F-GALLERY-MANAGE";
+        String 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";
         //主管理员角色id
         String mRId = IdGen.uuid();
         //初始化角色（新加公司超级管理员）

src/main/resources/application-test.yml

@@ -8,22 +8,6 @@ server:
   type: test
   maxHttpHeaderSize: 102400
 
-#logging:
-#  level:
-#    root: INFO
-#    org.springframework.web: DEBUG
-#
-#druid:
-##  url: jdbc:mysql://192.168.5.201:20001/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#  url: jdbc:mysql://192.168.5.41:3306/zx_education?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-#  username: edu
-#  password: edu20191127
-#  initial-size: 1
-#  min-idle: 1
-#  max-active: 20
-#  test-on-borrow: true
-
-
 mybatis:
   mapper-locations: classpath:mapper/**/**/*.xml
 
@@ -126,4 +110,16 @@ notice:
     urlCourse: http://192.168.5.54/education-mobile/#/courseDetail?
     urlTrain: http://192.168.5.54/education-mobile/#/trainDetail?
     urlExam: http://192.168.5.54/education-mobile/#/onlineExamination?
-  defaultUrl: http://zx-zgiot-002.oss-cn-qingdao.aliyuncs.com/image/2d60950fefa14041b4d9715a70a7d389.png
+  defaultUrl: http://zx-zgiot-002.oss-cn-qingdao.aliyuncs.com/image/2d60950fefa14041b4d9715a70a7d389.png
\ No newline at end of file
+
+
+appId:
+  globalAppId: 1
+  noticeAppId: 9
+
+upload:
+  replaceHttp: true # 智信上传接口返回oss链接 http替换https  默认false不替换
+  fileMaxSize: 100
+  fileMaxPages: 100
+  pdfMaxSize: 150
+  timeOut: 10   #  读取文件超时时间 秒为单位
\ No newline at end of file