设备，警情调整

nnnjjj123

2021-01-28 830d1772dfae2ea5eaaf41ecb7cdbcb9efffc6c5

设备，警情调整

 blade-service-api/blade-jfpts-api/pom.xml

@@ -11,7 +11,7 @@

    <artifactId>blade-jfpts-api</artifactId>
    <name>${project.artifactId}</name>
    <version>${bladex.project.version</version>
    <version>${bladex.project.version}</version>
    <packaging>jar</packaging>

</project>

 blade-service/blade-jfpts/pom.xml

@@ -9,7 +9,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-jfpts</artifactId>
    <artifactId>jfpt</artifactId>
   <name>${project.artifactId}</name>
    <version>${bladex.project.version</version>
    <packaging>jar</packaging>
@@ -40,9 +40,9 @@
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-jfpts-api</artifactId>
            <version>${bladex.project.version</version>
            <scope>compile</scope>
            <version>${bladex.project.version}</version>
        </dependency>

    </dependencies>

</project>

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java

@@ -41,7 +41,7 @@

    @Override
    public void run(String... args) throws Exception {
        Server server=new Server(8090);
        Server server=new Server(8088);
    }
}


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml

@@ -29,6 +29,7 @@
        <result column="channelNumber" property="channelNumber"/>
        <result column="czTime" property="czTime"/>
        <result column="bz" property="bz"/>
        <result column="name" property="name"/>
    </resultMap>


@@ -201,7 +202,8 @@
    <update id="updateOne" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
    update sys_alarm SET alarmType=#{alarmType},alarmPeople=#{alarmPeople},alarmTime=#{alarmTime},
    galarmPeople=#{galarmPeople},sex=#{sex},phoneNumber=#{phoneNumber},place=#{place},
    content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},district=#{district},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},coordinate=POINT(#{jd},#{wd}),jtype=#{jtype} where id=#{id}
    content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},district=#{district},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},
    coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},province=#{province},city=#{city} where id=#{id}
</update>


@@ -232,12 +234,12 @@
        a.wd,
        a.jtype,
        a.rname,
        d.addvnm,
        e.serialNumber,
        e.stype,
        e.channelNumber
        e.channelNumber,
        jfpth.blade_region.`name`
        FROM
        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where
        sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where
        DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime} ORDER BY alarmTime desc
    </select>


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java

@@ -38,4 +38,5 @@
    private  String channelNumber;
    private  String beginTime;
    private  String endTime;
    private  String name;
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java

@@ -106,6 +106,9 @@
    private String pay;
    private String expireTime;
    private String heartbeat;
    private String province;
    private String city;
    private String district;


}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -24,6 +24,9 @@
        <result column="pay" property="pay"/>
        <result column="expireTime" property="expireTime"/>
        <result column="heartbeat" property="heartbeat"/>
        <result column="province" property="province"/>
        <result column="city" property="city"/>
        <result column="district" property="district"/>
    </resultMap>

    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -202,12 +205,13 @@
   dept.wd,
   dept.street AS streeName,
   u.yname,
   d.addvnm,
   dept.addvcd
   dept.addvcd,
   dept.province,
   dept.city,
   dept.district
FROM
   sys_equipment dept
   LEFT JOIN sys_suser u ON u.ynumber = dept.ownerId
   LEFT JOIN sys_district d ON d.addvcds = dept.addvcd
   LEFT JOIN sys_street s ON s.id = dept.street  WHERE  dept.deviceNumber=#{deviceNumber}
    </select>


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java

@@ -136,7 +136,9 @@
                alarm.setAlarmTime(df.format(day));
                alarm.setPlace((String) list.get(0).get("streeName"));//事发地址
                alarm.setDeviceNumber((String) list.get(0).get("deviceNumber"));//设备编号
                alarm.setDistrict((String) list.get(0).get("district"));//行政区编码
                alarm.setDistrict((String) list.get(0).get("district"));//县区
                alarm.setProvince((String) list.get(0).get("province"));//市
                alarm.setCity((String) list.get(0).get("city"));
                alarm.setJd((String) list.get(0).get("jd"));//经度
                alarm.setWd((String) list.get(0).get("wd"));//纬度
                alarm.setJtype("0");