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

zengh

2021-01-15 16f44651a78d00943aea51b26fc6a4f20518a648

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

 Dockerfile

@@ -8,7 +8,7 @@

EXPOSE 8800

ADD ./target/blade-api.jar ./app.jar
ADD ./target/jfpt.jar ./app.jar

ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]


 src/main/java/org/springblade/modules/alarm/controller/AlarmController.java

@@ -312,6 +312,8 @@
        String time = df.format(new Date());// new Date()为获取当前系统时间
        String pastDate = getPastDate(7);
        List<AlarmVO> alarmVOS = alarmService.selectListSe(pastDate, time);
        for (int i=0;i<alarmVOS.size();i++){
        }
        return R.data(alarmVOS);
    }

@@ -320,11 +322,11 @@
     * 修改警情类型
     */
    @PostMapping("/updateJtype")
    public R updateJtype(String id,String czTime,String bz,HttpServletResponse response) {
    public R updateJtype(String id,String czTime,String bz,String jjTime,HttpServletResponse response) {
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        alarmService.updateJtype(id,czTime,bz);
        alarmService.updateJtype(id,czTime,bz,jjTime);
        return R.success("修改成功");
    }


 src/main/java/org/springblade/modules/alarm/entity/Alarm.java

@@ -143,6 +143,7 @@
        private String rname;
        private String czTime;
        private String bz;
        private String jjTime;


}

 src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java

@@ -48,7 +48,7 @@
    void deletejj(String id);

    void s(Alarm alarm);
    void updateJtype(String id,String czTime,String bz);
    void updateJtype(String id,String czTime,String bz,String jjTime);
    void updateOne(Alarm alarm);

    List<Map<String, Object>> selectScount(String time);

 src/main/java/org/springblade/modules/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="jjTime" property="jjTime"/>
    </resultMap>


@@ -70,6 +71,7 @@
        a.alarmId,
        a.czTime,
        a.bz,
        a.jjTime,
        a.LEVEL,
        ST_ASTEXT (a.coordinate ) AS coordinate,
        a.jd,
@@ -119,6 +121,7 @@
        a.addvcd,
        a.alarmId,
        a.rname,
        a.jjTime,
        a.LEVEL,
        ST_ASTEXT(a.coordinate) AS coordinate,
        a.jd,
@@ -149,6 +152,7 @@
        a.region,
        a.addvcd,
        a.alarmId,
        a.jjTime,
        a.rname,
        a.LEVEL,
        ST_ASTEXT (a.coordinate ) AS coordinate,
@@ -173,14 +177,18 @@
    <!--新增-->
    <insert id="s" parameterType="org.springblade.modules.alarm.entity.Alarm">
       INSERT INTO sys_alarm (alarmType,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
       region,addvcd,alarmId,level,rname,coordinate,jd,wd,jtype) VALUES
        (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{addvcd},#{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype})
       region,addvcd,alarmId,level,rname,coordinate,jd,wd,jtype,czTime,bz,jjTime) VALUES
        (#{alarmType},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},#{deviceNumber},#{region},#{addvcd},
        #{alarmId},#{level},#{rname},POINT(#{jd},#{wd}),#{jd},#{wd},#{jtype}
        ,#{czTime},#{bz},#{jjTime})
    </insert>

    <update id="updateOne" parameterType="org.springblade.modules.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},addvcd=#{addvcd},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},
    addvcd=#{addvcd},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},
    wd=#{wd},coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},jtype=#{jtype},czTime=#{czTime},bz=#{bz},jjTime=#{jjTime} where id=#{id}
</update>


@@ -216,12 +224,12 @@
        e.stype,
        e.channelNumber
        FROM
        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where
        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber  where
        DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime} ORDER BY alarmTime desc
    </select>


    <update id="updateJtype">
    update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
    update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz},jjTime=#{jjTime} where id=#{id}
</update>
</mapper>

 src/main/java/org/springblade/modules/alarm/service/IAlarmService.java

@@ -48,5 +48,5 @@
    void updateOne(Alarm alarm);
    List<Map<String, Object>> selectScount(String time);
    List<AlarmVO> selectListSe(String beginTime,String endTime);
    void updateJtype(String id,String czTime,String bz);
    void updateJtype(String id,String czTime,String bz,String jjTime);
}

 src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java

@@ -84,8 +84,8 @@
    }

    @Override
    public void updateJtype(String id,String czTime,String bz) {
        baseMapper.updateJtype(id,czTime,bz);
    public void updateJtype(String id,String czTime,String bz,String jjTime) {
        baseMapper.updateJtype(id,czTime,bz,jjTime);
    }

}

 src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java

@@ -37,4 +37,5 @@
    private  String stype;
    private  String channelNumber;


}

 src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.xml

@@ -49,6 +49,7 @@
        <if test="type!=null and type!=''">
            and j.type=#{type}
        </if>
        ORDER BY j.type asc,j.galarmTime desc
    </select>

    <select id="selectdInfo" resultMap="jingdanResultMap">