南昌市物联网技防平台-后台
zengh
2021-04-23 01fcd5a2e991b141d5523fc59a400faa6fafd451
app接口
6 files modified
13 ■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java 4 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -469,7 +469,7 @@
        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(operation.getJid(),operation.getJtype(),operation.getBz());
        alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr());
        alarmService.updatePoliceStatus(operation.getRid(),"0");
        operationService.save(operation);
        return R.success("修改成功");
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -53,7 +53,7 @@
    void deletejj(String id);
    List<AlarmVO> selectListSe(String beginTime, String endTime);
    void s(Alarm alarm);
    void updateJtype(String id, String jtype, String bz);
    void updateJtype(String id, String jtype, String bz,String securityArr);
    void updatePoliceStatus(String id, String status);
    void updateOne(Alarm alarm);
    void updateVaddress(String vaddress,String uids ,String jid);
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -398,7 +398,7 @@
    <update id="updateJtype">
        update sys_alarm SET jtype=#{jtype},bz=#{bz} where id=#{id}
        update sys_alarm SET jtype=#{jtype},bz=#{bz},securityArr =#{securityArr} where id=#{id}
    </update>
    <update id="updatePoliceStatus">
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -53,7 +53,7 @@
    void updateOne(Alarm alarm);
    List<Map<String, Object>> selectScount(String time);
    List<AlarmVO> selectListSe(String beginTime, String endTime);
    void updateJtype(String id, String jtype, String bz);
    void updateJtype(String id, String jtype, String bz,String securityArr);
    void updateVaddress(String vaddress,String uids,String jid);
    void updatePoliceStatus(String id, String status);
    void updateAaddress(String aaddress,String jid);
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -97,8 +97,8 @@
    }
    @Override
    public void updateJtype(String id,String jtype,String bz) {
        baseMapper.updateJtype(id,jtype,bz);
    public void updateJtype(String id,String jtype,String bz,String securityArr) {
        baseMapper.updateJtype(id,jtype,bz,securityArr);
    }
    @Override
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/operation/vo/OperationVO.java
@@ -36,5 +36,6 @@
    private String jtype;
    private String rid;
    private String bz;
    private String securityArr;
}