微调

lic-system/src/main/java/com/system/dao/LicInfoMapper.java

 package com.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.system.transfer.lic.*;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,10 +14,11 @@ public interface LicInfoMapper {
     /**
      * Lic信息列表
      *
+     * @param page 分页
      * @param inVo 条件
      * @return 列表
      */
-    List<LicInfoListOutVoRecords> licInfoList(LicInfoListInVo inVo);
+    List<LicInfoListOutVoRecords> licInfoList(@Param("page") Page<LicInfoListOutVoRecords> page, @Param("inVo") LicInfoListInVo inVo);
 
     /**
      * Lic信息创建

lic-system/src/main/java/com/system/dao/LicVerificationMapper.java

 package com.system.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.system.transfer.verification.*;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,10 +14,11 @@ public interface LicVerificationMapper {
     /**
      * Lic在线验证列表
      *
+     * @param page 分页
      * @param inVo 条件
      * @return 列表
      */
-    List<LicOnlineVerificationLogListOutVoRecords> licOnlineVerificationLogList(LicOnlineVerificationLogListInVo inVo);
+    List<LicOnlineVerificationLogListOutVoRecords> licOnlineVerificationLogList(@Param("page") Page<LicOnlineVerificationLogListOutVoRecords> page, @Param("inVo") LicOnlineVerificationLogListInVo inVo);
 
     /**
      * Lic在线验证详情

lic-system/src/main/java/com/system/dao/mapper/LicInfoMapper.xml

@@ -10,8 +10,8 @@
             id, mac_address, effective_time, file_effective_time, verification_interval, module_verification, create_time
         FROM tb_lic_info
         <where>
-            <if test="macAddress != null and macAddress != ''">
-                mac_address = #{macAddress}
+            <if test="inVo.macAddress != null and inVo.macAddress != ''">
+                mac_address = #{inVo.macAddress}
             </if>
         </where>
 

lic-system/src/main/java/com/system/dao/mapper/LicVerificationMapper.xml

@@ -10,11 +10,11 @@
             id, mac_address, flag, message, create_time
         FROM tb_lic_log
         <where>
-            <if test="macAddress != null and macAddress != ''">
-                mac_address = #{macAddress}
+            <if test="inVo.macAddress != null and inVo.macAddress != ''">
+                mac_address = #{inVo.macAddress}
             </if>
-            <if test="flag != null">
-                AND flag = #{flag}
+            <if test="inVo.flag != null">
+                AND flag = #{inVo.flag}
             </if>
         </where>
 

lic-system/src/main/java/com/system/serivce/impl/LicInfoServiceImpl.java

@@ -31,7 +31,7 @@ public class LicInfoServiceImpl implements ILicInfoService {
     @Override
     public LicInfoListOutVo licInfoList(LicInfoListInVo inVo) {
         Page<LicInfoListOutVoRecords> page = new Page<>(inVo.getPageNo(), inVo.getPageSize());
-        List<LicInfoListOutVoRecords> recordsList = licInfoMapper.licInfoList(inVo);
+        List<LicInfoListOutVoRecords> recordsList = licInfoMapper.licInfoList(page, inVo);
 
         LicInfoListOutVo outVo = new LicInfoListOutVo();
         outVo.setTotal((int) page.getTotal());

lic-system/src/main/java/com/system/serivce/impl/LicVerificationServiceImpl.java

@@ -40,7 +40,7 @@ public class LicVerificationServiceImpl implements ILicVerificationService {
     @Override
     public LicOnlineVerificationLogListOutVo licOnlineVerificationLogList(LicOnlineVerificationLogListInVo inVo) {
         Page<LicOnlineVerificationLogListOutVoRecords> page = new Page<>(inVo.getPageNo(), inVo.getPageSize());
-        List<LicOnlineVerificationLogListOutVoRecords> recordsList = licVerificationMapper.licOnlineVerificationLogList(inVo);
+        List<LicOnlineVerificationLogListOutVoRecords> recordsList = licVerificationMapper.licOnlineVerificationLogList(page, inVo);
 
         LicOnlineVerificationLogListOutVo outVo = new LicOnlineVerificationLogListOutVo();
         outVo.setTotal((int) page.getTotal());