fix：取消接口权限校验、初始化默认按钮接口

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/CommonBtnController.java

@@ -1,16 +1,22 @@
 package com.zkqy.web.controller.dragForm;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.TypeReference;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.utils.form.FromUtils;
 import com.zkqy.system.entity.CommonEntity;
 import com.zkqy.system.entity.DragForm;
+import com.zkqy.system.entity.DragTable;
 import com.zkqy.system.entity.DragTableBtn;
+import com.zkqy.system.entity.vo.DragTableBtnDefaultVo;
 import com.zkqy.system.mapper.DragTableMapper;
 import com.zkqy.system.service.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.FileReader;
 import java.util.*;
 
 /**
@@ -20,13 +26,13 @@ import java.util.*;
 @RestController
 @RequestMapping("/dragform/commonbtn")
 public class CommonBtnController extends BaseController {
-    @Resource   // 共通crud
+    @Resource // 共通crud
     private ICommonService commonService;
 
-    @Resource  // 动态表单
+    @Resource // 动态表单
     private IDragFormService dragFormService;
 
-    @Resource  // 表格按钮
+    @Resource // 表格按钮
     private IDragTableBtnService iDragTableBtnService;
 
     @Resource
@@ -38,18 +44,137 @@ public class CommonBtnController extends BaseController {
     @Resource
     private IDragTableGroupService dragTableGroupService;
 
+    @Resource
+    private IDragTableService dragTableService;
+
+    @GetMapping("/hauxian/btn")
+    public Object asd12312312312() throws Exception {
+
+        String btnJson = "{\n" + "  \"remark\": \"默认初始化\",\n" + "  \"btnParentId\": 0,\n"
+            + "  \"ancestorsId\": \"0\",\n" + "  \"btnKey\": \"66f9462f-3200-4339-9a8e-3325fd83130a\",\n"
+            + "  \"btnGroupName\": \"组名称\",\n" + "  \"btnGroupType\": \"top\",\n" + "  \"btnName\": \"操作\",\n"
+            + "  \"btnType\": \"DIRECTORY\",\n" + "  \"btnIcon\": \"bpmn-icon-data-store\",\n"
+            + "  \"btnFormKey\": null,\n" + "  \"btnFormType\": \"noNeed\",\n" + "  \"btnProcessKey\": \"\",\n"
+            + "  \"btnTableKey\": \"\",\n" + "  \"btnScriptKey\": \"\",\n" + "  \"btnTableFormGroupKey\": null,\n"
+            + "  \"btnShowCondition\": \"\",\n"
+            + "  \"btnParams\": \"{\\\"commonFieldData\\\":[],\\\"conditionData\\\":[]}\",\n"
+            + "  \"btnHasPermi\": \"\",\n" + "  \"btnSort\": 0,\n" + "  \"children\": [\n" + "    {\n"
+            + "      \"remark\": \"默认初始化\",\n" + "      \"btnParentId\": 0,\n" + "      \"ancestorsId\": \"0,0\",\n"
+            + "      \"btnKey\": \"ece9101a-599a-4d0e-a987-b5241e463f1e\",\n" + "      \"btnGroupName\": \"\",\n"
+            + "      \"btnGroupType\": \"top\",\n" + "      \"btnName\": \"新增\",\n" + "      \"btnType\": \"INSERT\",\n"
+            + "      \"btnIcon\": \"el-icon-plus@primary\",\n" + "      \"btnFormKey\": null,\n"
+            + "      \"btnFormType\": \"noNeed\",\n" + "      \"btnProcessKey\": \"\",\n"
+            + "      \"btnTableKey\": \"\",\n" + "      \"btnScriptKey\": \"\",\n"
+            + "      \"btnTableFormGroupKey\": null,\n" + "      \"btnShowCondition\": \"\",\n"
+            + "      \"btnParams\": \"{\\\"commonFieldData\\\":[],\\\"conditionData\\\":[]}\",\n"
+            + "      \"btnHasPermi\": \"guandao:shenqing:xinzeng\",\n" + "      \"btnSort\": 0\n" + "    },\n"
+            + "    {\n" + "      \"remark\": \"默认初始化\",\n" + "      \"btnParentId\": 0,\n"
+            + "      \"ancestorsId\": \"0,0\",\n" + "      \"btnKey\": \"5685de0b-96c6-4d24-89b7-5cbd9afed73e\",\n"
+            + "      \"btnGroupName\": \"\",\n" + "      \"btnGroupType\": \"top\",\n" + "      \"btnName\": \"修改\",\n"
+            + "      \"btnType\": \"UPDATE\",\n" + "      \"btnIcon\": \"el-icon-edit@success\",\n"
+            + "      \"btnFormKey\": null,\n" + "      \"btnFormType\": \"noNeed\",\n"
+            + "      \"btnProcessKey\": \"\",\n" + "      \"btnTableKey\": \"\",\n" + "      \"btnScriptKey\": \"\",\n"
+            + "      \"btnTableFormGroupKey\": null,\n" + "      \"btnShowCondition\": \"\",\n"
+            + "      \"btnParams\": \"{\\\"commonFieldData\\\":[],\\\"conditionData\\\":[]}\",\n"
+            + "      \"btnHasPermi\": \"\",\n" + "      \"btnSort\": 1\n" + "    },\n" + "    {\n"
+            + "      \"remark\": \"默认初始化\",\n" + "      \"btnParentId\": 0,\n" + "      \"ancestorsId\": \"0,0\",\n"
+            + "      \"btnKey\": \"f530b421-c593-4914-bd45-b92ce533f9b9\",\n" + "      \"btnGroupName\": \"\",\n"
+            + "      \"btnGroupType\": \"top\",\n" + "      \"btnName\": \"删除\",\n" + "      \"btnType\": \"DELETE\",\n"
+            + "      \"btnIcon\": \"el-icon-delete@danger\",\n" + "      \"btnFormKey\": null,\n"
+            + "      \"btnFormType\": \"noNeed\",\n" + "      \"btnProcessKey\": \"\",\n"
+            + "      \"btnTableKey\": \"\",\n" + "      \"btnScriptKey\": \"\",\n"
+            + "      \"btnTableFormGroupKey\": null,\n" + "      \"btnShowCondition\": \"\",\n"
+            + "      \"btnParams\": \"{\\\"commonFieldData\\\":[],\\\"conditionData\\\":[]}\",\n"
+            + "      \"btnHasPermi\": \"\",\n" + "      \"btnSort\": 2\n" + "    },\n" + "    {\n"
+            + "      \"remark\": \"默认初始化\",\n" + "      \"btnParentId\": 0,\n" + "      \"ancestorsId\": \"0,0\",\n"
+            + "      \"btnKey\": \"446baf01-39ae-4866-b9b7-a72616c6586f\",\n" + "      \"btnGroupName\": \"\",\n"
+            + "      \"btnGroupType\": \"top\",\n" + "      \"btnName\": \"导入\",\n" + "      \"btnType\": \"IMPORT\",\n"
+            + "      \"btnIcon\": \"el-icon-upload@info\",\n" + "      \"btnFormKey\": null,\n"
+            + "      \"btnFormType\": \"noNeed\",\n" + "      \"btnProcessKey\": \"\",\n"
+            + "      \"btnTableKey\": \"\",\n" + "      \"btnScriptKey\": \"\",\n"
+            + "      \"btnTableFormGroupKey\": null,\n" + "      \"btnShowCondition\": \"\",\n"
+            + "      \"btnParams\": \"{\\\"commonFieldData\\\":[],\\\"conditionData\\\":[]}\",\n"
+            + "      \"btnHasPermi\": \"\",\n" + "      \"btnSort\": 3\n" + "    },\n" + "    {\n"
+            + "      \"remark\": \"默认初始化\",\n" + "      \"btnParentId\": 0,\n" + "      \"ancestorsId\": \"0,0\",\n"
+            + "      \"btnKey\": \"822cda1a-e40e-4ba6-9fe1-11690e33da97\",\n" + "      \"btnGroupName\": \"\",\n"
+            + "      \"btnGroupType\": \"top\",\n" + "      \"btnName\": \"导出\",\n" + "      \"btnType\": \"EXPORT\",\n"
+            + "      \"btnIcon\": \"el-icon-download@warning\",\n" + "      \"btnFormKey\": null,\n"
+            + "      \"btnFormType\": \"noNeed\",\n" + "      \"btnProcessKey\": \"\",\n"
+            + "      \"btnTableKey\": \"\",\n" + "      \"btnScriptKey\": \"\",\n"
+            + "      \"btnTableFormGroupKey\": null,\n" + "      \"btnShowCondition\": \"\",\n"
+            + "      \"btnParams\": \"{\\\"commonFieldData\\\":[],\\\"conditionData\\\":[]}\",\n"
+            + "      \"btnHasPermi\": \"\",\n" + "      \"btnSort\": 4\n" + "    }\n" + "  ]\n" + "}";
+
+        String jsonFilePath = "/Users/zrwj/Desktop/ZKQY_LJJ/Intelligent_manufacturing/drag_form/C:/log/qwe3.json";
+
+        BufferedReader bufferedReader = new BufferedReader(new FileReader(jsonFilePath));
+        StringBuilder sb = new StringBuilder();
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            sb.append(line).append("\n");
+        }
+        String jsonString = sb.toString();
+
+        // 解析JSON字符串为List<Map<String, Object>>类型
+        List<Map<String, Object>> menuDataList =
+            JSON.parseObject(jsonString, new TypeReference<List<Map<String, Object>>>() {});
+
+        DragTable dragTable = new DragTable();
+        dragTable.setDtType("0");
+
+        // 得到tableList
+        List<DragTable> tableList = dragTableService.selectDragTableList(dragTable);
+        Map<String, Map<String, String>> tableBTNMap = new HashMap();
+        tableList.forEach(item -> {
+            Map<String, Object> objectMap = (Map<String, Object>)JSON.parse(item.getEchoData());
+            String menuName = ((Map)objectMap.get("formData")).get("menuName").toString();
+            Map<String, String> val = new HashMap<>();
+            val.put("menuName", menuName);
+            val.put("menuID", item.getMenuId().toString());
+            tableBTNMap.put(item.getTableKey(), val);
+        });
+        tableBTNMap.remove("a0ede390-f1a3-429a-a4f3-3882a51a67d6"); // 当前表格已存在顶部按钮
+        List<DragTableBtnDefaultVo> dragTableBtnDefaultVos = new ArrayList<>();
+        // 封装按钮数据
+        tableBTNMap.keySet().forEach(key -> {
+            DragTableBtnDefaultVo dragTableBtnDefaultVo = new DragTableBtnDefaultVo();
+            String mId = tableBTNMap.get(key).get("menuID");
+            dragTableBtnDefaultVo.setTableKey(key);
+            dragTableBtnDefaultVo.setMenuID(mId);
+            StringBuffer fujicaidanname = new StringBuffer(); // 父级菜单Id
+            menuDataList.forEach(item -> {
+                if (item.get("menuId").toString().equals(mId)) {
+                    menuDataList.forEach(mtem -> {
+                        if (mtem.get("menuId").toString().equals(item.get("parentId").toString())) {
+                            fujicaidanname.append(mtem.get("menuName"));
+                        }
+                    });
+                }
+            });
+            dragTableBtnDefaultVo.setHasPermiName("huaxian:" + fujicaidanname + tableBTNMap.get(key).get("menuName"));
+            DragTableBtn dragTableBtnTop = JSON.parseObject(btnJson, DragTableBtn.class);
+            dragTableBtnDefaultVo.setDragTableBtnTop(dragTableBtnTop);
+            dragTableBtnDefaultVos.add(dragTableBtnDefaultVo);
+        });
+        List<Map<String, Object>> menuList = new ArrayList<>();
+        dragTableBtnDefaultVos.forEach(item -> {
+            menuList.addAll(iDragTableBtnService.insertByDefaultBtn(item));
+        });
+        return menuList;
+
+    }
+
+
     /**
-     * 处理按钮通用接口（新增、修改、删除...）
-     * 判断什么类型走什么接口: visible  false代表弹窗未开启时走回显表单模板及数据信息接口；true代表弹窗开启时走保存数据接口
-     * 是否提交表单操作 true是 false回显表单数据  commonEntity.getBasicMap().get("visible").toString()
+     * 处理按钮通用接口（新增、修改、删除...） 判断什么类型走什么接口: visible false代表弹窗未开启时走回显表单模板及数据信息接口；true代表弹窗开启时走保存数据接口 是否提交表单操作 true是
+     * false回显表单数据 commonEntity.getBasicMap().get("visible").toString()
      */
     @PostMapping("/commonBtnHandle")
     public AjaxResult commonBtnHandle(@RequestBody CommonEntity commonEntity) {
         // 获取到按钮类型
         String btnType = commonEntity.getBasicMap().get("btnType").toString();
         /**
-         * 发起流程类型(需要特定参数)，
-         * 启动脚本类型(执行特定脚本无需传递参数)
+         * 发起流程类型(需要特定参数)， 启动脚本类型(执行特定脚本无需传递参数)
          */
         switch (btnType) {
             case "INSERT":
@@ -58,9 +183,9 @@ public class CommonBtnController extends BaseController {
                 return updateBtn(commonEntity);
             case "DELETE":
                 return deleteBtn(commonEntity);
-            case "EXECUTE":  // 执行脚本
+            case "EXECUTE": // 执行脚本
                 return executeBtn(commonEntity);
-            case "INITIATED":  // 发起流程
+            case "INITIATED": // 发起流程
                 return initiatedBtn(commonEntity);
             default:
                 return warn("暂不支持该操作！");
@@ -85,7 +210,6 @@ public class CommonBtnController extends BaseController {
         }
     }
 
-
     /**
      * 修改类型按钮
      *
@@ -93,18 +217,19 @@ public class CommonBtnController extends BaseController {
      * @return
      */
     public AjaxResult updateBtn(CommonEntity commonEntity) {
-        //是否开启弹窗
+        // 是否开启弹窗
         if (commonEntity.getBasicMap().get("visible").toString().equals("true")) {
-            if (commonEntity.getBasicMap().containsKey("btnKey")) {  // 按钮提交时会触发别的操作
+            if (commonEntity.getBasicMap().containsKey("btnKey")) { // 按钮提交时会触发别的操作
                 // 根据按钮别名查询按钮详细信息
-                DragTableBtn dragTableBtn = iDragTableBtnService.selectDragTableBtnByBtnKey(commonEntity.getBasicMap().get("btnKey").toString());
+                DragTableBtn dragTableBtn = iDragTableBtnService
+                    .selectDragTableBtnByBtnKey(commonEntity.getBasicMap().get("btnKey").toString());
                 // 根据流程的key判断当前按钮是否执行触发流程
                 if (!dragTableBtn.getBtnProcessKey().isEmpty()) {
                     // 调用发起流程接口
                     fromUtils.runBpmProductionScheduling(commonEntity);
-//                    if (dragTableBtn.getBtnFormKey().isEmpty()) {  // 校验当前按钮是否是直接触发流程 或者脚本 （新增按钮类型）
-//                        fromUtils.runBpmProductionScheduling(commonEntity);
-//                    }
+                    // if (dragTableBtn.getBtnFormKey().isEmpty()) { // 校验当前按钮是否是直接触发流程 或者脚本 （新增按钮类型）
+                    // fromUtils.runBpmProductionScheduling(commonEntity);
+                    // }
                 } else if (!dragTableBtn.getBtnScriptKey().isEmpty()) {
                     // 调用执行脚本接口
                     fromUtils.triggerScript(commonEntity);
@@ -143,9 +268,10 @@ public class CommonBtnController extends BaseController {
      */
     public AjaxResult executeBtn(CommonEntity commonEntity) {
         if (commonEntity.getBasicMap().get("visible").toString().equals("true")) {
-            if (commonEntity.getBasicMap().containsKey("btnKey")) {  // 按钮提交时会触发别的操作
+            if (commonEntity.getBasicMap().containsKey("btnKey")) { // 按钮提交时会触发别的操作
                 // 根据按钮别名查询按钮详细信息
-                DragTableBtn dragTableBtn = iDragTableBtnService.selectDragTableBtnByBtnKey(commonEntity.getBasicMap().get("btnKey").toString());
+                DragTableBtn dragTableBtn = iDragTableBtnService
+                    .selectDragTableBtnByBtnKey(commonEntity.getBasicMap().get("btnKey").toString());
                 if (!dragTableBtn.getBtnScriptKey().isEmpty()) {
                     // 调用执行脚本接口
                     fromUtils.triggerScript(commonEntity);
@@ -172,14 +298,15 @@ public class CommonBtnController extends BaseController {
      * @return
      */
     public AjaxResult initiatedBtn(CommonEntity commonEntity) {
-        //是否开启弹窗
+        // 是否开启弹窗
         if (commonEntity.getBasicMap().get("visible").toString().equals("true")) {
-            if (commonEntity.getBasicMap().containsKey("btnKey")) {  // 按钮提交时会触发别的操作
+            if (commonEntity.getBasicMap().containsKey("btnKey")) { // 按钮提交时会触发别的操作
                 // 根据按钮别名查询按钮详细信息
-                DragTableBtn dragTableBtn = iDragTableBtnService.selectDragTableBtnByBtnKey(commonEntity.getBasicMap().get("btnKey").toString());
+                DragTableBtn dragTableBtn = iDragTableBtnService
+                    .selectDragTableBtnByBtnKey(commonEntity.getBasicMap().get("btnKey").toString());
                 // 根据流程的key判断当前按钮是否执行触发流程
                 if (!dragTableBtn.getBtnProcessKey().isEmpty()) {
-                    //  表示对当前操作是及时选择的流程模板
+                    // 表示对当前操作是及时选择的流程模板
                     if (dragTableBtn.getBtnProcessKey().equals("unknown")) {
                         // 调用发起流程接口
                         fromUtils.runBpmProductionScheduling(commonEntity);
@@ -205,7 +332,6 @@ public class CommonBtnController extends BaseController {
         }
     }
 
-
     /**
      * 动态表格绑定的弹窗表格结构信息
      */
@@ -222,5 +348,4 @@ public class CommonBtnController extends BaseController {
         return AjaxResult.success(dragTableGroupService.getProcessPopupTableList(commonEntity));
     }
 
-
 }

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragFormController.java

@@ -34,7 +34,7 @@ public class DragFormController extends BaseController {
      * 查询动态表单
      * 列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:form:list')")
+    ////@PreAuthorize("@ss.hasPermi('system:form:list')")
     @GetMapping("/list")
     public TableDataInfo list(DragForm dragForm) {
         startPage();
@@ -46,7 +46,7 @@ public class DragFormController extends BaseController {
      * 导出动态表单
      * 列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:form:export')")
+    ////@PreAuthorize("@ss.hasPermi('system:form:export')")
     @Log(title = "动态表单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DragForm dragForm) {
@@ -59,7 +59,7 @@ public class DragFormController extends BaseController {
      * 获取动态表单
      * 详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('system:form:query')")
+    ////@PreAuthorize("@ss.hasPermi('system:form:query')")
     @GetMapping(value = "/{fId}")
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return success(dragFormService.selectDragFormByFId(fId));
@@ -73,7 +73,7 @@ public class DragFormController extends BaseController {
     /**
      * 新增动态表单
      */
-    //@PreAuthorize("@ss.hasPermi('system:form:add')")
+    ////@PreAuthorize("@ss.hasPermi('system:form:add')")
     @Log(title = "动态表单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DragForm dragForm) {
@@ -83,7 +83,7 @@ public class DragFormController extends BaseController {
     /**
      * 修改动态表单
      */
-    //@PreAuthorize("@ss.hasPermi('system:form:edit')")
+    ////@PreAuthorize("@ss.hasPermi('system:form:edit')")
     @Log(title = "动态表单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DragForm dragForm) {
@@ -93,7 +93,7 @@ public class DragFormController extends BaseController {
     /**
      * 删除动态表单
      */
-    //@PreAuthorize("@ss.hasPermi('system:form:remove')")
+    ////@PreAuthorize("@ss.hasPermi('system:form:remove')")
     @Log(title = "动态表单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds) {

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragFormGroupController.java

@@ -40,7 +40,7 @@ public class DragFormGroupController extends BaseController {
     /**
      * 查询动态表单组列表
      */
-//@PreAuthorize("@ss.hasPermi('system:formGroup:list')")
+////@PreAuthorize("@ss.hasPermi('system:formGroup:list')")
     @GetMapping("/list")
     @ApiOperation(value = "查询动态表单组列表")
     public TableDataInfo list(DragFormGroup dragFormGroup) {
@@ -52,7 +52,7 @@ public class DragFormGroupController extends BaseController {
     /**
      * 导出动态表单组列表
      */
-    @PreAuthorize("@ss.hasPermi('system:formGroup:export')")
+    //@PreAuthorize("@ss.hasPermi('system:formGroup:export')")
     @Log(title = "动态表单组", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出动态表单组列表")
@@ -65,7 +65,7 @@ public class DragFormGroupController extends BaseController {
     /**
      * 获取动态表单组详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:formGroup:query')")
+//    //@PreAuthorize("@ss.hasPermi('system:formGroup:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取动态表单组详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -75,7 +75,7 @@ public class DragFormGroupController extends BaseController {
     /**
      * 获取动态表单组详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:formGroup:query')")
+//    //@PreAuthorize("@ss.hasPermi('system:formGroup:query')")
     @GetMapping(value = "/getInfoByGroupKey/{groupKey}")
     @ApiOperation(value = "获取动态表单组详细信息")
     public AjaxResult getInfoByGroupKey(@PathVariable("groupKey") String groupKey) {
@@ -85,7 +85,7 @@ public class DragFormGroupController extends BaseController {
     /**
      * 新增动态表单组
      */
-//    @PreAuthorize("@ss.hasPermi('system:formGroup:add')")
+//    //@PreAuthorize("@ss.hasPermi('system:formGroup:add')")
     @Log(title = "动态表单组", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增动态表单组")
@@ -96,7 +96,7 @@ public class DragFormGroupController extends BaseController {
     /**
      * 修改动态表单组
      */
-//    @PreAuthorize("@ss.hasPermi('system:formGroup:edit')")
+//    //@PreAuthorize("@ss.hasPermi('system:formGroup:edit')")
     @Log(title = "动态表单组", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改动态表单组")
@@ -107,7 +107,7 @@ public class DragFormGroupController extends BaseController {
     /**
      * 删除动态表单组
      */
-//    @PreAuthorize("@ss.hasPermi('system:formGroup:remove')")
+//    //@PreAuthorize("@ss.hasPermi('system:formGroup:remove')")
     @Log(title = "动态表单组", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除动态表单组")

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableBtnController.java

@@ -43,7 +43,7 @@ public class DragTableBtnController extends BaseController {
     /**
      * 查询格绑定的自定义按钮列表
      */
-    @PreAuthorize("@ss.hasPermi('system:btn:list')")
+    //@PreAuthorize("@ss.hasPermi('system:btn:list')")
     @GetMapping("/list")
     public TableDataInfo list(DragTableBtn dragTableBtn) {
         startPage();
@@ -54,7 +54,7 @@ public class DragTableBtnController extends BaseController {
     /**
      * 导出格绑定的自定义按钮列表
      */
-    @PreAuthorize("@ss.hasPermi('system:btn:export')")
+    //@PreAuthorize("@ss.hasPermi('system:btn:export')")
     @Log(title = "格绑定的自定义按钮", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DragTableBtn dragTableBtn) {
@@ -66,7 +66,7 @@ public class DragTableBtnController extends BaseController {
     /**
      * 获取格绑定的自定义按钮详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:btn:query')")
+    //@PreAuthorize("@ss.hasPermi('system:btn:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(dragTableBtnService.selectDragTableBtnById(id));
@@ -75,7 +75,7 @@ public class DragTableBtnController extends BaseController {
     /**
      * 新增格绑定的自定义按钮
      */
-    @PreAuthorize("@ss.hasPermi('system:btn:add')")
+    //@PreAuthorize("@ss.hasPermi('system:btn:add')")
     @Log(title = "格绑定的自定义按钮", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DragTableBtn dragTableBtn) {
@@ -86,7 +86,7 @@ public class DragTableBtnController extends BaseController {
     /**
      * 修改格绑定的自定义按钮
      */
-    @PreAuthorize("@ss.hasPermi('system:btn:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:btn:edit')")
     @Log(title = "格绑定的自定义按钮", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DragTableBtn dragTableBtn) {
@@ -96,7 +96,7 @@ public class DragTableBtnController extends BaseController {
     /**
      * 删除格绑定的自定义按钮
      */
-    @PreAuthorize("@ss.hasPermi('system:btn:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:btn:remove')")
     @Log(title = "格绑定的自定义按钮", businessType = BusinessType.DELETE)
     @DeleteMapping("/{id}")
     public AjaxResult remove(@PathVariable Long id) {

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableConditionController.java

@@ -33,7 +33,7 @@ public class DragTableConditionController extends BaseController
     /**
      * 查询动态表格条件列表
      */
-    @PreAuthorize("@ss.hasPermi('system:condition:list')")
+    //@PreAuthorize("@ss.hasPermi('system:condition:list')")
     @GetMapping("/list")
     public TableDataInfo list(CommonEntity commonEntity)
     {
@@ -44,7 +44,7 @@ public class DragTableConditionController extends BaseController
     /**
      * 新增动态表格条件
      */
-    @PreAuthorize("@ss.hasPermi('system:condition:add')")
+    //@PreAuthorize("@ss.hasPermi('system:condition:add')")
     @Log(title = "动态表格条件", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CommonEntity commonEntity)
@@ -55,7 +55,7 @@ public class DragTableConditionController extends BaseController
     /**
      * 修改动态表格条件
      */
-    @PreAuthorize("@ss.hasPermi('system:condition:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:condition:edit')")
     @Log(title = "动态表格条件", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CommonEntity commonEntity)
@@ -66,7 +66,7 @@ public class DragTableConditionController extends BaseController
     /**
      * 删除动态表格条件
      */
-    @PreAuthorize("@ss.hasPermi('system:condition:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:condition:remove')")
     @Log(title = "动态表格条件", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{tcIds}")
     public AjaxResult remove(@RequestBody CommonEntity commonEntity)

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableGroupController.java

@@ -43,7 +43,7 @@ public class DragTableGroupController extends BaseController {
 
     /**
      * 查询拖拽格组列表
-     * @PreAuthorize("@ss.hasPermi('system:group:list')")
+     * //@PreAuthorize("@ss.hasPermi('system:group:list')")
      */
     @GetMapping("/list")
     @ApiOperation(value = "查询拖拽格组列表")
@@ -71,7 +71,7 @@ public class DragTableGroupController extends BaseController {
     /**
      * 导出拖拽格组列表
      */
-    @PreAuthorize("@ss.hasPermi('system:group:export')")
+    //@PreAuthorize("@ss.hasPermi('system:group:export')")
     @Log(title = "拖拽格组", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出拖拽格组列表")
@@ -86,7 +86,7 @@ public class DragTableGroupController extends BaseController {
     /**
      * 获取拖拽格组详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:group:query')")
+    //@PreAuthorize("@ss.hasPermi('system:group:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取拖拽格组详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -120,7 +120,7 @@ public class DragTableGroupController extends BaseController {
     /**
      * 修改拖拽格组
      */
-    @PreAuthorize("@ss.hasPermi('system:group:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:group:edit')")
     @Log(title = "拖拽格组", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改拖拽格组")
@@ -132,7 +132,7 @@ public class DragTableGroupController extends BaseController {
     /**
      * 修改拖拽配置表格组
      */
-    @PreAuthorize("@ss.hasPermi('system:group:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:group:edit')")
     @Log(title = "拖拽格组", businessType = BusinessType.UPDATE)
     @PutMapping("/editConfigurationGroup")
     @ApiOperation(value = "修改拖拽配置表格组")
@@ -145,7 +145,7 @@ public class DragTableGroupController extends BaseController {
     /**
      * 批量删除拖拽格组
      */
-    @PreAuthorize("@ss.hasPermi('system:group:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:group:remove')")
     @Log(title = "拖拽格组", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除拖拽格组")
@@ -169,7 +169,7 @@ public class DragTableGroupController extends BaseController {
     /**
      * 获取拖拽格组详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:group:query')")
+//    //@PreAuthorize("@ss.hasPermi('system:group:query')")
     @GetMapping("/getInfoBySqlKey/{groupKey}")
     public AjaxResult getInfoBySqlKey(@PathVariable("groupKey") String groupKey)
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableStatisticController.java

@@ -36,7 +36,7 @@ public class DragTableStatisticController extends BaseController
 /**
  * 查询动态表格统计列表
  */
-@PreAuthorize("@ss.hasPermi('system:statistic:list')")
+//@PreAuthorize("@ss.hasPermi('system:statistic:list')")
 @GetMapping("/list")
 @ApiOperation(value = "查询动态表格统计列表")
     public TableDataInfo list(DragTableStatistic dragTableStatistic)
@@ -49,7 +49,7 @@ public class DragTableStatisticController extends BaseController
     /**
      * 导出动态表格统计列表
      */
-    @PreAuthorize("@ss.hasPermi('system:statistic:export')")
+    //@PreAuthorize("@ss.hasPermi('system:statistic:export')")
     @Log(title = "动态表格统计", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出动态表格统计列表")
@@ -63,7 +63,7 @@ public class DragTableStatisticController extends BaseController
     /**
      * 获取动态表格统计详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:statistic:query')")
+    //@PreAuthorize("@ss.hasPermi('system:statistic:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取动态表格统计详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -74,7 +74,7 @@ public class DragTableStatisticController extends BaseController
     /**
      * 新增动态表格统计
      */
-    @PreAuthorize("@ss.hasPermi('system:statistic:add')")
+    //@PreAuthorize("@ss.hasPermi('system:statistic:add')")
     @Log(title = "动态表格统计", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增动态表格统计")
@@ -92,7 +92,7 @@ public class DragTableStatisticController extends BaseController
     /**
      * 新增动态表格组统计
      */
-    @PreAuthorize("@ss.hasPermi('system:statistic:add')")
+    //@PreAuthorize("@ss.hasPermi('system:statistic:add')")
     @Log(title = "动态表格统计", businessType = BusinessType.INSERT)
     @PostMapping("/addGroupTableStatistic")
     @ApiOperation(value = "新增动态表格统计")
@@ -110,7 +110,7 @@ public class DragTableStatisticController extends BaseController
     /**
      * 修改动态表格统计
      */
-    @PreAuthorize("@ss.hasPermi('system:statistic:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:statistic:edit')")
     @Log(title = "动态表格统计", businessType = BusinessType.UPDATE)
     @PutMapping("/updateGroupTableStatistic")
     @ApiOperation(value = "修改动态表格统计")
@@ -125,7 +125,7 @@ public class DragTableStatisticController extends BaseController
     /**
      * 修改动态表格统计
      */
-    @PreAuthorize("@ss.hasPermi('system:statistic:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:statistic:edit')")
     @Log(title = "动态表格统计", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改动态表格统计")
@@ -138,7 +138,7 @@ public class DragTableStatisticController extends BaseController
     /**
      * 删除动态表格统计
      */
-    @PreAuthorize("@ss.hasPermi('system:statistic:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:statistic:remove')")
     @Log(title = "动态表格统计", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tableKey}")
     @ApiOperation(value = "删除动态表格统计")
@@ -150,7 +150,7 @@ public class DragTableStatisticController extends BaseController
     /**
      * 获取动态表格统计详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:statistic:query')")
+    //@PreAuthorize("@ss.hasPermi('system:statistic:query')")
     @GetMapping("/getInfoBySqlKey")
     @ApiOperation(value = "获取动态表格统计详细信息")
     public AjaxResult getInfoBySqlKey(@RequestParam("sqlKey") String sqlKey)

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableStyleController.java

@@ -39,7 +39,7 @@ public class DragTableStyleController extends BaseController
     /**
      * 查询动态格样式列表
      */
-    @PreAuthorize("@ss.hasPermi('system:style:list')")
+    //@PreAuthorize("@ss.hasPermi('system:style:list')")
     @GetMapping("/list")
     public TableDataInfo list(DragTableStyle dragTableStyle)
     {
@@ -51,7 +51,7 @@ public class DragTableStyleController extends BaseController
     /**
      * 导出动态格样式列表
      */
-    @PreAuthorize("@ss.hasPermi('system:style:export')")
+    //@PreAuthorize("@ss.hasPermi('system:style:export')")
     @Log(title = "动态格样式", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DragTableStyle dragTableStyle)
@@ -64,7 +64,7 @@ public class DragTableStyleController extends BaseController
     /**
      * 获取动态格样式详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:style:query')")
+    //@PreAuthorize("@ss.hasPermi('system:style:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -74,7 +74,7 @@ public class DragTableStyleController extends BaseController
     /**
      * 新增动态格样式
      */
-    @PreAuthorize("@ss.hasPermi('system:style:add')")
+    //@PreAuthorize("@ss.hasPermi('system:style:add')")
     @Log(title = "动态格样式", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DragTableVo vo)
@@ -85,7 +85,7 @@ public class DragTableStyleController extends BaseController
     /**
      * 修改动态格样式
      */
-    @PreAuthorize("@ss.hasPermi('system:style:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:style:edit')")
     @Log(title = "动态格样式", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DragTableVo vo)
@@ -97,7 +97,7 @@ public class DragTableStyleController extends BaseController
     /**
      * 删除动态格样式
      */
-    @PreAuthorize("@ss.hasPermi('system:style:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:style:remove')")
     @Log(title = "动态格样式", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/SysDictDataController.java

@@ -43,7 +43,7 @@ public class SysDictDataController extends BaseController
     }
 
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:export')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictData dictData)
     {
@@ -55,7 +55,7 @@ public class SysDictDataController extends BaseController
     /**
      * 查询字典数据详细
      */
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:query')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:query')")
     @GetMapping(value = "/{dictCode}")
     public AjaxResult getInfo(@PathVariable Long dictCode)
     {
@@ -79,7 +79,7 @@ public class SysDictDataController extends BaseController
     /**
      * 新增字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:add')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictData dict)
@@ -92,7 +92,7 @@ public class SysDictDataController extends BaseController
     /**
      * 修改保存字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
@@ -105,7 +105,7 @@ public class SysDictDataController extends BaseController
     /**
      * 删除字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
     public AjaxResult remove(@PathVariable Long[] dictCodes)

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/SysDictTypeController.java

@@ -28,7 +28,7 @@ public class SysDictTypeController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:list')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysDictType dictType)
     {
@@ -38,7 +38,7 @@ public class SysDictTypeController extends BaseController
     }
 
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:export')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictType dictType)
     {
@@ -50,7 +50,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 查询字典类型详细
      */
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:query')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:query')")
     @GetMapping(value = "/{dictId}")
     public AjaxResult getInfo(@PathVariable Long dictId)
     {
@@ -60,7 +60,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 新增字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:add')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictType dict)
@@ -77,7 +77,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 修改字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDictType dict)
@@ -94,7 +94,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 删除字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:tenantDict:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:tenantDict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
     public AjaxResult remove(@PathVariable Long[] dictIds)
@@ -106,7 +106,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 刷新字典缓存
      */
-//    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+//    //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
 //    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
     public AjaxResult refreshCache()

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/TableSqlController.java

@@ -40,7 +40,7 @@ public class TableSqlController extends BaseController
     /**
      * 查询table 联合查询sql存储列表
      */
-    @PreAuthorize("@ss.hasPermi('system:sql:list')")
+    //@PreAuthorize("@ss.hasPermi('system:sql:list')")
     @GetMapping("/list")
     public TableDataInfo list(TableSql tableSql)
     {
@@ -52,7 +52,7 @@ public class TableSqlController extends BaseController
     /**
      * 导出table 联合查询sql存储列表
      */
-    @PreAuthorize("@ss.hasPermi('system:sql:export')")
+    //@PreAuthorize("@ss.hasPermi('system:sql:export')")
     @Log(title = "table 联合查询sql存储", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TableSql tableSql)
@@ -65,7 +65,7 @@ public class TableSqlController extends BaseController
     /**
      * 获取table 联合查询sql存储详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:sql:query')")
+    //@PreAuthorize("@ss.hasPermi('system:sql:query')")
     @GetMapping(value = "/{tId}")
     public AjaxResult getInfo(@PathVariable("tId") Long tId)
     {
@@ -75,7 +75,7 @@ public class TableSqlController extends BaseController
     /**
      * 新增table 联合查询sql存储
      */
-    @PreAuthorize("@ss.hasPermi('system:sql:add')")
+    //@PreAuthorize("@ss.hasPermi('system:sql:add')")
     @Log(title = "table 联合查询sql存储", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TableSql tableSql)
@@ -86,7 +86,7 @@ public class TableSqlController extends BaseController
     /**
      * 修改table 联合查询sql存储
      */
-    @PreAuthorize("@ss.hasPermi('system:sql:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:sql:edit')")
     @Log(title = "table 联合查询sql存储", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TableSql tableSql)
@@ -97,7 +97,7 @@ public class TableSqlController extends BaseController
     /**
      * 删除table 联合查询sql存储
      */
-    @PreAuthorize("@ss.hasPermi('system:sql:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:sql:remove')")
     @Log(title = "table 联合查询sql存储", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{tIds}")
     public AjaxResult remove(@PathVariable Long[] tIds)