From fa9ffa9012d7b1df7692bb99e71be6592f48cd4b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 10 Mar 2021 14:00:19 +0800
Subject: [PATCH] 修改报警器端口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml |   49 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
index 360a982..d563fde 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
@@ -8,6 +8,16 @@
         <result column="name" property="name"/>
         <result column="pId" property="pId"/>
         <result column="eqid" property="eqid"/>
+        <result column="tenant_id" property="tenant_id"/>
+    </resultMap>
+
+    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
+        <id column="id" property="id"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="title" property="title"/>
+        <result column="value" property="value"/>
+        <result column="key" property="key"/>
+        <result column="has_children" property="hasChildren"/>
     </resultMap>
 
 
@@ -18,7 +28,7 @@
     <select id="selectCatalogEqNUmber" resultType="java.util.HashMap">
 
         SELECT
-            *
+           id,name,pId,eqid
         FROM
             sys_catalog
 
@@ -56,21 +66,48 @@
 GROUP BY
 	s.addvcd
     </select>
+
     <select id="selectEq" resultType="java.util.HashMap">
       SELECT
 	COUNT(*) AS value,
 	s.addvcd,
-	d.addvnm as name
+	jfpth.blade_region.name as name
 FROM
 	sys_equipment s
-	INNER JOIN sys_district d ON d.addvcds = s.addvcd
+	INNER JOIN jfpth.blade_region on jfpth.blade_region.`code`=s.addvcd
 	WHERE s.parent_id!=0
-GROUP BY
-	s.addvcd
+	GROUP BY s.addvcd,jfpth.blade_region.name
     </select>
     <select id="selectWar" resultType="java.util.HashMap">
-     SELECT COUNT(*) as cou,waringType FROM `sys_alarm` GROUP BY waringType ORDER BY cou desc
+     SELECT COUNT(*) as cou,waringType FROM `sys_alarm` where DATE_FORMAT(alarmTime,'%Y-%m-%d')&gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d')&lt;=#{endTime} GROUP BY waringType ORDER BY cou desc
     </select>
 
+    <select id="lazyTree" resultMap="treeNodeResultMap" >
+        SELECT
+        dept.id,
+        dept.pId as parent_id,
+        dept.name AS title,
+        dept.eqid AS "value",
+        dept.eqid AS "key",
+        (
+        SELECT
+        CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+        FROM
+        sys_catalog
+        WHERE
+        pId = dept.id
+        ) AS "has_children"
+        FROM
+        sys_catalog dept
+        WHERE
+        dept.pId = #{param2}
+        <if test="param1!=null and param1!=''">
+            and dept.tenant_id = #{param1}
+        </if>
+    </select>
+
+    <update id="updateCatalog">
+    update sys_catalog SET name=#{name} where eqid=#{eqid}
+</update>
 
 </mapper>

--
Gitblit v1.9.3