Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-29 83bed9e77878cbe11e797b58fa2c2a48061e4555

Merge remote-tracking branch 'origin/master' into master

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

@@ -195,8 +195,10 @@
    <!--新增-->
    <insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
       INSERT INTO sys_alarm (alarmType,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
       region,district,alarmId,level,rname,coordinate,jd,wd,jtype) VALUES
        (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype})
       region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city) VALUES
        (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
        #{deviceNumber},#{region},#{district},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),
        #{jd},#{wd},#{jtype},#{province},#{city})
    </insert>

    <update id="updateOne" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
@@ -229,7 +231,6 @@
        a.district,
        a.alarmId,
        a.LEVEL,
        ST_ASTEXT (a.coordinate ) AS coordinate,
        a.jd,
        a.wd,
        a.jtype,

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

@@ -131,6 +131,7 @@
                List<Map<String, Object>> list = serverHandler.equipmentService.selectInfos(devId);
                Alarm alarm= new Alarm();
                alarm.setAlarmType("一键报警");
                alarm.setGalarmPeople("报警主机");
                Date day = new Date();
                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                alarm.setAlarmTime(df.format(day));