二维码查询改成关联查询

src/main/java/com/usky/dxtop/mapper/QrCodeMapper.java

@@ -3,6 +3,9 @@ package com.usky.dxtop.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.usky.dxtop.model.QrCode;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +17,6 @@ import com.usky.dxtop.model.QrCode;
  */
 public interface QrCodeMapper extends BaseMapper<QrCode> {
 
+
+    List<QrCode> list(QrCode qrCode);
 }

src/main/java/com/usky/dxtop/model/QrCode.java

@@ -1,5 +1,6 @@
 package com.usky.dxtop.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.usky.dxtop.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -29,6 +30,7 @@ public class QrCode extends BaseEntity implements Serializable {
 
     private Long topChannelId;
 
+    @TableField(exist = false)
     private String topChannelName;
 
     private String qrPath;

src/main/java/com/usky/dxtop/service/impl/QrCodeServiceImpl.java

@@ -43,10 +43,7 @@ public class QrCodeServiceImpl extends ServiceImpl<QrCodeMapper, QrCode> impleme
 
     @Override
     public List<QrCode> list(QrCode qrCode) {
-        LambdaQueryWrapper<QrCode> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(qrCode.getName()),QrCode::getName,qrCode.getName())
-                .eq(QrCode::isDelFlag,false);
-        return this.list(queryWrapper);
+        return baseMapper.list(qrCode);
     }
 
     @Override

src/main/resources/mapper/CallApiLogMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dxtop.dxtop.mapper.CallApiLogMapper">
+<mapper namespace="com.usky.dxtop.mapper.CallApiLogMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.dxtop.model.CallApiLog">
@@ -10,12 +10,10 @@
         <result column="api_url" property="apiUrl" />
         <result column="api_param" property="apiParam" />
         <result column="api_result_data" property="apiResultData" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="update_user_id" property="updateUserId" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_user_name" property="updateUserName" />
+        <result property="createBy"      column="create_by"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"      column="update_by"      />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/OrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dxtop.dxtop.mapper.OrderMapper">
+<mapper namespace="com.usky.dxtop.mapper.OrderMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.dxtop.model.Order">
@@ -13,12 +13,10 @@
         <result column="top_source" property="topSource" />
         <result column="pay_type" property="payType" />
         <result column="money" property="money" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="update_user_id" property="updateUserId" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_user_name" property="updateUserName" />
+        <result property="createBy"      column="create_by"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"      column="update_by"      />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/QrCodeMapper.xml

@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dxtop.dxtop.mapper.QrCodeMapper">
+<mapper namespace="com.usky.dxtop.mapper.QrCodeMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.dxtop.model.QrCode">
         <id column="id" property="id" />
         <result column="name" property="name" />
         <result column="top_channel_id" property="topChannelId" />
-        <result column="top_channel_name" property="topChannelName" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="update_user_id" property="updateUserId" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_user_name" property="updateUserName" />
+        <result property="createBy"      column="create_by"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"      column="update_by"      />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
+    <select id="list" parameterType="com.usky.dxtop.model.QrCode" resultType="com.usky.dxtop.model.QrCode">
+        select qc.*,tc.name as topChannelName
+        from
+        qr_code as qc
+        inner join top_channel as tc
+        on qc.top_channel_id = tc.id
+        <where>
+            <if test="name != null and name != ''">
+                AND qc.name like concat('%', #{name}, '%')
+            </if>
+            and qc.del_flag = 0
+        </where>
+    </select>
 
 </mapper>

src/main/resources/mapper/TopChannelMapper.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dxtop.dxtop.mapper.TopChannelMapper">
+<mapper namespace="com.usky.dxtop.mapper.TopChannelMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.dxtop.model.TopChannel">
         <id column="id" property="id" />
         <result column="name" property="name" />
         <result column="alias_name" property="aliasName" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="update_user_id" property="updateUserId" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_user_name" property="updateUserName" />
+        <result property="createBy"      column="create_by"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"      column="update_by"      />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/TopRadioMapper.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dxtop.dxtop.mapper.TopRadioMapper">
+<mapper namespace="com.usky.dxtop.mapper.TopRadioMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.dxtop.model.TopRadio">
         <id column="id" property="id" />
         <result column="identity" property="identity" />
         <result column="proportion" property="proportion" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="update_user_id" property="updateUserId" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_user_name" property="updateUserName" />
+        <result property="createBy"      column="create_by"      />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"      column="update_by"      />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
 </mapper>