隔离119 里面120数据

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -197,6 +197,16 @@ public class DataDictionaryController extends BaseController {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
 					"getParent", null,null);
+
+			if(type.equals("JQLB")){
+				for (Menu menu : menus) {
+					if(menu.id==1214){
+						menus.remove(menu);
+						break;
+					}
+				}
+			}
+
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -9,7 +9,8 @@
         sum( CASE WHEN alert_type_code = 230 THEN 1 ELSE 0 END ) majorAlertCount
         FROM
         jc_alert_called
-        WHERE 1 = 1
+        WHERE 1 = 1    and  jc_alert_called.alert_type_code  <![CDATA[ <> ]]> 1214
+
         <if test="beginDate != null and beginDate != ''">
             and call_time >= #{beginDate}
         </if>
@@ -42,9 +43,9 @@
         WHEN '1166' THEN '原地待命'
         ELSE '' END responseLevelCode
         FROM jc_alert_called a
-        where a.is_delete=0
-    <!--AND a.coordinate_x IS NOT NULL
-    AND a.coordinate_y IS NOT NULL-->
+        where a.is_delete=0   and a.alert_type_code <![CDATA[ <> ]]> 1214
+        <!--AND a.coordinate_x IS NOT NULL
+        AND a.coordinate_y IS NOT NULL-->
     <if test='par.status==0'>
         and a.alert_status =0
     </if>
@@ -86,7 +87,7 @@
     SELECT
     COUNT(*)
     FROM jc_alert_called a
-    where a.is_delete=0
+    where a.is_delete=0  and a.alert_type_code <![CDATA[ <> ]]> 1214
     AND a.coordinate_x IS NOT NULL
     AND a.coordinate_y IS NOT NULL
     <if test='par.status==0'>
@@ -143,7 +144,8 @@
        , jc_power_transfer j
     </if>
     <where>
-        a.is_delete = 0
+        a.is_delete = 0  and  a.alert_type_code  <![CDATA[ <> ]]> 1214
+
         <if test="alertStatus!= null ">
             and a.alert_status = #{alertStatus}
         </if>
@@ -186,7 +188,8 @@
     <if test="isFatherAlert!= null and isFatherAlert == 'true' ">
         ,jc_power_transfer j
     </if>
-    <where>a.is_delete = 0
+    <where>a.is_delete = 0   and  a.alert_type_code  <![CDATA[ <> ]]> 1214
+
         <if test="alertStatus!= null ">
             and a.alert_status = #{alertStatus}
         </if>
@@ -212,7 +215,8 @@
 
 <select id="AlertCalledcountTime" resultType="Integer">
 
-    select COUNT(*) from jc_alert_called where is_delete=0
+    select COUNT(*) from jc_alert_called where is_delete=0 and  alert_type_code  <![CDATA[ <> ]]> 1214
+
 
     <if test='type==1'>
         and YEAR(call_time)=YEAR(NOW())

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -72,7 +72,10 @@
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
         left join jc_power_transfer_company_resources ptcr on ptc.sequence_nbr = ptcr.power_transfer_company_id
+        LEFT JOIN jc_alert_called a ON pt.alert_called_id = a.sequence_nbr
         <where>
+            a.alert_type_code <![CDATA[ <> ]]> 1214
+
             <if test="beginDate != null and beginDate != ''">
                 AND pt.rec_date &gt;= #{beginDate}
             </if>
@@ -85,9 +88,13 @@
     </select>
 
     <select id="getPowerTransferInfo" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto">
-        select sequence_nbr, rescue_grid
-        from jc_power_transfer pt
+        select
+        pt.sequence_nbr,
+        pt.rescue_grid
+        from jc_power_transfer pt  LEFT JOIN jc_alert_called a ON pt.alert_called_id = a.sequence_nbr
         <where>
+            a.alert_type_code <![CDATA[ <> ]]> 1214
+
             <if test="beginDate != null and beginDate != ''">
                 AND pt.rec_date &gt;= #{beginDate}
             </if>
@@ -103,7 +110,10 @@
         select ptc.sequence_nbr, ptc.company_name, ptc.is_distribution_agencies, ptc.power_transfer_id
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
+        LEFT JOIN jc_alert_called a ON pt.alert_called_id = a.sequence_nbr
         <where>
+            a.alert_type_code <![CDATA[ <> ]]> 1214
+
             <if test="beginDate != null and beginDate != ''">
                 AND pt.rec_date &gt;= #{beginDate}
             </if>
@@ -120,7 +130,8 @@
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
         left join jc_power_transfer_company_resources ptcr on ptc.sequence_nbr = ptcr.power_transfer_company_id
-        where ptc.is_distribution_agencies = 0
+        LEFT JOIN jc_alert_called a ON pt.alert_called_id = a.sequence_nbr
+        where ptc.is_distribution_agencies = 0 and a.alert_type_code <![CDATA[ <> ]]> 1214
         <if test="beginDate != null and beginDate != ''">
             AND pt.rec_date &gt;= #{beginDate}
         </if>