整理数据权限

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicTemplateOrgService.java

@@ -22,7 +22,7 @@ public interface BasicTemplateOrgService extends IService<BasicTemplateOrg> {
 
     void removeByRuleId(Long id);
 
-    void saveBatch(TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId);
+    void saveBatch(Long schoolId, TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId);
 
     /**
      * 根据机构id查询所有机构集合下所使用的的模板信息

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCardRuleServiceImpl.java

@@ -119,7 +119,7 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
         }
 
         // 新增权限
-        basicTemplateOrgService.saveBatch(TemplateTypeEnum.CARD_RULE, cardRule.getId(), cardRule.getOrgIds(), cardRule.getCreateId());
+        basicTemplateOrgService.saveBatch(schoolId,TemplateTypeEnum.CARD_RULE, cardRule.getId(), cardRule.getOrgIds(), cardRule.getCreateId());
 
         return isSuccess;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateOrgServiceImpl.java

@@ -42,15 +42,15 @@ public class BasicTemplateOrgServiceImpl extends ServiceImpl<BasicTemplateOrgMap
     }
 
     @Override
-    public void saveBatch(TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId) {
+    public void saveBatch(Long schoolId, TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId) {
         List<BasicTemplateOrg> list = new ArrayList<>();
         for (Long orgId : orgIds) {
             BasicTemplateOrg basicTemplateOrg = new BasicTemplateOrg();
+            basicTemplateOrg.setSchoolId(schoolId);
             basicTemplateOrg.setType(type);
             basicTemplateOrg.setRuleId(ruleId);
             basicTemplateOrg.setOrgId(orgId);
-            basicTemplateOrg.setCreateId(createId);
-            basicTemplateOrg.setCreateTime(System.currentTimeMillis());
+            basicTemplateOrg.insertInfo(createId);
             list.add(basicTemplateOrg);
         }
         this.saveBatch(list);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateServiceImpl.java

@@ -69,11 +69,11 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                 List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(type, Long.valueOf(m.getId()));
                 m.setOrgs(sysOrgs);
 
-                if(type.equals(TemplateTypeEnum.GENERIC.name())){
+                if (type.equals(TemplateTypeEnum.GENERIC.name())) {
                     QueryWrapper<ExamCard> queryWrapper = new QueryWrapper<>();
                     queryWrapper.lambda().eq(ExamCard::getTemplateId, m.getId());
                     List<ExamCard> examCards = examCardService.list(queryWrapper);
-                    if(!CollectionUtils.isEmpty(examCards)){
+                    if (!CollectionUtils.isEmpty(examCards)) {
                         m.setCardId(examCards.get(0).getId().toString());
                     }
                 }
@@ -97,9 +97,8 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
             if (basicTemplate != null) {
                 throw ExceptionResultEnum.ERROR.exception("模板名称已存在");
             }
-            template.setId(SystemConstant.getDbUuid());
-            template.setCreateId(sysUser.getId());
-            template.setCreateTime(System.currentTimeMillis());
+            template.insertInfo(sysUser.getId());
+            template.setOrgId(sysUser.getOrgId());
             isSuccess = this.save(template);
         }
         // 修改
@@ -113,25 +112,21 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
             if (used) {
                 throw ExceptionResultEnum.ERROR.exception("通用题卡模板已绑定任务，不能修改");
             }
-
-            template.setUpdateId(sysUser.getId());
-            template.setUpdateTime(System.currentTimeMillis());
-
+            template.updateInfo(sysUser.getId());
             //删除权限
             basicTemplateOrgService.removeByRuleId(template.getId());
             isSuccess = this.updateById(template);
-
         }
 
         // 新增权限
-        basicTemplateOrgService.saveBatch(template.getType(), template.getId(), template.getOrgIds(), template.getCreateId());
+        basicTemplateOrgService.saveBatch(schoolId, template.getType(), template.getId(), template.getOrgIds(), template.getCreateId());
 
         if (TemplateTypeEnum.GENERIC.name().equals(template.getType().name())) {
             // 通用题卡，同步更新exam_card
             BasicAttachment attachment = basicAttachmentService.getById(template.getAttachmentId());
 
             ExamCard examCard1 = examCardService.getOneByTemplateId(template.getId());
-            if(examCard1 == null) {
+            if (examCard1 == null) {
                 ExamCard examCard = examCardService.getOneByTemplateId(template.getId());
                 ExamCardParams examCardParams = new ExamCardParams();
                 examCardParams.setId(examCard == null ? null : examCard.getId());

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardServiceImpl.java

@@ -72,12 +72,11 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         // 新增
         ExamCard examCard;
         ExamCardDetail examCardDetail;
-        if(examCardParams.getTitle().getBytes().length > 80){
+        if (examCardParams.getTitle().getBytes().length > 80) {
             throw ExceptionResultEnum.ERROR.exception("标题最长只能输入80个字符");
         }
         if (examCardParams.getId() == null) {
             examCard = new ExamCard();
-            examCard.setId(SystemConstant.getDbUuid());
             examCard.setSchoolId(schoolId);
             examCard.setCourseCode(examCardParams.getCourseCode());
             examCard.setCourseName(examCardParams.getCourseName());
@@ -86,18 +85,16 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             examCard.setStatus(examCardParams.getStatus());
             examCard.setType(examCardParams.getType());
             examCard.setTemplateId(examCardParams.getTemplateId());
-            examCard.setCreateId(user.getId());
-            examCard.setCreateTime(System.currentTimeMillis());
+            examCard.insertInfo(user.getId());
+            examCard.setOrgId(user.getOrgId());
             this.save(examCard);
 
             examCardDetail = new ExamCardDetail();
-            examCardDetail.setId(SystemConstant.getDbUuid());
             examCardDetail.setCardId(examCard.getId());
             examCardDetail.setContent(examCardParams.getContent());
             examCardDetail.setHtmlContent(examCardParams.getHtmlContent());
             examCardDetail.setAttachmentId(examCardParams.getAttachmentId());
-            examCardDetail.setCreateId(user.getId());
-            examCardDetail.setCreateTime(System.currentTimeMillis());
+            examCardDetail.insertInfo(user.getId());
             examCardDetailService.save(examCardDetail);
         }
         // 修改
@@ -122,8 +119,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             examCardDetail.setContent(examCardParams.getContent());
             examCardDetail.setHtmlContent(examCardParams.getHtmlContent());
             examCardDetail.setAttachmentId(examCardParams.getAttachmentId());
-            examCardDetail.setUpdateId(user.getId());
-            examCardDetail.setUpdateTime(System.currentTimeMillis());
+            examCardDetail.updateInfo(user.getId());
             examCardDetailService.updateById(examCardDetail);
 
         }
@@ -246,7 +242,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             ExamCardDetail examCardDetail = examCardDetailService.getByCardId(cardId);
             BasicAttachment attachment = basicAttachmentService.getById(examCardDetail.getCustAttachmentId());
             String fileName = attachment.getName() + attachment.getType();
-            teachcloudCommonService.copyFile(sj.toString(),fileName, attachment);
+            teachcloudCommonService.copyFile(sj.toString(), fileName, attachment);
         }
         // 压缩
         teachcloudCommonService.downloadFileAndZip(response, rootPath, time);

distributed-print/src/main/resources/application-dev.properties

@@ -12,7 +12,7 @@ spring.application.name=distributed-print
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=distributed-v2.2.0
+db.name=distributed-v2.2.0-test
 db.username=root
 db.password=123456789