警情分发修改

zengh

2021-03-12 636b86e9bc1a3223ed708db8be6f5acfb99590eb

警情分发修改

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

@@ -36,7 +36,7 @@

    <select id="selectAlarmPage" resultMap="alarmResultMap">
        select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
        e.serialNumber,
        e.stype,
        e.channelNumber from sys_alarm a
@@ -79,8 +79,9 @@

    <select id="listAll" resultMap="alarmResultMap">
       select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid
         from sys_alarm a
        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid
         from sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber

    </select>

    <select id="selectList" resultMap="alarmResultMap">

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java

@@ -42,7 +42,7 @@
import java.util.Map;

/**
 *  控制器
 * 控制器
 *
 * @author BladeX
 * @since 2020-07-03
@@ -121,19 +121,47 @@
    @ApiOperation(value = "新增或修改", notes = "传入jingdan")
    public R submit(@Valid @RequestBody Jingdan jingdan) {
        //return R.status(jingdanService.saveOrUpdate(jingdan));
        if ("".equals(jingdan.getType())){
                  jingdan.setType("0");
        if ("".equals(jingdan.getType())) {
            jingdan.setType("0");
        }
        if (jingdan.getCzTime() != null && jingdan.getCzTime().equals("")){
        if (jingdan.getCzTime() != null && jingdan.getCzTime().equals("")) {
            jingdan.setCzTime(null);
        }
        if (jingdan.getGalarmTime() != null && jingdan.getGalarmTime().equals("")){
        if (jingdan.getGalarmTime() != null && jingdan.getGalarmTime().equals("")) {
            jingdan.setGalarmTime(null);
        }
        if (jingdan.getHandleTime() != null && jingdan.getHandleTime().equals("")){
        if (jingdan.getHandleTime() != null && jingdan.getHandleTime().equals("")) {
            jingdan.setHandleTime(null);
        }
        return R.status(jingdanService.saveOrUpdate(jingdan));

        jingdanService.saveOrUpdate(jingdan);

        return R.data(jingdan.getId());
    }

    /**
     * 新增或修改
     */
    @PostMapping("/submitReId")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入jingdan")
    public R submitReId(@Valid @RequestBody JingdanVO jingdan) {
        //return R.status(jingdanService.saveOrUpdate(jingdan));
        if ("".equals(jingdan.getType())) {
            jingdan.setType("0");
        }
        if (jingdan.getCzTime() != null && jingdan.getCzTime().equals("")) {
            jingdan.setCzTime(null);
        }
        if (jingdan.getGalarmTime() != null && jingdan.getGalarmTime().equals("")) {
            jingdan.setGalarmTime(null);
        }
        if (jingdan.getHandleTime() != null && jingdan.getHandleTime().equals("")) {
            jingdan.setHandleTime(null);
        }
        int ces = jingdanService.submitReId(jingdan);
        int cess = jingdan.getId();
        return null;
    }


@@ -149,6 +177,7 @@

    /**
     * 警单列表
     *
     * @param waringType
     * @param beginTime
     * @param endTime
@@ -158,27 +187,28 @@
    public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String waringType, String beginTime, String endTime, String addvcd, String type, 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");
        return R.data(jingdanService.selectList(waringType, beginTime, endTime,addvcd,type));
        response.setHeader("Access-Control-Allow-Credentials", "true");
        return R.data(jingdanService.selectList(waringType, beginTime, endTime, addvcd, type));
    }

    /**
     * APP警单列表
     *
     * @param handleP
     * @param type
     * @return
     */
    @PostMapping("/selectLists")
    public R selectLists(@ApiParam(value = "主键集合", required = true) @RequestParam String handleP, String type , HttpServletResponse response) {
    public R selectLists(@ApiParam(value = "主键集合", required = true) @RequestParam String handleP, String type, 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");
        response.setHeader("Access-Control-Allow-Credentials", "true");
        Map<String, Object> maps = new HashMap<String, Object>();
        List<Map<String, Object>> lists = new ArrayList<>();
        List<Task> tasks = taskService.selectLists(handleP,type);
        List<Task> tasks = taskService.selectLists(handleP, type);
        List<JingdanVO> jingdanVOS = jingdanService.selectLists(handleP, type);
        maps.put("Jindang",jingdanVOS);
        maps.put("Task",tasks);
        maps.put("Jindang", jingdanVOS);
        maps.put("Task", tasks);
        lists.add(maps);
        return R.data(lists);
    }
@@ -186,6 +216,7 @@

    /**
     * 设备历史警情/警单id
     *
     * @param deviceNumber
     * @return
     */
@@ -193,12 +224,13 @@
    public R selectdInfo(@ApiParam(value = "主键集合", required = true) @RequestParam String deviceNumber, String id, 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");
        return R.data(jingdanService.selectdInfo(deviceNumber,id));
        response.setHeader("Access-Control-Allow-Credentials", "true");
        return R.data(jingdanService.selectdInfo(deviceNumber, id));
    }

    /**
     * 生成警单
     *
     * @param galarmPeople
     * @param phoneNumber
     * @param place
@@ -225,13 +257,14 @@
                   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.inserts(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
        response.setHeader("Access-Control-Allow-Credentials", "true");
        jingdanService.inserts(galarmPeople, phoneNumber, place, content, galarmTime, waringType, deviceNumber, type, handleP, handleTime, handName, level, coordinate, jd, wd, addvcd, rName, czTime, bz);
        return R.success("成功");
    }

    /**
     * 警单删除
     *
     * @param id
     * @param response
     * @return
@@ -240,14 +273,14 @@
    public R deletejd(String id, 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");
        response.setHeader("Access-Control-Allow-Credentials", "true");
        jingdanService.deletejd(id);
        return R.success("删除成功");
    }

    @PostMapping("/updateInfo")
    public R updateInfo(String id, String handleP, String handName, String handletype, String type) {
        jingdanService.updateInfo(id, handleP, handName,handletype,type);
        jingdanService.updateInfo(id, handleP, handName, handletype, type);
        return R.success("修改成功");
    }
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java

@@ -64,4 +64,5 @@
    void deletejd(String id);
    void updateInfo(String id, String handleP, String handName, String handletype, String type);

    int submitReId(JingdanVO jingdanVO);
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml

@@ -29,7 +29,7 @@

    <select id="selectJingdanPage" resultMap="jingdanResultMap">
        SELECT j.id,j.galarmPeople,j.phoneNumber,j.place,j.content,j.galarmTime,j.waringType,j.deviceNumber,j.type,
        j.handleP,j.handleTime,j.handName,j.level,j.jd,j.wd,j.district,j.rName,
        j.handleP,j.handleTime,j.handName,j.level,j.jd,j.wd,j.district,j.rName,j.czTime,j.bz,
        j.province,j.city FROM sys_jingdan j  where 1=1
        <if test="jingdan.waringType!=null and jingdan.waringType!=''">
            and j.waringType=#{jingdan.waringType}
@@ -252,6 +252,10 @@

    <update id="updateInfo" >
   UPDATE  sys_jingdan SET handleP=#{handleP},handName=#{handName},handletype=#{handletype},type=#{type} WHERE id=#{id}
</update>
    </update>

    <insert id="submitReId" useGeneratedKeys="true" keyProperty="id" >
        insert into sys_jingdan(galarmPeople) values("nihao")
    </insert>

</mapper>

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

@@ -47,5 +47,6 @@
                String handleTime, String handName, String level, String coordinate, String jd, String wd,
                String addvcd, String rName, String czTime, String bz);
    void deletejd(String id);
    int submitReId(JingdanVO jingdanVO);
    void updateInfo(String id, String handleP, String handName, String handletype, String type);
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/impl/JingdanServiceImpl.java

@@ -74,4 +74,9 @@
        baseMapper.updateInfo(id, handleP, handName,handletype,type);
    }

    @Override
    public int submitReId(JingdanVO jingdanVO) {
        return baseMapper.submitReId(jingdanVO);
    }

}