Browse Source

同一数据源,添加限制,最多运行5个组

zhoupeng 1 year ago
parent
commit
4043c8e48d

+ 8 - 5
cqcy-ei/cqcy-ei-common/src/main/java/com/example/opc_common/util/ConstantStr.java

@@ -65,11 +65,11 @@ public class ConstantStr {
     public static final String INDEX = "index";
     public static final String VALUE = "value";
     public static final String VALUE_BELONG_TIME = "valueBelongTime";
-    public static final String START_NUM="startNum";
-    public static final String END_NUM="endNum";
-    public static final String CURRENT_NUM="currentNum";
-    public static final String TABLE_ID="tableId";
-    public static final String REPORT_TABLE_ITEM="reportTableItem";
+    public static final String START_NUM = "startNum";
+    public static final String END_NUM = "endNum";
+    public static final String CURRENT_NUM = "currentNum";
+    public static final String TABLE_ID = "tableId";
+    public static final String REPORT_TABLE_ITEM = "reportTableItem";
 
     public static final String DATA_SOURCE_TREE = "dataSourceTree";
 
@@ -82,6 +82,9 @@ public class ConstantStr {
     public static final String BAR_CHART = "bar";
     public static final String PIE_CHART = "pie";
 
+    //同一数据源中数据组最大运行个数
+    public static final Integer DATA_SOURCE_GROUP_NUM = 5;
+
     //数据项类型,0附属属性,1基础属性
     public static final Integer ATTACH_ATTRIBUTES = 0;
     public static final Integer BASIC_ATTRIBUTES = 1;

+ 2 - 0
cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/dao/ItemGroupDao.java

@@ -81,4 +81,6 @@ public interface ItemGroupDao {
      * @return
      */
     Integer updateItemGroupState(@Param("dataSourceList") List<DataSource> dataSourceList, @Param("modifyState") Integer modifyState, @Param("changeState") Integer changeState);
+
+    Integer getRunItemGroupNum(String ipAddress, String clsId, Integer runState);
 }

+ 11 - 0
cqcy-ei/cqcy-ei-da/src/main/resources/mapper/ItemGroupDao.xml

@@ -324,4 +324,15 @@
         </foreach>
     </select>
 
+    <select id="getRunItemGroupNum" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM t_item_group
+        WHERE run_state = #{runState}
+          AND data_source_id IN
+              (SELECT id
+               FROM t_data_source
+               WHERE ip_address = #{ipAddress}
+                 AND cls_id = #{clsId})
+    </select>
+
 </mapper>