2022-09-13 气瓶领用归还添加对应的权限。

zd-common/zd-common-core/src/main/java/com/zd/common/core/domain/per/PerPrefix.java

@@ -700,10 +700,30 @@ public class PerPrefix {
 
 
     /**   ================================================气瓶申请流程的权限=====================================     */
+    /***
+     * 用气审核列表
+     */
     public static final String QP_USEGASAPPLY = "bottle:usegasApply:";
 
+    /***
+     * 用气审批
+     */
     public static final String QP_USEGASAUDITRECORD = "bottle:usegasAuditRecord:";
 
+    /***
+     * 气瓶使用(管理端)
+     */
+    public static final String BOTTLE_BOTTLEUSEBYADMIN= "bottle:bottleUseAdmin:";
+
+    /***
+     * 气瓶使用(学生端)
+     */
+    public static final String BOTTLE_BOTTLEUSEBYUSER= "bottle:bottleUseUser:";
+
+    /***
+     * 气瓶使用(学生端)
+     */
+    public static final String BOTTLE_USERECORD= "bottle:useRecord:";
 
     /***
      * 气瓶入库-2版

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageController.java

@@ -100,6 +100,7 @@ public class BottleStorageController extends BaseController {
      * 查询领用气瓶列表(管理端)
      */
     @GetMapping("/receivingGasList")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLEUSEBYADMIN + PerFun.LIST)
     @ApiOperation(value = "查询领用气瓶列表")
     public TableDataInfo<BottleStorage> receivingGasList(BottleStorage bottleStorage) {
         startPage();
@@ -112,6 +113,7 @@ public class BottleStorageController extends BaseController {
      * 归还气瓶列表(管理端)
      */
     @GetMapping("/returnGas")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLEUSEBYADMIN + PerFun.LIST)
     @ApiOperation(value = "归还气瓶列表")
     public TableDataInfo<BottleStorage> returnGas(BottleStorageUseVo bottleStorageUseVo) {
         startPage();
@@ -124,6 +126,7 @@ public class BottleStorageController extends BaseController {
      * 查询领用气瓶列表(学生端)
      */
     @GetMapping("/receivingGasListByStu")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLEUSEBYUSER + PerFun.LIST)
     @ApiOperation(value = "查询领用气瓶列表")
     public TableDataInfo<BottleStorage> receivingGasListByStu(BottleStorage bottleStorage) {
         startPage();
@@ -135,6 +138,7 @@ public class BottleStorageController extends BaseController {
      * 归还气瓶列表(学生端)
      */
     @GetMapping("/returnGasByStu")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLEUSEBYUSER + PerFun.LIST)
     @ApiOperation(value = "归还气瓶列表")
     public TableDataInfo<BottleStorage> returnGasByStu(BottleStorageUseVo bottleStorageUseVo) {
         startPage();

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UseRecordController.java

@@ -7,6 +7,8 @@ import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.AirAmount;
 import com.zd.bottle.vo.UseRecordVo;
 import com.zd.bottle.vo.WebUseRecordVo;
+import com.zd.common.core.domain.per.PerFun;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
@@ -153,6 +155,7 @@ public class UseRecordController extends BaseController<UseRecord> {
      * 4：气瓶正在使用中
      */
     @ApiOperation(value = "新增使用登记")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_USERECORD + PerFun.ADD)
     @Log(title = "新增使用登记", businessType = BusinessType.INSERT)
     @PostMapping
     public ResultData<Integer> add(@RequestBody UseRecordDto recordDto) {
@@ -163,6 +166,7 @@ public class UseRecordController extends BaseController<UseRecord> {
      * 归还登记
      */
     @ApiOperation(value = "归还登记")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_USERECORD + PerFun.EDIT)
     @Log(title = "归还登记", businessType = BusinessType.UPDATE)
     @PutMapping
     public ResultData<Boolean> edit(@RequestBody UseRecord useRecord) {