1

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmVehicleAlarmMapper.xml

@@ -8,10 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="vehicleNo"    column="vehicle_no"    />
         <result property="vehicleGroup"    column="vehicle_group"    />
-        <result property="countyOrgNm"    column="county_org_nm"    />
-        <result property="curator"    column="curator"    />
-        <result property="equipNo"    column="equip_no"    />
-        <result property="equipNm"    column="equip_nm"    />
         <result property="alarmCd"    column="alarm_cd"    />
         <result property="alarmDesc"    column="alarm_desc"    />
         <result property="createTime"    column="create_time"    />
@@ -21,22 +17,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPdmVehicleAlarmVo">
-        select id, county_org_nm,curator,vehicle_no, vehicle_group, equip_no, equip_nm, alarm_cd, alarm_desc, create_time, update_by, update_time, remark from pdm_vehicle_alarm
+        select id,vehicle_no, vehicle_group,  alarm_cd, alarm_desc, create_time, update_by, update_time, remark from pdm_vehicle_alarm
     </sql>
 
     <select id="selectPdmVehicleAlarmList" parameterType="PdmVehicleAlarm" resultMap="PdmVehicleAlarmResult">
         <include refid="selectPdmVehicleAlarmVo"/>
         <where>
-            <if test="countyOrgNm != null  and countyOrgNm != ''"> and county_org_nm  like concat('%', #{countyOrgNm}, '%')</if>
-            <if test="curator != null  and curator != ''"> and curator  like concat('%', #{curator}, '%')</if>
-            <if test="vehicleNo != null  and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
-            <if test="vehicleGroup != null  and vehicleGroup != ''"> and vehicle_group = #{vehicleGroup}</if>
-            <if test="equipNo != null  and equipNo != ''"> and equip_no = #{equipNo}</if>
-            <if test="equipNm != null  and equipNm != ''"> and equip_nm = #{equipNm}</if>
+            and ifnull(alarm_cd,'')!=''
+            <if test="vehicleNo != null  and vehicleNo != ''"> and vehicle_no like concat('%', #{vehicleNo}, '%')</if>
+            <if test="vehicleGroup != null  and vehicleGroup != ''"> and vehicle_group like concat('%', #{vehicleGroup}, '%')</if>
             <if test="alarmCd != null  and alarmCd != ''"> and alarm_cd = #{alarmCd}</if>
             <if test="alarmDesc != null  and alarmDesc != ''"> and alarm_desc = #{alarmDesc}</if>
         </where>
-        order by county_org_nm,vehicle_group,curator
+        order by vehicle_group,vehicle_no
     </select>
     
     <select id="selectPdmVehicleAlarmById" parameterType="Long" resultMap="PdmVehicleAlarmResult">
@@ -101,15 +94,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
     <insert id="insertVehicleAlar">
         insert into pdm_vehicle_alarm
-        select * from (
+        select DISTINCT a.* from (
         SELECT
         null as id,
-        county_org_nm,
         SUBSTRING_INDEX( SUBSTRING_INDEX( construc_car_number, ',', n ), ',', - 1 ) AS vchicle_no ,
         team_nm,
-        team_leader,
-        null as equip_no,
-        null as equip_nm,
         '0',
         '正常',
         SYSDATE() as create_time,
@@ -124,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND n &lt;= ( LENGTH( construc_car_number ) - LENGTH( REPLACE ( construc_car_number, ',', '' ) ) + 1 )
         ORDER BY
         id)a where 1=1 and   IFNULL(vchicle_no,'')!='' and not EXISTS(select 1 from pdm_vehicle_alarm p where p.vehicle_no =a.vchicle_no
-        and p.curator=a.team_leader and p.vehicle_group=a.team_nm
+         and p.vehicle_group=a.team_nm
         )
     </insert>
     <delete id="deletePdmVehicleAlarmByVehicleNo" parameterType="String">