fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/controller/OperateFlowDataController.java

@@ -68,8 +68,7 @@ public class OperateFlowDataController {
             if (deviceIds.size() > 0) {
                 operateFlowData.setDeviceIds(deviceIds);
             } else {
-                deviceIds.add(-1L);
-                operateFlowData.setDeviceIds(deviceIds);
+                operateFlowData.setDeviceLevelIds(levelIds);
             }
         }
 

virgo.api/src/main/java/com/bosshand/virgo/api/operate/model/OperateFlowData.java

@@ -33,6 +33,11 @@ public class OperateFlowData {
      */
     private long deviceLevelId;
 
+    private List<Long> deviceLevelIds;
+
+    /**
+     * 设备id
+     */
     private long deviceId;
 
     private List<Long> deviceIds;
@@ -149,6 +154,14 @@ public class OperateFlowData {
         this.deviceLevelId = deviceLevelId;
     }
 
+    public List<Long> getDeviceLevelIds() {
+        return deviceLevelIds;
+    }
+
+    public void setDeviceLevelIds(List<Long> deviceLevelIds) {
+        this.deviceLevelIds = deviceLevelIds;
+    }
+
     public long getDeviceId() {
         return deviceId;
     }

virgo.api/src/main/resources/mapper/OperateFlowDataMapper.xml

@@ -13,6 +13,7 @@
         <result column="createdByUserId" property="createdByUserId" />
         <result column="createdByUserName" property="createdByUserName" />
         <result column="createdByUserPortrait" property="createdByUserPortrait" />
+        <result column="deviceLevelId" property="deviceLevelId" />
         <result column="deviceId" property="deviceId" />
         <result column="date" property="date" />
         <result column="projectFlowId" property="projectFlowId" />
@@ -82,6 +83,13 @@
             <if test="ofd.projectItemTargetRoomId != 0">
                 and a.projectItemTargetRoomId = #{ofd.projectItemTargetRoomId}
             </if>
+            <if test="ofd.deviceLevelIds != null">
+                and a.deviceLevelId in (
+                <foreach collection="ofd.deviceLevelIds" item="item" index="index" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
             <if test="ofd.deviceId != 0">
                 and a.deviceId = #{ofd.deviceId}
             </if>
@@ -130,6 +138,13 @@
             <if test="ofd.projectItemTargetRoomId != 0">
                 and projectItemTargetRoomId = #{ofd.projectItemTargetRoomId}
             </if>
+            <if test="ofd.deviceLevelIds != null">
+                and deviceLevelId in (
+                <foreach collection="ofd.deviceLevelIds" item="item" index="index" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
             <if test="ofd.deviceId != 0">
                 and deviceId = #{ofd.deviceId}
             </if>
@@ -163,11 +178,11 @@
         INSERT INTO operate_flow_data(
             projectId, projectItemId,
             projectItemTargetId, projectItemTargetRoomId,
-            deviceId, date, projectFlowId, flowUserList, state, flowData, createdByUserId, document, receiver, attachment, flowType, type)
+            deviceLevelId,deviceId, date, projectFlowId, flowUserList, state, flowData, createdByUserId, document, receiver, attachment, flowType, type)
         VALUES
             (#{projectId}, #{projectItemId},
              #{projectItemTargetId}, #{projectItemTargetRoomId},
-             #{deviceId}, now(), #{projectFlowId}, #{flowUserList}, #{state}, #{flowData}, #{createdByUserId}, #{document}, #{receiver}, #{attachment}, #{flowType}, #{type})
+             #{deviceLevelId}, #{deviceId}, now(), #{projectFlowId}, #{flowUserList}, #{state}, #{flowData}, #{createdByUserId}, #{document}, #{receiver}, #{attachment}, #{flowType}, #{type})
     </insert>
 
     <delete id="delete">
@@ -181,6 +196,7 @@
             <if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
             <if test="projectItemTargetId!=0">projectItemTargetId=#{projectItemTargetId},</if>
             <if test="projectItemTargetRoomId!=0">projectItemTargetRoomId=#{projectItemTargetRoomId},</if>
+            <if test="deviceLevelId!=0">deviceLevelId=#{deviceLevelId},</if>
             <if test="deviceId!=0">deviceId=#{deviceId},</if>
             <if test="projectFlowId!=0">projectFlowId=#{projectFlowId},</if>
             <if test="flowUserList!=null">flowUserList=#{flowUserList},</if>