فهرست منبع

app云端协作场景

lyhzzz 2 سال پیش
والد
کامیت
be5d8c8b5d

+ 1 - 2
src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -84,8 +84,7 @@ public class AppSceneService {
             }
             cooperationNumList = sceneCooperationService.getNumByUserIds(Arrays.asList(user.getId()));
             if(cooperationNumList.size() >0){
-                String cooperationNums = cooperationNumList.stream().map(num->"'"+num+"'").collect(Collectors.joining(","));
-                param.setCooperationNums(cooperationNums );
+                param.setCooperationNumList(cooperationNumList );
             }
             param.setUserId(user.getId());
         }

+ 1 - 0
src/main/java/com/fdkankan/ucenter/vo/request/AppSceneParam.java

@@ -20,6 +20,7 @@ public class AppSceneParam extends RequestBase {
     private String snCode;
 
     private String cooperationNums;
+    private List<String> cooperationNumList;
 
     private Long cameraId;
 

+ 7 - 4
src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -36,7 +36,7 @@
 
 
     <sql id="commonWhere">
-        <if test= 'param.userId != null or param.cooperationNums != null or param.cameraId != null'>
+        <if test= 'param.userId != null or param.cooperationNumList != null or param.cameraId != null'>
            and  ( 1!=1
         </if>
         <if test="param.userId != null">
@@ -45,10 +45,13 @@
         <if test="param.cameraId !=null ">
             or p.camera_id = #{param.cameraId}
         </if>
-        <if test="param.cooperationNums !=null and param.cooperationNums !=''">
-            or p.num in ( #{param.cooperationNums} )
+        <if test="param.cooperationNumList !=null and param.cooperationNumList.size >0">
+            or p.num in
+               <foreach collection="param.cooperationNumList" item="sceneNum" open="("  separator="," close=")">
+                   #{sceneNum}
+               </foreach>
         </if>
-        <if test= 'param.userId != null or param.cooperationNums != null or param.cameraId != null'>
+        <if test= 'param.userId != null or param.cooperationNumList != null or param.cameraId != null'>
             )
         </if>
         <if test="param.sceneType !=null and param.sceneType !=''">