南昌市物联网技防平台-后台
tangzy
2021-03-13 6c31ac6260bbf0869631ab9d81f9b1b3f27a82eb
1.警情
3 files modified
9 ■■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java 6 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
@@ -119,7 +119,7 @@
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入jingdan")
    public R submit(@Valid @RequestBody Jingdan jingdan) {
    public R submit(@RequestBody Jingdan jingdan) {
        //return R.status(jingdanService.saveOrUpdate(jingdan));
        if ("".equals(jingdan.getType())) {
            jingdan.setType("0");
@@ -184,11 +184,11 @@
     * @return
     */
    @PostMapping("/selectList")
    public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
    public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String waringType, String beginTime, String endTime, String district, 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));
        return R.data(jingdanService.selectList(waringType, beginTime, endTime, district, type));
    }
    /**
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java
@@ -23,6 +23,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java
@@ -47,7 +47,7 @@
     * @param endTime
     * @return
     */
    List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String addvcd, String type);
    List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String district, String type);
    List<JingdanVO> selectLists(String handleP, String type);
    /**