1.新增保安员列表接口 2.行政区tree 接口修改

Administrator

2021-07-19 6224d1c19b5d92a2e5dd31eaa36d70fdfb0f5243

 src/main/java/org/springblade/modules/permit/controller/PermitController.java

@@ -16,23 +16,27 @@
 */
package org.springblade.modules.permit.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.punish.entity.Punish;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.validation.Valid;
import java.util.Date;
import java.util.Map;

/**
 *  控制器
@@ -42,7 +46,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("blade-permit/permit")
@RequestMapping("/permit")
@Api(value = "", tags = "接口")
public class PermitController extends BladeController {

@@ -60,18 +64,18 @@
   }

   /**
    * 分页 
    * 分页
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入permit")
   public R<IPage<Permit>> list(Permit permit, Query query) {
      IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
   public R<IPage<Permit>> list(@ApiIgnore @RequestParam Map<String, Object> permit, Query query) {
      IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit, Permit.class));
      return R.data(pages);
   }

   /**
    * 自定义分页 
    * 自定义分页
    */
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
@@ -82,17 +86,19 @@
   }

   /**
    * 新增 
    * 新增
    */
   @PostMapping("/save")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入permit")
   public R save(@Valid @RequestBody Permit permit) {
      permit.setType("2");
      permit.setPermitime(new Date());
      return R.status(permitService.save(permit));
   }

   /**
    * 修改 
    * 修改
    */
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
@@ -102,7 +108,7 @@
   }

   /**
    * 新增或修改 
    * 新增或修改
    */
   @PostMapping("/submit")
   @ApiOperationSupport(order = 6)
@@ -111,9 +117,9 @@
      return R.status(permitService.saveOrUpdate(permit));
   }

	

   /**
    * 删除 
    * 删除
    */
   @PostMapping("/remove")
   @ApiOperationSupport(order = 8)
@@ -122,5 +128,5 @@
      return R.status(permitService.removeByIds(Func.toLongList(ids)));
   }

	

}