Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/early-warning

 Conflicts:

	warning-web/src/main/resources/mappers-postgresql/Alertrule2Mapper.xml

warning-web/src/main/resources/application-ys.yaml

@@ -91,4 +91,5 @@ rule_encryption_key: gyee-alarm123456
 syz_kg_relieve_show: false
 
 homestat:
-  alertIds: HD03,HD04,HD06,HD07,HD13,HD15,HD19,HD31
+#  alertIds: HD03,HD04,HD06,HD07,HD13,HD15,HD19,HD31
+  alertIds: ZX001,ZX002,ZX003,ZX004,ZX005,ZX006,ZX007,ZX008,ZX009,ZX010,ZX011,ZX012,ZX013,ZX014,ZX015,ZX016,ZX017,ZX018,ZX019,ZX020,ZX021,ZX022,ZX023,ZX024,ZX025,ZX026,ZX027,ZX028,ZX029,ZX030,ZX031,ZX032,ZX033,ZX034,ZX035,ZX036,ZX037,ZX038,ZX039,ZX040,ZX041,ZX042,ZX043,ZX044,ZX045,ZX046,ZX047,ZX048

warning-web/src/main/resources/mappers-postgresql/Alertrule2Mapper.xml

@@ -62,7 +62,7 @@
     </resultMap>
 
     <select id="pageQueryAll" parameterType="java.util.Map" resultMap="alertRule2ResultToPostgreSql">
-        select a.*, (case a.enabled   WHEN 't' then 1  when 'f' then 0  else 0 end) as specialenable from ALERTRULE2 a
+        select a.*, enabled specialenable from ALERTRULE2 a
         left join windpowerstation w on w.id = a.station
         <where>
             1=1
@@ -98,8 +98,8 @@
 
     <select id="getAllByStationIdAndModelId2" parameterType="java.util.Map"
             resultMap="alertRule2ResultToPostgreSql">
-        select a.* from  ALERTRULE2 a
+--         select a.*, enabled specialenable from  ALERTRULE2 a
+        select a.*, a.enabled specialenable from  ALERTRULE2 a
         <where>
             1=1
             <if test="station !=null and station !=''">
@@ -116,7 +116,7 @@
     </select>
     <select id="getAllByStationIdAndModelId" parameterType="java.util.Map"
             resultMap="alertRule2ResultToPostgreSql">
-        select *, (case a.enabled WHEN 't' then 1 when 'f' then 0 else 0 end) as specialenable from ALERTRULE2 a
+        select *, enabled specialenable from ALERTRULE2 a
         <where>
             1=1
             <if test="idString !=null and idString !=''">
@@ -232,7 +232,7 @@
 
 
     <select id="selectByAlertrule2Id" resultMap="alertRule2ResultToPostgreSql">
-        select *, (case a.enabled WHEN 't' then 1 when 'f' then 0 else 0 end) as specialenable from ALERTRULE2 a where a.id=#{id}
+        select *, enabled specialenable from ALERTRULE2 a where a.id=#{id}
     </select>
 
     <select id="selectByNameAndSataionAndModelid" resultType="com.gyee.wisdom.alarm.sharding.entity.Alertrule2">

warning-web/src/main/resources/mappers-postgresql/ScadabjMapper.xml

@@ -19,7 +19,7 @@
     </resultMap>
 
     <select id="pageQueryAll" parameterType="java.util.Map" resultMap="scadabjResultToPostgreSql">
-        select a.*,(case a.enabled   WHEN 't' then 1  when 'f' then 0  else 0 end) as specialenable from  SCADABJ a
+        select a.*,enabled specialenable from  SCADABJ a
         <where>
             1=1
             <if test="pointKey !=null and pointKey !=''">
@@ -43,7 +43,7 @@
     </select>
 
     <select id="getAll" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.sharding.entity.Scadabj">
-        select a.*,(case a.enabled   WHEN 't' then 1  when 'f' then 0  else 0 end) as specialenable from  SCADABJ a
+        select a.*,enabled specialenable from  SCADABJ a
 
     </select>