1.警情分发调整

tangzy

2021-03-12 67feebc7abacd70b850a963fdfb52307e89b5a10

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

@@ -120,6 +120,19 @@
   @ApiOperationSupport(order = 6)
   @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 (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);
      }
      return R.status(jingdanService.saveOrUpdate(jingdan));
   }

@@ -142,11 +155,11 @@
    * @return
    */
   @PostMapping("/selectList")
   public R<IPage<JingdanVO>> selectList(@ApiParam(value = "主键集合", required = true) @RequestParam Query query  ,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 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(Condition.getPage(query),waringType, beginTime, endTime,addvcd,type));
      return R.data(jingdanService.selectList(waringType, beginTime, endTime,addvcd,type));
   }

   /**
@@ -213,7 +226,7 @@
      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,czTime,bz);
      jingdanService.inserts(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
      return R.success("成功");
   }

@@ -233,10 +246,7 @@
   }

   @PostMapping("/updateInfo")
   public R updateInfo(String id, String handleP, String handName, String handletype, 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");
   public R updateInfo(String id, String handleP, String handName, String handletype, String type) {
      jingdanService.updateInfo(id, handleP, handName,handletype,type);
      return R.success("修改成功");
   }