Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/zcloud/config/ShiroConfiguration.java

@@ -66,6 +66,7 @@ public class ShiroConfiguration {
 		filterChainMap.put("/App**/**", "anon");
 		filterChainMap.put("/app/**/**", "anon");
 		filterChainMap.put("/sync/**/**", "anon");
+		filterChainMap.put("/aiwarning/**", "anon");
 		filterChainMap.put("/dictionaries/**", "anon");
         filterChainMap.put("/corptype/listAllCorpTypeMent", "anon");
         filterChainMap.put("/corpinfo/hasCorpName", "anon");

src/main/java/com/zcloud/controller/video/AIWarningController.java

@@ -80,6 +80,8 @@ public class AIWarningController extends BaseController {
 				pd.put("VIDEOMANAGER_ID", videoPd.get("VIDEOMANAGER_ID"));    //视频ID
 				pd.put("VIDEOMANAGER_NAME", videoPd.get("VIDEONAME"));    //视频名称
 				pd.put("OUTSOURCED_ID", videoPd.get("OUTSOURCED_ID"));    //重点工程id
+				pd.put("CORPINFO_ID", videoPd.get("CORPINFO_ID"));    //重点工程id
+				pd.put("CHECK_NO", videoPd.get("CHECK_NO"));    //重点工程id
 			}
 			pd.put("STATUS", 0);    //状态0未处置
 			pd.put("ISTRUE", 3);    //状态3未审核

src/main/java/com/zcloud/service/electronicFence/impl/ElectronicFenceServiceImpl.java

@@ -68,17 +68,16 @@ public class ElectronicFenceServiceImpl implements ElectronicFenceService {
         Map<String, Map<String, Object>> idToNodeMap = new HashMap<>();
         List<Map<String, Object>> rootNodes = new ArrayList<>();
 
-        // Map IDs to their nodes
         for (Map<String, Object> data : dataList) {
             String id = (String) data.get("id");
             idToNodeMap.put(id, data);
         }
 
-        // Find root nodes and attach children
         for (Map.Entry<String, Map<String, Object>> entry : idToNodeMap.entrySet()) {
             Map<String, Object> node = entry.getValue();
             String pId = (String) node.get("pId");
             if ("0".equals(pId)) {
+                node.put("disabled",true);
                 rootNodes.add(node);
             } else {
                 Map<String, Object> parentNode = idToNodeMap.get(pId);
@@ -96,13 +95,11 @@ public class ElectronicFenceServiceImpl implements ElectronicFenceService {
         Map<String, Map<String, Object>> idToNodeMap = new HashMap<>();
         List<Map<String, Object>> rootNodes = new ArrayList<>();
 
-        // Map IDs to their nodes
         for (Map<String, Object> data : dataList) {
             String id = (String) data.get("ELECTRONIC_FENCE_AREA_ID");
             idToNodeMap.put(id, data);
         }
 
-        // Find root nodes and attach children
         for (Map.Entry<String, Map<String, Object>> entry : idToNodeMap.entrySet()) {
             Map<String, Object> node = entry.getValue();
             String pId = (String) node.get("pId");

src/main/resources/mybatis/datasource/video/AIWarningMapper.xml

@@ -27,7 +27,9 @@
 		f.STATUS,
 		f.ISTRUE,
 		f.HASHIDDEN,
-		f.AIWARNING_ID
+		f.AIWARNING_ID,
+		f.CORPINFO_ID,
+		f.CHECK_NO
 	</sql>
 
 	<!-- 字段用于新增 -->
@@ -45,7 +47,9 @@
 		STATUS,
 		ISTRUE,
 		HASHIDDEN,
-		AIWARNING_ID
+		AIWARNING_ID,
+		CORPINFO_ID,
+		CHECK_NO
 	</sql>
 
 	<!-- 字段值 -->
@@ -63,7 +67,9 @@
 		#{STATUS},
 		#{ISTRUE},
 		#{HASHIDDEN},
-		#{AIWARNING_ID}
+		#{AIWARNING_ID},
+		#{CORPINFO_ID},
+		#{CHECK_NO}
 	</sql>
 	<insert id="save" parameterType="pd">
 		insert into

src/main/resources/mybatis/datasource/video/VideoManagerMapper.xml

@@ -190,11 +190,13 @@
         </if>
     </select>
     <select id="findByCode" parameterType="pd" resultType="pd">
-        select
-        <include refid="Field"></include>
-        from
-        <include refid="tableName"></include>
-        f
+        SELECT
+            f.*,
+            e.CHECK_NO
+        FROM
+            bus_videomanager f
+                LEFT JOIN bus_eightwork_videomanager e ON f.VIDEOMANAGER_ID = e.VIDEOMANAGER_ID
+                AND e.ISDELETE = 0
         where
         f.CODE=#{CODE}
     </select>