fix

src/main/java/cn/com/qmth/markingaudit/bean/ExamDataQuery.java

@@ -4,4 +4,13 @@ import cn.com.qmth.markingaudit.support.IdPagerQuery;
 
 public class ExamDataQuery extends IdPagerQuery {
 
+    private Integer schoolId;
+
+    public Integer getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Integer schoolId) {
+        this.schoolId = schoolId;
+    }
 }

src/main/java/cn/com/qmth/markingaudit/bean/LoginDataQuery.java

@@ -0,0 +1,17 @@
+package cn.com.qmth.markingaudit.bean;
+
+import cn.com.qmth.markingaudit.support.IdPagerQuery;
+
+public class LoginDataQuery extends IdPagerQuery {
+
+    private Integer schoolId;
+
+    public Integer getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Integer schoolId) {
+        this.schoolId = schoolId;
+    }
+
+}

src/main/java/cn/com/qmth/markingaudit/bean/LoginDataVo.java

@@ -0,0 +1,45 @@
+package cn.com.qmth.markingaudit.bean;
+
+public class LoginDataVo {
+
+    private String id;
+
+    private String info;
+
+    private String createTime;
+
+    private Integer dataId;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(Integer dataId) {
+        this.dataId = dataId;
+    }
+
+}

src/main/java/cn/com/qmth/markingaudit/controller/MonitorController.java

@@ -14,6 +14,8 @@ import cn.com.qmth.markingaudit.bean.ExamDataQuery;
 import cn.com.qmth.markingaudit.bean.ExamDataVo;
 import cn.com.qmth.markingaudit.bean.InspectDataQuery;
 import cn.com.qmth.markingaudit.bean.InspectDataVo;
+import cn.com.qmth.markingaudit.bean.LoginDataQuery;
+import cn.com.qmth.markingaudit.bean.LoginDataVo;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataQuery;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataVo;
 import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
@@ -103,4 +105,12 @@ public class MonitorController {
         req.setSchoolCode(ai.getSchoolCode());
         return monitorService.scoreData(req);
     }
+
+    @ApiOperation(value = "登录日志")
+    @PostMapping("logDataSync")
+    public List<LoginDataVo> loginData(@Validated LoginDataQuery req) {
+        AccessInfo ai = ServletUtil.getAccessInfo();
+        req.setSchoolCode(ai.getSchoolCode());
+        return monitorService.loginData(req);
+    }
 }

src/main/java/cn/com/qmth/markingaudit/dao/MonitorDao.java

@@ -9,6 +9,8 @@ import cn.com.qmth.markingaudit.bean.ExamDataVo;
 import cn.com.qmth.markingaudit.bean.InspectDataInfo;
 import cn.com.qmth.markingaudit.bean.InspectDataQuery;
 import cn.com.qmth.markingaudit.bean.InspectDataVo;
+import cn.com.qmth.markingaudit.bean.LoginDataQuery;
+import cn.com.qmth.markingaudit.bean.LoginDataVo;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataQuery;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataVo;
 import cn.com.qmth.markingaudit.bean.MarkingScoreInfo;
@@ -50,4 +52,8 @@ public interface MonitorDao {
 
     List<ScoreDataVo> scoreData(@Param("req") ScoreDataQuery req);
 
+    Integer getSchoolId(@Param("schoolCode") String schoolCode);
+
+    List<LoginDataVo> loginData(@Param("req") LoginDataQuery req);
+
 }

src/main/java/cn/com/qmth/markingaudit/service/MonitorService.java

@@ -6,6 +6,8 @@ import cn.com.qmth.markingaudit.bean.ExamDataQuery;
 import cn.com.qmth.markingaudit.bean.ExamDataVo;
 import cn.com.qmth.markingaudit.bean.InspectDataQuery;
 import cn.com.qmth.markingaudit.bean.InspectDataVo;
+import cn.com.qmth.markingaudit.bean.LoginDataQuery;
+import cn.com.qmth.markingaudit.bean.LoginDataVo;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataQuery;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataVo;
 import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
@@ -40,4 +42,6 @@ public interface MonitorService {
 
     List<ScoreDataVo> scoreData(ScoreDataQuery req);
 
+    List<LoginDataVo> loginData(LoginDataQuery req);
+
 }

src/main/java/cn/com/qmth/markingaudit/service/impl/MonitorServiceImpl.java

@@ -19,6 +19,8 @@ import cn.com.qmth.markingaudit.bean.ExamDataVo;
 import cn.com.qmth.markingaudit.bean.InspectDataInfo;
 import cn.com.qmth.markingaudit.bean.InspectDataQuery;
 import cn.com.qmth.markingaudit.bean.InspectDataVo;
+import cn.com.qmth.markingaudit.bean.LoginDataQuery;
+import cn.com.qmth.markingaudit.bean.LoginDataVo;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataQuery;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataVo;
 import cn.com.qmth.markingaudit.bean.MarkingScoreInfo;
@@ -46,6 +48,11 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Override
     public List<ExamDataVo> examData(ExamDataQuery req) {
+        Integer schoolId = monitorDao.getSchoolId(req.getSchoolCode());
+        if (schoolId == null) {
+            throw new StatusException("未找到学校信息");
+        }
+        req.setSchoolId(schoolId);
         List<ExamDataVo> ret = monitorDao.examData(req);
         if (CollectionUtils.isNotEmpty(ret)) {
             for (ExamDataVo vo : ret) {
@@ -253,4 +260,14 @@ public class MonitorServiceImpl implements MonitorService {
         return Double.valueOf(scores[index]);
     }
 
+    @Override
+    public List<LoginDataVo> loginData(LoginDataQuery req) {
+        Integer schoolId = monitorDao.getSchoolId(req.getSchoolCode());
+        if (schoolId == null) {
+            throw new StatusException("未找到学校信息");
+        }
+        req.setSchoolId(schoolId);
+        return monitorDao.loginData(req);
+    }
+
 }

src/main/resources/mapper/MonitorMapper.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.qmth.markingaudit.dao.MonitorDao">
+	<select id="getSchoolId" resultType="int">
+		select s.id
+		from b_school s 
+		where s.code=#{schoolCode}
+	</select>
 	<select id="getExamIdByIdAndSchoolCode" resultType="int">
 		select t.id
 		from eb_exam t 
@@ -13,8 +18,7 @@
 		,t.mark_end_time end_time,t.create_time,t.sas_config,
 		t.id dataId
 		from eb_exam t 
-		left join b_school s on t.school_id=s.id
-		where s.code=#{req.schoolCode}
+		where t.school_id=#{req.schoolId}
 		and t.id&gt;=#{req.startId}
 		order by t.id
 		limit #{req.pageSize}
@@ -129,4 +133,14 @@
 		order by t.id
 		limit #{req.pageSize}
 	</select>
+	<select id="loginData" resultType="cn.com.qmth.markingaudit.bean.LoginDataVo">
+		select t.id dataId,u.login_name id,u.name info,t.create_time
+		from eb_operation_log t 
+		left join b_user u on t.operator_id=u.id
+		where t.school_id=#{req.schoolId}
+		and t.menu='登录'
+		and t.id&gt;=#{req.startId}
+		order by t.id
+		limit #{req.pageSize}
+	</select>
 </mapper>