From 899c75ef1c2ada043896aa9e451060090a6f069d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 14 Dec 2023 22:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=A7=9F=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/datasource/mappers/LogMapperEx.java | 6 ++++-- .../com/jsh/erp/service/log/LogComponent.java | 10 ++++++---- .../java/com/jsh/erp/service/log/LogService.java | 12 ++++++------ .../main/resources/mapper_xml/LogMapperEx.xml | 16 ++++++++++++---- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java index 1cb25f04..01b7eaa8 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java @@ -13,7 +13,8 @@ public interface LogMapperEx { @Param("operation") String operation, @Param("userInfo") String userInfo, @Param("clientIp") String clientIp, - @Param("status") Integer status, + @Param("tenantLoginName") String tenantLoginName, + @Param("tenantType") String tenantType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("content") String content, @@ -24,7 +25,8 @@ public interface LogMapperEx { @Param("operation") String operation, @Param("userInfo") String userInfo, @Param("clientIp") String clientIp, - @Param("status") Integer status, + @Param("tenantLoginName") String tenantLoginName, + @Param("tenantType") String tenantType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("content") String content); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogComponent.java index e97d4023..78b90e46 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogComponent.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogComponent.java @@ -34,11 +34,12 @@ public class LogComponent implements ICommonQuery { String operation = StringUtil.getInfo(search, "operation"); String userInfo = StringUtil.getInfo(search, "userInfo"); String clientIp = StringUtil.getInfo(search, "clientIp"); - Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status")); + String tenantLoginName = StringUtil.getInfo(search, "tenantLoginName"); + String tenantType = StringUtil.getInfo(search, "tenantType"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); String content = StringUtil.getInfo(search, "content"); - return logService.select(operation, userInfo, clientIp, status, beginTime, endTime, content, + return logService.select(operation, userInfo, clientIp, tenantLoginName, tenantType, beginTime, endTime, content, QueryUtils.offset(map), QueryUtils.rows(map)); } @@ -48,11 +49,12 @@ public class LogComponent implements ICommonQuery { String operation = StringUtil.getInfo(search, "operation"); String userInfo = StringUtil.getInfo(search, "userInfo"); String clientIp = StringUtil.getInfo(search, "clientIp"); - Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status")); + String tenantLoginName = StringUtil.getInfo(search, "tenantLoginName"); + String tenantType = StringUtil.getInfo(search, "tenantType"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); String content = StringUtil.getInfo(search, "content"); - return logService.countLog(operation, userInfo, clientIp, status, beginTime, endTime, content); + return logService.countLog(operation, userInfo, clientIp, tenantLoginName, tenantType, beginTime, endTime, content); } @Override diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java index 34ebcc09..6693f5ab 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java @@ -63,13 +63,13 @@ public class LogService { return list; } - public List select(String operation, String userInfo, String clientIp, Integer status, String beginTime, String endTime, - String content, int offset, int rows)throws Exception { + public List select(String operation, String userInfo, String clientIp, String tenantLoginName, String tenantType, + String beginTime, String endTime, String content, int offset, int rows)throws Exception { List list=null; try{ beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - list=logMapperEx.selectByConditionLog(operation, userInfo, clientIp, status, beginTime, endTime, + list=logMapperEx.selectByConditionLog(operation, userInfo, clientIp, tenantLoginName, tenantType, beginTime, endTime, content, offset, rows); if (null != list) { for (LogVo4List log : list) { @@ -82,13 +82,13 @@ public class LogService { return list; } - public Long countLog(String operation, String userInfo, String clientIp, Integer status, String beginTime, String endTime, - String content)throws Exception { + public Long countLog(String operation, String userInfo, String clientIp, String tenantLoginName, String tenantType, + String beginTime, String endTime, String content)throws Exception { Long result=null; try{ beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - result=logMapperEx.countsByLog(operation, userInfo, clientIp, status, beginTime, endTime, content); + result=logMapperEx.countsByLog(operation, userInfo, clientIp, tenantLoginName, tenantType, beginTime, endTime, content); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml index dc19af92..c78b065f 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml @@ -10,6 +10,7 @@ select l.*,u.login_name,u.username userName FROM jsh_log l left join jsh_user u on l.user_id = u.id and ifnull(u.Status,'0') !='1' + left join jsh_tenant t on l.tenant_id=t.tenant_id where 1=1 @@ -23,8 +24,11 @@ and l.client_ip like #{bindClientIp} - - and l.status=#{status} + + and t.login_name = #{tenantLoginName} + + + and t.type = #{tenantType} and l.create_time >= #{beginTime} @@ -46,6 +50,7 @@ COUNT(1) FROM jsh_log l left join jsh_user u on l.user_id = u.id and ifnull(u.Status,'0') !='1' + left join jsh_tenant t on l.tenant_id=t.tenant_id WHERE 1=1 @@ -59,8 +64,11 @@ and l.client_ip like #{bindClientIp} - - and l.status = #{status} + + and t.login_name = #{tenantLoginName} + + + and t.type = #{tenantType} and l.create_time >= #{beginTime}