1.接警调整 2.警单调整

nnnjjj123

2021-01-14 22515dce96ad77542ce71375004d0c45aee049e8

1.接警调整
2.警单调整

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

@@ -320,11 +320,11 @@
     * 修改警情类型
     */
    @PostMapping("/updateJtype")
    public R updateJtype(String id,HttpServletResponse response) {
    public R updateJtype(String id,String czTime,String bz,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);
        alarmService.updateJtype(id,czTime,bz);
        return R.success("修改成功");
    }


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

@@ -141,6 +141,8 @@
        @ApiModelProperty(value = "是否生成警单(0:否 1：是)")
        private String jtype;
        private String rname;
        private String czTime;
        private String bz;


}

 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);
    void updateJtype(String id,String czTime,String bz);
    void updateOne(Alarm alarm);

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

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

@@ -27,6 +27,8 @@
        <result column="serialNumber" property="serialNumber"/>
        <result column="stype" property="stype"/>
        <result column="channelNumber" property="channelNumber"/>
        <result column="czTime" property="czTime"/>
        <result column="bz" property="bz"/>
    </resultMap>


@@ -66,6 +68,8 @@
        a.region,
        a.addvcd,
        a.alarmId,
        a.czTime,
        a.bz,
        a.LEVEL,
        ST_ASTEXT (a.coordinate ) AS coordinate,
        a.jd,
@@ -106,6 +110,8 @@
        a.sex,
        a.phoneNumber,
        a.place,
        a.czTime,
        a.bz,
        a.content,
        a.waringType,
        a.deviceNumber,
@@ -216,6 +222,6 @@


    <update id="updateJtype">
    update sys_alarm SET jtype=1 where id=#{id}
    update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} 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);
    void updateJtype(String id,String czTime,String bz);
}

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

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

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

}

 src/main/java/org/springblade/modules/jingdan/controller/JingdanController.java

@@ -211,11 +211,11 @@
    public R saves(@ApiParam(value = "主键集合", required = true) @RequestParam String galarmPeople,String phoneNumber,String place,String content,
                   String galarmTime,String waringType,String deviceNumber,String type,String handleP,
                   String handleTime,String handName,String level,String coordinate,String jd,String wd,
                   String addvcd,String rName,HttpServletResponse response) {
                   String addvcd,String rName,String czTime,String bz,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");
        jingdanService.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName);
        jingdanService.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
        return R.success("成功");
    }


 src/main/java/org/springblade/modules/jingdan/entity/Jingdan.java

@@ -129,6 +129,8 @@
        private String addvcd;
        private String rName;
        private String handletype;
        private String czTime;
        private String bz;




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

@@ -59,7 +59,7 @@
    int insert(String galarmPeople,String phoneNumber,String place,String content,
               String galarmTime,String waringType,String deviceNumber,String type,String handleP,
               String handleTime,String handName,String level,String coordinate,String jd,String wd,
               String addvcd,String rName);
               String addvcd,String rName,String czTime,String bz);
    void deletejd(String id);
    void updateInfo(String id,String handleP,String handName,String handletype,String type);


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

@@ -138,6 +138,12 @@
            <if test="rName!=null and rName!=''">
                rName,
            </if>
            <if test="czTime!=null and czTime!=''">
                czTime,
            </if>
            <if test="bz!=null and bz!=''">
                bz,
            </if>
        </trim>
    </sql>
    <sql id="value">
@@ -193,6 +199,12 @@
            <if test="rName!=null and rName!=''">
                #{rName},
            </if>
            <if test="czTime!=null and czTime!=''">
                #{czTime},
            </if>
            <if test="bz!=null and bz!=''">
                #{bz},
            </if>
        </trim>
    </sql>
    <insert id="insert">

 src/main/java/org/springblade/modules/jingdan/service/IJingdanService.java

@@ -45,7 +45,7 @@
    void insert(String galarmPeople,String phoneNumber,String place,String content,
                String galarmTime,String waringType,String deviceNumber,String type,String handleP,
                String handleTime,String handName,String level,String coordinate,String jd,String wd,
                String addvcd,String rName);
                String addvcd,String rName,String czTime,String bz);
    void deletejd(String id);
    void updateInfo(String id,String handleP,String handName,String handletype,String type);
}

 src/main/java/org/springblade/modules/jingdan/service/impl/JingdanServiceImpl.java

@@ -61,8 +61,8 @@
    public void insert(String galarmPeople,String phoneNumber,String place,String content,
                       String galarmTime,String waringType,String deviceNumber,String type,String handleP,
                       String handleTime,String handName,String level,String coordinate,String jd,String wd,
                       String addvcd,String rName) {
        baseMapper.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName);
                       String addvcd,String rName,String czTime,String bz) {
        baseMapper.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
    }

    @Override