Merge remote-tracking branch 'origin/dev' into dev

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeReportController.java

@@ -1,22 +1,23 @@
 package com.qmth.themis.backend.api;
 
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.qmth.themis.business.bean.backend.InvigilateListPatrolReportBean;
-import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.dto.AuthDto;
-import com.qmth.themis.business.entity.TBUser;
-import com.qmth.themis.business.enums.RoleEnum;
 import com.qmth.themis.business.service.TIeReportService;
 import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 
 /**
  * 监考报表

themis-business/src/main/java/com/qmth/themis/business/bean/backend/ExaminationMonitorWarnMsgBean.java

@@ -0,0 +1,25 @@
+package com.qmth.themis.business.bean.backend;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ExaminationMonitorWarnMsgBean {
+
+	@ApiModelProperty(name = "时间")
+	private String time;
+	@ApiModelProperty(name = "预警信息")
+	private String content;
+	public String getTime() {
+		return time;
+	}
+	public void setTime(String time) {
+		this.time = time;
+	}
+	public String getContent() {
+		return content;
+	}
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	
+}

themis-business/src/main/java/com/qmth/themis/business/service/TIeReportService.java

@@ -10,6 +10,7 @@ import com.qmth.themis.business.bean.backend.ExamStudentLogDetailListBean;
 import com.qmth.themis.business.bean.backend.ExaminationMonitorCountBean;
 import com.qmth.themis.business.bean.backend.ExaminationMonitorHourWarnCountBean;
 import com.qmth.themis.business.bean.backend.ExaminationMonitorWarnDistributionBean;
+import com.qmth.themis.business.bean.backend.ExaminationMonitorWarnMsgBean;
 import com.qmth.themis.business.bean.backend.InvigilateListPatrolReportBean;
 
 public interface TIeReportService {
@@ -63,5 +64,5 @@ public interface TIeReportService {
 
 	public List<ExaminationMonitorHourWarnCountBean> warnTrend();
 
-	public List<String> warnMsg();
+	public List<ExaminationMonitorWarnMsgBean> warnMsg();
 }

themis-business/src/main/java/com/qmth/themis/business/service/impl/TIeReportServiceImpl.java

@@ -32,6 +32,7 @@ import com.qmth.themis.business.bean.backend.ExamViewCountListBean;
 import com.qmth.themis.business.bean.backend.ExaminationMonitorCountBean;
 import com.qmth.themis.business.bean.backend.ExaminationMonitorHourWarnCountBean;
 import com.qmth.themis.business.bean.backend.ExaminationMonitorWarnDistributionBean;
+import com.qmth.themis.business.bean.backend.ExaminationMonitorWarnMsgBean;
 import com.qmth.themis.business.bean.backend.InvigilateListPatrolReportBean;
 import com.qmth.themis.business.bean.backend.WarningNotifyBean;
 import com.qmth.themis.business.cache.bean.ExamActivityCacheBean;
@@ -493,13 +494,15 @@ public class TIeReportServiceImpl implements TIeReportService {
 	}
 
 	@Override
-	public List<String> warnMsg() {
-		List<String> ret=new ArrayList<String>();
+	public List<ExaminationMonitorWarnMsgBean> warnMsg() {
+		List<ExaminationMonitorWarnMsgBean> ret=new ArrayList<ExaminationMonitorWarnMsgBean>();
 		List<WarningNotifyBean> list=invigilateWarnInfoMapper.findLastMsg(6);
 		if(list!=null&&list.size()>0) {
 			for(WarningNotifyBean b:list) {
-				StringBuilder sb=new StringBuilder("* ");
-				sb.append(b.getCreateTime()).append(" ").append(b.getName()).append(" （证件号：").append(b.getIdentity()).append("） ").append(b.getInfo());
+				ExaminationMonitorWarnMsgBean bean=new ExaminationMonitorWarnMsgBean();
+				bean.setTime(b.getCreateTime());
+				StringBuilder sb=new StringBuilder();
+				sb.append(b.getName()).append(" （证件号：").append(b.getIdentity()).append("） ").append(b.getInfo());
 				List<Map<String,String>> users=examInvigilateUserMapper.getInvigilateUsers(b.getExamId(),b.getRoomCode());
 				if(users!=null&&users.size()>0) {
 					StringBuilder usersb=new StringBuilder();
@@ -516,7 +519,8 @@ public class TIeReportServiceImpl implements TIeReportService {
 						sb.append("，系统已提示").append(usersb).append("进行人工干预");
 					}
 				}
-				ret.add(sb.toString());
+				bean.setContent(sb.toString());
+				ret.add(bean);
 			}
 		}
 		return ret;