优化

‘liusuyi’

2023-06-14 e4b75d402e8cb84a70e2f84f4e19f566ffd38d85

优化

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java

@@ -128,7 +128,6 @@
        switch (topic) {
            case "stealelec":
                ArdAlarmStealelec ardAlarmStealelec = JSONObject.parseObject(message, ArdAlarmStealelec.class);
                ardAlarmStealelec.setId(uuid);
                ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmStealelec.getDescribe());
                if(well!=null)
                {
@@ -136,8 +135,13 @@
                    ardAlarmStealelec.setLatitude(well.getLatitude());
                    ardAlarmStealelec.setDeptId(well.getDeptId());
                }
                int insertaas = ardAlarmStealelecMapper.insert(ardAlarmStealelec);
                if(insertaas>0)
                ArdAlarmStealelec existe = ardAlarmStealelecMapper.selectByPrimaryKey(ardAlarmStealelec.getId());
                if(StringUtils.isNotNull(existe))
                {
                    return;
                }
                int aas = ardAlarmStealelecMapper.insert(ardAlarmStealelec);
                if(aas>0)
                {
                    log.info("stealelec入库成功：" +ardAlarmStealelec);
                }
@@ -162,8 +166,8 @@
                        ardAlarmTube.setAltitude(geoPoint.getAltitude());
                    }
                }
                int i = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
                if (i > 0) {
                int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
                if (aat > 0) {
                    log.info("tube入库成功：" + ardAlarmTube);
                }
                break;

 ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml

ÎļþÃû´Ó ard-work/src/main/resources/mapper/stealAlarm/ArdAlarmStealelecMapper.xml ÐÞ¸Ä
@@ -3,7 +3,6 @@
<mapper namespace="com.ruoyi.alarm.stealAlarm.mapper.ArdAlarmStealelecMapper">
    <resultMap id="BaseResultMap" type="ArdAlarmStealelec">
        <id column="id" property="id"/>
        <result column="command" property="command"/>
        <result column="name" property="name"/>
        <result column="describe" property="describe"/>
        <result column="catalog_text" property="catalogText"/>
@@ -17,8 +16,7 @@
        <result column="dept_id" property="deptId"/>
    </resultMap>
    <sql id="Base_Column_List">
        id
        ,command, name, describe, catalog_text, description, start_time, end_time,view_time,longitude,latitude,create_by,create_time,user_id,dept_id
        id, name, describe, catalog_text, description, start_time, end_time,view_time,longitude,latitude,create_by,create_time,user_id,dept_id
    </sql>
    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
        select
@@ -92,7 +90,7 @@
    </update>
    <insert id="insert" parameterType="ArdAlarmStealelec">
        insert into ard_alarm_stealelec(<include refid="Base_Column_List"/>)
        values (#{id},#{command}, #{name},#{describe},#{catalogText},#{description}, #{startTime}, #{endTime},
        values (#{id}, #{name},#{describe},#{catalogText},#{description}, #{startTime}, #{endTime},
        #{viewTime},#{longitude},#{latitude},#{createBy},#{createTime},#{userId},#{deptId})
    </insert>
</mapper>

 ruoyi-admin/src/main/resources/application-ard.yml

@@ -20,7 +20,7 @@
  clientId: m3c
  username: admin
  password: xzx12345
  topic: tube
  topic: tube,stealelec
  timeout: 100
  keepalive: 60
  enabled: true