日志返回字段增加id

common/src/main/java/com/lantone/common/dto/AbnormalLogDTO.java

@@ -14,6 +14,10 @@ public class AbnormalLogDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    private Long id;
 
     /**
      * 操作人用户ID

common/src/main/java/com/lantone/common/dto/LoginLogDTO.java

@@ -16,6 +16,11 @@ public class LoginLogDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    private Long id;
+
     /**
      * 登录用户ID
      */

common/src/main/java/com/lantone/common/dto/OperationLogDTO.java

@@ -14,6 +14,11 @@ public class OperationLogDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    private Long id;
+
     /**
      * 操作人用户ID
      */

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/AbnormalLogFacade.java

@@ -1,15 +1,7 @@
 package com.lantone.dblayermbg.facade;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.common.dto.AbnormalLogDTO;
-import com.lantone.common.vo.GetAbnormalLogVO;
-import com.lantone.common.vo.GetAbnormalWayAndIpVO;
-import com.lantone.dblayermbg.mapper.AbnormalLogMapper;
 import com.lantone.dblayermbg.service.impl.AbnormalLogServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
-import java.util.List;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -18,39 +10,5 @@ import java.util.List;
  */
 @Component
 public class AbnormalLogFacade extends AbnormalLogServiceImpl {
-    @Autowired
-    private AbnormalLogMapper abnormalLogMapper;
-
-    /**
-     * @Description: 新增异常日志
-     * @Param: [abnormalLogDTO]
-     * @return: void
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public void addOperErrorLog(AbnormalLogDTO abnormalLogDTO) {
-        abnormalLogMapper.addOperErrorLog(abnormalLogDTO);
-    }
-
-    /**
-     * @Description:  查看异常日志
-     * @Param: [getAbnormalLogVO]
-     * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.common.dto.AbnormalLogDTO>
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public IPage<AbnormalLogDTO> getAbnormalLog(GetAbnormalLogVO getAbnormalLogVO) {
-        return  abnormalLogMapper.getAbnormalLog(getAbnormalLogVO);
-    }
 
-    /**
-     * @Description:  查看异常日志请求方式|ip地址
-     * @Param: [getAbnormalWayAndIpVO]
-     * @return: java.util.List<java.lang.String>
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public List<String> getAbnormalLogWayAndIp(GetAbnormalWayAndIpVO getAbnormalWayAndIpVO) {
-        return  abnormalLogMapper.getAbnormalLogWayAndIp(getAbnormalWayAndIpVO);
-    }
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/LoginLogFacade.java

@@ -1,14 +1,7 @@
 package com.lantone.dblayermbg.facade;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.common.dto.LoginLogDTO;
-import com.lantone.common.vo.GetLoginLogVO;
-import com.lantone.common.vo.GetLoginNameAndIpVO;
-import com.lantone.dblayermbg.mapper.LoginLogMapper;
 import com.lantone.dblayermbg.service.impl.LoginLogServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 
 
 /**
@@ -18,39 +11,5 @@ import java.util.List;
  */
 @Component
 public class LoginLogFacade extends LoginLogServiceImpl {
-    @Autowired
-    private LoginLogMapper loginLogMapper;
 
-    /**
-     * @Description: 新增登录日志
-     * @Param: [loginLogDTO]
-     * @return: void
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public void addLoginLog(LoginLogDTO loginLogDTO) {
-        loginLogMapper.addLoginLog(loginLogDTO);
-    }
-
-    /**
-     * @Description: 查看登录日志
-     * @Param: [getLoginLogVO]
-     * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.common.dto.LoginLogDTO>
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public IPage<LoginLogDTO> getLoginLog(GetLoginLogVO getLoginLogVO) {
-        return loginLogMapper.getLoginLog(getLoginLogVO);
-    }
-
-    /**查看登录日志登录用户|登录ip地址
-     * @Description:
-     * @Param: [getLoginNameAndIpVO]
-     * @return: java.util.List<java.lang.String>
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public List<String> getLoginLogNameAndIp(GetLoginNameAndIpVO getLoginNameAndIpVO) {
-        return loginLogMapper.getLoginLogNameAndIp(getLoginNameAndIpVO);
-    }
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/OperationLogFacade.java

@@ -1,18 +1,7 @@
 package com.lantone.dblayermbg.facade;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.common.dto.OperationLogDTO;
-import com.lantone.common.vo.GetOperationLogVO;
-import com.lantone.dblayermbg.entity.OperationLog;
-import com.lantone.dblayermbg.mapper.OperationLogMapper;
 import com.lantone.dblayermbg.service.impl.OperationLogServiceImpl;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  * 表名：sys_operation_log 业务类
@@ -20,42 +9,5 @@ import java.util.stream.Collectors;
  */
 @Component
 public class OperationLogFacade extends OperationLogServiceImpl {
-    @Autowired
-    private OperationLogMapper operationLogMapper;
-
-    /**
-     * @Description: 新增操作日志
-     * @Param: [operationLog]
-     * @return: void
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public void addOperLog(OperationLogDTO operationLog) {
-        operationLogMapper.addOperLog(operationLog);
-    }
-
-    /**
-     * @Description:  查看操作日志
-     * @Param: [getOperationLogVO]
-     * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.common.dto.OperationLogDTO>
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public IPage<OperationLogDTO> getOperationLog(GetOperationLogVO getOperationLogVO) {
-        return operationLogMapper.getOperationLog(getOperationLogVO);
-    }
 
-    /**
-     * @Description:  查看操作日志操作用户
-     * @Param: [operationName]
-     * @return: java.util.List<java.lang.String>
-     * @Author: cy
-     * @Date: 2021/9/8
-     */
-    public List<String> getOperationLogName(String operationName) {
-        return this.lambdaQuery()
-                .like(StringUtils.isNotBlank(operationName), OperationLog::getOperationName, operationName)
-                .select(OperationLog::getOperationName)
-                .list().stream().map(OperationLog::getOperationName).collect(Collectors.toList());
-    }
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RegionFacade.java

@@ -1,8 +1,5 @@
 package com.lantone.dblayermbg.facade;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.common.dto.ViewRegionDTO;
-import com.lantone.common.vo.GetRegionVO;
 import com.lantone.dblayermbg.service.impl.RegionServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -14,8 +11,4 @@ import org.springframework.stereotype.Component;
 @Component
 public class RegionFacade extends RegionServiceImpl {
 
-    public IPage<ViewRegionDTO> getWard(GetRegionVO getRegionVO) {
-        return this.baseMapper.getWard(getRegionVO);
-    }
-
 }

dblayer-mbg/src/main/resources/mapper/AbnormalLogMapper.xml

@@ -8,6 +8,7 @@
 
     <select id="getAbnormalLog" resultType="com.lantone.common.dto.AbnormalLogDTO">
         SELECT
+        id,
         a.operation_id AS operationId,
         a.operation_name AS operationName,
         a.gmt_create AS gmtCreate,

dblayer-mbg/src/main/resources/mapper/LoginLogMapper.xml

@@ -7,7 +7,8 @@
     </insert>
 
     <select id="getLoginLog" resultType="com.lantone.common.dto.LoginLogDTO">
-        select a.login_id as loginId,
+        select id,
+        a.login_id as loginId,
         a.login_name as loginName,
         a.login_date as loginDate,
         INET_NTOA(a.login_ip) as loginIp,

dblayer-mbg/src/main/resources/mapper/OperationLogMapper.xml

@@ -8,6 +8,7 @@
 
     <select id="getOperationLog" resultType="com.lantone.common.dto.OperationLogDTO">
         SELECT
+        id,
         a.operation_id AS operationId,
         a.operation_name AS operationName,
         a.operation_date AS operationDate,

message-service/src/main/java/com/lantone/message/component/MessageReceiver.java

@@ -60,20 +60,20 @@ public class MessageReceiver {
     @RabbitListener(queues = "emrais.login.success.record.queue", ackMode = "MANUAL")
     public void sendLogSuccessMessageHandle(LoginLogDTO loginLog, Message message, Channel channel) throws Exception {
         loginLog.setLoginAddress(AddressUtils.getRealAddressByIP(loginLog.getLoginIp()));
-        loginLogFacade.addLoginLog(loginLog);
+        loginLogFacade.getBaseMapper().addLoginLog(loginLog);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
 
     @RabbitListener(queues = "emrais.oper.log.record.queue", ackMode = "MANUAL")
     public void sendOperLogRecordMessage(OperationLogDTO operationLog, Message message, Channel channel) throws Exception {
         operationLog.setOperationAddress(AddressUtils.getRealAddressByIP(operationLog.getOperationIp()));
-        operationLogFacade.addOperLog(operationLog);
+        operationLogFacade.getBaseMapper().addOperLog(operationLog);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
 
     @RabbitListener(queues = "emrais.oper.error.record.queue", ackMode = "MANUAL")
     public void sendOperErrorRecordMessage(AbnormalLogDTO abnormalLogDTO, Message message, Channel channel) throws Exception {
-        abnormalLogFacade.addOperErrorLog(abnormalLogDTO);
+        abnormalLogFacade.getBaseMapper().addOperErrorLog(abnormalLogDTO);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
 

security-center/src/main/java/com/lantone/security/facade/LogManagementFacade.java

@@ -9,12 +9,15 @@ import com.lantone.common.vo.GetAbnormalWayAndIpVO;
 import com.lantone.common.vo.GetLoginLogVO;
 import com.lantone.common.vo.GetLoginNameAndIpVO;
 import com.lantone.common.vo.GetOperationLogVO;
+import com.lantone.dblayermbg.entity.OperationLog;
 import com.lantone.dblayermbg.facade.AbnormalLogFacade;
 import com.lantone.dblayermbg.facade.LoginLogFacade;
 import com.lantone.dblayermbg.facade.OperationLogFacade;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description:日志管理
@@ -38,7 +41,7 @@ public class LogManagementFacade {
      * @Date: 2021/9/8
      */
     public IPage<LoginLogDTO> getLoginLog(GetLoginLogVO getLoginLogVO) {
-        return loginLogFacade.getLoginLog(getLoginLogVO);
+        return loginLogFacade.getBaseMapper().getLoginLog(getLoginLogVO);
     }
 
     /**查看登录日志登录用户|登录ip地址
@@ -49,7 +52,7 @@ public class LogManagementFacade {
      * @Date: 2021/9/8
      */
     public List<String> getLoginLogNameAndIp(GetLoginNameAndIpVO getLoginNameAndIpVO) {
-        return loginLogFacade.getLoginLogNameAndIp(getLoginNameAndIpVO);
+        return loginLogFacade.getBaseMapper().getLoginLogNameAndIp(getLoginNameAndIpVO);
     }
 
     /**
@@ -60,7 +63,7 @@ public class LogManagementFacade {
      * @Date: 2021/9/8
      */
     public IPage<OperationLogDTO> getOperationLog(GetOperationLogVO getOperationLogVO) {
-        return operationLogFacade.getOperationLog(getOperationLogVO);
+        return operationLogFacade.getBaseMapper().getOperationLog(getOperationLogVO);
     }
 
     /**
@@ -71,7 +74,10 @@ public class LogManagementFacade {
      * @Date: 2021/9/8
      */
     public List<String> getOperationLogName(String operationName) {
-        return operationLogFacade.getOperationLogName(operationName);
+        return operationLogFacade.lambdaQuery()
+                .like(StringUtils.isNotBlank(operationName), OperationLog::getOperationName, operationName)
+                .select(OperationLog::getOperationName)
+                .list().stream().map(OperationLog::getOperationName).collect(Collectors.toList());
     }
 
     /**
@@ -82,7 +88,7 @@ public class LogManagementFacade {
      * @Date: 2021/9/8
      */
     public IPage<AbnormalLogDTO> getAbnormalLog(GetAbnormalLogVO getAbnormalLogVO) {
-        return  abnormalLogFacade.getAbnormalLog(getAbnormalLogVO);
+        return  abnormalLogFacade.getBaseMapper().getAbnormalLog(getAbnormalLogVO);
     }
 
     /**
@@ -93,6 +99,6 @@ public class LogManagementFacade {
      * @Date: 2021/9/8
      */
     public List<String> getAbnormalLogWayAndIp(GetAbnormalWayAndIpVO getAbnormalWayAndIpVO) {
-        return  abnormalLogFacade.getAbnormalLogWayAndIp(getAbnormalWayAndIpVO);
+        return  abnormalLogFacade.getBaseMapper().getAbnormalLogWayAndIp(getAbnormalWayAndIpVO);
     }
 }

security-center/src/main/java/com/lantone/security/facade/RegionManagementFacade.java

@@ -64,7 +64,7 @@ public class RegionManagementFacade {
         if (1 == updateRegionVO.getMark()) {
             GetRegionVO getRegionVO = new GetRegionVO();
             BeanUtils.copyProperties(updateRegionVO, getRegionVO);
-            return regionFacade.getWard(getRegionVO);
+            return regionFacade.getBaseMapper().getWard(getRegionVO);
         }
         Region sysRegion = new Region();
         BeanUtils.copyProperties(updateRegionVO, sysRegion);
@@ -83,7 +83,7 @@ public class RegionManagementFacade {
     public IPage<ViewRegionDTO> getRegion(GetRegionVO getRegionVO) {
         getRegionVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
         getRegionVO.setUserId(SysUserUtils.getCurrentPrincipleId());
-        return regionFacade.getWard(getRegionVO);
+        return regionFacade.getBaseMapper().getWard(getRegionVO);
     }
 
     /**