优化代码

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysLogininforServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysDictData;
@@ -35,7 +36,16 @@ public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, S
         } else {
             page = new Page<>();
         }
+
         QueryWrapper<SysLogininfor> where = new QueryWrapper<>(logininfor);
+        Object beginTime = logininfor.getParams().get("beginTime");
+        Object endTime = logininfor.getParams().get("endTime");
+        if(beginTime != null){
+            where.lambda().ge(SysLogininfor::getAccessTime, DateUtils.parseDate(beginTime));
+        }
+        if(endTime != null){
+            where.lambda().le(SysLogininfor::getAccessTime, DateUtils.parseDate(endTime));
+        }
         baseMapper.selectPage(page, where);
         return TableDataInfo.build(page);
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOperLogServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.system.api.domain.SysLogininfor;
 import com.xunmei.system.api.domain.SysOperLog;
@@ -34,6 +35,16 @@ public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOper
             page = new Page<>();
         }
         QueryWrapper<SysOperLog> where = new QueryWrapper<>(operLog);
+
+        Object beginTime = operLog.getParams().get("beginTime");
+        Object endTime = operLog.getParams().get("endTime");
+        if(beginTime != null){
+            where.lambda().ge(SysOperLog::getOperTime, DateUtils.parseDate(beginTime));
+        }
+        if(endTime != null){
+            where.lambda().le(SysOperLog::getOperTime, DateUtils.parseDate(endTime));
+        }
+
         baseMapper.selectPage(page, where);
         return TableDataInfo.build(page);
     }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -14,10 +14,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<insert id="insertLogininfor" parameterType="com.xunmei.system.api.domain.SysLogininfor">
-		insert into sys_logininfor (user_name, status, ipaddr, msg, access_time)
-		values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate())
+		insert into sys_logininfor (user_name, status, ipaddr, msg, access_time,platform_type)
+		values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate(),#{platformType})
 	</insert>
-	
+
 	<select id="selectLogininforList" parameterType="com.xunmei.system.api.domain.SysLogininfor" resultMap="SysLogininforResult">
 		select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor
 		<where>
@@ -39,16 +39,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 		order by info_id desc
 	</select>
-	
+
 	<delete id="deleteLogininforByIds" parameterType="Long">
  		delete from sys_logininfor where info_id in
  		<foreach collection="array" item="infoId" open="(" separator="," close=")">
  			#{infoId}
-        </foreach> 
+        </foreach>
  	</delete>
-    
+
     <update id="cleanLogininfor">
         truncate table sys_logininfor
     </update>
-    
-</mapper> 
+
+</mapper>