update

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

@@ -92,14 +92,11 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Map<String, Object> printPlanTemplateDatasource(Long schoolId, Long userId) {
+    public Map<String, Object> printPlanTemplateDatasource(Long requestSchoolId, Long userId) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         //1.根据userId，schoolId查出orgId(应该从requestUser 获取)
-        List<SysUser> requestUserList = sysUserService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, userId).eq(SysUser::getSchoolId, schoolId));
-        if (requestUserList.size() != 1) {
-            throw ExceptionResultEnum.ERROR.exception("未找到用户信息");
-        }
-        SysUser requestUser = requestUserList.get(0);
-        Long orgId = requestUser.getOrgId();
+        Long schoolId = sysUser.getSchoolId();
+        Long orgId = sysUser.getOrgId();
 
         //2.根据orgId查询他的所有叶子id 并把这些id放入List<Long> ids
         List<Long> orgIds;
@@ -123,55 +120,47 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
 
         // 变量印品
         List<Map<String, Object>> variable = new ArrayList<>();
-        List<TemplatePrintInfoResult> SIGNList = templateInfoList.stream()
+        List<TemplatePrintInfoResult> variableList = templateInfoList.stream()
                 .filter(e -> TemplateTypeEnum.VARIABLE.equals(e.getTemplateType()))
-                .filter(e -> ClassifyEnum.SIGN.equals(e.getTemplateClassify()))
                 .collect(Collectors.toList());
-        List<TemplatePrintInfoResult> PACKAGEList = templateInfoList.stream()
-                .filter(e -> TemplateTypeEnum.VARIABLE.equals(e.getTemplateType()))
-                .filter(e -> ClassifyEnum.PACKAGE.equals(e.getTemplateClassify()))
-                .collect(Collectors.toList());
-        Map<String, Object> SIGNMap = new HashMap<>();
-        List<Map<String, Object>> signTemplate = new ArrayList<>();
-        for (TemplatePrintInfoResult sign : SIGNList) {
-            Map<String, Object> signMap = new HashMap<>();
-            signMap.put("id", sign.getTemplateId());
-            signMap.put("name", sign.getTemplateName());
-            signTemplate.add(signMap);
-        }
-        SIGNMap.put("type", ClassifyEnum.SIGN);
-        SIGNMap.put("template", signTemplate);
-
-        Map<String, Object> PACKAGEMap = new HashMap<>();
-        List<Map<String, Object>> packageTemplate = new ArrayList<>();
-        for (TemplatePrintInfoResult pack : PACKAGEList) {
-            Map<String, Object> packageMap = new HashMap<>();
-            packageMap.put("id", pack.getTemplateId());
-            packageMap.put("name", pack.getTemplateName());
-            packageTemplate.add(packageMap);
+        for (ClassifyEnum value : ClassifyEnum.values()) {
+            Map<String, Object> variableMap = new HashMap<>();
+            List<TemplatePrintInfoResult> sourceList = variableList.stream().filter(e -> value.equals(e.getTemplateClassify())).collect(Collectors.toList());
+            List<Map<String,Object>> templateList = new ArrayList<>();
+            for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
+                Map<String, Object> printMap = new HashMap<>();
+                printMap.put("id", templatePrintInfoResult.getTemplateId());
+                printMap.put("name", templatePrintInfoResult.getTemplateName());
+                templateList.add(printMap);
+            }
+            if (templateList.size() > 0){
+                variableMap.put("type",value);
+                variableMap.put("template",templateList);
+                variable.add(variableMap);
+            }
         }
-        PACKAGEMap.put("type", ClassifyEnum.PACKAGE);
-        PACKAGEMap.put("template", packageTemplate);
-        variable.add(SIGNMap);
-        variable.add(PACKAGEMap);
 
         // 普通印品
         List<Map<String, Object>> ordinary = new ArrayList<>();
-        List<TemplatePrintInfoResult> CHECKINList = templateInfoList.stream()
+        List<TemplatePrintInfoResult> ordinaryList = templateInfoList.stream()
                 .filter(e -> TemplateTypeEnum.ORDINARY.equals(e.getTemplateType()))
-                .filter(e -> ClassifyEnum.CHECK_IN.equals(e.getTemplateClassify()))
                 .collect(Collectors.toList());
-        Map<String, Object> CHECKINMap = new HashMap<>();
-        List<Map<String, Object>> checkInTemplate = new ArrayList<>();
-        for (TemplatePrintInfoResult checkIn : CHECKINList) {
-            Map<String, Object> checkInMap = new HashMap<>();
-            checkInMap.put("id", checkIn.getTemplateId());
-            checkInMap.put("name", checkIn.getTemplateName());
-            checkInTemplate.add(checkInMap);
+        Map<String, Object> ordinaryMap = new HashMap<>();
+        for (ClassifyEnum value : ClassifyEnum.values()) {
+            List<TemplatePrintInfoResult> sourceList = ordinaryList.stream().filter(e -> value.equals(e.getTemplateClassify())).collect(Collectors.toList());
+            List<Map<String,Object>> templateList = new ArrayList<>();
+            for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
+                Map<String, Object> printMap = new HashMap<>();
+                printMap.put("id", templatePrintInfoResult.getTemplateId());
+                printMap.put("name", templatePrintInfoResult.getTemplateName());
+                templateList.add(printMap);
+            }
+            if (templateList.size() > 0){
+                ordinaryMap.put("type",value);
+                ordinaryMap.put("template",templateList);
+                ordinary.add(ordinaryMap);
+            }
         }
-        CHECKINMap.put("type", ClassifyEnum.CHECK_IN);
-        CHECKINMap.put("template", checkInTemplate);
-        ordinary.add(CHECKINMap);
 
         result.put("variable", variable);
         result.put("ordinary", ordinary);

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

@@ -61,8 +61,7 @@ public class OrgCenterDataDisposeServiceImpl implements OrgCenterDataDisposeServ
             Long id = SystemConstant.convertIdToLong(String.valueOf(map.get("id")));
             String code = String.valueOf(map.get("code"));
             String name = String.valueOf(map.get("name"));
-            // TODO: 2021/4/6 数据中心的logo字段 
-//            String logo = String.valueOf(map.get("logo"));
+            String logo = String.valueOf(map.get("logo"));
             String accessKey = String.valueOf(map.get("accessKey"));
             String accessSecret = String.valueOf(map.get("accessSecret"));
             Map typeMap = JSONObject.parseObject(String.valueOf(map.get("type")));
@@ -79,7 +78,7 @@ public class OrgCenterDataDisposeServiceImpl implements OrgCenterDataDisposeServ
                 school.setEnable(true);
                 school.setAccessKey(accessKey);
                 school.setAccessSecret(accessSecret);
-//                school.setLogo(logo);
+                school.setLogo(logo);
                 basicSchoolService.save(school);
             }
         }

distributed-print/src/test/java/com/qmth/distributed/print/ServiceTest.java

@@ -1,12 +1,9 @@
 package com.qmth.distributed.print;
 
 import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
-import com.qmth.distributed.print.business.entity.ExamPrintPlan;
-import com.qmth.distributed.print.business.mapper.BasicTemplateOrgMapper;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.distributed.print.business.service.ExamPrintPlanService;
 import org.junit.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -14,7 +11,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: service层测试