feat: 添加共享菜单权限

dbscript/20.6.18.sql

@@ -18,7 +18,7 @@ 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);
 
 -- 为 主管理员添加 新消息管理菜单 权限
-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' where r_type = 0;
+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;
 
 
 

src/main/java/org/rcisoft/business/blesson/entity/BLessonPerson.java

@@ -174,6 +174,10 @@ public class BLessonPerson extends IdEntity<BLessonPerson> {
     @ApiModelProperty(value = "学员id集合")
     ILessonCountDTO iLessonCount;
 
+    @ApiModelProperty(value = "isnew")
+    @Transient
+    private String isNew;
+
     public BLessonPerson(String isAppoint,String appointId){
         this.isAppoint = isAppoint;
         this.appointId = appointId;

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

 package org.rcisoft.business.blesson.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.rcisoft.business.blesson.dao.BAppointRepository;
@@ -16,11 +17,14 @@ import org.rcisoft.business.blesson.enums.IsFinishEnum;
 import org.rcisoft.business.blesson.enums.LessonTypeEnum;
 import org.rcisoft.business.blesson.enums.ReleaseStateEnum;
 import org.rcisoft.business.blesson.service.BLessonPersonService;
+import org.rcisoft.business.bmessage.dao.BMessageRepository;
+import org.rcisoft.business.bmessage.entity.BMessage;
 import org.rcisoft.business.bpersonvalue.dao.BPersonValueRepository;
 import org.rcisoft.business.bpersonvalue.entity.BPersonValue;
 import org.rcisoft.common.util.feignDto.*;
 import org.rcisoft.common.util.outClient.MTCotactApiRequestClient;
 import org.rcisoft.core.aop.PageUtil;
+import org.rcisoft.core.enums.MessageEnum;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;
@@ -71,6 +75,9 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
     @Autowired
     BLessonServiceImpl bLessonServiceImpl;
 
+    @Autowired
+    BMessageRepository bMessageRepository;
+
 
     @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
     @Override
@@ -124,7 +131,7 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
                 }
             });
         }
-        return bLessonList;
+        return addNew(bLessonList);
     }
 
     @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
@@ -441,4 +448,54 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
         }
         return bLessonPerson;
     }
+
+    /**
+     * 新建的课程培训 添加new字段
+     *
+     * @param result
+     * @return
+     */
+    public List<BLessonPerson> addNew(List<BLessonPerson> result) {
+        if(result == null)
+            return result;
+        //获取当前登录人信息
+        CurUser curUser = UserUtil.getCurUser();
+        String userId = curUser.getUserId();
+        String corpId = curUser.getCorpId();
+        log.info("-----------addNew---------当前登录人信息curUser----------"+curUser+"--------------------");
+        BMessage bMessage = new BMessage();
+        bMessage.setName(MessageEnum.NEWNOTICE.getName());
+        //查询当前企业的 新消息时间 的配置
+        List<BMessage> messageList = bMessageRepository.queryByNameAndCorp(MessageEnum.NEWNOTICE.getName(),corpId);
+        log.info("-----------addNew---------新消息配置messageList---------"+messageList+"--------------");
+        if (messageList.size() <= 0)
+            return result;
+        BMessage newNotice = messageList.get(0);
+        //获取当前时间
+        Calendar c = Calendar.getInstance();
+        int time = Integer.parseInt(newNotice.getTimeValue());
+        for (BLessonPerson b : result) {
+            //step 1 查询look表中是否有对应任何课程的点击记录
+            int flag = bLessonRepository.getCountByUserAndLesson(userId, b.getBusinessId(), "0");
+            //step 2 存在则返回，不存在则判断时间 满足条件 setIsNew() flag <= 0 说明此用户未点击过该课程
+            if (flag <= 0) {
+                //获取课程的 指派时间
+                Calendar c1 = DateUtil.calendar(b.getCreateDate());
+                log.info("-----------addNew------课程指派时间--"+DateUtil.date(c1)+"---------------");
+                switch (newNotice.getValueType()){
+                    case "1" : c1.add(Calendar.HOUR, time); break;
+                    case "2" : c1.add(Calendar.DAY_OF_MONTH, time);  break;
+                    case "3" : c1.add(Calendar.WEEK_OF_MONTH, time); break;
+                    case "4" : c1.add(Calendar.MONTH, time); break;
+                }
+                log.info("-----------addNew-------当前时间--"+DateUtil.date(c)+"--new标志结束时间--"+DateUtil.date(c1));
+                if (c1.after(c)){
+                    b.setIsNew("1");
+                    log.info("-----------addNew---------当前课程已设置new-------"+b);
+                }
+            }
+        }
+        return result;
+    }
+
 }

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

@@ -41,5 +41,6 @@ public class MenuMap {
         menuMap.put("F-ROLE-MANAGE", "0053");
         menuMap.put("F-NOTICE-MANAGE", "0054");
         menuMap.put("F-NEW-MANAGE", "0055");
+        menuMap.put("F-SYNCH-MANAGE", "0056");
     }
 }

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-NEW-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，F-SYNCH-MANAGE";
         //主管理员角色id
         String mRId = IdGen.uuid();
         //初始化角色（新加公司超级管理员）