日志和资源搜索

sapi/src/main/java/com/xhkjedu/sapi/model/system/TUserLog.java

@@ -23,6 +23,9 @@ public class TUserLog extends BaseBean {
     //登录名
     private String loginname;
 
+    //用户类型999超管0学校管理员1教师2学生
+    private Integer usertype;
+
     //登录状态1成功2失败
     private Integer loginstate;
 
@@ -47,6 +50,18 @@ public class TUserLog extends BaseBean {
     //学校id
     private Integer schoolid;
 
+    //登录mac地址
+    private String mac;
+
+    //登录终端品牌（华为、小米、荣耀、vivo、oppo、浏览器名等）
+    private String ultypeband;
+
+    //登录终端型号（华为mate9、小米13、浏览器版本号等）
+    private String ultypemodel;
+
+    //系统版本（android、鸿蒙、荣耀系统、win等）
+    private String systemversion;
+
     @Transient
     //截止时间
     private Integer endtime;

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

@@ -193,6 +193,9 @@
         <if test="question.complexity!=null and question.complexity!=0">
             and q.complexity=#{question.complexity}
         </if>
+        <if test="question.year!=null and question.year!=0">
+            and FROM_UNIXTIME(q.createtime,'%Y')=#{question.year}
+        </if>
         and q.qlevel &lt; 3
         </where>
         group by q.questionid order by q.qstate,q.createtime desc
@@ -288,6 +291,9 @@
                 and qc.userid=#{question.createid}
             </if>
         </if>
+        <if test="question.year!=null and question.year!=0">
+            and FROM_UNIXTIME(q.createtime,'%Y')=#{question.year}
+        </if>
         and q.qlevel &lt; 3
         group by q.questionid order by q.createtime desc
     </select>

sstudy/src/main/resources/mapper/resource/ResourceMapper.xml

@@ -68,6 +68,9 @@
                 and rc.userid=#{resource.createid}
             </if>
         </if>
+        <if test="resource.year!=null and resource.year!=0">
+            and FROM_UNIXTIME(r.createtime,'%Y')=#{resource.year}
+        </if>
         group by r.resourceid
         <choose>
             <when test="resource.readcount!=null and resource.readcount!=0">

suser/src/main/java/com/xhkjedu/suser/model/system/TUserLog.java

@@ -41,16 +41,16 @@ public class TUserLog extends BaseBean {
     //登录终端设备
     private String ultype;
 
-    //登录终端品牌（华为、小米、荣耀、vivo、oppo等）
+    //登录终端品牌（华为、小米、荣耀、vivo、oppo、浏览器名等）
     private String ultypeband;
 
-    //登录终端型号（华为mate9、小米13等）
+    //登录终端型号（华为mate9、小米13、浏览器版本号等）
     private String ultypemodel;
 
     //版本号
     private String versionnum;
 
-    //系统版本（android、鸿蒙、荣耀系统等）
+    //系统版本（android、鸿蒙、荣耀系统、win等）
     private String systemversion;
 
     //备注