Merge branch 'dev_v2.0.0' into master_v2.0.0

merge

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

@@ -300,7 +300,7 @@ public class ClientServiceImpl implements ClientService {
                 List<String> studentPaperTypes = examStudentService.listByExamDetailCourseId(examDetailCourseId);
                 Object exposedPaperType = examDetailCours.get("exposedPaperType");
                 Set<String> exposedPaperSet = Objects.isNull(exposedPaperType) ? new HashSet<>() : new HashSet<>(Arrays.asList(exposedPaperType.toString().split(",")));
-                Object unexposedPaperType = examDetailCours.get("unexposedPaperType").toString();
+                Object unexposedPaperType = examDetailCours.get("unexposedPaperType");
                 Set<String> unexposedPaperSet = Objects.isNull(unexposedPaperType) ? new HashSet<>() : new HashSet<>(Arrays.asList(unexposedPaperType.toString().split(",")));
                 if (!studentPaperTypes.isEmpty()) {
                     for (String studentPaperType : studentPaperTypes) {

distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

@@ -267,6 +267,7 @@
         sys_user d ON a.create_id = d.id
         <where>
             and a.school_id = #{schoolId}
+            AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
                 #{item}
@@ -363,6 +364,7 @@
             sys_user d ON a.create_id = d.id
         <where>
             and a.school_id = #{schoolId}
+            AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
                 #{item}
@@ -429,6 +431,7 @@
         sys_user d ON a.create_id = d.id
         <where>
             and a.school_id = #{schoolId}
+            AND a.status != 'END'
             AND b.status not IN
             <foreach collection="examDetailStatus" item="item" index="index" open="(" separator="," close=")">
                 #{item}

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -191,6 +191,10 @@ public class SysController {
         String loginName = loginParam.getLoginName();
         String password = loginParam.getPassword();
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(loginParam.getSchoolCode())) {
+            BasicSchool basicSchool = cacheService.schoolCache(loginParam.getSchoolCode());
+            wrapper.lambda().eq(SysUser::getSchoolId, basicSchool.getId());
+        }
         wrapper.lambda().eq(SysUser::getLoginName, loginName);
         SysUser user = sysUserService.getOne(wrapper);
         //用户不存在

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

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

hs_err_pid8534.log

@@ -0,0 +1,75 @@
+#
+# A fatal error has been detected by the Java Runtime Environment:
+#
+#  SIGBUS (0xa) at pc=0x00000001003e6b90, pid=8534, tid=0x000000000000d903
+#
+# JRE version: Java(TM) SE Runtime Environment (8.0_131-b11) (build 1.8.0_131-b11)
+# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.131-b11 mixed mode bsd-amd64 compressed oops)
+# Problematic frame:
+# V  [libjvm.dylib+0xdbb90]
+#
+# Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again
+#
+# If you would like to submit a bug report, please visit:
+#   http://bugreport.java.com/bugreport/crash.jsp
+#
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x00007f868077a000):  JavaThread "taskThreadPool2" [_thread_in_vm, id=55555, stack(0x0000700014367000,0x0000700014467000)]
+
+siginfo: si_signo: 10 (SIGBUS), si_code: 2 (BUS_ADRERR), si_addr: 0x000000012589657c
+
+Registers:
+RAX=0x0000000125896594, RBX=0x0000000000000010, RCX=0x000000079e5905f0, RDX=0x0000000000000000
+RSP=0x0000700014465148, RBP=0x0000700014465190, RSI=0x000000079e5905d8, RDI=0x000000012589657c
+R8 =0x0000000000000009, R9 =0x0000000000000010, R10=0x000000010d829ba7, R11=0x000000010d841ac0
+R12=0x0000000000000000, R13=0x00007f868077a000, R14=0x00007000144651c0, R15=0x000000012589657c
+RIP=0x00000001003e6b90, EFLAGS=0x0000000000010257, ERR=0x0000000000000004
+  TRAPNO=0x000000000000000e
+
+Top of Stack: (sp=0x0000700014465148)
+0x0000700014465148:   000000010088e23d 00007000144651e0
+0x0000700014465158:   00007f868077a000 00007f868077a000
+0x0000700014465168:   0000000000000024 0000000000000000
+0x0000700014465178:   0000700014465298 0000700014465360
+0x0000700014465188:   00007f868077a000 00007000144651e0
+0x0000700014465198:   000000010d829c21 0000000000000024
+0x00007000144651a8:   000000074008ec40 0000000000000000
+0x00007000144651b8:   00000001003ad650 000000079e5905c8
+0x00007000144651c8:   00007f868077a000 0000700014465378
+0x00007000144651d8:   0000000125657998 0000700014465320
+0x00007000144651e8:   000000010d841b54 00007f8683037c70
+0x00007000144651f8:   00000001003ad650 0000000125656708
+0x0000700014465208:   00000001256566b8 00007000144653b8
+0x0000700014465218:   0000000325656708 000000079e58fa10
+0x0000700014465228:   00007f868077a000 0000000000000003
+0x0000700014465238:   000000079e58fa10 0000000000000010
+0x0000700014465248:   000000012589657c 0000000000000024
+0x0000700014465258:   0000000000000024 000000079e5905c8
+0x0000700014465268:   0000000000000000 0000000000000010
+0x0000700014465278:   00007f868077a000 0000700014465320
+0x0000700014465288:   000000010d42633d 000000010d42633d
+0x0000700014465298:   0000000000000024 00007000144652e0
+0x00007000144652a8:   0000000000000000 0000700014465320
+0x00007000144652b8:   0000000000000010 0000700014465320
+0x00007000144652c8:   000000079e5905c8 000000012589657c
+0x00007000144652d8:   000000079e5867e0 00007000144652e0
+0x00007000144652e8:   0000000106c99ff5 0000700014465360
+0x00007000144652f8:   0000000106c9d7b0 0000000000000000
+0x0000700014465308:   0000000106c9a028 0000700014465298
+0x0000700014465318:   0000700014465348 00007000144653a8
+0x0000700014465328:   000000010d4260c0 0000000000000051
+0x0000700014465338:   00000000000275cd 000000000002757c 
+
+Instructions: (pc=0x00000001003e6b90)
+0x00000001003e6b70:   48 8b 74 d0 08 48 89 74 d1 08 48 83 c2 01 75 f0
+0x00000001003e6b80:   49 f7 c0 01 00 00 00 74 06 8b 70 08 89 71 08 c3
+0x00000001003e6b90:   48 8b 74 d0 e8 48 89 74 d1 e8 48 8b 74 d0 f0 48
+0x00000001003e6ba0:   89 74 d1 f0 48 8b 74 d0 f8 48 89 74 d1 f8 48 8b 
+
+Register to memory mapping:
+
+RAX=0x0000000125896594 is an unknown value
+RBX=0x0000000000000010 is an unknown value
+RCX=0x000000079e5905f0 is an oop