1

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -408,13 +408,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public Object getScenes(String username, RequestScene param) {
         User user = userService.getByUserName(username);
-        String cameraId = null;
-        String nums = null;
         log.info("搜索条件是："+ param.getSearchKey());
         //type为12表示一键换装的请求，不查询相机数据
         if(StringUtils.isNotEmpty(param.getSearchKey()) && !"11".equals(param.getType())){
-            List<Camera> cameraEntityList = cameraService.findLikeChildName(param.getSearchKey());
-            cameraId = cameraEntityList.parallelStream().map(entity->"'"+entity.getId()+"'").collect(Collectors.joining(","));
             List<Long> userIds = userService.getLikeUserName(param.getSearchKey());
             if(userIds.size() > 0){
                 List<String> cooperationList = sceneCooperationService.getNumByUserIds(userIds);

src/main/resources/mapper/ucenter/SceneMapper.xml

@@ -11,9 +11,16 @@
         WHERE is_upgrade = 0 and  p.rec_status = 'A'
         <include refid="commonWhere"></include>
 
-        <include refid="commonSceneWhere"></include>
         <if test="param.searchKey !=null and param.searchKey !=''">
-            and  p.scene_name like CONCAT('%',#{param.sceneName},'%')
+            and ( p.scene_name like CONCAT('%',#{param.searchKey},'%')
+            or c.sn_code like CONCAT('%',#{param.searchKey},'%')
+            <if test="param.numList !=null and param.numList.size >0">
+                or num in
+                <foreach item="num" collection="param.numList" open="(" separator="," close=")">
+                    #{num}
+                </foreach>
+            </if>
+            )
         </if>
         UNION
         SELECT  p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,num,title as scene_name,description as scene_dec,
@@ -24,9 +31,16 @@
         WHERE p.rec_status = 'A'
         <include refid="commonWhere"></include>
 
-        <include refid="commonSceneWhere"></include>
         <if test="param.searchKey !=null and param.searchKey !=''">
-            and  p.title like CONCAT('%',#{param.sceneName},'%')
+            and ( p.title like CONCAT('%',#{param.searchKey},'%')
+            or c.sn_code like CONCAT('%',#{param.searchKey},'%')
+            <if test="param.numList !=null and param.numList.size >0">
+                or num in
+                <foreach item="num" collection="param.numList" open="(" separator="," close=")">
+                    #{num}
+                </foreach>
+            </if>
+            )
         </if>
         ORDER BY create_time desc
         ) as scene_tb
@@ -42,15 +56,4 @@
         LEFT JOIN t_camera c on p.camera_id = c.id
     </sql>
 
-    <sql id="commonSceneWhere">
-        <if test="param.numList !=null and param.numList.size >0">
-            and num in
-            <foreach item="num" collection="param.numList" open="(" separator="," close=")">
-                #{num}
-            </foreach>
-        </if>
-        <if test="param.searchKey !=null and param.searchKey !=''">
-            and c.sn_code like CONCAT('%',#{param.searchKey},'%')
-        </if>
-    </sql>
 </mapper>