merge from release_v5.0.6

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/StudentCloudServiceProvider.java

@@ -96,7 +96,6 @@ public class StudentCloudServiceProvider extends ControllerSupport implements St
         SaveStudentResp resp = new SaveStudentResp();
         resp.setStudentId(student.getId());
         resp.setRootOrgId(student.getRootOrgId());
-
         if (null != student.getOrgId()) {
             OrgEntity org = GlobalHelper.getEntity(orgRepo, student.getOrgId(), OrgEntity.class);
             resp.setOrgId(org.getId());
@@ -118,8 +117,8 @@ public class StudentCloudServiceProvider extends ControllerSupport implements St
         String studentCode = req.getStudentCode();
         String securityPhone = req.getSecurityPhone();
 
-        StudentInfo student = studentService.getStudentInfo(rootOrgId, studentId, identityNumber,
-                studentCode, securityPhone);
+        StudentInfo student = studentService.getStudentInfo(rootOrgId, studentId, identityNumber, studentCode,
+                securityPhone);
 
         StudentBean studentBean = new StudentBean();
         studentBean.setId(student.getId());
@@ -162,8 +161,7 @@ public class StudentCloudServiceProvider extends ControllerSupport implements St
             throw new StatusException("160002", "studentCode is blank");
         }
 
-        List<Long> studentIdList = studentService.unbindStudentCode(rootOrgId, studentCode,
-                identityNumber);
+        List<Long> studentIdList = studentService.unbindStudentCode(rootOrgId, studentCode, identityNumber);
 
         UnbindStudentCodeResp resp = new UnbindStudentCodeResp();
         resp.setStudentIdList(studentIdList);

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/report/ExamProcessRecordReport.java

@@ -1,12 +1,12 @@
 package cn.com.qmth.examcloud.core.basic.service.report;
 
+import java.util.Date;
+
 import cn.com.qmth.examcloud.reports.commons.bean.BaseReport;
 import cn.com.qmth.examcloud.reports.commons.enums.Tag;
-import cn.com.qmth.examcloud.reports.commons.enums.Topic;
+import cn.com.qmth.examcloud.reports.commons.util.ReportsUtil;
 import cn.com.qmth.examcloud.support.enums.ExamProcess;
 
-import java.util.Date;
-
 /**
  * @Description 考试过程记录
  * @Author lideyin
@@ -62,7 +62,7 @@ public class ExamProcessRecordReport extends BaseReport {
         this.examRecordDataId = examRecordDataId;
         this.examProcess = examProcess;
         this.recordTime = recordTime;
-        this.topic = Topic.REPORT_TOPIC.getCode();
+        this.topic = ReportsUtil.getReportTopic();
         this.tag = Tag.EXAM_PROCESS_RECORD.getCode();
     }
 }

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/report/RocketMqConsumerListener.java

@@ -17,14 +17,16 @@ import com.aliyun.openservices.ons.api.PropertyKeyConst;
 import cn.com.qmth.examcloud.core.basic.service.AdminOperateService;
 import cn.com.qmth.examcloud.reports.commons.bean.AdminOperateReport;
 import cn.com.qmth.examcloud.reports.commons.enums.Tag;
-import cn.com.qmth.examcloud.reports.commons.enums.Topic;
+import cn.com.qmth.examcloud.reports.commons.util.ReportsUtil;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 
 public class RocketMqConsumerListener {
+
     private static final Logger LOG = LoggerFactory.getLogger(RocketMqConsumerListener.class);
 
     private static AdminOperateService adminOperateService = SpringContextHolder.getBean(AdminOperateService.class);
+
     private static Properties properties = new Properties();
 
     static {
@@ -42,18 +44,19 @@ public class RocketMqConsumerListener {
     }
 
     public static void start() {
-    	adminOperate();
+        adminOperate();
     }
 
     private static void adminOperate() {
         properties.put(PropertyKeyConst.GROUP_ID, Tag.ADMIN_OPERATE_INFO.getGroup());
         Consumer consumer = ONSFactory.createConsumer(properties);
-        consumer.subscribe(Topic.REPORT_TOPIC.getCode(), Tag.ADMIN_OPERATE_INFO.getCode(), new MessageListener() {
+        consumer.subscribe(ReportsUtil.getReportTopic(), Tag.ADMIN_OPERATE_INFO.getCode(), new MessageListener() {
+
             @Override
             public Action consume(Message message, ConsumeContext context) {
                 try {
                     String msg = new String(message.getBody(), "utf-8");
-                    onMessageAdminOperate(msg,message.getMsgID());
+                    onMessageAdminOperate(msg, message.getMsgID());
                     return Action.CommitMessage;
                 } catch (Exception e) {
                     LOG.error("consumer failed MsgID:" + message.getMsgID(), e);
@@ -66,8 +69,8 @@ public class RocketMqConsumerListener {
         consumer.start();
     }
 
-    private static void onMessageAdminOperate(String message,String msgId) {
-    	AdminOperateReport r = JSON.parseObject(message, AdminOperateReport.class);
+    private static void onMessageAdminOperate(String message, String msgId) {
+        AdminOperateReport r = JSON.parseObject(message, AdminOperateReport.class);
         adminOperateService.saveOperate(r, msgId);
     }
 }

examcloud-core-basic-starter/src/main/resources/org-properties.xml

@@ -240,4 +240,10 @@
         <desc>考生端展示的用户信息</desc>
         <valueType>STRING</valueType>
     </enum>
+    <enum>
+        <id>40</id>
+        <name>OVERWRITE_PHOTO</name>
+        <desc>接口同步考生照片是否覆盖</desc>
+        <valueType>BOOLEAN</valueType>
+    </enum>
 </enums>