Merge branch 'master' into prod

device-api-service/src/main/java/com/xy/service/DeviceEventMsgServiceImpl.java

@@ -68,6 +68,7 @@ public class DeviceEventMsgServiceImpl extends ServiceImpl<DeviceEventMsgMapper,
                 .ge(DeviceEventMsg::getCreateTime, page.getBeginCreateTime())
                 .le(DeviceEventMsg::getCreateTime, page.getEndCreateTime())
                 .in(DeviceEventMsg::getCode, codes)
+                .like(DeviceEventMsg::getMsg)
                 .build()
                 .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceEventMsg::getId);
         IPage<DeviceEventMsg> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
@@ -100,6 +101,7 @@ public class DeviceEventMsgServiceImpl extends ServiceImpl<DeviceEventMsgMapper,
                 .in(DeviceEventMsg::getId, selectList.getIds())
                 .in(DeviceEventMsg::getDeviceId, selectList.getDeviceIds())
                 .in(DeviceEventMsg::getCode, codes)
+                .like(DeviceEventMsg::getMsg)
                 .build();
         List<DeviceEventMsg> list = list(lambdaQueryWrapper);
         List<DeviceEventMsgDto.Vo> vos = copy(DeviceEventMsgDto.Vo.class, list);

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -260,6 +260,9 @@
                 </otherwise>
             </choose>
         </if>
+        <if test="queryPage.keyword != null and queryPage.keyword != ''">
+            and CONCAT(IFNULL(info.device_name, ''), IFNULL(info.device_id, '')) LIKE CONCAT('%',#{queryPage.keyword},'%')
+        </if>
         <if test="queryPage.showStatus != null">
             and info.show_status = #{queryPage.showStatus}
         </if>

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -395,6 +395,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("缺货状态")
         private Integer stockStatus;
 
+        @ApiModelProperty("搜索词")
+        private String keyword;
+
         /**
          * 设备ID
          */