Merge remote-tracking branch 'origin/master'

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

@@ -528,6 +528,11 @@ public class PerPrefix {
     public static final String LABORATORY_WHITELIST = "laboratory:whitelist:";
 
     /**
+     * 音乐合成
+     */
+    public static final String LABORATORY_SYNTHESIS = "laboratory:synthesis:";
+
+    /**
      * 代码生成 操作处理
      */
     public static final String LABORATORY_TOOLGEN = "tool:gen:";

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabAudioSynthesisController.java

@@ -4,6 +4,9 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zd.common.core.domain.per.PerFun;
+import com.zd.common.core.domain.per.PerPrefix;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,7 +47,7 @@ public class LabAudioSynthesisController extends BaseController<LabAudioSynthesi
     /**
      * 查询音乐合成列表
      */
-    @PreAuthorize(hasPermi = "laboratory:synthesis:list")
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SYNTHESIS + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询音乐合成列表")
     public TableDataInfo<LabAudioSynthesis> list(LabAudioSynthesis labAudioSynthesis)
@@ -58,7 +61,7 @@ public class LabAudioSynthesisController extends BaseController<LabAudioSynthesi
      * 导出音乐合成列表
      */
     @ApiOperation(value = "导出音乐合成列表")
-    @PreAuthorize(hasPermi = "laboratory:synthesis:export")
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SYNTHESIS + PerFun.EXPORT)
     @Log(title = "音乐合成", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, LabAudioSynthesis labAudioSynthesis) throws IOException
@@ -72,7 +75,7 @@ public class LabAudioSynthesisController extends BaseController<LabAudioSynthesi
      * 获取音乐合成详细信息
      */
     @ApiOperation(value = "获取音乐合成详细信息")
-    @PreAuthorize(hasPermi = "laboratory:synthesis:query")
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SYNTHESIS + PerFun.QUERY)
     @GetMapping(value = "/{id}")
     public ResultData<LabAudioSynthesis> getInfo(@PathVariable("id") Long id)
     {
@@ -83,7 +86,7 @@ public class LabAudioSynthesisController extends BaseController<LabAudioSynthesi
      * 新增音乐合成
      */
     @ApiOperation(value = "新增音乐合成")
-    @PreAuthorize(hasPermi = "laboratory:synthesis:add")
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SYNTHESIS + PerFun.ADD)
     @Log(title = "音乐合成", businessType = BusinessType.INSERT)
     @PostMapping
     public ResultData add(@RequestBody LabAudioSynthesis labAudioSynthesis, HttpServletRequest request)
@@ -95,7 +98,7 @@ public class LabAudioSynthesisController extends BaseController<LabAudioSynthesi
      * 修改音乐合成
      */
     @ApiOperation(value = "修改音乐合成")
-    @PreAuthorize(hasPermi = "laboratory:synthesis:edit")
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SYNTHESIS + PerFun.EDIT)
     @Log(title = "音乐合成", businessType = BusinessType.UPDATE)
     @PutMapping
     public ResultData edit(@RequestBody LabAudioSynthesis labAudioSynthesis)
@@ -107,7 +110,7 @@ public class LabAudioSynthesisController extends BaseController<LabAudioSynthesi
      * 删除音乐合成
      */
     @ApiOperation(value = "删除音乐合成")
-    @PreAuthorize(hasPermi = "laboratory:synthesis:remove")
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_SYNTHESIS + PerFun.REMOVE)
     @Log(title = "音乐合成", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public ResultData remove(@PathVariable Long[] ids)