Merge branch 'dev_v2.2.0' into release_v2.2.0

merge

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

@@ -441,8 +441,14 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         // 同一任务是否有多个校区
         Map<String, List<Map<String, Object>>> stringListMap = examDetailKeyList.stream().collect(Collectors.groupingBy(m -> m.get("schoolId") + "#" + m.get("printPlanId") + "#" + m.get("printPlanName") + "#" + m.get("examPlace") + "#" + m.get("examRoom") + "#" + m.get("examStartTime") + "#" + m.get("examEndTime")));
         for (Map.Entry<String, List<Map<String, Object>>> entry : stringListMap.entrySet()) {
-            if(entry.getValue().size() > 1){
-                throw ExceptionResultEnum.ERROR.exception("同一考场数据只能指派一个印刷室");
+            Set<Long> printHouseIds = new HashSet<>();
+            for (Map<String, Object> objectMap : entry.getValue()) {
+                Long schoolId = Long.valueOf(String.valueOf(objectMap.get("schoolId")));
+                String campusName = String.valueOf(objectMap.get("campusName"));
+                printHouseIds.add(basicCampusService.getPrintHouseIdBySchoolIdAndCampusName(schoolId, campusName));
+            }
+            if(printHouseIds.size() > 1){
+                throw ExceptionResultEnum.ERROR.exception("同一考场对应校区指派的印刷室只能为一个");
             }
         }
 

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

@@ -66,8 +66,8 @@ sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=localhost:7001
-sys.config.serverHost=localhost:7001
+sys.config.fileHost=localhost:7771
+sys.config.serverHost=localhost:7771
 #sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
 sys.config.accessKey=918d0878ee7944beb448980b011ff804
@@ -136,7 +136,7 @@ sms.config.codeSendInterval=60
 sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 #aliyun SMS secret
 sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-sms.config.aliyunSMSSignName=\u9038\u6559\u4e91
+sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
 sms.config.aliyunSMSTplCode=SMS_147416565
 sms.config.aliyunSMSAuditPassCode=SMS_216425141
 sms.config.aliyunSMSAuditNotPassCode=SMS_216275156

teachcloud-task/src/main/resources/application-task_test.properties

@@ -11,17 +11,17 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=teachcloud-task
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
-db.port=3306
-db.name=distributed-v2.2.0-test
-db.username=root
-db.password=123456789
+db.host=192.168.10.136
+db.port=3307
+db.name=dps_test
+db.username=dps_test
+db.password=dps_test
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
+com.qmth.redis.db=14
 com.qmth.redis.port=6379
-com.qmth.redis.db=15
-#com.qmth.redis.password
+com.qmth.redis.password=123456
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -56,10 +56,10 @@ aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
 aliyun.oss.bucket=teachcloud-test
 aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
 
-com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
-com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-public
+com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
+com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-private
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
@@ -71,8 +71,8 @@ sys.config.fileHost=localhost:7011
 sys.config.serverHost=localhost:7011
 #sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+sys.config.accessKey=918d0878ee7944beb448980b011ff804
+sys.config.accessSecret=IY3NB9FXtd7OQHWH5YHl6mbrU9ch33QC
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
@@ -88,7 +88,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/ONLINE_EXAM/distributed/task_tomcat/logs/distributed-task.log
+com.qmth.logging.file-path=/opt/logs/distributed-task.log
 
 #============================================================================
 # \u914D\u7F6EJobStore